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

Bug 850713 - Bump the required NDK version to 9. r=blassey.bugs,mh+mozilla

Browse Source
This commit is contained in:
Paul Adenot 2013-03-15 16:28:07 +13:00
parent cafa3e6710
commit 50b59f2b0b
15 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -15,4 +15,4 @@
#
# 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

12
build/autoconf/android.m4
View File

@ -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,

2
configure.in
View File

@ -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

12
js/src/build/autoconf/android.m4
View File

@ -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,

2
mobile/android/config/mozconfigs/android-armv6/debug
View File

@ -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

2
mobile/android/config/mozconfigs/android-armv6/l10n-nightly
View File

@ -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}

2
mobile/android/config/mozconfigs/android-armv6/l10n-release
View File

@ -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}

2
mobile/android/config/mozconfigs/android-armv6/nightly
View File

@ -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}

2
mobile/android/config/mozconfigs/android-armv6/release
View File

@ -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}

2
mobile/android/config/mozconfigs/android-noion/nightly
View File

@ -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}

2
mobile/android/config/mozconfigs/android/debug
View File

@ -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

2
mobile/android/config/mozconfigs/android/l10n-nightly
View File

@ -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}

2
mobile/android/config/mozconfigs/android/l10n-release
View File

@ -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}

2
mobile/android/config/mozconfigs/android/nightly
View File

@ -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}

2
mobile/android/config/mozconfigs/android/release
View File

@ -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}