Skip to content

Commit fb26e5c

Browse files
primeosprimeos
committedJun 10, 2017
androidenv: Update all packages using fetch.sh
Platforms: - Update platform_25 (r02 -> r03) - Add platform_26 Sources: - Add source_25
·
branch-off-24.1117.09-beta
1 parent c2c775d commit fb26e5c

File tree

7 files changed

+372
-141
lines changed

7 files changed

+372
-141
lines changed
 

‎pkgs/development/mobile/androidenv/addon.xml

+75-43
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" ?>
22
<sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3-
<!--Generated on 2016-11-23 16:51:44.011243 with ADRT.-->
3+
<!--Generated on 2017-06-07 21:05:03.785544 with ADRT.-->
44
<sdk:license id="android-sdk-license" type="text">Terms and Conditions
55

66
This is the Android Software Development Kit License Agreement
@@ -1118,6 +1118,39 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
11181118
</sdk:lib>
11191119
</sdk:libs>
11201120
</sdk:add-on>
1121+
<sdk:add-on>
1122+
<!--Generated from bid:3756122, branch:git_nyc-mr1-emu-release-->
1123+
<sdk:revision>1</sdk:revision>
1124+
<sdk:archives>
1125+
<sdk:archive>
1126+
<!--Built on: Tue Apr 25 23:37:40 2017.-->
1127+
<sdk:size>154871</sdk:size>
1128+
<sdk:checksum type="sha1">550e83eea9513ab11c44919ac6da54b36084a9f3</sdk:checksum>
1129+
<sdk:url>google_apis-25_r1.zip</sdk:url>
1130+
</sdk:archive>
1131+
</sdk:archives>
1132+
<sdk:uses-license ref="android-sdk-license"/>
1133+
<sdk:vendor-id>google</sdk:vendor-id>
1134+
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
1135+
<sdk:name-id>google_apis</sdk:name-id>
1136+
<sdk:name-display>Google APIs</sdk:name-display>
1137+
<sdk:api-level>23</sdk:api-level>
1138+
<sdk:description>Android + Google APIs</sdk:description>
1139+
<sdk:libs>
1140+
<sdk:lib>
1141+
<sdk:name>com.google.android.maps</sdk:name>
1142+
<sdk:description>API for Google Maps</sdk:description>
1143+
</sdk:lib>
1144+
<sdk:lib>
1145+
<sdk:name>com.android.future.usb.accessory</sdk:name>
1146+
<sdk:description>API for USB Accessories</sdk:description>
1147+
</sdk:lib>
1148+
<sdk:lib>
1149+
<sdk:name>com.google.android.media.effects</sdk:name>
1150+
<sdk:description>Collection of video effects</sdk:description>
1151+
</sdk:lib>
1152+
</sdk:libs>
1153+
</sdk:add-on>
11211154
<sdk:add-on>
11221155
<!--Generated from bid:77907680, branch:perforce-->
11231156
<sdk:revision>1</sdk:revision>
@@ -1262,18 +1295,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
12621295
<sdk:libs/>
12631296
</sdk:add-on>
12641297
<sdk:extra>
1265-
<!--Generated from bid:3453458, branch:git_nyc-support-release-->
1298+
<!--Generated from bid:3841166, branch:git_nyc-support-release-->
12661299
<sdk:revision>
1267-
<sdk:major>40</sdk:major>
1300+
<sdk:major>47</sdk:major>
12681301
<sdk:minor>0</sdk:minor>
12691302
<sdk:micro>0</sdk:micro>
12701303
</sdk:revision>
12711304
<sdk:archives>
12721305
<sdk:archive>
1273-
<!--Built on: Wed Nov 9 14:52:17 2016.-->
1274-
<sdk:size>305545706</sdk:size>
1275-
<sdk:checksum type="sha1">782e7233f18c890463e8602571d304e680ce354c</sdk:checksum>
1276-
<sdk:url>android_m2repository_r40.zip</sdk:url>
1306+
<!--Built on: Wed Mar 22 18:05:52 2017.-->
1307+
<sdk:size>355529608</sdk:size>
1308+
<sdk:checksum type="sha1">a0d22beacc106a6977321f2b07d692ce4979e96a</sdk:checksum>
1309+
<sdk:url>android_m2repository_r47.zip</sdk:url>
12771310
</sdk:archive>
12781311
</sdk:archives>
12791312
<sdk:uses-license ref="android-sdk-license"/>
@@ -1284,40 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
12841317
<sdk:path>m2repository</sdk:path>
12851318
</sdk:extra>
12861319
<sdk:extra>
1287-
<!--Generated from bid:116899064, branch:perforce-->
1288-
<sdk:obsolete/>
1289-
<sdk:revision>
1290-
<sdk:major>23</sdk:major>
1291-
<sdk:minor>2</sdk:minor>
1292-
<sdk:micro>1</sdk:micro>
1293-
</sdk:revision>
1294-
<sdk:archives>
1295-
<sdk:archive>
1296-
<!--Built on: Tue Apr 5 11:38:38 2016.-->
1297-
<sdk:size>10850402</sdk:size>
1298-
<sdk:checksum type="sha1">41121bbc412c2fce0be170d589d20cfa3e78e857</sdk:checksum>
1299-
<sdk:url>support_r23.2.1.zip</sdk:url>
1300-
</sdk:archive>
1301-
</sdk:archives>
1302-
<sdk:uses-license ref="android-sdk-license"/>
1303-
<sdk:vendor-id>android</sdk:vendor-id>
1304-
<sdk:vendor-display>Android</sdk:vendor-display>
1305-
<sdk:description></sdk:description>
1306-
<sdk:name-display>Android Support Library</sdk:name-display>
1307-
<sdk:path>support</sdk:path>
1308-
<sdk:old-paths>compatibility</sdk:old-paths>
1309-
</sdk:extra>
1310-
<sdk:extra>
1311-
<!--Generated from bid:140037564, branch:perforce-->
1320+
<!--Generated from bid:158324354, branch:perforce-->
13121321
<sdk:revision>
1313-
<sdk:major>40</sdk:major>
1322+
<sdk:major>53</sdk:major>
13141323
</sdk:revision>
13151324
<sdk:archives>
13161325
<sdk:archive>
1317-
<!--Built on: Wed Nov 23 09:14:40 2016.-->
1318-
<sdk:size>152633821</sdk:size>
1319-
<sdk:checksum type="sha1">0f599f7f35fba49b9277ef9e1394c5c82d8bd369</sdk:checksum>
1320-
<sdk:url>google_m2repository_gms_v8_rc42_wear_2a3.zip</sdk:url>
1326+
<!--Built on: Wed Jun 7 15:15:19 2017.-->
1327+
<sdk:size>194148491</sdk:size>
1328+
<sdk:checksum type="sha1">9008082eb1e6ff5a78d32a1fed6915f266fc5013</sdk:checksum>
1329+
<sdk:url>google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip</sdk:url>
13211330
</sdk:archive>
13221331
</sdk:archives>
13231332
<sdk:uses-license ref="android-sdk-license"/>
@@ -1392,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
13921401
<sdk:path>google_play_services_froyo</sdk:path>
13931402
</sdk:extra>
13941403
<sdk:extra>
1395-
<!--Generated from bid:139489718, branch:perforce-->
1404+
<!--Generated from bid:158051086, branch:perforce-->
13961405
<sdk:revision>
1397-
<sdk:major>38</sdk:major>
1406+
<sdk:major>41</sdk:major>
13981407
</sdk:revision>
13991408
<sdk:archives>
14001409
<sdk:archive>
1401-
<!--Built on: Fri Nov 18 10:26:20 2016.-->
1402-
<sdk:size>12351978</sdk:size>
1403-
<sdk:checksum type="sha1">7a50dec81ba9c9b51d7778c19ca05002498209e8</sdk:checksum>
1404-
<sdk:url>google_play_services_v8_rc41.zip</sdk:url>
1410+
<!--Built on: Tue Jun 6 11:50:00 2017.-->
1411+
<sdk:size>13165315</sdk:size>
1412+
<sdk:checksum type="sha1">55be81c50041f6a8f62947418f74f683369c971f</sdk:checksum>
1413+
<sdk:url>google_play_services_v11_rc16.zip</sdk:url>
14051414
</sdk:archive>
14061415
</sdk:archives>
14071416
<sdk:uses-license ref="android-sdk-license"/>
@@ -1601,4 +1610,27 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
16011610
<sdk:name-display>Android Auto Desktop Head Unit emulator</sdk:name-display>
16021611
<sdk:path>auto</sdk:path>
16031612
</sdk:extra>
1613+
<sdk:extra>
1614+
<!--Generated from bid:155747253, branch:perforce-->
1615+
<sdk:revision>
1616+
<sdk:major>1</sdk:major>
1617+
<sdk:minor>0</sdk:minor>
1618+
<sdk:micro>0</sdk:micro>
1619+
</sdk:revision>
1620+
<sdk:archives>
1621+
<sdk:archive>
1622+
<!--Built on: Thu May 11 08:10:37 2017.-->
1623+
<sdk:size>450468876</sdk:size>
1624+
<sdk:checksum type="sha1">50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53</sdk:checksum>
1625+
<sdk:url>aiasdk-1.0.0.zip</sdk:url>
1626+
</sdk:archive>
1627+
</sdk:archives>
1628+
<sdk:uses-license ref="android-sdk-license"/>
1629+
<sdk:vendor-id>google</sdk:vendor-id>
1630+
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
1631+
<sdk:description>Android Instant Apps Development SDK</sdk:description>
1632+
<sdk:desc-url>https://developer.android.com/topic/instant-apps/index.html</sdk:desc-url>
1633+
<sdk:name-display>Instant Apps Development SDK</sdk:name-display>
1634+
<sdk:path>instantapps</sdk:path>
1635+
</sdk:extra>
16041636
</sdk:sdk-addon>

