Fix lifecycle issues on Quest 2

Author: blaind

.gitignore

@@ -1,4 +1,5 @@
 /target
+/apk_target
 *.sw*
 /repos
 Cargo.lock

Cargo.toml

@@ -37,9 +37,7 @@ ndk-glue = "0.2.1"
 apk_label = "Bevy OpenXR wgpu"
 build_targets = ["aarch64-linux-android"]
 assets = "assets"
-libs = "libs"
-
-[package.metadata.android.sdk]
+runtime_libs = "libs"
 min_sdk_version = 16
 target_sdk_version = 29
 
@@ -62,10 +60,9 @@ resizeable_activity = "false"
 name = "com.oculus.vr.focusaware"
 value = "true"
 
-[[package.metadata.android.intent_filter]]
+[[package.metadata.android.application.activity.intent_filter]]
 actions = ["android.intent.action.MAIN"]
 categories = ["com.oculus.intent.category.VR", "android.intent.category.LAUNCHER"]
-data = []
 
 [[package.metadata.android.uses_permission]]
 name = "com.oculus.permission.HAND_TRACKING"

Makefile

@@ -1,7 +1,3 @@
-install_cargo_apk:
-	echo "Installing patched version of cargo-apk"
-	cargo install --path repos/android-ndk-rs/cargo-apk
-
 download_dependencies:
 	mkdir -p repos
 	for i in android-ndk-rs bevy bevy_rapier gfx openxrs wgpu wgpu-rs; \
@@ -13,15 +9,15 @@ download_dependencies:
 			git -C repos/$$i checkout bevy_openxr; \
 		fi; \
 	done;
-	
+
 	git -C repos clone https://github.com/blaind/bevy_openxr.git
 
 update_dependencies:
 	for i in android-ndk-rs bevy bevy_rapier gfx openxrs wgpu wgpu-rs; \
 	do \
 		git -C repos/$$i pull; \
 	done;
-	
+
 	git -C repos/bevy_openxr pull
 	git pull
 
@@ -38,8 +34,13 @@ adb_shell:
 	$$ANDROID_SDK_ROOT/platform-tools/adb -d shell
 
 run_xr_apk:
-	cargo apk run --example xr_apk_scene --release
+	CARGO_BUILD_TARGET_DIR=apk_target cargo apk run --example xr_apk_scene --release
 
 run_xr_pc:
 	cargo run --example xr_pc_scene
 
+restart_apk:
+	$$ANDROID_SDK_ROOT/platform-tools/adb shell am force-stop rust.example.xr_apk_scene
+	$$ANDROID_SDK_ROOT/platform-tools/adb shell am start -a android.intent.action.MAIN -n rust.example.xr_apk_scene/android.app.NativeActivity
+
+

docs/install_oculus.md

@@ -5,16 +5,7 @@
 Prequisite installation:
 
     sudo apt-get install make openjdk-11-jre g++ libudev-dev libasound2-dev gcc
-
-Currently a patched version of cargo-apk is required. Install it like this:
-
-**NOTE! THIS WILL REPLACE PREVIOUSLY INSTALLED cargo-apk IN GLOBAL PATH!**
-
-    cargo install --path repos/android-ndk-rs/cargo-apk
-
-or
-
-    install_cargo_apk
+    cargo install cargo-apk
 
 If you have not setup udev yet, copy udev rules for Oculus Quest 2
 
@@ -25,16 +16,14 @@ If you have not setup udev yet, copy udev rules for Oculus Quest 2
 
 ## Oculus OpenXR plugin
 
-You must download `libopenxr_loader.so` from [Oculus OpenXR Mobile SDK](https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk/) file. It should be stored to `libs/aarch64-linux-android` folder. It is at path `OpenXR/Libs/Android/arm64-v8a/Release` in the zip file.
+You must download `libopenxr_loader.so` from [Oculus OpenXR Mobile SDK](https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk/) file. It should be stored to `libs/arm64-v8a` folder. It is at path `OpenXR/Libs/Android/arm64-v8a/Release` in the zip file.
 
-    $ ls -al libs/aarch64-linux-android/libopenxr_loader.so
-    -rwxrwxr-x 1 user user 10639048 feb  13 14:46 libs/aarch64-linux-android/libopenxr_loader.so
+    $ ls -al libs/arm64-v8a/libopenxr_loader.so
+    -rwxrwxr-x 1 user user 10639048 feb  13 14:46 libs/arm64-v8a/libopenxr_loader.so
 
-    $ file libs/aarch64-linux-android/libopenxr_loader.so
+    $ file libs/arm64-v8a/libopenxr_loader.so
     ELF 64-bit LSB shared object, ARM aarch64, version 1 (SYSV), dynamically linked, BuildID[sha1]=..., with debug_info, not stripped
 
-
-
 ## Android SDK
 
 You need android SDK & NDK to build .apk.

examples/xr_apk_scene.rs

@@ -4,11 +4,13 @@ use xrbevy::{is_already_running, ExampleScenePlugin};
 #[cfg_attr(target_os = "android", ndk_glue::main(backtrace = "on"))]
 fn main() {
     if is_already_running() {
-        //return;
+        // in android, main() can be called on resume
+        // will create a new thread, but the process and existing App will be present
+        println!("Already running - quit call to main()");
+    } else {
+        App::build()
+            .add_plugin(ExampleScenePlugin)
+            .add_plugin(bevy_openxr::OpenXRHandTrackingPlugin)
+            .run();
     }
-
-    App::build()
-        .add_plugin(ExampleScenePlugin)
-        .add_plugin(bevy_openxr::OpenXRHandTrackingPlugin)
-        .run();
 }