Skip to content

Commit

Permalink
Revert "android: attempt to get it working on really old versions"
Browse files Browse the repository at this point in the history
This reverts commit e2b3004.
  • Loading branch information
jb55 committed Feb 10, 2024
1 parent fd0a14e commit c377951
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
8 changes: 1 addition & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ winit = { version = "0.29", 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]]
Expand All @@ -81,7 +75,7 @@ version = 1

[[package.metadata.android.uses_permission]]
name = "android.permission.WRITE_EXTERNAL_STORAGE"
max_sdk_version = 30
max_sdk_version = 18

[package.metadata.android.signing.release]
path = "damus.keystore"
Expand Down
5 changes: 1 addition & 4 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ with pkgs;
let
x11libs = lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi libglvnd vulkan-loader vulkan-validation-layers libxkbcommon ];
ndk-version = "24.0.8215888";
#ndk-version = "21.0.6113669";

androidComposition = androidenv.composeAndroidPackages {
includeNDK = true;
ndkVersions = [ ndk-version ];
#platformVersions = [ "22" "28" "29" "30" ];
platformVersions = [ "22" "30" ];
platformVersions = [ "28" "29" "30" ];
useGoogleAPIs = false;
#useGoogleTVAddOns = false;
#includeExtras = [
Expand Down

0 comments on commit c377951

Please sign in to comment.