‎pkgs/development/mobile/androidenv/generate-platforms.xsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ in
4545
};
4646
meta = {
4747
description = "<xsl:value-of select="sdk:description" />";
48-
<xsl:for-each select="sdk:desc-url"> url = <xsl:value-of select="." />;</xsl:for-each>
48+
<xsl:for-each select="sdk:desc-url"> homepage = <xsl:value-of select="." />;</xsl:for-each>
4949
};
5050
};
5151
</xsl:for-each>

‎pkgs/development/mobile/androidenv/platforms-linux.nix

+14-2
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,25 @@ in
295295
platform_25 = buildPlatform {
296296
name = "android-platform-7.1.1";
297297
src = fetchurl {
298-
url = https://dl.google.com/android/repository/platform-25_r02.zip;
299-
sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
298+
url = https://dl.google.com/android/repository/platform-25_r03.zip;
299+
sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
300300
};
301301
meta = {
302302
description = "Android SDK Platform 25";
303303
homepage = http://developer.android.com/sdk/;
304304
};
305305
};
306306

307+
platform_26 = buildPlatform {
308+
name = "android-platform-8.0.0";
309+
src = fetchurl {
310+
url = https://dl.google.com/android/repository/platform-26_r01.zip;
311+
sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
312+
};
313+
meta = {
314+
description = "Android SDK Platform 26";
315+
homepage = http://developer.android.com/sdk/;
316+
};
317+
};
318+
307319
}

