bug 577635 - android_stub.h broken for android platform version 8, pass ANDROID_VERSION to nss r=khuey
authorBrad Lassey <blassey@mozilla.com>
Mon, 19 Jul 2010 14:05:29 -0400
changeset 47932 42b67d331734261570f95b4d1908f0d4716790c8
parent 47931 9329d05ad12a8199b30c6f30015c2e161fe91bb5
child 47933 62d0fbc0e2ba2a6c64917bc2e8b121107205f7e2
push id14486
push userblassey@mozilla.com
push dateMon, 19 Jul 2010 18:05:58 +0000
treeherdermozilla-central@42b67d331734 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs577635
milestone2.0b2pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 577635 - android_stub.h broken for android platform version 8, pass ANDROID_VERSION to nss r=khuey
config/autoconf.mk.in
configure.in
security/manager/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -664,8 +664,9 @@ MOZ_OFFICIAL_BRANDING = @MOZ_OFFICIAL_BR
 HAVE_CLOCK_MONOTONIC = @HAVE_CLOCK_MONOTONIC@
 REALTIME_LIBS = @REALTIME_LIBS@
 
 ANDROID_NDK       = @ANDROID_NDK@
 ANDROID_TOOLCHAIN = @ANDROID_TOOLCHAIN@
 ANDROID_PLATFORM  = @ANDROID_PLATFORM@
 ANDROID_SDK       = @ANDROID_SDK@
 ANDROID_TOOLS     = @ANDROID_TOOLS@
+ANDROID_VERSION   = @ANDROID_VERSION@
--- a/configure.in
+++ b/configure.in
@@ -326,19 +326,21 @@ if test "$target" = "arm-android-eabi" ;
         HOST_LDFLAGS=" "
     fi
 
     ANDROID_NDK="${android_ndk}"
     ANDROID_TOOLCHAIN="{android_toolchain}"
     ANDROID_PLATFORM="{android_platform}"
     ANDROID_SDK="${android_sdk}"
     ANDROID_TOOLS="${android_tools}"
+    ANDROID_VERSION="${android_version}"
 
     AC_DEFINE(ANDROID)
     AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version)
+    AC_SUBST(ANDROID_VERSION)
     CROSS_COMPILE=1
     MOZ_CHROME_FILE_FORMAT=omni
 fi
 
 AC_SUBST(ANDROID_NDK)
 AC_SUBST(ANDROID_TOOLCHAIN)
 AC_SUBST(ANDROID_PLATFORM)
 AC_SUBST(ANDROID_SDK)
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -280,17 +280,17 @@ DEFAULT_GMAKE_FLAGS += \
 endif
 
 # Android has pthreads integrated into -lc, so OS_LIBS is set to nothing
 ifeq ($(OS_TARGET), Android)
 DEFAULT_GMAKE_FLAGS += \
 	OS_RELEASE="2.6" \
 	OS_LIBS= \
 	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) " \
 	$(NULL)
 endif
 
 SKIP_CHK=1
 endif
 ifdef WRAP_MALLOC_CFLAGS
 DEFAULT_GMAKE_FLAGS += \