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

@@ -19,12 +19,13 @@ 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

mobile/android/config/mozconfigs/android-armv6/l10n-release

@@ -16,12 +16,13 @@ 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

mobile/android/config/mozconfigs/android-x86/l10n-nightly

@@ -18,12 +18,13 @@ 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

mobile/android/config/mozconfigs/android-x86/l10n-release

@@ -15,12 +15,13 @@ 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

mobile/android/config/mozconfigs/android/l10n-nightly

@@ -18,12 +18,13 @@ 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

mobile/android/config/mozconfigs/android/l10n-release

@@ -15,12 +15,13 @@ 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