‎pkgs/development/mobile/androidenv/platforms-macosx.nix

+14-2
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,25 @@ in
295295
platform_25 = buildPlatform {
296296
name = "android-platform-7.1.1";
297297
src = fetchurl {
298-
url = https://dl.google.com/android/repository/platform-25_r02.zip;
299-
sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
298+
url = https://dl.google.com/android/repository/platform-25_r03.zip;
299+
sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
300300
};
301301
meta = {
302302
description = "Android SDK Platform 25";
303303
homepage = http://developer.android.com/sdk/;
304304
};
305305
};
306306

307+
platform_26 = buildPlatform {
308+
name = "android-platform-8.0.0";
309+
src = fetchurl {
310+
url = https://dl.google.com/android/repository/platform-26_r01.zip;
311+
sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
312+
};
313+
meta = {
314+
description = "Android SDK Platform 26";
315+
homepage = http://developer.android.com/sdk/;
316+
};
317+
};
318+
307319
}

‎pkgs/development/mobile/androidenv/repository-11.xml

+256-56
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
-->
1717
<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
18-
<!--Generated on 2016-11-23 16:51:35.129300 with ADRT.-->
18+
<!--Generated on 2017-06-07 21:04:43.441919 with ADRT.-->
1919
<sdk:license id="android-sdk-license" type="text">Terms and Conditions
2020

