Bug 712284 - Remove dladdr hack for NSS on android. r=ted,a=blassey
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 10 Jan 2012 09:10:53 +0100
changeset 85459 4e9f76b31e81effcc4246b2973018c87158678aa
parent 85458 471d0ae1db6d7cfb220817adb3c3a87707c965a7
child 85460 d8158788ac4ddb01ed65e27a1d61607cb725f47a
push id114
push userffxbld
push dateFri, 09 Mar 2012 01:01:18 +0000
treeherdermozilla-release@c081ebf13261 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, blassey
bugs712284
milestone11.0a2
Bug 712284 - Remove dladdr hack for NSS on android. r=ted,a=blassey
security/manager/Makefile.in
security/manager/android_stub.h
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -257,23 +257,18 @@ DEFAULT_GMAKE_FLAGS += \
 # Android has pthreads integrated into -lc, so OS_PTHREAD is set to nothing
 ifeq ($(OS_TARGET), Android)
 DEFAULT_GMAKE_FLAGS += \
 	OS_RELEASE="2.6" \
 	OS_PTHREAD= \
 	STANDARDS_CFLAGS="-std=gnu89" \
 	$(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-DEFAULT_GMAKE_FLAGS += ARCHFLAG="$(CFLAGS) -DCHECK_FORK_GETPID -DRTLD_NOLOAD=0 -DANDROID_VERSION=$(ANDROID_VERSION) -include $(ABS_topsrcdir)/security/manager/android_stub.h"
-else
 DEFAULT_GMAKE_FLAGS += ARCHFLAG="$(CFLAGS) -DCHECK_FORK_GETPID -DRTLD_NOLOAD=0 -include $(ABS_topsrcdir)/security/manager/android_stub.h"
 endif
-
-endif
 endif
 
 ifdef WRAP_LDFLAGS
 DEFAULT_GMAKE_FLAGS += \
 	LDFLAGS="$(LDFLAGS) $(WRAP_LDFLAGS)" \
 	DSO_LDOPTS="-shared $(LDFLAGS) $(WRAP_LDFLAGS)" \
 	$(NULL)
 endif
--- a/security/manager/android_stub.h
+++ b/security/manager/android_stub.h
@@ -35,29 +35,16 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* This file allows NSS to build by stubbing out
  * features that aren't provided by Android/Bionic */
 
 #ifndef ANDROID_STUB_H
 #define ANDROID_STUB_H
 
-#include "dlfcn.h"
-#ifdef ANDROID_VERSION
-#if ANDROID_VERSION < 8
-/* because dladdr isn't supported in android 2.1 and older.
- * however, it exists in the android repos so.. maybe someday. */
-typedef struct {
-  char *dli_fname;
-} Dl_info;
-
-#define dladdr(foo, bar) 0
-#endif
-#endif
-
 /* sysinfo is defined but not implemented.
  * we may be able to implement it ourselves. */
 #define _SYS_SYSINFO_H_
 
 #include <sys/cdefs.h>
 #include <linux/kernel.h>
 
 #define sysinfo(foo) -1