androidenv: Update all packages using fetch.sh

7 files changed, 149 insertions, 117 deletions

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index d9b478266487..05b545420336 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-06-07 21:05:03.785544 with ADRT.-->
+	<!--Generated on 2017-07-26 17:22:37.387749 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -1317,16 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>m2repository</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:158324354, branch:perforce-->
+		<!--Generated from bid:163087974, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>53</sdk:major>
+			<sdk:major>57</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 15:15:19 2017.-->
-				<sdk:size>194148491</sdk:size>
-				<sdk:checksum type="sha1">9008082eb1e6ff5a78d32a1fed6915f266fc5013</sdk:checksum>
-				<sdk:url>google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip</sdk:url>
+				<!--Built on: Tue Jul 25 14:44:09 2017.-->
+				<sdk:size>214565802</sdk:size>
+				<sdk:checksum type="sha1">4bc48d6d4d39944cf2b061e3f618cd9d447c75bb</sdk:checksum>
+				<sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_4.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>google_play_services_froyo</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:158051086, branch:perforce-->
+		<!--Generated from bid:163088463, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>41</sdk:major>
+			<sdk:major>43</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Jun  6 11:50:00 2017.-->
-				<sdk:size>13165315</sdk:size>
-				<sdk:checksum type="sha1">55be81c50041f6a8f62947418f74f683369c971f</sdk:checksum>
-				<sdk:url>google_play_services_v11_rc16.zip</sdk:url>
+				<!--Built on: Tue Jul 25 14:44:00 2017.-->
+				<sdk:size>21391284</sdk:size>
+				<sdk:checksum type="sha1">6b072d5b96fb8726405d363ccdbb4d26bec0b54f</sdk:checksum>
+				<sdk:url>google_play_services_v11_3_rc05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 06be6515ee53..71ce2c3d0792 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -296,8 +296,8 @@ in
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip;
-      sha1 = "55be81c50041f6a8f62947418f74f683369c971f";
+      url = https://dl.google.com/android/repository/google_play_services_v11_3_rc05.zip;
+      sha1 = "6b072d5b96fb8726405d363ccdbb4d26bec0b54f";
     };
     meta = {
       description = "Google Play services client library and sample code";
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index 1caa6cebb14f..e24a9c431602 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -307,8 +307,8 @@ in
   platform_26 = buildPlatform {
     name = "android-platform-8.0.0";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-26_r01.zip;
-      sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
+      url = https://dl.google.com/android/repository/platform-26_r02.zip;
+      sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
     };
     meta = {
       description = "Android SDK Platform 26";
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index a4903cd0d402..3775872514ca 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -307,8 +307,8 @@ in
   platform_26 = buildPlatform {
     name = "android-platform-8.0.0";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-26_r01.zip;
-      sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
+      url = https://dl.google.com/android/repository/platform-26_r02.zip;
+      sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
     };
     meta = {
       description = "Android SDK Platform 26";
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index 9f46af93a880..6d2c87178a6d 100644
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -15,7 +15,7 @@
  * limitations under the License.
 -->
 <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-06-07 21:04:43.441919 with ADRT.-->
+	<!--Generated on 2017-07-26 17:22:12.162164 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the &quot;License Agreement&q
 
 June 2014.</sdk:license>
 	<sdk:ndk>
-		<!--Generated from bid:4075724, branch:aosp-ndk-r15-release-->
+		<!--Generated from bid:4119039, branch:aosp-ndk-r15-release-->
 		<sdk:description>NDK</sdk:description>
 		<sdk:revision>15</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:50:43 2017.-->
-				<sdk:size>959176682</sdk:size>
-				<sdk:checksum type="sha1">9dd0ff18d177ec75797b021a3ebd294362e8a41e</sdk:checksum>
-				<sdk:url>android-ndk-r15-darwin-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:06:49 2017.-->
+				<sdk:size>959321525</sdk:size>
+				<sdk:checksum type="sha1">05e3eec7e9ce1d09bb5401b41cf778a2ec19c819</sdk:checksum>
+				<sdk:url>android-ndk-r15b-darwin-x86_64.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:51:08 2017.-->
-				<sdk:size>973898016</sdk:size>
-				<sdk:checksum type="sha1">32b3115357ed798a8a48d7d589ffcb901693c745</sdk:checksum>
-				<sdk:url>android-ndk-r15-linux-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:07:17 2017.-->
+				<sdk:size>974035125</sdk:size>
+				<sdk:checksum type="sha1">2690d416e54f88f7fa52d0dcb5f539056a357b3b</sdk:checksum>
+				<sdk:url>android-ndk-r15b-linux-x86_64.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:49:52 2017.-->
-				<sdk:size>783705009</sdk:size>
-				<sdk:checksum type="sha1">bf869b624f6d4778065d5d4703815b0c689069e1</sdk:checksum>
-				<sdk:url>android-ndk-r15-windows-x86.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:05:55 2017.-->
+				<sdk:size>783838327</sdk:size>
+				<sdk:checksum type="sha1">74e45891d0cc99b077b3951aeba87d9c91df20a8</sdk:checksum>
+				<sdk:url>android-ndk-r15b-windows-x86.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>32</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:50:17 2017.-->
-				<sdk:size>848657615</sdk:size>
-				<sdk:checksum type="sha1">45d310443ceb5ff19a0dde139ee9b3404908c178</sdk:checksum>
-				<sdk:url>android-ndk-r15-windows-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:06:20 2017.-->
+				<sdk:size>848796389</sdk:size>
+				<sdk:checksum type="sha1">126a1cd8985132c0383ab96579feed09ba402e22</sdk:checksum>
+				<sdk:url>android-ndk-r15b-windows-x86_64.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
@@ -336,17 +336,17 @@ June 2014.</sdk:license>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:ndk>
 	<sdk:platform>
-		<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
+		<!--Generated from bid:4187382, branch:git_oc-release-->
 		<sdk:version>8.0.0</sdk:version>
 		<sdk:api-level>26</sdk:api-level>
 		<sdk:description>Android SDK Platform 26</sdk:description>
-		<sdk:revision>1</sdk:revision>
+		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Jun  2 13:22:35 2017.-->
-				<sdk:size>63467872</sdk:size>
-				<sdk:checksum type="sha1">33a4f9788bfd7123e712906b2d7e5d54a729e14a</sdk:checksum>
-				<sdk:url>platform-26_r01.zip</sdk:url>
+				<!--Built on: Tue Jul 18 10:38:38 2017.-->
+				<sdk:size>63623734</sdk:size>
+				<sdk:checksum type="sha1">e4ae5d7aa557a3c827135838ee400da8443ac4ef</sdk:checksum>
+				<sdk:url>platform-26_r02.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1170,6 +1170,38 @@ June 2014.</sdk:license>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:source>
 	<sdk:build-tool>
+		<!--Generated from bid:4187382, branch:git_oc-release-->
+		<sdk:revision>
+			<sdk:major>26</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>1</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Tue Jul 18 10:38:26 2017.-->
+				<sdk:size>54113329</sdk:size>
+				<sdk:checksum type="sha1">5378c2c78091b414d0eac40a6bd37f2faa31a365</sdk:checksum>
+				<sdk:url>build-tools_r26.0.1-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Jul 18 10:38:23 2017.-->
+				<sdk:size>53266653</sdk:size>
+				<sdk:checksum type="sha1">cbde59de198916b390777dd0227921bfa2120832</sdk:checksum>
+				<sdk:url>build-tools_r26.0.1-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Jul 18 10:38:21 2017.-->
+				<sdk:size>54936185</sdk:size>
+				<sdk:checksum type="sha1">02494c80ffbe65bfff0aaa7463c9692693327b7d</sdk:checksum>
+				<sdk:url>build-tools_r26.0.1-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
+	<sdk:build-tool>
 		<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
 		<sdk:revision>
 			<sdk:major>26</sdk:major>
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 8ea0cfb5b802..06754b250763 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-06-07 21:04:43.770481 with ADRT.-->
+	<!--Generated on 2017-07-26 17:22:12.517198 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -746,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3462041, branch:git_klp-emu-release-->
+		<!--Generated from bid:4174703, branch:git_klp-emu-release-->
 		<sdk:api-level>19</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
+		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:21:38 2016.-->
-				<sdk:size>183968605</sdk:size>
-				<sdk:checksum type="sha1">1d98426467580abfd03c724c5344450f5d0df379</sdk:checksum>
-				<sdk:url>x86-19_r05.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:41:20 2017.-->
+				<sdk:size>185886274</sdk:size>
+				<sdk:checksum type="sha1">2ac82153aae97f7eae4c5a0761224fe04321d03d</sdk:checksum>
+				<sdk:url>x86-19_r06.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -763,16 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
+		<!--Generated from bid:4174711, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
+		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:12:20 2016.-->
-				<sdk:size>206305926</sdk:size>
-				<sdk:checksum type="sha1">c7732f45c931c0eaa064e57e8c054bce86c30e54</sdk:checksum>
-				<sdk:url>x86-21_r04.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:42:18 2017.-->
+				<sdk:size>208212529</sdk:size>
+				<sdk:checksum type="sha1">00f0eb0a1003efe3316347f762e20a85d8749cff</sdk:checksum>
+				<sdk:url>x86-21_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -780,16 +780,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079158, branch:git_lmp-mr1-emu-release-->
+		<!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release-->
 		<sdk:api-level>22</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
+		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:12:40 2016.-->
-				<sdk:size>212327460</sdk:size>
-				<sdk:checksum type="sha1">7e2c93891ea9efec07dccccf6b9ab051a014dbdf</sdk:checksum>
-				<sdk:url>x86-22_r05.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:43:18 2017.-->
+				<sdk:size>214268954</sdk:size>
+				<sdk:checksum type="sha1">e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e</sdk:checksum>
+				<sdk:url>x86-22_r06.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -797,16 +797,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
+		<!--Generated from bid:4174734, branch:git_mnc-emu-release-->
 		<sdk:api-level>23</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>9</sdk:revision>
+		<sdk:revision>10</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:13:52 2016.-->
-				<sdk:size>260241399</sdk:size>
-				<sdk:checksum type="sha1">d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1</sdk:checksum>
-				<sdk:url>x86-23_r09.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:44:25 2017.-->
+				<sdk:size>260804863</sdk:size>
+				<sdk:checksum type="sha1">f6c3e3dd7bd951454795aa75c3a145fd05ac25bb</sdk:checksum>
+				<sdk:url>x86-23_r10.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -814,16 +814,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3245079, branch:git_nyc-emu-release-->
+		<!--Generated from bid:4174735, branch:git_nyc-emu-release-->
 		<sdk:api-level>24</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>7</sdk:revision>
+		<sdk:revision>8</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Sep  6 08:29:27 2016.-->
-				<sdk:size>302213276</sdk:size>
-				<sdk:checksum type="sha1">566fdee283a907854bfa3c174265bc31f396eabd</sdk:checksum>
-				<sdk:url>x86-24_r07.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:45:47 2017.-->
+				<sdk:size>313489224</sdk:size>
+				<sdk:checksum type="sha1">c1cae7634b0216c0b5990f2c144eb8ca948e3511</sdk:checksum>
+				<sdk:url>x86-24_r08.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -831,16 +831,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
+		<!--Generated from bid:4174711, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
+		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:08:22 2016.-->
-				<sdk:size>290608820</sdk:size>
-				<sdk:checksum type="sha1">9b2d64a69a72fa596c386899a742a404308f2c92</sdk:checksum>
-				<sdk:url>x86_64-21_r04.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:46:57 2017.-->
+				<sdk:size>292623982</sdk:size>
+				<sdk:checksum type="sha1">9078a095825a69e5e215713f0866c83cef65a342</sdk:checksum>
+				<sdk:url>x86_64-21_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -848,16 +848,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release-->
+		<!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release-->
 		<sdk:api-level>22</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
+		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:08:46 2016.-->
-				<sdk:size>297850561</sdk:size>
-				<sdk:checksum type="sha1">99d1d6c77e92284b4210640edf6c81eceb28520d</sdk:checksum>
-				<sdk:url>x86_64-22_r05.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:48:15 2017.-->
+				<sdk:size>299976630</sdk:size>
+				<sdk:checksum type="sha1">5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4</sdk:checksum>
+				<sdk:url>x86_64-22_r06.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -865,16 +865,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
+		<!--Generated from bid:4174734, branch:git_mnc-emu-release-->
 		<sdk:api-level>23</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>9</sdk:revision>
+		<sdk:revision>10</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:09:15 2016.-->
-				<sdk:size>363794271</sdk:size>
-				<sdk:checksum type="sha1">84cc076eacec043c8e88382c6ab391b0cd5c0695</sdk:checksum>
-				<sdk:url>x86_64-23_r09.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:49:37 2017.-->
+				<sdk:size>365009313</sdk:size>
+				<sdk:checksum type="sha1">7cbc291483ca07dc67b71268c5f08a5755f50f51</sdk:checksum>
+				<sdk:url>x86_64-23_r10.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -882,16 +882,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3245079, branch:git_nyc-emu-release-->
+		<!--Generated from bid:4174735, branch:git_nyc-emu-release-->
 		<sdk:api-level>24</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>7</sdk:revision>
+		<sdk:revision>8</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Sep  6 08:29:51 2016.-->
-				<sdk:size>407148033</sdk:size>
-				<sdk:checksum type="sha1">a379932395ced0a8f572b39c396d86e08827a9ba</sdk:checksum>
-				<sdk:url>x86_64-24_r07.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:51:15 2017.-->
+				<sdk:size>419261998</sdk:size>
+				<sdk:checksum type="sha1">f6559e1949a5879f31a9662f4f0e50ad60181684</sdk:checksum>
+				<sdk:url>x86_64-24_r08.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index 89c48e5fb59e..c5d075d63076 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -138,8 +138,8 @@ in
   sysimg_x86_19 = buildSystemImage {
     name = "sysimg-x86-19";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip;
-      sha1 = "1d98426467580abfd03c724c5344450f5d0df379";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip;
+      sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d";
     };
   };
 
@@ -154,16 +154,16 @@ in
   sysimg_x86_21 = buildSystemImage {
     name = "sysimg-x86-21";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip;
-      sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip;
+      sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff";
     };
   };
 
   sysimg_x86_64_21 = buildSystemImage {
     name = "sysimg-x86_64-21";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip;
-      sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip;
+      sha1 = "9078a095825a69e5e215713f0866c83cef65a342";
     };
   };
 
@@ -178,16 +178,16 @@ in
   sysimg_x86_22 = buildSystemImage {
     name = "sysimg-x86-22";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip;
-      sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip;
+      sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e";
     };
   };
 
   sysimg_x86_64_22 = buildSystemImage {
     name = "sysimg-x86_64-22";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip;
-      sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip;
+      sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4";
     };
   };
 
@@ -202,16 +202,16 @@ in
   sysimg_x86_23 = buildSystemImage {
     name = "sysimg-x86-23";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip;
-      sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip;
+      sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb";
     };
   };
 
   sysimg_x86_64_23 = buildSystemImage {
     name = "sysimg-x86_64-23";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip;
-      sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip;
+      sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51";
     };
   };
 
@@ -234,16 +234,16 @@ in
   sysimg_x86_24 = buildSystemImage {
     name = "sysimg-x86-24";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip;
-      sha1 = "566fdee283a907854bfa3c174265bc31f396eabd";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip;
+      sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511";
     };
   };
 
   sysimg_x86_64_24 = buildSystemImage {
     name = "sysimg-x86_64-24";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip;
-      sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip;
+      sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684";
     };
   };
 
@@ -263,4 +263,4 @@ in
     };
   };
 }
- 
+