Update android files

This commit is contained in:
2024-12-21 17:49:41 +01:00
parent 118b9c8358
commit 4651d2a5b0
14 changed files with 162 additions and 102 deletions

View File

@@ -20,23 +20,99 @@
allowUnfree = true;
};
};
buildToolsVersion = "33.0.2";
androidComposition = pkgs.androidenv.composeAndroidPackages {
buildToolsVersions = [ buildToolsVersion ];
platformVersions = [ "33" ];
abiVersions = [ "arm64-v8a" ];
buildToolsVersions = [
"34.0.0"
"33.0.1"
];
platformVersions = [
"28"
"29"
"30"
"31"
"32"
"33"
"34"
];
abiVersions = [
"armeabi-v7a"
"arm64-v8a"
];
includeNDK = true;
ndkVersions = [ "25.1.8937393" ];
};
# androidComposition = pkgs.androidenv.composeAndroidPackages {
# toolsVersion = "26.1.1";
# platformToolsVersion = "34.0.5";
# buildToolsVersions = [ "30.0.3" ];
# includeEmulator = false;
# emulatorVersion = "34.1.9";
# platformVersions = [
# "28"
# "29"
# "30"
# "31"
# "32"
# "33"
# "34"
# ];
# includeSources = false;
# includeSystemImages = false;
# systemImageTypes = [ "google_apis_playstore" ];
# abiVersions = [
# "armeabi-v7a"
# "arm64-v8a"
# ];
# cmakeVersions = [ "3.10.2" ];
# includeNDK = true;
# ndkVersions = [ "21.4.7075529" ];
# useGoogleAPIs = false;
# useGoogleTVAddOns = false;
# # buildToolsVersions = [ buildToolsVersion ];
# # platformVersions = [
# # "29"
# # "30"
# # "31"
# # "32"
# # "33"
# # "34"
# # "28"
# # ];
# # abiVersions = [
# # "armeabi-v7a"
# # "arm64-v8a"
# # ];
# };
androidSdk = androidComposition.androidsdk;
platformTools = androidComposition.platform-tools;
in
{
devShell =
with pkgs;
mkShell rec {
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
# JAVA_HOME = pkgs.jdk17;
buildInputs = [
flutter
androidSdk
jdk11
# platformTools
jdk17
# Needed by flutter_secure_storage
libsecret.dev
gtk3.dev
pcre2.dev
libsysprof-capture
util-linux.dev
libselinux.dev
libsepol.dev
libthai.dev
libgcrypt.dev
libdatrie.dev
libgpg-error.dev
xorg.libXdmcp.dev
pkg-config
];
};
}