From 80dcb414f440252b2debf254af50b766a811a15d Mon Sep 17 00:00:00 2001 From: Paul Adenot Date: Fri, 15 Mar 2013 16:28:07 +1300 Subject: [PATCH] Bug 850713 - Bump the required NDK version to 9. r=blassey.bugs,mh+mozilla --HG-- extra : rebase_source : d6886dcfe87747e77c3828289b1184a58e6a0c09 --- build/autoconf/android.m4 | 12 ++---------- configure.in | 2 +- js/src/build/autoconf/android.m4 | 12 ++---------- mobile/android/config/mozconfigs/android-armv6/debug | 2 +- .../config/mozconfigs/android-armv6/l10n-nightly | 2 +- .../config/mozconfigs/android-armv6/l10n-release | 2 +- .../android/config/mozconfigs/android-armv6/nightly | 2 +- .../android/config/mozconfigs/android-armv6/release | 2 +- .../android/config/mozconfigs/android-noion/nightly | 2 +- mobile/android/config/mozconfigs/android/debug | 2 +- .../android/config/mozconfigs/android/l10n-nightly | 2 +- .../android/config/mozconfigs/android/l10n-release | 2 +- mobile/android/config/mozconfigs/android/nightly | 2 +- mobile/android/config/mozconfigs/android/release | 2 +- 14 files changed, 16 insertions(+), 32 deletions(-) diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index f7a82272ae97..aa18b4dd565e 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -26,19 +26,11 @@ MOZ_ARG_ENABLE_BOOL(android-libstdcxx, 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, diff --git a/configure.in b/configure.in index e3ebd1eaa027..e13437fd574f 100644 --- a/configure.in +++ b/configure.in @@ -9268,7 +9268,7 @@ if test -n "$_WRAP_MALLOC"; then 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 diff --git a/js/src/build/autoconf/android.m4 b/js/src/build/autoconf/android.m4 index f7a82272ae97..aa18b4dd565e 100644 --- a/js/src/build/autoconf/android.m4 +++ b/js/src/build/autoconf/android.m4 @@ -26,19 +26,11 @@ MOZ_ARG_ENABLE_BOOL(android-libstdcxx, 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, diff --git a/mobile/android/config/mozconfigs/android-armv6/debug b/mobile/android/config/mozconfigs/android-armv6/debug index b167e8469d85..1881e203d644 100644 --- a/mobile/android/config/mozconfigs/android-armv6/debug +++ b/mobile/android/config/mozconfigs/android-armv6/debug @@ -12,7 +12,7 @@ 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 diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly index 3ee1d89caecd..f452220ed721 100644 --- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly @@ -18,7 +18,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-release b/mobile/android/config/mozconfigs/android-armv6/l10n-release index 218e320c1386..71a141106ccd 100644 --- a/mobile/android/config/mozconfigs/android-armv6/l10n-release +++ b/mobile/android/config/mozconfigs/android-armv6/l10n-release @@ -15,7 +15,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android-armv6/nightly b/mobile/android/config/mozconfigs/android-armv6/nightly index 91b4d37e7f0e..7ca7e29f82b3 100644 --- a/mobile/android/config/mozconfigs/android-armv6/nightly +++ b/mobile/android/config/mozconfigs/android-armv6/nightly @@ -9,7 +9,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android-armv6/release b/mobile/android/config/mozconfigs/android-armv6/release index 0587d54478be..902b10707a8d 100644 --- a/mobile/android/config/mozconfigs/android-armv6/release +++ b/mobile/android/config/mozconfigs/android-armv6/release @@ -9,7 +9,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android-noion/nightly b/mobile/android/config/mozconfigs/android-noion/nightly index c12bf30f6902..97529ad095dc 100644 --- a/mobile/android/config/mozconfigs/android-noion/nightly +++ b/mobile/android/config/mozconfigs/android-noion/nightly @@ -8,7 +8,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android/debug b/mobile/android/config/mozconfigs/android/debug index 29593209d9cd..188c56852d25 100644 --- a/mobile/android/config/mozconfigs/android/debug +++ b/mobile/android/config/mozconfigs/android/debug @@ -11,7 +11,7 @@ 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 diff --git a/mobile/android/config/mozconfigs/android/l10n-nightly b/mobile/android/config/mozconfigs/android/l10n-nightly index 12b2722c5d13..8971688bc03b 100644 --- a/mobile/android/config/mozconfigs/android/l10n-nightly +++ b/mobile/android/config/mozconfigs/android/l10n-nightly @@ -17,7 +17,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android/l10n-release b/mobile/android/config/mozconfigs/android/l10n-release index 18ac37ab1db4..cf37d2b6ffec 100644 --- a/mobile/android/config/mozconfigs/android/l10n-release +++ b/mobile/android/config/mozconfigs/android/l10n-release @@ -14,7 +14,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android/nightly b/mobile/android/config/mozconfigs/android/nightly index adced2ff9e9b..95cd28160a3b 100644 --- a/mobile/android/config/mozconfigs/android/nightly +++ b/mobile/android/config/mozconfigs/android/nightly @@ -8,7 +8,7 @@ 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} diff --git a/mobile/android/config/mozconfigs/android/release b/mobile/android/config/mozconfigs/android/release index 6533b7f908df..8b11fe2ff46b 100644 --- a/mobile/android/config/mozconfigs/android/release +++ b/mobile/android/config/mozconfigs/android/release @@ -8,7 +8,7 @@ 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}