From 2501d24d1202f3c3979962d2bb1b526217264ab9 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Thu, 4 Jun 2015 13:30:28 -0700
Subject: [PATCH] Bug 1165422 - Update builder configurations to android API
 22. r?coop

--HG--
extra : commitid : GbuTlkUu3ah
extra : rebase_source : 26acb20060486122709be89229a8c788fa0cf70f
---
 mobile/android/config/mozconfigs/common                       | 2 +-
 .../config/tooltool-manifests/android-armv6/releng.manifest   | 4 ++--
 .../config/tooltool-manifests/android-x86/releng.manifest     | 4 ++--
 .../android/config/tooltool-manifests/android/releng.manifest | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common
index 9d1d6d6b6f8f..06dbd73a1265 100644
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -19,7 +19,7 @@ ac_add_options --enable-elf-hack
 
 ANDROID_NDK_VERSION="r8e"
 ANDROID_NDK_VERSION_32BIT="r8c"
-ANDROID_SDK_VERSION="21"
+ANDROID_SDK_VERSION="22"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
diff --git a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest b/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
index e75eb549d217..b0cf2b388d83 100644
--- a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
@@ -6,8 +6,8 @@
 "filename": "android-ndk.tar.bz2"
 },
 {
-"size": 227988048,
-"digest": "c84db0abd1f4fda1bb38292ef561e211e1e6b99586764fd8cf0829fa4d0c6a605eb21e1eb5462465fcca64749d48e22ac1b13029e2623bbdfe103801f5ef1411",
+"size": 329217868,
+"digest": "1cf54f12c271a2eea8f03caafa458207768ba12400cf53d742e3c4654a32b18fb75d8e0dece95e27691695751a6f6514ccb724b1a74958948c5f111c5c00da4f",
 "algorithm": "sha512",
 "filename": "android-sdk.tar.xz"
 },
diff --git a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
index f7614021526f..c345c68d6482 100644
--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -7,8 +7,8 @@
 "filename": "android-ndk.tar.bz2"
 },
 {
-"size": 227988048,
-"digest": "c84db0abd1f4fda1bb38292ef561e211e1e6b99586764fd8cf0829fa4d0c6a605eb21e1eb5462465fcca64749d48e22ac1b13029e2623bbdfe103801f5ef1411",
+"size": 329217868,
+"digest": "1cf54f12c271a2eea8f03caafa458207768ba12400cf53d742e3c4654a32b18fb75d8e0dece95e27691695751a6f6514ccb724b1a74958948c5f111c5c00da4f",
 "algorithm": "sha512",
 "filename": "android-sdk.tar.xz"
 },
diff --git a/mobile/android/config/tooltool-manifests/android/releng.manifest b/mobile/android/config/tooltool-manifests/android/releng.manifest
index 7772f6d65435..3355b0740e46 100644
--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -7,9 +7,9 @@
 "filename": "android-ndk.tar.bz2"
 },
 {
-"size": 227988048,
+"size": 329217868,
 "visibility": "internal",
-"digest": "c84db0abd1f4fda1bb38292ef561e211e1e6b99586764fd8cf0829fa4d0c6a605eb21e1eb5462465fcca64749d48e22ac1b13029e2623bbdfe103801f5ef1411",
+"digest": "1cf54f12c271a2eea8f03caafa458207768ba12400cf53d742e3c4654a32b18fb75d8e0dece95e27691695751a6f6514ccb724b1a74958948c5f111c5c00da4f",
 "algorithm": "sha512",
 "filename": "android-sdk.tar.xz"
 },