Comment on attachment 608621 [details] [diff] [review] patch Review of attachment 608621 [details] [diff] [review]: ----------------------------------------------------------------- ::: configure.in @@ +7274,3 @@ > fi > + WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror" > + WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=fork,--wrap=pthread_atfork" Do you really want to also wrap getaddrinfo, etc.? ::: mozglue/build/Makefile.in @@ +96,5 @@ > +# To properly wrap jemalloc's pthread_atfork call. > +EXTRA_DSO_LDOPTS += -Wl,--wrap=pthread_atfork > +SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,$(DEPTH)/other-licenses/android) > +SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,gonk,../gonk) > +endif Please share this with android. ::: mozglue/gonk/GonkGlue.cpp @@ +31,5 @@ > + * and other provisions required by the GPL or the LGPL. If you do not delete > + * the provisions above, a recipient may use your version of this file under > + * the terms of any one of the MPL, the GPL or the LGPL. > + * > + * ***** END LICENSE BLOCK ***** */ Please use MPL2 header. @@ +80,5 @@ > + if (it->parent) > + it->parent(); > + } > + return pid; > +} Please move that under mozglue/build, remove the mozglue/android/APKOpen.cpp corresponding code, and make both android and gonk build from mozglue/build.

Can we do some of this as follow-up fixes? The jemalloc landing broke our builds and our build host is burning. And yes we want to wrap getaddrinfo etc hence the libandroid import.

(In reply to Andreas Gal :gal from comment #3) > Can we do some of this as follow-up fixes? The jemalloc landing broke our > builds and our build host is burning. And yes we want to wrap getaddrinfo > etc hence the libandroid import. Ok. Please change the license boilerplate, though.

Will change boilerplate and land and file follow-up. Thanks. Can you stamp with these conditions?

Pushed to inbound. Follow-up filed. MPL2 header fixed. http://hg.mozilla.org/integration/mozilla-inbound/rev/fd2c598e7fde

Wait! The mozglue/gonk/Makefile.in has C++ comment syntax in it instead of Makefile # comments!

mwu will fix in follow-up, we wanted to stop the builder from burning

Mode header is wrong too (C++ instead of Makefile), which screws things up massively in emacs.

Please take this to the follow-up bug