notedeck

commit c3779510eccc5d0156b24a4c9278409be36cc83c
parent fd0a14eac26538355caa6fc85bc516519bf9f5e5
Author: William Casarin <jb55@jb55.com>
Date:   Fri,  9 Feb 2024 18:55:25 -0800

Revert "android: attempt to get it working on really old versions"

This reverts commit e2b3004cb4dd2dd9ef078a223528408038a36903.

Diffstat:
M
Cargo.toml
 | 
8
+-------
M
shell.nix
 | 
5
+----

2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -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]]
@@ -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"
diff --git a/shell.nix b/shell.nix
@@ -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 = [