bug 880457 - try and fix android l10n builds by using gcc 4.6 for them only since they're still done on i686 r=khuey DONTBUILD
authorTrevor Saunders <trev.saunders@gmail.com>
Thu, 06 Jun 2013 18:32:37 -0400
changeset 145740 9ca690835a5eff4af37effc64986d3352f7da20c
parent 145739 dc8e78ed8c44bc61fd3caaa7410f1703ac4f9718
child 145755 1c199f8871abb3c11eaedea682c3406b6a66f4bf
child 169983 aebaf0ec9d924dd711e11cba9789d4ff5404e7b5
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs880457
milestone24.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 880457 - try and fix android l10n builds by using gcc 4.6 for them only since they're still done on i686 r=khuey DONTBUILD
mobile/android/config/mozconfigs/android-armv6/l10n-nightly
mobile/android/config/mozconfigs/android-armv6/l10n-release
mobile/android/config/mozconfigs/android-x86/l10n-nightly
mobile/android/config/mozconfigs/android-x86/l10n-release
mobile/android/config/mozconfigs/android/l10n-nightly
mobile/android/config/mozconfigs/android/l10n-release
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -14,22 +14,23 @@ ac_add_options --enable-application=mobi
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
 if test `uname -m` = 'x86_64'; then
   ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
+  ac_add_options --with-android-gnu-compiler-version=4.7
 else
   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
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.7
 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
@@ -11,22 +11,23 @@ ac_add_options --enable-application=mobi
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
 if test `uname -m` = 'x86_64'; then
   ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
+  ac_add_options --with-android-gnu-compiler-version=4.7
 else
   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
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.7
 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-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -13,22 +13,23 @@ ac_add_options --enable-js-diagnostics
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
   ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
+  ac_add_options --with-android-gnu-compiler-version=4.7
 else
   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
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.7
 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
 
--- a/mobile/android/config/mozconfigs/android-x86/l10n-release
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-release
@@ -10,22 +10,23 @@ ac_add_options --disable-tests
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
   ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
+  ac_add_options --with-android-gnu-compiler-version=4.7
 else
   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
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.7
 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
 
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -13,22 +13,23 @@ ac_add_options --enable-js-diagnostics
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
   ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
+  ac_add_options --with-android-gnu-compiler-version=4.7
 else
   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
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.7
 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
 
--- a/mobile/android/config/mozconfigs/android/l10n-release
+++ b/mobile/android/config/mozconfigs/android/l10n-release
@@ -10,22 +10,23 @@ ac_add_options --disable-tests
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
   ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
+  ac_add_options --with-android-gnu-compiler-version=4.7
 else
   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
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.7
 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