2121
This is the Android Software Development Kit License Agreement
@@ -296,57 +296,81 @@ This is the Android SDK Preview License Agreement (the &quot;License Agreement&q
296296

297297
June 2014.</sdk:license>
298298
<sdk:ndk>
299-
<!--Generated from bid:3345770, branch:aosp-ndk-r13-release-->
299+
<!--Generated from bid:4075724, branch:aosp-ndk-r15-release-->
300300
<sdk:description>NDK</sdk:description>
301-
<sdk:revision>13</sdk:revision>
301+
<sdk:revision>15</sdk:revision>
302302
<sdk:archives>
303303
<sdk:archive>
304-
<!--Built on: Wed Oct 12 22:27:26 2016.-->
305-
<sdk:size>665967997</sdk:size>
306-
<sdk:checksum type="sha1">71fe653a7bf5db08c3af154735b6ccbc12f0add5</sdk:checksum>
307-
<sdk:url>android-ndk-r13b-darwin-x86_64.zip</sdk:url>
304+
<!--Built on: Wed Jun 7 14:50:43 2017.-->
305+
<sdk:size>959176682</sdk:size>
306+
<sdk:checksum type="sha1">9dd0ff18d177ec75797b021a3ebd294362e8a41e</sdk:checksum>
307+
<sdk:url>android-ndk-r15-darwin-x86_64.zip</sdk:url>
308308
<sdk:host-os>macosx</sdk:host-os>
309309
<sdk:host-bits>64</sdk:host-bits>
310310
</sdk:archive>
311311
<sdk:archive>
312-
<!--Built on: Wed Oct 12 22:27:48 2016.-->
313-
<sdk:size>687311866</sdk:size>
314-
<sdk:checksum type="sha1">0600157c4ddf50ec15b8a037cfc474143f718fd0</sdk:checksum>
315-
<sdk:url>android-ndk-r13b-linux-x86_64.zip</sdk:url>
312+
<!--Built on: Wed Jun 7 14:51:08 2017.-->
313+
<sdk:size>973898016</sdk:size>
314+
<sdk:checksum type="sha1">32b3115357ed798a8a48d7d589ffcb901693c745</sdk:checksum>
315+
<sdk:url>android-ndk-r15-linux-x86_64.zip</sdk:url>
316316
<sdk:host-os>linux</sdk:host-os>
317317
<sdk:host-bits>64</sdk:host-bits>
318318
</sdk:archive>
319319
<sdk:archive>
320-
<!--Built on: Wed Oct 12 22:26:38 2016.-->
321-
<sdk:size>620461544</sdk:size>
322-
<sdk:checksum type="sha1">4eb1288b1d4134a9d6474eb247f0448808d52408</sdk:checksum>
323-
<sdk:url>android-ndk-r13b-windows-x86.zip</sdk:url>
320+
<!--Built on: Wed Jun 7 14:49:52 2017.-->
321+
<sdk:size>783705009</sdk:size>
322+
<sdk:checksum type="sha1">bf869b624f6d4778065d5d4703815b0c689069e1</sdk:checksum>
323+
<sdk:url>android-ndk-r15-windows-x86.zip</sdk:url>
324324
<sdk:host-os>windows</sdk:host-os>
325325
<sdk:host-bits>32</sdk:host-bits>
326326
</sdk:archive>
327327
<sdk:archive>
328-
<!--Built on: Wed Oct 12 22:27:04 2016.-->
329-
<sdk:size>681320123</sdk:size>
330-
<sdk:checksum type="sha1">649d306559435c244cec5881b880318bb3dee53a</sdk:checksum>
331-
<sdk:url>android-ndk-r13b-windows-x86_64.zip</sdk:url>
328+
<!--Built on: Wed Jun 7 14:50:17 2017.-->
329+
<sdk:size>848657615</sdk:size>
330+
<sdk:checksum type="sha1">45d310443ceb5ff19a0dde139ee9b3404908c178</sdk:checksum>
331+
<sdk:url>android-ndk-r15-windows-x86_64.zip</sdk:url>
332332
<sdk:host-os>windows</sdk:host-os>
333333
<sdk:host-bits>64</sdk:host-bits>
334334
</sdk:archive>
335335
</sdk:archives>
336336
<sdk:uses-license ref="android-sdk-license"/>
337337
</sdk:ndk>
338338
<sdk:platform>
339-
<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
339+
<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
340+
<sdk:version>8.0.0</sdk:version>
341+
<sdk:api-level>26</sdk:api-level>
342+
<sdk:description>Android SDK Platform 26</sdk:description>
343+
<sdk:revision>1</sdk:revision>
344+
<sdk:archives>
345+
<sdk:archive>
346+
<!--Built on: Fri Jun 2 13:22:35 2017.-->
347+
<sdk:size>63467872</sdk:size>
348+
<sdk:checksum type="sha1">33a4f9788bfd7123e712906b2d7e5d54a729e14a</sdk:checksum>
349+
<sdk:url>platform-26_r01.zip</sdk:url>
350+
</sdk:archive>
351+
</sdk:archives>
352+
<sdk:uses-license ref="android-sdk-license"/>
353+
<sdk:min-tools-rev>
354+
<sdk:major>22</sdk:major>
355+
</sdk:min-tools-rev>
356+
<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
357+
<sdk:layoutlib>
358+
<sdk:api>15</sdk:api>
359+
<sdk:revision>1</sdk:revision>
360+
</sdk:layoutlib>
361+
</sdk:platform>
362+
<sdk:platform>
363+
<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
340364
<sdk:version>7.1.1</sdk:version>
341365
<sdk:api-level>25</sdk:api-level>
342366
<sdk:description>Android SDK Platform 25</sdk:description>
343-
<sdk:revision>2</sdk:revision>
367+
<sdk:revision>3</sdk:revision>
344368
<sdk:archives>
345369
<sdk:archive>
346-
<!--Built on: Mon Nov 14 23:49:40 2016.-->
347-
<sdk:size>85434042</sdk:size>
348-
<sdk:checksum type="sha1">6057e54a04f1d141f36a2c8d20f2962b41a3183f</sdk:checksum>
349-
<sdk:url>platform-25_r02.zip</sdk:url>
370+
<!--Built on: Mon Dec 5 10:12:38 2016.-->
371+
<sdk:size>85424763</sdk:size>
372+
<sdk:checksum type="sha1">00c2c5765e8988504be10a1eb66ed71fcdbd7fe8</sdk:checksum>
373+
<sdk:url>platform-25_r03.zip</sdk:url>
350374
</sdk:archive>
351375
</sdk:archives>
352376
<sdk:uses-license ref="android-sdk-license"/>
@@ -976,6 +1000,20 @@ June 2014.</sdk:license>
9761000
<sdk:api>4</sdk:api>
9771001
</sdk:layoutlib>
9781002
</sdk:platform>
1003+
<sdk:source>
1004+
<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
1005+
<sdk:api-level>25</sdk:api-level>
1006+
<sdk:revision>1</sdk:revision>
1007+
<sdk:archives>
1008+
<sdk:archive>
1009+
<!--Built on: Mon Dec 5 10:12:27 2016.-->
1010+
<sdk:size>30822685</sdk:size>
1011+
<sdk:checksum type="sha1">bbc72efd1a9bad87cc507e308f0d29aad438c52c</sdk:checksum>
1012+
<sdk:url>sources-25_r01.zip</sdk:url>
1013+
</sdk:archive>
1014+
</sdk:archives>
1015+
<sdk:uses-license ref="android-sdk-license"/>
1016+
</sdk:source>
9791017
<sdk:source>
9801018
<!--Generated from bid:3209611, branch:git_nyc-sdk-dev-->
9811019
<sdk:api-level>24</sdk:api-level>
@@ -1131,6 +1169,168 @@ June 2014.</sdk:license>
11311169
</sdk:archives>
11321170
<sdk:uses-license ref="android-sdk-license"/>
11331171
</sdk:source>
1172+
<sdk:build-tool>
1173+
<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
1174+
<sdk:revision>
1175+
<sdk:major>26</sdk:major>
1176+
<sdk:minor>0</sdk:minor>
1177+
<sdk:micro>0</sdk:micro>
1178+
</sdk:revision>
1179+
<sdk:archives>
1180+
<sdk:archive>
1181+
<!--Built on: Fri Jun 2 13:22:18 2017.-->
1182+
<sdk:size>53854197</sdk:size>
1183+
<sdk:checksum type="sha1">1cbe72929876f8a872ab1f1b1040a9f720261f59</sdk:checksum>
1184+
<sdk:url>build-tools_r26-linux.zip</sdk:url>
1185+
<sdk:host-os>linux</sdk:host-os>
1186+
</sdk:archive>
1187+
<sdk:archive>
1188+
<!--Built on: Fri Jun 2 13:22:15 2017.-->
1189+
<sdk:size>53010814</sdk:size>
1190+
<sdk:checksum type="sha1">d01a1aeca03747245f1f5936b3cb01759c66d086</sdk:checksum>
1191+
<sdk:url>build-tools_r26-macosx.zip</sdk:url>
1192+
<sdk:host-os>macosx</sdk:host-os>
1193+
</sdk:archive>
1194+
<sdk:archive>
1195+
<!--Built on: Fri Jun 2 13:22:13 2017.-->
1196+
<sdk:size>54681641</sdk:size>
1197+
<sdk:checksum type="sha1">896ebd31117c09db220f7a3116cc0e5121c78b9d</sdk:checksum>
1198+
<sdk:url>build-tools_r26-windows.zip</sdk:url>
1199+
<sdk:host-os>windows</sdk:host-os>
1200+
</sdk:archive>
1201+
</sdk:archives>
1202+
<sdk:uses-license ref="android-sdk-license"/>
1203+
</sdk:build-tool>
1204+
<sdk:build-tool>
1205+
<!--Generated from bid:4004883, branch:git_oc-preview2-sdk-->
1206+
<sdk:revision>
1207+
<sdk:major>26</sdk:major>
1208+
<sdk:minor>0</sdk:minor>
1209+
<sdk:micro>0</sdk:micro>
1210+
<sdk:preview>2</sdk:preview>
1211+
</sdk:revision>
1212+
<sdk:archives>
1213+
<sdk:archive>
1214+
<!--Built on: Fri May 12 23:05:09 2017.-->
1215+
<sdk:size>53847560</sdk:size>
1216+
<sdk:checksum type="sha1">629bbd8d2e415bf64871fb0b4c0540fd6d0347a0</sdk:checksum>
1217+
<sdk:url>build-tools_r26-rc2-linux.zip</sdk:url>
1218+
<sdk:host-os>linux</sdk:host-os>
1219+
</sdk:archive>
1220+
<sdk:archive>
1221+
<!--Built on: Fri May 12 23:05:07 2017.-->
1222+
<sdk:size>53003874</sdk:size>
1223+
<sdk:checksum type="sha1">cb1eb738a1f7003025af267a9b8cc2d259533c70</sdk:checksum>
1224+
<sdk:url>build-tools_r26-rc2-macosx.zip</sdk:url>
1225+
<sdk:host-os>macosx</sdk:host-os>
1226+
</sdk:archive>
1227+
<sdk:archive>
1228+
<!--Built on: Fri May 12 23:05:05 2017.-->
1229+
<sdk:size>54678375</sdk:size>
1230+
<sdk:checksum type="sha1">ddaba77db0557a98f6330fbd579ad0bd12cbb152</sdk:checksum>
1231+
<sdk:url>build-tools_r26-rc2-windows.zip</sdk:url>
1232+
<sdk:host-os>windows</sdk:host-os>
1233+
</sdk:archive>
1234+
</sdk:archives>
1235+
<sdk:uses-license ref="android-sdk-preview-license"/>
1236+
</sdk:build-tool>
1237+
<sdk:build-tool>
1238+
<!--Generated from bid:3821161, branch:git_oc-preview-release-->
1239+
<sdk:revision>
1240+
<sdk:major>26</sdk:major>
1241+
<sdk:minor>0</sdk:minor>
1242+
<sdk:micro>0</sdk:micro>
1243+
<sdk:preview>1</sdk:preview>
1244+
</sdk:revision>
1245+
<sdk:archives>
1246+
<sdk:archive>
1247+
<!--Built on: Tue Mar 21 10:10:45 2017.-->
1248+
<sdk:size>53648603</sdk:size>
1249+
<sdk:checksum type="sha1">8cd6388dc96db2d7a49d06159cf990d3bbc78d04</sdk:checksum>
1250+
<sdk:url>build-tools_r26-rc1-linux.zip</sdk:url>
1251+
<sdk:host-os>linux</sdk:host-os>
1252+
</sdk:archive>
1253+
<sdk:archive>
1254+
<!--Built on: Tue Mar 21 10:10:34 2017.-->
1255+
<sdk:size>52821129</sdk:size>
1256+
<sdk:checksum type="sha1">5c5a1de7d5f4f000d36ae349229fe0be846d6137</sdk:checksum>
1257+
<sdk:url>build-tools_r26-rc1-macosx.zip</sdk:url>
1258+
<sdk:host-os>macosx</sdk:host-os>
1259+
</sdk:archive>
1260+
<sdk:archive>
1261+
<!--Built on: Tue Mar 21 10:10:25 2017.-->
1262+
<sdk:size>54379108</sdk:size>
1263+
<sdk:checksum type="sha1">43c2ddad3b67a5c33712ae14331a60673e69be91</sdk:checksum>
1264+
<sdk:url>build-tools_r26-rc1-windows.zip</sdk:url>
1265+
<sdk:host-os>windows</sdk:host-os>
1266+
</sdk:archive>
1267+
</sdk:archives>
1268+
<sdk:uses-license ref="android-sdk-preview-license"/>
1269+
</sdk:build-tool>
1270+
<sdk:build-tool>
1271+
<!--Generated from bid:3907386, branch:git_nyc-mr1-sdk-dev-->
1272+
<sdk:revision>
1273+
<sdk:major>25</sdk:major>
1274+
<sdk:minor>0</sdk:minor>
1275+
<sdk:micro>3</sdk:micro>
1276+
</sdk:revision>
1277+
<sdk:archives>
1278+
<sdk:archive>
1279+
<!--Built on: Thu Apr 13 13:27:23 2017.-->
1280+
<sdk:size>50757258</sdk:size>
1281+
<sdk:checksum type="sha1">db95f3a0ae376534d4d69f4cdb6fad20649f3509</sdk:checksum>
1282+
<sdk:url>build-tools_r25.0.3-linux.zip</sdk:url>
1283+
<sdk:host-os>linux</sdk:host-os>
1284+
</sdk:archive>
1285+
<sdk:archive>
1286+
<!--Built on: Thu Apr 13 13:27:21 2017.-->
1287+
<sdk:size>50545085</sdk:size>
1288+
<sdk:checksum type="sha1">160d2fefb5ce68e443427fc30a793a703b63e26e</sdk:checksum>
1289+
<sdk:url>build-tools_r25.0.3-macosx.zip</sdk:url>
1290+
<sdk:host-os>macosx</sdk:host-os>
1291+
</sdk:archive>
1292+
<sdk:archive>
1293+
<!--Built on: Thu Apr 13 13:27:19 2017.-->
1294+
<sdk:size>51337442</sdk:size>
1295+
<sdk:checksum type="sha1">1edcb109ae5133aebfed573cf0bc84e0c353c28d</sdk:checksum>
1296+
<sdk:url>build-tools_r25.0.3-windows.zip</sdk:url>
1297+
<sdk:host-os>windows</sdk:host-os>
1298+
</sdk:archive>
1299+
</sdk:archives>
1300+
<sdk:uses-license ref="android-sdk-license"/>
1301+
</sdk:build-tool>
1302+
<sdk:build-tool>
1303+
<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
1304+
<sdk:revision>
1305+
<sdk:major>25</sdk:major>
1306+
<sdk:minor>0</sdk:minor>
1307+
<sdk:micro>2</sdk:micro>
1308+
</sdk:revision>
1309+
<sdk:archives>
1310+
<sdk:archive>
1311+
<!--Built on: Mon Dec 5 10:11:59 2016.-->
1312+
<sdk:size>49880329</sdk:size>
1313+
<sdk:checksum type="sha1">ff953c0177e317618fda40516f3e9d95fd43c7ae</sdk:checksum>
1314+
<sdk:url>build-tools_r25.0.2-linux.zip</sdk:url>
1315+
<sdk:host-os>linux</sdk:host-os>
1316+
</sdk:archive>
1317+
<sdk:archive>
1318+
<!--Built on: Mon Dec 5 10:11:57 2016.-->
1319+
<sdk:size>49667185</sdk:size>
1320+
<sdk:checksum type="sha1">12a5204bb3b6e39437535469fde7ddf42da46b16</sdk:checksum>
1321+
<sdk:url>build-tools_r25.0.2-macosx.zip</sdk:url>
1322+
<sdk:host-os>macosx</sdk:host-os>
1323+
</sdk:archive>
1324+
<sdk:archive>
1325+
<!--Built on: Mon Dec 5 10:11:55 2016.-->
1326+
<sdk:size>50458908</sdk:size>
1327+
<sdk:checksum type="sha1">2fee3c0704d6ecc480570450d8b8069b2c4a2dd4</sdk:checksum>
1328+
<sdk:url>build-tools_r25.0.2-windows.zip</sdk:url>
1329+
<sdk:host-os>windows</sdk:host-os>
1330+
</sdk:archive>
1331+
</sdk:archives>
1332+
<sdk:uses-license ref="android-sdk-license"/>
1333+
</sdk:build-tool>
11341334
<sdk:build-tool>
11351335
<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
11361336
<sdk:revision>
@@ -2043,64 +2243,64 @@ June 2014.</sdk:license>
20432243
<sdk:uses-license ref="android-sdk-license"/>
20442244
</sdk:build-tool>
20452245
<sdk:platform-tool>
2046-
<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
2246+
<!--Generated from bid:4062713a, branch:git_oc-preview3-sdk-->
20472247
<sdk:revision>
2048-
<sdk:major>25</sdk:major>
2248+
<sdk:major>26</sdk:major>
20492249
<sdk:minor>0</sdk:minor>
2050-
<sdk:micro>1</sdk:micro>
2250+
<sdk:micro>0</sdk:micro>
20512251
</sdk:revision>
20522252
<sdk:archives>
20532253
<sdk:archive>
2054-
<!--Built on: Mon Nov 14 23:49:26 2016.-->
2055-
<sdk:size>3916151</sdk:size>
2056-
<sdk:checksum type="sha1">8e461a2c76717824d1d8e91af68216c9f230a373</sdk:checksum>
2057-
<sdk:url>platform-tools_r25.0.1-linux.zip</sdk:url>
2058-
<sdk:host-os>linux</sdk:host-os>
2254+
<!--Built on: Fri Jun 2 13:22:20 2017.-->
2255+
<sdk:size>7771750</sdk:size>
2256+
<sdk:checksum type="sha1">e75b6137dc444f777eb02f44a6d9819b3aabff82</sdk:checksum>
2257+
<sdk:url>platform-tools_r26.0.0-darwin.zip</sdk:url>
2258+
<sdk:host-os>macosx</sdk:host-os>
20592259
</sdk:archive>
20602260
<sdk:archive>
2061-
<!--Built on: Mon Nov 14 23:49:25 2016.-->
2062-
<sdk:size>3732924</sdk:size>
2063-
<sdk:checksum type="sha1">96abc8638bf9f65435bc0ab641cc4a3ff753eed5</sdk:checksum>
2064-
<sdk:url>platform-tools_r25.0.1-macosx.zip</sdk:url>
2065-
<sdk:host-os>macosx</sdk:host-os>
2261+
<!--Built on: Fri Jun 2 13:22:19 2017.-->
2262+
<sdk:size>7859155</sdk:size>
2263+
<sdk:checksum type="sha1">00de8a6631405b617c10f68cd11ff2e1cd528e23</sdk:checksum>
2264+
<sdk:url>platform-tools_r26.0.0-linux.zip</sdk:url>
2265+
<sdk:host-os>linux</sdk:host-os>
20662266
</sdk:archive>
20672267
<sdk:archive>
2068-
<!--Built on: Mon Nov 14 23:49:25 2016.-->
2069-
<sdk:size>3573485</sdk:size>
2070-
<sdk:checksum type="sha1">75249224c12528329a151dfbc591509168ef6efd</sdk:checksum>
2071-
<sdk:url>platform-tools_r25.0.1-windows.zip</sdk:url>
2268+
<!--Built on: Fri Jun 2 13:22:20 2017.-->
2269+
<sdk:size>7511554</sdk:size>
2270+
<sdk:checksum type="sha1">a4128ebc3d1b6372d981810920e3fa01637f891a</sdk:checksum>
2271+
<sdk:url>platform-tools_r26.0.0-windows.zip</sdk:url>
20722272
<sdk:host-os>windows</sdk:host-os>
20732273
</sdk:archive>
20742274
</sdk:archives>
20752275
<sdk:uses-license ref="android-sdk-license"/>
20762276
</sdk:platform-tool>
20772277
<sdk:tool>
2078-
<!--Generated from bid:3470232, branch:aosp-emu-2.2-release-->
2278+
<!--Generated from bid:3567187, branch:aosp-emu-2.2-release-->
20792279
<sdk:revision>
20802280
<sdk:major>25</sdk:major>
20812281
<sdk:minor>2</sdk:minor>
2082-
<sdk:micro>3</sdk:micro>
2282+
<sdk:micro>5</sdk:micro>
20832283
</sdk:revision>
20842284
<sdk:archives>
20852285
<sdk:archive>
2086-
<!--Built on: Fri Nov 11 08:51:34 2016.-->
2087-
<sdk:size>277861433</sdk:size>
2088-
<sdk:checksum type="sha1">aafe7f28ac51549784efc2f3bdfc620be8a08213</sdk:checksum>
2089-
<sdk:url>tools_r25.2.3-linux.zip</sdk:url>
2286+
<!--Built on: Mon Dec 12 17:20:14 2016.-->
2287+
<sdk:size>277894900</sdk:size>
2288+
<sdk:checksum type="sha1">72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1</sdk:checksum>
2289+
<sdk:url>tools_r25.2.5-linux.zip</sdk:url>
20902290
<sdk:host-os>linux</sdk:host-os>
20912291
</sdk:archive>
20922292
<sdk:archive>
2093-
<!--Built on: Fri Nov 11 08:51:29 2016.-->
2094-
<sdk:size>200496727</sdk:size>
2095-
<sdk:checksum type="sha1">0e88c0bdb8f8ee85cce248580173e033a1bbc9cb</sdk:checksum>
2096-
<sdk:url>tools_r25.2.3-macosx.zip</sdk:url>
2293+
<!--Built on: Mon Dec 12 17:20:09 2016.-->
2294+
<sdk:size>200529982</sdk:size>
2295+
<sdk:checksum type="sha1">d2168d963ac5b616e3d3ddaf21511d084baf3659</sdk:checksum>
2296+
<sdk:url>tools_r25.2.5-macosx.zip</sdk:url>
20972297
<sdk:host-os>macosx</sdk:host-os>
20982298
</sdk:archive>
20992299
<sdk:archive>
2100-
<!--Built on: Fri Nov 11 08:51:26 2016.-->
2101-
<sdk:size>306745639</sdk:size>
2102-
<sdk:checksum type="sha1">b965decb234ed793eb9574bad8791c50ca574173</sdk:checksum>
2103-
<sdk:url>tools_r25.2.3-windows.zip</sdk:url>
2300+
<!--Built on: Mon Dec 12 17:20:05 2016.-->
2301+
<sdk:size>306785944</sdk:size>
2302+
<sdk:checksum type="sha1">a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca</sdk:checksum>
2303+
<sdk:url>tools_r25.2.5-windows.zip</sdk:url>
21042304
<sdk:host-os>windows</sdk:host-os>
21052305
</sdk:archive>
21062306
</sdk:archives>

‎pkgs/development/mobile/androidenv/sources.nix

+11
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,15 @@ in
137137
};
138138
};
139139

