Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 712284 - Remove dladdr hack for NSS on android. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2012-01-10 09:10:53 +01:00
parent 0ff14cec65
commit 84247499ed
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/manager/Makefile.in
View File

@ -262,12 +262,7 @@ DEFAULT_GMAKE_FLAGS += \
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

13
security/manager/android_stub.h
View File

@ -40,19 +40,6 @@
#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_