mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
androidenv: updates for Android API 34
This commit is contained in:
parent
0a41eb1276
commit
1809b32877
@ -4,10 +4,10 @@
|
|||||||
|
|
||||||
{ cmdLineToolsVersion ? "11.0"
|
{ cmdLineToolsVersion ? "11.0"
|
||||||
, toolsVersion ? "26.1.1"
|
, toolsVersion ? "26.1.1"
|
||||||
, platformToolsVersion ? "34.0.4"
|
, platformToolsVersion ? "34.0.5"
|
||||||
, buildToolsVersions ? [ "34.0.0" ]
|
, buildToolsVersions ? [ "34.0.0" ]
|
||||||
, includeEmulator ? false
|
, includeEmulator ? false
|
||||||
, emulatorVersion ? "32.1.14"
|
, emulatorVersion ? "34.1.9"
|
||||||
, platformVersions ? []
|
, platformVersions ? []
|
||||||
, includeSources ? false
|
, includeSources ? false
|
||||||
, includeSystemImages ? false
|
, includeSystemImages ? false
|
||||||
@ -15,7 +15,7 @@
|
|||||||
, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ]
|
, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ]
|
||||||
, cmakeVersions ? [ ]
|
, cmakeVersions ? [ ]
|
||||||
, includeNDK ? false
|
, includeNDK ? false
|
||||||
, ndkVersion ? "25.2.9519653"
|
, ndkVersion ? "26.1.10909125"
|
||||||
, ndkVersions ? [ndkVersion]
|
, ndkVersions ? [ndkVersion]
|
||||||
, useGoogleAPIs ? false
|
, useGoogleAPIs ? false
|
||||||
, useGoogleTVAddOns ? false
|
, useGoogleTVAddOns ? false
|
||||||
|
@ -26,14 +26,13 @@ let
|
|||||||
android = {
|
android = {
|
||||||
versions = {
|
versions = {
|
||||||
cmdLineToolsVersion = "11.0";
|
cmdLineToolsVersion = "11.0";
|
||||||
platformTools = "34.0.4";
|
platformTools = "34.0.5";
|
||||||
buildTools = "34.0.0";
|
buildTools = "34.0.0";
|
||||||
ndk = [
|
ndk = [
|
||||||
"25.1.8937393" # LTS NDK
|
"26.1.10909125"
|
||||||
"26.0.10404224-rc1"
|
|
||||||
];
|
];
|
||||||
cmake = "3.6.4111459";
|
cmake = "3.6.4111459";
|
||||||
emulator = "33.1.17";
|
emulator = "34.1.9";
|
||||||
};
|
};
|
||||||
|
|
||||||
platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ];
|
platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ];
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user