bug 877503 - build firefox for android with gcc 4.7 r=ted, blassey, nthomas

mobile/android/config/mozconfigs/android-armv6/debug

@@ -11,14 +11,14 @@ 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-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+ac_add_options --with-android-gnu-compiler-version=4.7
 ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 

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

@@ -17,14 +17,14 @@ 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-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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

@@ -14,14 +14,14 @@ 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-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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/nightly

@@ -8,14 +8,14 @@ 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-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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-update-channel=${MOZ_UPDATE_CHANNEL}

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

@@ -8,14 +8,14 @@ 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-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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-noion/nightly

@@ -7,14 +7,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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-update-channel=${MOZ_UPDATE_CHANNEL}

mobile/android/config/mozconfigs/android-x86/debug

@@ -10,14 +10,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+ac_add_options --with-android-gnu-compiler-version=4.7
 ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 

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

@@ -16,14 +16,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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

@@ -13,14 +13,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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/nightly

@@ -7,14 +7,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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-update-channel=${MOZ_UPDATE_CHANNEL}

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

@@ -7,14 +7,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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/debug

@@ -10,14 +10,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+ac_add_options --with-android-gnu-compiler-version=4.7
 ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 

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

@@ -16,14 +16,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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

@@ -13,14 +13,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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/nightly

@@ -7,14 +7,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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-update-channel=${MOZ_UPDATE_CHANNEL}

mobile/android/config/mozconfigs/android/release

@@ -7,14 +7,14 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
+  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
   ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.6
+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/tooltool-manifests/android-armv6/releng.manifest

@@ -1,9 +1,9 @@
 [
 {
-"size": 75650889,
-"digest": "225ee9bb331a08ec496acc47ef8a1e9d9a21c290bfe22271cdc6ee2d10befecc372faf2a718e3e0ad5c36938a9b94f5d6b6b2d999880bc476c576856f1c99812",
+"size": 78706854,
+"digest": "8ff42509ecebfd7e20f8fac9987ed2b2c04942641eead674ee66f74014c5153f1c20080cd3ccb243af76ca7432df3c3f5b5ae08a478fd2817e62661a4edb437c",
 "algorithm": "sha512",
-"filename": "android-ndk-r8e-arm-gcc4.6.tar.bz2"
+"filename": "android-ndk.tar.bz2"
 },
 {
 "size": 147088338,
@@ -12,8 +12,8 @@
 "filename": "android-sdk-16.tar.bz2"
 },
 {
-"size": 269,
-"digest": "0c21a793d87773b3ed82d141bea33869a6b647e5dddab3ecfee1738751e5c8d3d0b9ca45d7453ef88d335949c73f935c37de3521978b318ca51d8369be894b92",
+"size": 221,
+"digest": "7a7e9edf3aaa2cd5f7d923a82a65ae0bb4d13082736ebe52f06a7fc133c5a0dcb304d516a7859c542dcab598afb8bd6a2d2233ce481497f5c8f76709074920ad",
 "algorithm": "sha512",
 "filename": "setup.sh"
 }

mobile/android/config/tooltool-manifests/android-x86/releng.manifest

@@ -1,9 +1,9 @@
 [
 {
-"size": 78190771,
-"digest": "57c69c5f55722f197ca6a5bd7d366d3562df474da8d98a6df753830c8234c269c1a174e518168b801e39290db081ef192a8fa24fcc5133039b1ad489dfe45f48",
+"size": 80729933,
+"digest": "ccd13527c0ba3979f4030eae713e6529e916a701b9b16a371256d92618e914fb0fd2ba70547efca0e93d02010c89eeb7c222d40a9b6f26fab80911386cdfecc7",
 "algorithm": "sha512",
-"filename": "android-ndk-r8e-x86-gcc4.6.tar.bz2"
+"filename": "android-ndk.tar.bz2"
 },
 {
 "size": 147088338,
@@ -12,8 +12,8 @@
 "filename": "android-sdk-16.tar.bz2"
 },
 {
-"size": 273,
-"digest": "3db7c58c2002e96e6c0c34468f3349ca7de17c7473e07edec054ee3083ae39e6ead0e2a8f9177c1ce5891539073280e1afda1a6518f78e999dddc5d3f02a1e18",
+"size": 221,
+"digest": "7a7e9edf3aaa2cd5f7d923a82a65ae0bb4d13082736ebe52f06a7fc133c5a0dcb304d516a7859c542dcab598afb8bd6a2d2233ce481497f5c8f76709074920ad",
 "algorithm": "sha512",
 "filename": "setup.sh"
 }

mobile/android/config/tooltool-manifests/android/releng.manifest

@@ -1,9 +1,9 @@
 [
 {
-"size": 75650889,
-"digest": "225ee9bb331a08ec496acc47ef8a1e9d9a21c290bfe22271cdc6ee2d10befecc372faf2a718e3e0ad5c36938a9b94f5d6b6b2d999880bc476c576856f1c99812",
+"size": 78706854,
+"digest": "8ff42509ecebfd7e20f8fac9987ed2b2c04942641eead674ee66f74014c5153f1c20080cd3ccb243af76ca7432df3c3f5b5ae08a478fd2817e62661a4edb437c",
 "algorithm": "sha512",
-"filename": "android-ndk-r8e-arm-gcc4.6.tar.bz2"
+"filename": "android-ndk.tar.bz2"
 },
 {
 "size": 147088338,
@@ -12,8 +12,8 @@
 "filename": "android-sdk-16.tar.bz2"
 },
 {
-"size": 269,
-"digest": "0c21a793d87773b3ed82d141bea33869a6b647e5dddab3ecfee1738751e5c8d3d0b9ca45d7453ef88d335949c73f935c37de3521978b318ca51d8369be894b92",
+"size": 221,
+"digest": "7a7e9edf3aaa2cd5f7d923a82a65ae0bb4d13082736ebe52f06a7fc133c5a0dcb304d516a7859c542dcab598afb8bd6a2d2233ce481497f5c8f76709074920ad",
 "algorithm": "sha512",
 "filename": "setup.sh"
 }