diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 538b7622df71..d9b478266487 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
-
+
Terms and Conditions
This is the Android Software Development Kit License Agreement
@@ -1118,6 +1118,39 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
+
+
+ 1
+
+
+
+ 154871
+ 550e83eea9513ab11c44919ac6da54b36084a9f3
+ google_apis-25_r1.zip
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 23
+ Android + Google APIs
+
+
+ com.google.android.maps
+ API for Google Maps
+
+
+ com.android.future.usb.accessory
+ API for USB Accessories
+
+
+ com.google.android.media.effects
+ Collection of video effects
+
+
+
1
@@ -1262,18 +1295,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
-
+
- 40
+ 47
0
0
-
- 305545706
- 782e7233f18c890463e8602571d304e680ce354c
- android_m2repository_r40.zip
+
+ 355529608
+ a0d22beacc106a6977321f2b07d692ce4979e96a
+ android_m2repository_r47.zip
@@ -1284,40 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
m2repository
-
-
+
- 23
- 2
- 1
+ 53
-
- 10850402
- 41121bbc412c2fce0be170d589d20cfa3e78e857
- support_r23.2.1.zip
-
-
-
- android
- Android
-
- Android Support Library
- support
- compatibility
-
-
-
-
- 40
-
-
-
-
- 152633821
- 0f599f7f35fba49b9277ef9e1394c5c82d8bd369
- google_m2repository_gms_v8_rc42_wear_2a3.zip
+
+ 194148491
+ 9008082eb1e6ff5a78d32a1fed6915f266fc5013
+ google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip
@@ -1392,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
google_play_services_froyo
-
+
- 38
+ 41
-
- 12351978
- 7a50dec81ba9c9b51d7778c19ca05002498209e8
- google_play_services_v8_rc41.zip
+
+ 13165315
+ 55be81c50041f6a8f62947418f74f683369c971f
+ google_play_services_v11_rc16.zip
@@ -1601,4 +1610,27 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
Android Auto Desktop Head Unit emulator
auto
+
+
+
+ 1
+ 0
+ 0
+
+
+
+
+ 450468876
+ 50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53
+ aiasdk-1.0.0.zip
+
+
+
+ google
+ Google Inc.
+ Android Instant Apps Development SDK
+ https://developer.android.com/topic/instant-apps/index.html
+ Instant Apps Development SDK
+ instantapps
+
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
index d195511cdb3b..54a165d21e4d 100644
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -45,7 +45,7 @@ in
};
meta = {
description = "";
- url = ;
+ homepage = ;
};
};
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index bdf3f5454805..1caa6cebb14f 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -295,8 +295,8 @@ in
platform_25 = buildPlatform {
name = "android-platform-7.1.1";
src = fetchurl {
- url = https://dl.google.com/android/repository/platform-25_r02.zip;
- sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+ url = https://dl.google.com/android/repository/platform-25_r03.zip;
+ sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
};
meta = {
description = "Android SDK Platform 25";
@@ -304,4 +304,16 @@ 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";
+ };
+ meta = {
+ description = "Android SDK Platform 26";
+ homepage = http://developer.android.com/sdk/;
+ };
+ };
+
}
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index 7bcc5f40769e..a4903cd0d402 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -295,8 +295,8 @@ in
platform_25 = buildPlatform {
name = "android-platform-7.1.1";
src = fetchurl {
- url = https://dl.google.com/android/repository/platform-25_r02.zip;
- sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+ url = https://dl.google.com/android/repository/platform-25_r03.zip;
+ sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
};
meta = {
description = "Android SDK Platform 25";
@@ -304,4 +304,16 @@ 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";
+ };
+ meta = {
+ description = "Android SDK Platform 26";
+ homepage = http://developer.android.com/sdk/;
+ };
+ };
+
}
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index e115f6747902..9f46af93a880 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.
-->
-
+
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 "License Agreement&q
June 2014.
-
+
NDK
- 13
+ 15
-
- 665967997
- 71fe653a7bf5db08c3af154735b6ccbc12f0add5
- android-ndk-r13b-darwin-x86_64.zip
+
+ 959176682
+ 9dd0ff18d177ec75797b021a3ebd294362e8a41e
+ android-ndk-r15-darwin-x86_64.zip
macosx
64
-
- 687311866
- 0600157c4ddf50ec15b8a037cfc474143f718fd0
- android-ndk-r13b-linux-x86_64.zip
+
+ 973898016
+ 32b3115357ed798a8a48d7d589ffcb901693c745
+ android-ndk-r15-linux-x86_64.zip
linux
64
-
- 620461544
- 4eb1288b1d4134a9d6474eb247f0448808d52408
- android-ndk-r13b-windows-x86.zip
+
+ 783705009
+ bf869b624f6d4778065d5d4703815b0c689069e1
+ android-ndk-r15-windows-x86.zip
windows
32
-
- 681320123
- 649d306559435c244cec5881b880318bb3dee53a
- android-ndk-r13b-windows-x86_64.zip
+
+ 848657615
+ 45d310443ceb5ff19a0dde139ee9b3404908c178
+ android-ndk-r15-windows-x86_64.zip
windows
64
@@ -336,17 +336,41 @@ June 2014.
-
+
+ 8.0.0
+ 26
+ Android SDK Platform 26
+ 1
+
+
+
+ 63467872
+ 33a4f9788bfd7123e712906b2d7e5d54a729e14a
+ platform-26_r01.zip
+
+
+
+
+ 22
+
+ http://developer.android.com/sdk/
+
+ 15
+ 1
+
+
+
+
7.1.1
25
Android SDK Platform 25
- 2
+ 3
-
- 85434042
- 6057e54a04f1d141f36a2c8d20f2962b41a3183f
- platform-25_r02.zip
+
+ 85424763
+ 00c2c5765e8988504be10a1eb66ed71fcdbd7fe8
+ platform-25_r03.zip
@@ -976,6 +1000,20 @@ June 2014.
4
+
+
+ 25
+ 1
+
+
+
+ 30822685
+ bbc72efd1a9bad87cc507e308f0d29aad438c52c
+ sources-25_r01.zip
+
+
+
+
24
@@ -1131,6 +1169,168 @@ June 2014.
+
+
+
+ 26
+ 0
+ 0
+
+
+
+
+ 53854197
+ 1cbe72929876f8a872ab1f1b1040a9f720261f59
+ build-tools_r26-linux.zip
+ linux
+
+
+
+ 53010814
+ d01a1aeca03747245f1f5936b3cb01759c66d086
+ build-tools_r26-macosx.zip
+ macosx
+
+
+
+ 54681641
+ 896ebd31117c09db220f7a3116cc0e5121c78b9d
+ build-tools_r26-windows.zip
+ windows
+
+
+
+
+
+
+
+ 26
+ 0
+ 0
+ 2
+
+
+
+
+ 53847560
+ 629bbd8d2e415bf64871fb0b4c0540fd6d0347a0
+ build-tools_r26-rc2-linux.zip
+ linux
+
+
+
+ 53003874
+ cb1eb738a1f7003025af267a9b8cc2d259533c70
+ build-tools_r26-rc2-macosx.zip
+ macosx
+
+
+
+ 54678375
+ ddaba77db0557a98f6330fbd579ad0bd12cbb152
+ build-tools_r26-rc2-windows.zip
+ windows
+
+
+
+
+
+
+
+ 26
+ 0
+ 0
+ 1
+
+
+
+
+ 53648603
+ 8cd6388dc96db2d7a49d06159cf990d3bbc78d04
+ build-tools_r26-rc1-linux.zip
+ linux
+
+
+
+ 52821129
+ 5c5a1de7d5f4f000d36ae349229fe0be846d6137
+ build-tools_r26-rc1-macosx.zip
+ macosx
+
+
+
+ 54379108
+ 43c2ddad3b67a5c33712ae14331a60673e69be91
+ build-tools_r26-rc1-windows.zip
+ windows
+
+
+
+
+
+
+
+ 25
+ 0
+ 3
+
+
+
+
+ 50757258
+ db95f3a0ae376534d4d69f4cdb6fad20649f3509
+ build-tools_r25.0.3-linux.zip
+ linux
+
+
+
+ 50545085
+ 160d2fefb5ce68e443427fc30a793a703b63e26e
+ build-tools_r25.0.3-macosx.zip
+ macosx
+
+
+
+ 51337442
+ 1edcb109ae5133aebfed573cf0bc84e0c353c28d
+ build-tools_r25.0.3-windows.zip
+ windows
+
+
+
+
+
+
+
+ 25
+ 0
+ 2
+
+
+
+
+ 49880329
+ ff953c0177e317618fda40516f3e9d95fd43c7ae
+ build-tools_r25.0.2-linux.zip
+ linux
+
+
+
+ 49667185
+ 12a5204bb3b6e39437535469fde7ddf42da46b16
+ build-tools_r25.0.2-macosx.zip
+ macosx
+
+
+
+ 50458908
+ 2fee3c0704d6ecc480570450d8b8069b2c4a2dd4
+ build-tools_r25.0.2-windows.zip
+ windows
+
+
+
+
@@ -2043,64 +2243,64 @@ June 2014.
-
+
- 25
+ 26
0
- 1
+ 0
-
- 3916151
- 8e461a2c76717824d1d8e91af68216c9f230a373
- platform-tools_r25.0.1-linux.zip
- linux
-
-
-
- 3732924
- 96abc8638bf9f65435bc0ab641cc4a3ff753eed5
- platform-tools_r25.0.1-macosx.zip
+
+ 7771750
+ e75b6137dc444f777eb02f44a6d9819b3aabff82
+ platform-tools_r26.0.0-darwin.zip
macosx
-
- 3573485
- 75249224c12528329a151dfbc591509168ef6efd
- platform-tools_r25.0.1-windows.zip
+
+ 7859155
+ 00de8a6631405b617c10f68cd11ff2e1cd528e23
+ platform-tools_r26.0.0-linux.zip
+ linux
+
+
+
+ 7511554
+ a4128ebc3d1b6372d981810920e3fa01637f891a
+ platform-tools_r26.0.0-windows.zip
windows
-
+
25
2
- 3
+ 5
-
- 277861433
- aafe7f28ac51549784efc2f3bdfc620be8a08213
- tools_r25.2.3-linux.zip
+
+ 277894900
+ 72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1
+ tools_r25.2.5-linux.zip
linux
-
- 200496727
- 0e88c0bdb8f8ee85cce248580173e033a1bbc9cb
- tools_r25.2.3-macosx.zip
+
+ 200529982
+ d2168d963ac5b616e3d3ddaf21511d084baf3659
+ tools_r25.2.5-macosx.zip
macosx
-
- 306745639
- b965decb234ed793eb9574bad8791c50ca574173
- tools_r25.2.3-windows.zip
+
+ 306785944
+ a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca
+ tools_r25.2.5-windows.zip
windows
diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix
index 5bb7409c2c4e..e4fe3cf0ff5d 100644
--- a/pkgs/development/mobile/androidenv/sources.nix
+++ b/pkgs/development/mobile/androidenv/sources.nix
@@ -137,4 +137,15 @@ in
};
};
+ source_25 = buildSource {
+ name = "android-source-25";
+ src = fetchurl {
+ url = https://dl.google.com/android/repository/sources-25_r01.zip;
+ sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c";
+ };
+ meta = {
+ description = "Source code for Android API 25";
+ };
+ };
+
}
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 807d4976296c..8ea0cfb5b802 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
-
+
Terms and Conditions
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
x86
default
-
-
- 25
- Google APIs Intel x86 Atom System Image
- 3
-
-
-
- 703131759
- 7dd19cfee4e43a1f60e0f5f058404d92d9544b33
- x86-25_r03.zip
-
-
-
- x86
- google_apis
- Google APIs
-
21
@@ -916,22 +898,4 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
x86_64
default
-
-
- 25
- Google APIs Intel x86 Atom_64 System Image
- 3
-
-
-
- 912938750
- 4593ee04811df21c339f3374fc5917843db06f8d
- x86_64-25_r03.zip
-
-
-
- x86_64
- google_apis
- Google APIs
-