notedeck

commit b21e39dea9da8b0cfcfd5315ad6bded11229e708
parent 9ce2b4da2cc92e76d3bbe1ade576a1ba44d6cc82
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 28 Jan 2025 13:35:43 -0800

android: get GameActivity to launch

For some reason there are no touch inputs though

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
Cargo.toml
 | 
2
+-
M
crates/notedeck_chrome/Cargo.toml
 | 
4
++--
M
crates/notedeck_chrome/android/app/src/main/AndroidManifest.xml
 | 
2
+-
M
crates/notedeck_chrome/android/app/src/main/java/com/damus/notedeck/MainActivity.java
 | 
2
+-

4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ rmpv = "1.3.0"
 bech32 = { version = "0.11", default-features = false }
 bitflags = "2.5.0"
 dirs = "5.0.1"
-eframe = { version = "0.29.1", default-features = false, features = [ "wgpu", "wayland", "x11", "android-native-activity" ] }
+eframe = { version = "0.29.1", default-features = false, features = [ "wgpu", "wayland", "x11", "android-game-activity" ] }
 egui = { version = "0.29.1", features = ["serde"] }
 egui_extras = { version = "0.29.1", features = ["all_loaders"] }
 egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "ac7d663307b76634757024b438dd4b899790da99" }
diff --git a/crates/notedeck_chrome/Cargo.toml b/crates/notedeck_chrome/Cargo.toml
@@ -47,8 +47,8 @@ debug-interactive-widgets = []
 [target.'cfg(target_os = "android")'.dependencies]
 tracing-logcat = "0.1.0"
 log = { workspace = true }
-android-activity = { version = "0.4", features = [ "native-activity" ] }
-winit = { version = "0.30.5", features = [ "android-native-activity" ] }
+android-activity = { version = "0.4", features = [ "game-activity" ] }
+winit = { version = "0.30.5", features = [ "android-game-activity" ] }
 
 [package.metadata.bundle]
 name = "Notedeck"
diff --git a/crates/notedeck_chrome/android/app/src/main/AndroidManifest.xml b/crates/notedeck_chrome/android/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
 
             <meta-data
                 android:name="android.app.lib_name"
-                android:value="main" />
+                android:value="notedeck_chrome" />
         </activity>
     </application>
 
diff --git a/crates/notedeck_chrome/android/app/src/main/java/com/damus/notedeck/MainActivity.java b/crates/notedeck_chrome/android/app/src/main/java/com/damus/notedeck/MainActivity.java
@@ -16,7 +16,7 @@ import com.google.androidgamesdk.GameActivity;
 
 public class MainActivity extends GameActivity {
   static {
-    System.loadLibrary("main");
+    System.loadLibrary("notedeck_chrome");
   }
 
   @Override