Comment 32 for bug 856072

(In reply to Michael K. Edwards from comment #28)
> (In reply to Doug Turner (:dougt) from comment #27)
> > Comment on attachment 563867 [diff] [details] [review] [diff] [details] [review]
> > Updated patch, with Honeycomb handling
> >
> > Review of attachment 563867 [diff] [details] [review] [diff] [details] [review]:
> > -----------------------------------------------------------------
> >
> > looking better. Please fixup. mwu should also look at these changes when
> > the patch is cleaned up.
> >
> > mwu - are you comfortable with the license here? is it similar to the
> > APKOpen stuff?
> >
> > ::: memory/mozutils/Makefile.in
> > @@ +83,5 @@
> > > ifeq (Android, $(OS_TARGET))
> > > # Add Android linker
> > > EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
> > > SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,$(DEPTH)/other-licenses/android)
> > > +WRAP_LDFLAGS = -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror
> >
> > Why is this needed, but wasn't needed to wrap malloc?
>
> Now that we call __real_getaddrinfo() from __wrap_getaddrinfo(), libmozutils
> linking breaks without it.

Just call getaddrinfo() from __wrap_getaddrinfo(), and you don't need -Wl,--wrap... like __wrap_dl* functions call dl* (see dlfcn.h)