diff --git a/Cargo.toml b/Cargo.toml index f3e089c9..2a120d85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,6 +57,12 @@ winit = { version = "0.28", features = [ "android-native-activity" ] } [package.metadata.android] package = "com.damus.app" apk_name = "damus" +#build_targets = ["armv7-linux-androideabi", "aarch64-linux-android" ] + +[package.metadata.android.sdk] +min_sdk_version = 22 +target_sdk_version = 30 +#max_sdk_version = 29 #assets = "assets" [[package.metadata.android.uses_feature]] @@ -66,7 +72,7 @@ version = 1 [[package.metadata.android.uses_permission]] name = "android.permission.WRITE_EXTERNAL_STORAGE" -max_sdk_version = 18 +max_sdk_version = 30 [package.metadata.android.signing.release] path = "damus.keystore" diff --git a/shell.nix b/shell.nix index ae9617d8..4c8115e0 100644 --- a/shell.nix +++ b/shell.nix @@ -3,10 +3,13 @@ with pkgs; let x11libs = lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi libglvnd vulkan-loader vulkan-validation-layers ]; ndk-version = "24.0.8215888"; + #ndk-version = "21.0.6113669"; + androidComposition = androidenv.composeAndroidPackages { includeNDK = true; ndkVersions = [ ndk-version ]; - platformVersions = [ "28" "29" "30" ]; + #platformVersions = [ "22" "28" "29" "30" ]; + platformVersions = [ "22" "30" ]; useGoogleAPIs = false; #useGoogleTVAddOns = false; #includeExtras = [