Bug 850713 - Bump the required NDK version to 9. r=blassey.bugs,mh+mozilla
authorPaul Adenot <paul@paul.cx>
Fri, 15 Mar 2013 16:28:07 +1300
changeset 124866 7f8791dc5d908cf7eb128cc4fea23762fbfedbb4
parent 124865 4d228e87b2cc9ba213f563582c938958a555fcf9
child 124867 8e0441770277688342281aab429f06eb211a559c
push id24650
push usermgregan@mozilla.com
push dateFri, 15 Mar 2013 05:30:30 +0000
treeherdermozilla-inbound@37f55a0c903a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey.bugs, mh
bugs850713
milestone22.0a1
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 850713 - Bump the required NDK version to 9. r=blassey.bugs,mh+mozilla
CLOBBER
build/autoconf/android.m4
configure.in
js/src/build/autoconf/android.m4
mobile/android/config/mozconfigs/android-armv6/debug
mobile/android/config/mozconfigs/android-armv6/l10n-nightly
mobile/android/config/mozconfigs/android-armv6/l10n-release
mobile/android/config/mozconfigs/android-armv6/nightly
mobile/android/config/mozconfigs/android-armv6/release
mobile/android/config/mozconfigs/android-noion/nightly
mobile/android/config/mozconfigs/android/debug
mobile/android/config/mozconfigs/android/l10n-nightly
mobile/android/config/mozconfigs/android/l10n-release
mobile/android/config/mozconfigs/android/nightly
mobile/android/config/mozconfigs/android/release
--- a/CLOBBER
+++ b/CLOBBER
@@ -10,9 +10,9 @@
 #                  O   <-- Users coming from both parents need to Clobber
 #               /     \
 #          O               O
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
-Bug 847890 appears to need a clobber
+Bug 850713 requires a clobber
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -21,29 +21,21 @@ MOZ_ARG_WITH_STRING(android-gnu-compiler
     android_gnu_compiler_version=$withval)
 
 MOZ_ARG_ENABLE_BOOL(android-libstdcxx,
 [  --enable-android-libstdcxx
                           use GNU libstdc++ instead of STLPort],
     MOZ_ANDROID_LIBSTDCXX=1,
     MOZ_ANDROID_LIBSTDCXX= )
 
-dnl default android_version is different per target cpu
-case "$target_cpu" in
-arm)
-    android_version=5
-    ;;
-i?86|mipsel)
-    android_version=9
-    ;;
-esac
+android_version=9
 
 MOZ_ARG_WITH_STRING(android-version,
 [  --with-android-version=VER
-                          android platform version, default 5 for arm, 9 for x86/mips],
+                          android platform version, default 9],
     android_version=$withval)
 
 MOZ_ARG_WITH_STRING(android-platform,
 [  --with-android-platform=DIR
                            location of platform dir],
     android_platform=$withval)
 
 case "$target" in
--- a/configure.in
+++ b/configure.in
@@ -9263,17 +9263,17 @@ if test "$COMPILE_ENVIRONMENT" -a -z "$L
 export WRAP_LDFLAGS
 
 if test -n "$_WRAP_MALLOC"; then
     # Avoid doubling wrap malloc arguments
     _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--enable-wrap-malloc *//'`"
 fi
 
 if test -z "$MOZ_NATIVE_NSPR"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla --with-android-version=$ANDROID_VERSION"
     if test -z "$MOZ_DEBUG"; then
         ac_configure_args="$ac_configure_args --disable-debug"
     else
         ac_configure_args="$ac_configure_args --enable-debug"
     fi
     if test "$MOZ_OPTIMIZE" = "1"; then
         ac_configure_args="$ac_configure_args --enable-optimize"
     elif test -z "$MOZ_OPTIMIZE"; then
--- a/js/src/build/autoconf/android.m4
+++ b/js/src/build/autoconf/android.m4
@@ -21,29 +21,21 @@ MOZ_ARG_WITH_STRING(android-gnu-compiler
     android_gnu_compiler_version=$withval)
 
 MOZ_ARG_ENABLE_BOOL(android-libstdcxx,
 [  --enable-android-libstdcxx
                           use GNU libstdc++ instead of STLPort],
     MOZ_ANDROID_LIBSTDCXX=1,
     MOZ_ANDROID_LIBSTDCXX= )
 
-dnl default android_version is different per target cpu
-case "$target_cpu" in
-arm)
-    android_version=5
-    ;;
-i?86|mipsel)
-    android_version=9
-    ;;
-esac
+android_version=9
 
 MOZ_ARG_WITH_STRING(android-version,
 [  --with-android-version=VER
-                          android platform version, default 5 for arm, 9 for x86/mips],
+                          android platform version, default 9],
     android_version=$withval)
 
 MOZ_ARG_WITH_STRING(android-platform,
 [  --with-android-platform=DIR
                            location of platform dir],
     android_platform=$withval)
 
 case "$target" in
--- a/mobile/android/config/mozconfigs/android-armv6/debug
+++ b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -7,17 +7,17 @@ ac_add_options --enable-debug
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -13,17 +13,17 @@ ac_add_options --enable-js-diagnostics
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_PKG_SPECIAL=armv6
 
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-release
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-release
@@ -10,17 +10,17 @@ ac_add_options --disable-tests
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_PKG_SPECIAL=armv6
 
--- a/mobile/android/config/mozconfigs/android-armv6/nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/nightly
@@ -4,17 +4,17 @@
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-armv6/release
+++ b/mobile/android/config/mozconfigs/android-armv6/release
@@ -4,17 +4,17 @@
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 export JAVA_HOME=/tools/jdk6
--- a/mobile/android/config/mozconfigs/android-noion/nightly
+++ b/mobile/android/config/mozconfigs/android-noion/nightly
@@ -3,17 +3,17 @@
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android/debug
+++ b/mobile/android/config/mozconfigs/android/debug
@@ -6,17 +6,17 @@ ac_add_options --enable-debug
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -12,17 +12,17 @@ ac_add_options --enable-js-diagnostics
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android/l10n-release
+++ b/mobile/android/config/mozconfigs/android/l10n-release
@@ -9,17 +9,17 @@ ac_add_options --disable-tests
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --enable-official-branding
--- a/mobile/android/config/mozconfigs/android/nightly
+++ b/mobile/android/config/mozconfigs/android/nightly
@@ -3,17 +3,17 @@
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android/release
+++ b/mobile/android/config/mozconfigs/android/release
@@ -3,17 +3,17 @@
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-gnu-compiler-version=4.6
-ac_add_options --with-android-version=5
+ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1