Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 577635 - android_stub.h broken for android platform version 8, pass ANDROID_VERSION to nss r=khuey

Browse Source
This commit is contained in:
Brad Lassey 2010-07-19 14:05:29 -04:00
parent acef5b87c5
commit cf31d613af
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -669,3 +669,4 @@ ANDROID_TOOLCHAIN = @ANDROID_TOOLCHAIN@
ANDROID_PLATFORM = @ANDROID_PLATFORM@ ANDROID_PLATFORM = @ANDROID_PLATFORM@
ANDROID_SDK = @ANDROID_SDK@ ANDROID_SDK = @ANDROID_SDK@
ANDROID_TOOLS = @ANDROID_TOOLS@ ANDROID_TOOLS = @ANDROID_TOOLS@
ANDROID_VERSION = @ANDROID_VERSION@

2
configure.in
View File

@ -331,9 +331,11 @@ if test "$target" = "arm-android-eabi" ; then
ANDROID_PLATFORM="{android_platform}" ANDROID_PLATFORM="{android_platform}"
ANDROID_SDK="${android_sdk}" ANDROID_SDK="${android_sdk}"
ANDROID_TOOLS="${android_tools}" ANDROID_TOOLS="${android_tools}"
ANDROID_VERSION="${android_version}"
AC_DEFINE(ANDROID) AC_DEFINE(ANDROID)
AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version) AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version)
AC_SUBST(ANDROID_VERSION)
CROSS_COMPILE=1 CROSS_COMPILE=1
MOZ_CHROME_FILE_FORMAT=omni MOZ_CHROME_FILE_FORMAT=omni
fi fi

2
security/manager/Makefile.in
View File

@ -285,7 +285,7 @@ DEFAULT_GMAKE_FLAGS += \
OS_RELEASE="2.6" \ OS_RELEASE="2.6" \
OS_LIBS= \ OS_LIBS= \
STANDARDS_CFLAGS="-std=gnu89" \ STANDARDS_CFLAGS="-std=gnu89" \
DSO_CFLAGS="$(CFLAGS) -DCHECK_FORK_GETPID -DRTLD_NOLOAD=0 -include $(topsrcdir)/security/manager/android_stub.h" \ DSO_CFLAGS="$(CFLAGS) -DCHECK_FORK_GETPID -DRTLD_NOLOAD=0 -DANDROID_VERSION=$(ANDROID_VERSION) -include $(topsrcdir)/security/manager/android_stub.h" \
DSO_LDOPTS="-shared $(LDFLAGS) $(WRAP_MALLOC_CFLAGS) $(WRAP_MALLOC_LIB) " \ DSO_LDOPTS="-shared $(LDFLAGS) $(WRAP_MALLOC_CFLAGS) $(WRAP_MALLOC_LIB) " \
$(NULL) $(NULL)
endif endif