140+
source_25 = buildSource {
141+
name = "android-source-25";
142+
src = fetchurl {
143+
url = https://dl.google.com/android/repository/sources-25_r01.zip;
144+
sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c";
145+
};
146+
meta = {
147+
description = "Source code for Android API 25";
148+
};
149+
};
150+
140151
}

‎pkgs/development/mobile/androidenv/sys-img.xml

+1-37
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" ?>
22
<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3-
<!--Generated on 2016-11-23 16:51:35.431708 with ADRT.-->
3+
<!--Generated on 2017-06-07 21:04:43.770481 with ADRT.-->
44
<sdk:license id="android-sdk-license" type="text">Terms and Conditions
55

66
This is the Android Software Development Kit License Agreement
@@ -830,24 +830,6 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
830830
<sdk:abi>x86</sdk:abi>
831831
<sdk:tag-id>default</sdk:tag-id>
832832
</sdk:system-image>
833-
<sdk:system-image>
834-
<!--Generated from bid:3479480, branch:git_nyc-preview-release-->
835-
<sdk:api-level>25</sdk:api-level>
836-
<sdk:description>Google APIs Intel x86 Atom System Image</sdk:description>
837-
<sdk:revision>3</sdk:revision>
838-
<sdk:archives>
839-
<sdk:archive>
840-
<!--Built on: Mon Nov 14 16:41:48 2016.-->
841-
<sdk:size>703131759</sdk:size>
842-
<sdk:checksum type="sha1">7dd19cfee4e43a1f60e0f5f058404d92d9544b33</sdk:checksum>
843-
<sdk:url>x86-25_r03.zip</sdk:url>
844-
</sdk:archive>
845-
</sdk:archives>
846-
<sdk:uses-license ref="android-sdk-preview-license"/>
847-
<sdk:abi>x86</sdk:abi>
848-
<sdk:tag-id>google_apis</sdk:tag-id>
849-
<sdk:tag-display>Google APIs</sdk:tag-display>
850-
</sdk:system-image>
851833
<sdk:system-image>
852834
<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
853835
<sdk:api-level>21</sdk:api-level>
@@ -916,22 +898,4 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
916898
<sdk:abi>x86_64</sdk:abi>
917899
<sdk:tag-id>default</sdk:tag-id>
918900
</sdk:system-image>
919-
<sdk:system-image>
920-
<!--Generated from bid:3479480, branch:git_nyc-preview-release-->
921-
<sdk:api-level>25</sdk:api-level>
922-
<sdk:description>Google APIs Intel x86 Atom_64 System Image</sdk:description>
923-
<sdk:revision>3</sdk:revision>
924-
<sdk:archives>
925-
<sdk:archive>
926-
<!--Built on: Mon Nov 14 16:42:52 2016.-->
927-
<sdk:size>912938750</sdk:size>
928-
<sdk:checksum type="sha1">4593ee04811df21c339f3374fc5917843db06f8d</sdk:checksum>
929-
<sdk:url>x86_64-25_r03.zip</sdk:url>
930-
</sdk:archive>
931-
</sdk:archives>
932-
<sdk:uses-license ref="android-sdk-preview-license"/>
933-
<sdk:abi>x86_64</sdk:abi>
934-
<sdk:tag-id>google_apis</sdk:tag-id>
935-
<sdk:tag-display>Google APIs</sdk:tag-display>
936-
</sdk:system-image>
937901
</sdk:sdk-sys-img>

0 commit comments

Comments
 (0)
Please sign in to comment.