bug 877503 - build firefox for android with gcc 4.7 r=ted, blassey, nthomas
authorTrevor Saunders <trev.saunders@gmail.com>
Wed, 05 Jun 2013 23:43:05 -0400
changeset 146548 10a6781c41e46473cfb52eca8510750f28adf93a
parent 146547 a6912e70b705e6528601356881c58d3e5bbc7544
child 146557 a47f4e36197f7fe3422a08c5d668f168cdf7e1f9
child 146558 03be241006e00c05bc62b41a727923d4df051d85
push id368
push userbbajaj@mozilla.com
push dateMon, 09 Sep 2013 22:57:58 +0000
treeherdermozilla-release@5a4f47ae1217 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, blassey, nthomas
bugs877503
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 877503 - build firefox for android with gcc 4.7 r=ted, blassey, nthomas
mobile/android/config/mozconfigs/android-armv6/debug
mobile/android/config/mozconfigs/android-armv6/l10n-nightly
mobile/android/config/mozconfigs/android-armv6/l10n-release
mobile/android/config/mozconfigs/android-armv6/nightly
mobile/android/config/mozconfigs/android-armv6/release
mobile/android/config/mozconfigs/android-noion/nightly
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android-x86/l10n-nightly
mobile/android/config/mozconfigs/android-x86/l10n-release
mobile/android/config/mozconfigs/android-x86/nightly
mobile/android/config/mozconfigs/android-x86/release
mobile/android/config/mozconfigs/android/debug
mobile/android/config/mozconfigs/android/l10n-nightly
mobile/android/config/mozconfigs/android/l10n-release
mobile/android/config/mozconfigs/android/nightly
mobile/android/config/mozconfigs/android/release
mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
mobile/android/config/tooltool-manifests/android-x86/releng.manifest
mobile/android/config/tooltool-manifests/android/releng.manifest
--- a/mobile/android/config/mozconfigs/android-armv6/debug
+++ b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -6,24 +6,24 @@ ac_add_options --enable-debug
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # 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-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
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_PKG_SPECIAL=armv6
 
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -12,24 +12,24 @@ ac_add_options --enable-js-diagnostics
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # 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-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
 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
@@ -9,24 +9,24 @@ ac_add_options --disable-tests
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # 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-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
 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/nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/nightly
@@ -3,24 +3,24 @@
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # 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-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}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_PKG_SPECIAL=armv6
--- a/mobile/android/config/mozconfigs/android-armv6/release
+++ b/mobile/android/config/mozconfigs/android-armv6/release
@@ -3,24 +3,24 @@
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # 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-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
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android-noion/nightly
+++ b/mobile/android/config/mozconfigs/android-noion/nightly
@@ -2,24 +2,24 @@
 
 # Build Fennec
 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-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}
 
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 export JAVA_HOME=/tools/jdk6
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -5,24 +5,24 @@ ac_add_options --enable-debug
 
 # Build Fennec
 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-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
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -11,24 +11,24 @@ ac_add_options --enable-js-diagnostics
 
 # Build Fennec
 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-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
 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
@@ -8,24 +8,24 @@ ac_add_options --disable-tests
 
 # Build Fennec
 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-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
 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/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -2,24 +2,24 @@
 
 # Build Fennec
 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-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}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mobile/android/config/mozconfigs/android-x86/release
+++ b/mobile/android/config/mozconfigs/android-x86/release
@@ -2,24 +2,24 @@
 
 # Build Fennec
 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-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
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android/debug
+++ b/mobile/android/config/mozconfigs/android/debug
@@ -5,24 +5,24 @@ ac_add_options --enable-debug
 
 # Build Fennec
 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-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
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -11,24 +11,24 @@ ac_add_options --enable-js-diagnostics
 
 # Build Fennec
 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-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
 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
@@ -8,24 +8,24 @@ ac_add_options --disable-tests
 
 # Build Fennec
 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-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
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
--- a/mobile/android/config/mozconfigs/android/nightly
+++ b/mobile/android/config/mozconfigs/android/nightly
@@ -2,24 +2,24 @@
 
 # Build Fennec
 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-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}
 ac_add_options --enable-profiling
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android/release
+++ b/mobile/android/config/mozconfigs/android/release
@@ -2,24 +2,24 @@
 
 # Build Fennec
 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-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
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
@@ -1,20 +1,20 @@
 [
 {
-"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,
 "digest": "56fc5dc8c5e8cf46605667db153477e32bdf724bfa989663bbbed7e52ee47a4cb8cf7f8bf49b82b7e15fc89efe59a0f1656ca4b7a4ffcc8de31f9b2229549dab",
 "algorithm": "sha512",
 "filename": "android-sdk-16.tar.bz2"
 },
 {
-"size": 269,
-"digest": "0c21a793d87773b3ed82d141bea33869a6b647e5dddab3ecfee1738751e5c8d3d0b9ca45d7453ef88d335949c73f935c37de3521978b318ca51d8369be894b92",
+"size": 221,
+"digest": "7a7e9edf3aaa2cd5f7d923a82a65ae0bb4d13082736ebe52f06a7fc133c5a0dcb304d516a7859c542dcab598afb8bd6a2d2233ce481497f5c8f76709074920ad",
 "algorithm": "sha512",
 "filename": "setup.sh"
 }
 ]
--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -1,20 +1,20 @@
 [
 {
-"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,
 "digest": "56fc5dc8c5e8cf46605667db153477e32bdf724bfa989663bbbed7e52ee47a4cb8cf7f8bf49b82b7e15fc89efe59a0f1656ca4b7a4ffcc8de31f9b2229549dab",
 "algorithm": "sha512",
 "filename": "android-sdk-16.tar.bz2"
 },
 {
-"size": 273,
-"digest": "3db7c58c2002e96e6c0c34468f3349ca7de17c7473e07edec054ee3083ae39e6ead0e2a8f9177c1ce5891539073280e1afda1a6518f78e999dddc5d3f02a1e18",
+"size": 221,
+"digest": "7a7e9edf3aaa2cd5f7d923a82a65ae0bb4d13082736ebe52f06a7fc133c5a0dcb304d516a7859c542dcab598afb8bd6a2d2233ce481497f5c8f76709074920ad",
 "algorithm": "sha512",
 "filename": "setup.sh"
 }
 ]
--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -1,20 +1,20 @@
 [
 {
-"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,
 "digest": "56fc5dc8c5e8cf46605667db153477e32bdf724bfa989663bbbed7e52ee47a4cb8cf7f8bf49b82b7e15fc89efe59a0f1656ca4b7a4ffcc8de31f9b2229549dab",
 "algorithm": "sha512",
 "filename": "android-sdk-16.tar.bz2"
 },
 {
-"size": 269,
-"digest": "0c21a793d87773b3ed82d141bea33869a6b647e5dddab3ecfee1738751e5c8d3d0b9ca45d7453ef88d335949c73f935c37de3521978b318ca51d8369be894b92",
+"size": 221,
+"digest": "7a7e9edf3aaa2cd5f7d923a82a65ae0bb4d13082736ebe52f06a7fc133c5a0dcb304d516a7859c542dcab598afb8bd6a2d2233ce481497f5c8f76709074920ad",
 "algorithm": "sha512",
 "filename": "setup.sh"
 }
 ]