git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119092 from numinit/update-androidenv

androidenv: Allow multiple ndkVersions to be specified

commit14b427a7e4b50bdabeb05bb27f3c76c871dd3447 authorJohn Ericson <git@JohnEricson.me> dateSun 25 Apr 2021, 10:08 (6 years ago) parent4ac8826a7e5b07
4 files changed+496−125
compare with master
unifiedsplit
doc/languages-frameworks/android.section.md+6−2 pkgs/development/mobile/androidenv/compose-android-packages.nix+26−8 pkgs/development/mobile/androidenv/examples/shell.nix+9−9 pkgs/development/mobile/androidenv/repo.json+455−106
doc/languages-frameworks/android.section.md+6−2
@@ -25,7 +25,7 @@ let
2525 abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
2626 cmakeVersions = [ "3.10.2" ];
2727 includeNDK = true;
28− ndkVersion = "22.0.7026061";
28+ ndkVersions = ["22.0.7026061"];
2929 useGoogleAPIs = false;
3030 useGoogleTVAddOns = false;
3131 includeExtras = [
@@ -52,7 +52,11 @@ The following parameters are supported:
5252* `cmakeVersions` specifies which CMake versions should be deployed.
5353* `includeNDK` specifies that the Android NDK bundle should be included.
5454 Defaults to: `false`.
55−* `ndkVersion` specifies the NDK version that we want to use.
55+* `ndkVersions` specifies the NDK versions that we want to use. These are linked
56+ under the `ndk` directory of the SDK root, and the first is linked under the
57+ `ndk-bundle` directory.
58+* `ndkVersion` is equivalent to specifying one entry in `ndkVersions`, and
59+ `ndkVersions` overrides this parameter if provided.
5660* `includeExtras` is an array of identifier strings referring to arbitrary
5761 add-on packages that should be installed.
5862* `platformVersions` specifies which platform SDK versions should be included.
pkgs/development/mobile/androidenv/compose-android-packages.nix+26−8
@@ -3,10 +3,10 @@
33}:
44
55{ toolsVersion ? "26.1.1"
6−, platformToolsVersion ? "30.0.5"
6+, platformToolsVersion ? "31.0.2"
77, buildToolsVersions ? [ "30.0.3" ]
88, includeEmulator ? false
9−, emulatorVersion ? "30.3.4"
9+, emulatorVersion ? "30.6.3"
1010, platformVersions ? []
1111, includeSources ? false
1212, includeSystemImages ? false
@@ -14,7 +14,8 @@
1414, abiVersions ? [ "armeabi-v7a" ]
1515, cmakeVersions ? [ ]
1616, includeNDK ? false
17−, ndkVersion ? "22.0.7026061"
17+, ndkVersion ? "22.1.7171670"
18+, ndkVersions ? [ndkVersion]
1819, useGoogleAPIs ? false
1920, useGoogleTVAddOns ? false
2021, includeExtras ? []
@@ -175,10 +176,18 @@ rec {
175176 }
176177 ) cmakeVersions;
177178
178− ndk-bundle = import ./ndk-bundle {
179− inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools;
180− package = packages.ndk-bundle.${ndkVersion};
181− };
179+ # Creates a NDK bundle.
180+ makeNdkBundle = ndkVersion:
181+ import ./ndk-bundle {
182+ inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools;
183+ package = packages.ndk-bundle.${ndkVersion};
184+ };
185+
186+ # All NDK bundles.
187+ ndk-bundles = if includeNDK then map makeNdkBundle ndkVersions else [];
188+
189+ # The "default" NDK bundle.
190+ ndk-bundle = if includeNDK then lib.findFirst (x: x != null) null ndk-bundles else null;
182191
183192 google-apis = map (version:
184193 deployAndroidPackage {
@@ -203,6 +212,15 @@ rec {
203212 '') plugins}
204213 '';
205214
215+ # Function that automatically links all NDK plugins.
216+ linkNdkPlugins = {name, plugins, rootName ? name}:
217+ lib.optionalString (plugins != []) ''
218+ mkdir -p ${rootName}
219+ ${lib.concatMapStrings (plugin: ''
220+ ln -s ${plugin}/libexec/android-sdk/${name} ${rootName}/${plugin.version}
221+ '') plugins}
222+ '';
223+
206224 # Function that automatically links a plugin for which only one version exists
207225 linkPlugin = {name, plugin, check ? true}:
208226 lib.optionalString check ''
@@ -233,13 +251,13 @@ rec {
233251
234252 postInstall = ''
235253 # Symlink all requested plugins
236−
237254 ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
238255 ${linkPlugins { name = "build-tools"; plugins = build-tools; }}
239256 ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
240257 ${linkPlugins { name = "platforms"; plugins = platforms; }}
241258 ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }}
242259 ${linkPlugins { name = "cmake"; plugins = cmake; }}
260+ ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }}
243261 ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}
244262
245263 ${lib.optionalString includeSystemImages ''
pkgs/development/mobile/androidenv/examples/shell.nix+9−9
@@ -23,14 +23,14 @@ let
2323 android = {
2424 versions = {
2525 tools = "26.1.1";
26− platformTools = "30.0.5";
26+ platformTools = "31.0.2";
2727 buildTools = "30.0.3";
28− ndk = "22.0.7026061";
29−
30− # or the LTS NDK:
31− # ndk = "21.3.6528147";
32− cmake = "3.10.2";
33− emulator = "30.3.4";
28+ ndk = [
29+ "22.1.7171670"
30+ "21.3.6528147" # LTS NDK
31+ ];
32+ cmake = "3.18.1";
33+ emulator = "30.6.3";
3434 };
3535
3636 platforms = ["23" "24" "25" "26" "27" "28" "29" "30"];
@@ -69,7 +69,7 @@ let
6969 emulatorVersion = android.versions.emulator;
7070
7171 includeNDK = true;
72− ndkVersion = android.versions.ndk;
72+ ndkVersions = android.versions.ndk;
7373 cmakeVersions = [android.versions.cmake];
7474
7575 useGoogleAPIs = true;
@@ -130,7 +130,7 @@ pkgs.mkShell rec {
130130
131131 shellHook = ''
132132 # Add cmake to the path.
133− cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/${android.versions.cmake}".*/)"
133+ cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/${android.versions.cmake}"*/)"
134134 export PATH="$cmake_root/bin:$PATH"
135135
136136 # Write out local.properties for Android Studio.
pkgs/development/mobile/androidenv/repo.json+455−106
@@ -425,16 +425,16 @@
425425 "archives": [
426426 {
427427 "os": "windows",
428− "sha1": "9b3479ce8f42fdcbd487aa843a2453d5950f5fc9",
429− "size": 164505,
430− "url": "https://dl.google.com/android/repository/gvm-windows_v1_6_0.zip"
428+ "sha1": "1d35ead3cdfaf6e51001455f66a2db102dd647b7",
429+ "size": 167191,
430+ "url": "https://dl.google.com/android/repository/gvm-windows_v1_7_0.zip"
431431 }
432432 ],
433433 "displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer)",
434434 "license": "android-sdk-license",
435435 "name": "extras-google-Android_Emulator_Hypervisor_Driver",
436436 "path": "extras/google/Android_Emulator_Hypervisor_Driver",
437− "revision": "1.6.0"
437+ "revision": "1.7.0"
438438 },
439439 "extras;google;admob_ads_sdk": {
440440 "archives": [
@@ -466,33 +466,6 @@
466466 "path": "extras/google/analytics_sdk_v2",
467467 "revision": "3"
468468 },
469− "extras;google;auto": {
470− "archives": [
471− {
472− "os": "linux",
473− "sha1": "202a6e1b3009a0eb815f8c672d2d5b3717de6169",
474− "size": 1346009,
475− "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip"
476− },
477− {
478− "os": "macosx",
479− "sha1": "8179cbb3914493ebc5eb65b731cba061582f2e84",
480− "size": 2375533,
481− "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip"
482− },
483− {
484− "os": "windows",
485− "sha1": "99c4a7172d73673552119347bc24c58b47da177b",
486− "size": 2691901,
487− "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r01.1.zip"
488− }
489− ],
490− "displayName": "Android Auto Desktop Head Unit emulator",
491− "license": "android-sdk-license",
492− "name": "extras-google-auto",
493− "path": "extras/google/auto",
494− "revision": "1.1"
495− },
496469 "extras;google;gcm": {
497470 "archives": [
498471 {
@@ -1537,21 +1510,21 @@
15371510 "archives": [
15381511 {
15391512 "os": "windows",
1540− "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1",
1541− "size": 1404149582,
1542− "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-windows.zip"
1513+ "sha1": "ead1babced6bdfaa8e641faeb6ed115ca603c4a9",
1514+ "size": 1404405641,
1515+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-windows.zip"
15431516 },
15441517 {
15451518 "os": "macosx",
1546− "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1",
1547− "size": 1404149582,
1548− "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-darwin.zip"
1519+ "sha1": "ead1babced6bdfaa8e641faeb6ed115ca603c4a9",
1520+ "size": 1404405641,
1521+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-darwin.zip"
15491522 },
15501523 {
15511524 "os": "linux",
1552− "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1",
1553− "size": 1404149582,
1554− "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-linux.zip"
1525+ "sha1": "ead1babced6bdfaa8e641faeb6ed115ca603c4a9",
1526+ "size": 1404405641,
1527+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-linux.zip"
15551528 }
15561529 ],
15571530 "displayName": "Google Play Intel x86 Atom_64 System Image",
@@ -1561,6 +1534,58 @@
15611534 "revision": "30-google_apis_playstore-x86_64"
15621535 }
15631536 }
1537+ },
1538+ "S": {
1539+ "google_apis_playstore": {
1540+ "arm64-v8a": {
1541+ "archives": [
1542+ {
1543+ "os": "macosx",
1544+ "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733",
1545+ "size": 1333046412,
1546+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-darwin.zip"
1547+ },
1548+ {
1549+ "os": "linux",
1550+ "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733",
1551+ "size": 1333046412,
1552+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-linux.zip"
1553+ }
1554+ ],
1555+ "displayName": "Google Play ARM 64 v8a System Image",
1556+ "license": "android-sdk-arm-dbt-license",
1557+ "name": "system-image-S-google_apis_playstore-arm64-v8a",
1558+ "path": "system-images/android-S/google_apis_playstore/arm64-v8a",
1559+ "revision": "S-google_apis_playstore-arm64-v8a"
1560+ },
1561+ "x86_64": {
1562+ "archives": [
1563+ {
1564+ "os": "windows",
1565+ "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
1566+ "size": 1384401947,
1567+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-windows.zip"
1568+ },
1569+ {
1570+ "os": "macosx",
1571+ "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
1572+ "size": 1384401947,
1573+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-darwin.zip"
1574+ },
1575+ {
1576+ "os": "linux",
1577+ "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
1578+ "size": 1384401947,
1579+ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-linux.zip"
1580+ }
1581+ ],
1582+ "displayName": "Google Play Intel x86 Atom_64 System Image",
1583+ "license": "android-sdk-preview-license",
1584+ "name": "system-image-S-google_apis_playstore-x86_64",
1585+ "path": "system-images/android-S/google_apis_playstore/x86_64",
1586+ "revision": "S-google_apis_playstore-x86_64"
1587+ }
1588+ }
15641589 }
15651590 },
15661591 "licenses": {
@@ -3075,6 +3100,33 @@
30753100 "name": "build-tools",
30763101 "path": "build-tools/30.0.3",
30773102 "revision": "30.0.3"
3103+ },
3104+ "31.0.0-rc3": {
3105+ "archives": [
3106+ {
3107+ "os": "macosx",
3108+ "sha1": "e75dfb7a975809ba0ca0d25c2b82f7fd56444a4b",
3109+ "size": 53224980,
3110+ "url": "https://dl.google.com/android/repository/012061446cfd98341585d0d07401d0bd1a4c30f6.build-tools_r31-rc3-macosx.zip"
3111+ },
3112+ {
3113+ "os": "windows",
3114+ "sha1": "9d9ce209353c9046abe16285d58ef893c4b42221",
3115+ "size": 57592553,
3116+ "url": "https://dl.google.com/android/repository/41966dc138d44a3e3797b92fb68bf70552011d5d.build-tools_r31-rc3-windows.zip"
3117+ },
3118+ {
3119+ "os": "linux",
3120+ "sha1": "6859f11348d3984afbfcc74984802bd2e31cc0e2",
3121+ "size": 54724181,
3122+ "url": "https://dl.google.com/android/repository/build-tools_r31-rc3-linux.zip"
3123+ }
3124+ ],
3125+ "displayName": "Android SDK Build-Tools 31-rc3",
3126+ "license": "android-sdk-preview-license",
3127+ "name": "build-tools",
3128+ "path": "build-tools/31.0.0-rc3",
3129+ "revision": "31.0.0-rc3"
30783130 }
30793131 },
30803132 "cmake": {
@@ -3109,14 +3161,14 @@
31093161 "archives": [
31103162 {
31113163 "os": "windows",
3112− "sha1": "80916762df6955f431743066e3568ae65b1b2b2f",
3113− "size": 14677038,
3164+ "sha1": "63723e9657a3ce1fc3ae078229c6199af80b76bd",
3165+ "size": 14676950,
31143166 "url": "https://dl.google.com/android/repository/7c386a739f915f5bd60051f2572c24782388e807.cmake-3.18.1-windows.zip"
31153167 },
31163168 {
31173169 "os": "macosx",
3118− "sha1": "1580deb8fb5d705aefb028413dad1a3a129891fe",
3119− "size": 18505815,
3170+ "sha1": "809fdc8e14c745c6df4e506cc2157910f50b9cd9",
3171+ "size": 18505220,
31203172 "url": "https://dl.google.com/android/repository/ba34c321f92f6e6fd696c8354c262c122f56abf8.cmake-3.18.1-darwin.zip"
31213173 },
31223174 {
@@ -3127,7 +3179,7 @@
31273179 }
31283180 ],
31293181 "displayName": "CMake 3.18.1",
3130− "license": "android-sdk-preview-license",
3182+ "license": "android-sdk-license",
31313183 "name": "cmake",
31323184 "path": "cmake/3.18.1",
31333185 "revision": "3.18.1"
@@ -3198,8 +3250,8 @@
31983250 },
31993251 {
32003252 "os": "macosx",
3201− "sha1": "a69c4493c4c919698989484bf0ea684550ec5217",
3202− "size": 86522172,
3253+ "sha1": "d45816955198c4dfd652584f4c0f1b0e86efb1b7",
3254+ "size": 86521848,
32033255 "url": "https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip"
32043256 },
32053257 {
@@ -3325,74 +3377,59 @@
33253377 }
33263378 },
33273379 "emulator": {
3328− "28.0.25": {
3329− "archives": [
3330− {
3331− "os": "windows",
3332− "sha1": "6004fd05db29f8088ec89ba85c273c0bf86ef0be",
3333− "size": 372563893,
3334− "url": "https://dl.google.com/android/repository/emulator-windows-5395263.zip"
3335− }
3336− ],
3337− "displayName": "Android Emulator",
3338− "license": "android-sdk-license",
3339− "name": "emulator",
3340− "path": "emulator",
3341− "revision": "28.0.25"
3342− },
3343− "30.2.6": {
3380+ "30.5.5": {
33443381 "archives": [
33453382 {
33463383 "os": "macosx",
3347− "sha1": "60cc4cfe372b3189679e1e08c929ff2fb793f3f6",
3348− "size": 292634405,
3349− "url": "https://dl.google.com/android/repository/emulator-darwin-6962233.zip"
3384+ "sha1": "90f8a9942253db75ab4d13f791377e9739a88617",
3385+ "size": 300476485,
3386+ "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7285888.zip"
33503387 },
33513388 {
33523389 "os": "linux",
3353− "sha1": "751044f953541b70a656d77343f6b0aac1153e24",
3354− "size": 262303903,
3355− "url": "https://dl.google.com/android/repository/emulator-linux-6962233.zip"
3390+ "sha1": "ccdee1aa99e4ec39f5a762d6912682ac248b92f0",
3391+ "size": 272500365,
3392+ "url": "https://dl.google.com/android/repository/emulator-linux_x64-7285888.zip"
33563393 },
33573394 {
33583395 "os": "windows",
3359− "sha1": "daa448bc56199b6beeaecf5f796d26c65e5a5fb8",
3360− "size": 258566662,
3361− "url": "https://dl.google.com/android/repository/emulator-windows-6962233.zip"
3396+ "sha1": "84c3105ba1a3a94963e1f99b3f706d0231948fc9",
3397+ "size": 324371999,
3398+ "url": "https://dl.google.com/android/repository/emulator-windows_x64-7285888.zip"
33623399 }
33633400 ],
33643401 "displayName": "Android Emulator",
33653402 "license": "android-sdk-license",
33663403 "name": "emulator",
33673404 "path": "emulator",
3368− "revision": "30.2.6"
3405+ "revision": "30.5.5"
33693406 },
3370− "30.3.4": {
3407+ "30.6.3": {
33713408 "archives": [
33723409 {
33733410 "os": "macosx",
3374− "sha1": "7c456b3946a89d8543a070d9f643f3fe87283d68",
3375− "size": 295125219,
3376− "url": "https://dl.google.com/android/repository/emulator-darwin-7020230.zip"
3411+ "sha1": "66c9b788de49548d0faab052274f97b042f7241d",
3412+ "size": 308984491,
3413+ "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7266284.zip"
33773414 },
33783415 {
33793416 "os": "linux",
3380− "sha1": "5285e71825453c83ad951b55a7a7d917a667221a",
3381− "size": 265877671,
3382− "url": "https://dl.google.com/android/repository/emulator-linux-7020230.zip"
3417+ "sha1": "ecd9b55fe4784b6c8683faa4b1d2c951b8929154",
3418+ "size": 272243636,
3419+ "url": "https://dl.google.com/android/repository/emulator-linux_x64-7266284.zip"
33833420 },
33843421 {
33853422 "os": "windows",
3386− "sha1": "918b6236a57d425b7a95495cd76a2cf1aaa98560",
3387− "size": 320221036,
3388− "url": "https://dl.google.com/android/repository/emulator-windows-7020230.zip"
3423+ "sha1": "5736749dc46ad950ec84e8275dfde2606d3e8a80",
3424+ "size": 324657514,
3425+ "url": "https://dl.google.com/android/repository/emulator-windows_x64-7266284.zip"
33893426 }
33903427 ],
33913428 "displayName": "Android Emulator",
33923429 "license": "android-sdk-preview-license",
33933430 "name": "emulator",
33943431 "path": "emulator",
3395− "revision": "30.3.4"
3432+ "revision": "30.6.3"
33963433 }
33973434 },
33983435 "extras": {
@@ -3911,6 +3948,33 @@
39113948 "path": "ndk/21.3.6528147",
39123949 "revision": "21.3.6528147"
39133950 },
3951+ "21.4.7075529": {
3952+ "archives": [
3953+ {
3954+ "os": "macosx",
3955+ "sha1": "3f15c23a1c247ad17c7c271806848dbd40434738",
3956+ "size": 1042617180,
3957+ "url": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip"
3958+ },
3959+ {
3960+ "os": "linux",
3961+ "sha1": "c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9",
3962+ "size": 1190670072,
3963+ "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip"
3964+ },
3965+ {
3966+ "os": "windows",
3967+ "sha1": "fc44fea8bb3f5a6789821f40f41dce2d2cd5dc30",
3968+ "size": 1109665123,
3969+ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip"
3970+ }
3971+ ],
3972+ "displayName": "NDK (Side by side) 21.4.7075529",
3973+ "license": "android-sdk-license",
3974+ "name": "ndk",
3975+ "path": "ndk/21.4.7075529",
3976+ "revision": "21.4.7075529"
3977+ },
39143978 "22.0.6917172-rc1": {
39153979 "archives": [
39163980 {
@@ -3964,6 +4028,114 @@
39644028 "name": "ndk",
39654029 "path": "ndk/22.0.7026061",
39664030 "revision": "22.0.7026061"
4031+ },
4032+ "22.1.7171670": {
4033+ "archives": [
4034+ {
4035+ "os": "macosx",
4036+ "sha1": "dc80e8a2cfcb28db74c1931d42c652e9d17ff2c3",
4037+ "size": 1049337733,
4038+ "url": "https://dl.google.com/android/repository/android-ndk-r22b-darwin-x86_64.zip"
4039+ },
4040+ {
4041+ "os": "linux",
4042+ "sha1": "9ece64c7f19763dd67320d512794969930fce9dc",
4043+ "size": 1148198368,
4044+ "url": "https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip"
4045+ },
4046+ {
4047+ "os": "windows",
4048+ "sha1": "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50",
4049+ "size": 1082301775,
4050+ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip"
4051+ }
4052+ ],
4053+ "displayName": "NDK (Side by side) 22.1.7171670",
4054+ "license": "android-sdk-license",
4055+ "name": "ndk",
4056+ "path": "ndk/22.1.7171670",
4057+ "revision": "22.1.7171670"
4058+ },
4059+ "23.0.7123448-rc1": {
4060+ "archives": [
4061+ {
4062+ "os": "macosx",
4063+ "sha1": "708ebbceb719c43a3165503ea82fb107d823ad54",
4064+ "size": 721278316,
4065+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-darwin-x86_64.zip"
4066+ },
4067+ {
4068+ "os": "linux",
4069+ "sha1": "1340ed20f27fcb184ea814ae63e0f3cd75890342",
4070+ "size": 804392699,
4071+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-linux-x86_64.zip"
4072+ },
4073+ {
4074+ "os": "windows",
4075+ "sha1": "c056900896129d3dd4eb953a53a8961d9853aa20",
4076+ "size": 749304589,
4077+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip"
4078+ }
4079+ ],
4080+ "displayName": "NDK (Side by side) 23.0.7123448",
4081+ "license": "android-sdk-preview-license",
4082+ "name": "ndk",
4083+ "path": "ndk/23.0.7123448",
4084+ "revision": "23.0.7123448-rc1"
4085+ },
4086+ "23.0.7196353-rc2": {
4087+ "archives": [
4088+ {
4089+ "os": "macosx",
4090+ "sha1": "454fd0c1e8385896ad465d7cfd653e28fbf3523f",
4091+ "size": 674507658,
4092+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-darwin-x86_64.zip"
4093+ },
4094+ {
4095+ "os": "linux",
4096+ "sha1": "290e8c39bb9732ac8784855e1f22342eb488228e",
4097+ "size": 705747711,
4098+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-linux-x86_64.zip"
4099+ },
4100+ {
4101+ "os": "windows",
4102+ "sha1": "00194ae44ce90f2052ab8e42f1a11a0db8d50c2a",
4103+ "size": 747953762,
4104+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip"
4105+ }
4106+ ],
4107+ "displayName": "NDK (Side by side) 23.0.7196353",
4108+ "license": "android-sdk-preview-license",
4109+ "name": "ndk",
4110+ "path": "ndk/23.0.7196353",
4111+ "revision": "23.0.7196353-rc2"
4112+ },
4113+ "23.0.7272597-rc3": {
4114+ "archives": [
4115+ {
4116+ "os": "macosx",
4117+ "sha1": "3b977f0f8e0fa2d6777fae6b1d37aebfc075ab56",
4118+ "size": 695243724,
4119+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-darwin-x86_64.zip"
4120+ },
4121+ {
4122+ "os": "linux",
4123+ "sha1": "2298465ef13dab0c527b9cf6ef892b1ec6461fb4",
4124+ "size": 724828157,
4125+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-linux-x86_64.zip"
4126+ },
4127+ {
4128+ "os": "windows",
4129+ "sha1": "8c10a51f50f4f12ccc839dcb4bd8107133024c2f",
4130+ "size": 785932724,
4131+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip"
4132+ }
4133+ ],
4134+ "displayName": "NDK (Side by side) 23.0.7272597",
4135+ "license": "android-sdk-preview-license",
4136+ "name": "ndk",
4137+ "path": "ndk/23.0.7272597",
4138+ "revision": "23.0.7272597-rc3"
39674139 }
39684140 },
39694141 "ndk-bundle": {
@@ -4426,6 +4598,33 @@
44264598 "path": "ndk-bundle",
44274599 "revision": "21.3.6528147"
44284600 },
4601+ "21.4.7075529": {
4602+ "archives": [
4603+ {
4604+ "os": "macosx",
4605+ "sha1": "3f15c23a1c247ad17c7c271806848dbd40434738",
4606+ "size": 1042617180,
4607+ "url": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip"
4608+ },
4609+ {
4610+ "os": "linux",
4611+ "sha1": "c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9",
4612+ "size": 1190670072,
4613+ "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip"
4614+ },
4615+ {
4616+ "os": "windows",
4617+ "sha1": "fc44fea8bb3f5a6789821f40f41dce2d2cd5dc30",
4618+ "size": 1109665123,
4619+ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip"
4620+ }
4621+ ],
4622+ "displayName": "NDK",
4623+ "license": "android-sdk-license",
4624+ "name": "ndk-bundle",
4625+ "path": "ndk-bundle",
4626+ "revision": "21.4.7075529"
4627+ },
44294628 "22.0.6917172-rc1": {
44304629 "archives": [
44314630 {
@@ -4479,6 +4678,114 @@
44794678 "name": "ndk-bundle",
44804679 "path": "ndk-bundle",
44814680 "revision": "22.0.7026061"
4681+ },
4682+ "22.1.7171670": {
4683+ "archives": [
4684+ {
4685+ "os": "macosx",
4686+ "sha1": "dc80e8a2cfcb28db74c1931d42c652e9d17ff2c3",
4687+ "size": 1049337733,
4688+ "url": "https://dl.google.com/android/repository/android-ndk-r22b-darwin-x86_64.zip"
4689+ },
4690+ {
4691+ "os": "linux",
4692+ "sha1": "9ece64c7f19763dd67320d512794969930fce9dc",
4693+ "size": 1148198368,
4694+ "url": "https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip"
4695+ },
4696+ {
4697+ "os": "windows",
4698+ "sha1": "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50",
4699+ "size": 1082301775,
4700+ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip"
4701+ }
4702+ ],
4703+ "displayName": "NDK",
4704+ "license": "android-sdk-license",
4705+ "name": "ndk-bundle",
4706+ "path": "ndk-bundle",
4707+ "revision": "22.1.7171670"
4708+ },
4709+ "23.0.7123448-rc1": {
4710+ "archives": [
4711+ {
4712+ "os": "macosx",
4713+ "sha1": "708ebbceb719c43a3165503ea82fb107d823ad54",
4714+ "size": 721278316,
4715+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-darwin-x86_64.zip"
4716+ },
4717+ {
4718+ "os": "linux",
4719+ "sha1": "1340ed20f27fcb184ea814ae63e0f3cd75890342",
4720+ "size": 804392699,
4721+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-linux-x86_64.zip"
4722+ },
4723+ {
4724+ "os": "windows",
4725+ "sha1": "c056900896129d3dd4eb953a53a8961d9853aa20",
4726+ "size": 749304589,
4727+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip"
4728+ }
4729+ ],
4730+ "displayName": "NDK",
4731+ "license": "android-sdk-preview-license",
4732+ "name": "ndk-bundle",
4733+ "path": "ndk-bundle",
4734+ "revision": "23.0.7123448-rc1"
4735+ },
4736+ "23.0.7196353-rc2": {
4737+ "archives": [
4738+ {
4739+ "os": "macosx",
4740+ "sha1": "454fd0c1e8385896ad465d7cfd653e28fbf3523f",
4741+ "size": 674507658,
4742+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-darwin-x86_64.zip"
4743+ },
4744+ {
4745+ "os": "linux",
4746+ "sha1": "290e8c39bb9732ac8784855e1f22342eb488228e",
4747+ "size": 705747711,
4748+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-linux-x86_64.zip"
4749+ },
4750+ {
4751+ "os": "windows",
4752+ "sha1": "00194ae44ce90f2052ab8e42f1a11a0db8d50c2a",
4753+ "size": 747953762,
4754+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip"
4755+ }
4756+ ],
4757+ "displayName": "NDK",
4758+ "license": "android-sdk-preview-license",
4759+ "name": "ndk-bundle",
4760+ "path": "ndk-bundle",
4761+ "revision": "23.0.7196353-rc2"
4762+ },
4763+ "23.0.7272597-rc3": {
4764+ "archives": [
4765+ {
4766+ "os": "macosx",
4767+ "sha1": "3b977f0f8e0fa2d6777fae6b1d37aebfc075ab56",
4768+ "size": 695243724,
4769+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-darwin-x86_64.zip"
4770+ },
4771+ {
4772+ "os": "linux",
4773+ "sha1": "2298465ef13dab0c527b9cf6ef892b1ec6461fb4",
4774+ "size": 724828157,
4775+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-linux-x86_64.zip"
4776+ },
4777+ {
4778+ "os": "windows",
4779+ "sha1": "8c10a51f50f4f12ccc839dcb4bd8107133024c2f",
4780+ "size": 785932724,
4781+ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip"
4782+ }
4783+ ],
4784+ "displayName": "NDK",
4785+ "license": "android-sdk-preview-license",
4786+ "name": "ndk-bundle",
4787+ "path": "ndk-bundle",
4788+ "revision": "23.0.7272597-rc3"
44824789 }
44834790 },
44844791 "patcher": {
@@ -4499,32 +4806,32 @@
44994806 }
45004807 },
45014808 "platform-tools": {
4502− "30.0.5": {
4809+ "31.0.2": {
45034810 "archives": [
45044811 {
45054812 "os": "macosx",
4506− "sha1": "6f77800c35f27dc8e014a214e656aae17c7ea2d0",
4507− "size": 13311295,
4508− "url": "https://dl.google.com/android/repository/eabcd8b4b7ab518c6af9c941af8494072f17ec4b.platform-tools_r30.0.5-darwin.zip"
4813+ "sha1": "78937049851e1db90317612c6b831759f56fc86d",
4814+ "size": 13829393,
4815+ "url": "https://dl.google.com/android/repository/42b081e1e068bb936179551684cdcb30315e245c.platform-tools_r31.0.2-darwin.zip"
45094816 },
45104817 {
45114818 "os": "linux",
4512− "sha1": "ba07433b8e34c2a51c250033abcd1442a28d0863",
4513− "size": 13338136,
4514− "url": "https://dl.google.com/android/repository/platform-tools_r30.0.5-linux.zip"
4819+ "sha1": "ff02a9d8c6fa9687e1207fc0c4b84033925d452d",
4820+ "size": 13876419,
4821+ "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-linux.zip"
45154822 },
45164823 {
45174824 "os": "windows",
4518− "sha1": "e66c951841f78f225e36cfae74e81712a704a37a",
4519− "size": 12328924,
4520− "url": "https://dl.google.com/android/repository/platform-tools_r30.0.5-windows.zip"
4825+ "sha1": "9cc0f642a66706a978214395b85c8e8228c24f2f",
4826+ "size": 12537668,
4827+ "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-windows.zip"
45214828 }
45224829 ],
45234830 "displayName": "Android SDK Platform-Tools",
45244831 "license": "android-sdk-license",
45254832 "name": "platform-tools",
45264833 "path": "platform-tools",
4527− "revision": "30.0.5"
4834+ "revision": "31.0.2"
45284835 }
45294836 },
45304837 "platforms": {
@@ -5022,35 +5329,77 @@
50225329 "name": "platforms",
50235330 "path": "platforms/android-9",
50245331 "revision": "9"
5332+ },
5333+ "S": {
5334+ "archives": [
5335+ {
5336+ "os": "all",
5337+ "sha1": "3aee3ad760dc7becf657d6421629fe360215f92e",
5338+ "size": 56206479,
5339+ "url": "https://dl.google.com/android/repository/platform-S_r03.zip"
5340+ }
5341+ ],
5342+ "displayName": "Android SDK Platform S",
5343+ "license": "android-sdk-license",
5344+ "name": "platforms",
5345+ "path": "platforms/android-S",
5346+ "revision": "S"
50255347 }
50265348 },
50275349 "skiaparser": {
5028− "5": {
5350+ "2": {
5351+ "archives": [
5352+ {
5353+ "os": "linux",
5354+ "sha1": "2703a570224a5ced1f73eb3efbdb3192a1ecec81",
5355+ "size": 6681896,
5356+ "url": "https://dl.google.com/android/repository/skiaparser-7248848-linux.zip"
5357+ },
5358+ {
5359+ "os": "macosx",
5360+ "sha1": "ecf8794beccf578d4130bb9f7f2c7fa0c40c62c2",
5361+ "size": 7340904,
5362+ "url": "https://dl.google.com/android/repository/skiaparser-7248848-mac.zip"
5363+ },
5364+ {
5365+ "os": "windows",
5366+ "sha1": "84c28480ca057e48e8d2fed0ae8f52fc21aa7e61",
5367+ "size": 6450856,
5368+ "url": "https://dl.google.com/android/repository/skiaparser-7248848-win.zip"
5369+ }
5370+ ],
5371+ "displayName": "Layout Inspector image server for API S",
5372+ "license": "android-sdk-license",
5373+ "name": "skiaparser",
5374+ "path": "skiaparser/2",
5375+ "revision": "2"
5376+ },
5377+ "6": {
50295378 "archives": [
50305379 {
50315380 "os": "linux",
5032− "sha1": "b4ac0f553c2b582fd4e1896f46e2021b9da9d19b",
5033− "size": 6234850,
5034− "url": "https://dl.google.com/android/repository/skiaparser-6923996-linux.zip"
5381+ "sha1": "78af2cd3e4168af80c16d7686536baa318e10cc4",
5382+ "size": 6323164,
5383+ "url": "https://dl.google.com/android/repository/skiaparser-7083912-linux.zip"
50355384 },
50365385 {
50375386 "os": "macosx",
5038− "sha1": "6d4bafe363b8536c9c3da51fac6f4b16c5685359",
5039− "size": 6297430,
5040− "url": "https://dl.google.com/android/repository/skiaparser-6923996-mac.zip"
5387+ "sha1": "73aa4e3b52177cf7d4cf956a74311e0097987bb4",
5388+ "size": 6561072,
5389+ "url": "https://dl.google.com/android/repository/skiaparser-7083912-mac.zip"
50415390 },
50425391 {
50435392 "os": "windows",
5044− "sha1": "2aafef23d600d05467e645cd1420e8c7e5a5dad3",
5045− "size": 6008442,
5046− "url": "https://dl.google.com/android/repository/skiaparser-6923996-win.zip"
5393+ "sha1": "28dde025a70a0f4819cf195c1cb6e0e2b4bf4514",
5394+ "size": 6059180,
5395+ "url": "https://dl.google.com/android/repository/skiaparser-7083912-win.zip"
50475396 }
50485397 ],
50495398 "displayName": "Layout Inspector image server for API 29-30",
50505399 "license": "android-sdk-license",
50515400 "name": "skiaparser",
50525401 "path": "skiaparser/1",
5053− "revision": "5"
5402+ "revision": "6"
50545403 }
50555404 },
50565405 "sources": {