зеркало из https://github.com/mozilla/gecko-dev.git
Bug 850713 - Bump the required NDK version to 9. r=blassey.bugs,mh+mozilla
--HG-- extra : rebase_source : d6886dcfe87747e77c3828289b1184a58e6a0c09
This commit is contained in:
Paul Adenot
Родитель
af5c22370c
Коммит
80dcb414f4
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче