From 28c847244a17f8a5b6849e9db958928e1ce4354b Mon Sep 17 00:00:00 2001 From: Alexi Chepura Date: Wed, 18 Oct 2023 13:13:20 +0300 Subject: [PATCH] android example lib, almost done --- README.md | 6 ----- examples/android/.gitignore | 3 +++ examples/android/Cargo.toml | 27 +++++++++++----------- examples/android/README.md | 6 +++++ examples/android/hotham_examples.keystore | Bin 0 -> 2726 bytes examples/android/src/lib.rs | 2 -- 6 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 examples/android/.gitignore create mode 100644 examples/android/README.md create mode 100644 examples/android/hotham_examples.keystore diff --git a/README.md b/README.md index a2dda6d..73e1856 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,3 @@ An in-progress crate for adding openxr support to Bevy without forking. ![image](https://github.com/awtterpip/bevy_openxr/assets/50841145/aa01fde4-7915-49b9-b486-ff61ce6d57a9) To see it in action run the example in `examples` with `cargo run --example xr`. - -## Quest -Running on Meta Quest can be done with https://github.com/rust-mobile/cargo-apk and requires disabling default features. -```sh -cargo apk run --example xr --release --no-default-features -``` diff --git a/examples/android/.gitignore b/examples/android/.gitignore new file mode 100644 index 0000000..d74eb91 --- /dev/null +++ b/examples/android/.gitignore @@ -0,0 +1,3 @@ +/target +/Cargo.lock +/runtime_libs diff --git a/examples/android/Cargo.toml b/examples/android/Cargo.toml index 1f5163d..ef9e36c 100644 --- a/examples/android/Cargo.toml +++ b/examples/android/Cargo.toml @@ -13,10 +13,10 @@ crate-type = ["staticlib", "cdylib"] [package.metadata.android] package = "org.bevyengine.example_openxr_android" build_targets = ["aarch64-linux-android"] -runtime_libs = "examples/libs" +runtime_libs = "runtime_libs" apk_name = "bevyopenxr" -assets = "assets" -res = "assets/android-res" +# assets = "assets" +# res = "assets/android-res" icon = "@mipmap/ic_launcher" label = "Bevy Openxr Android" strip = "strip" @@ -29,18 +29,9 @@ target_sdk_version = 32 # label = "Bevy Example" [dependencies] -anyhow = "1.0.75" -# ash = "0.37.3" +bevy_openxr = { path = "../.." } bevy = { git = "https://github.com/bevyengine/bevy.git" } openxr = { git = "https://github.com/Ralith/openxrs", features = ["mint"] } -mint = "0.5.9" - -wgpu = "0.17.1" -wgpu-core = { version = "0.17.1", features = ["vulkan"] } -wgpu-hal = "0.17.2" - -[dev-dependencies] -color-eyre = "0.6.2" [profile.release] lto = "fat" @@ -61,6 +52,16 @@ categories = [ "android.intent.category.LAUNCHER", ] +# !! IMPORTANT !! +# +# When creating your own apps, make sure to generate your own keystore, rather than using our example one! +# You can use `keytool` like so: +# keytool -genkey -v -keystore my-release-key.keystore -keyalg RSA -keysize 2048 -validity 10000 +# +# For more information on key signing and why it's so important, check out this article: +# https://developer.android.com/studio/publish/app-signing +# +# !! IMPORTANT !! [package.metadata.android.signing.release] path = "./hotham_examples.keystore" keystore_password = "chomsky-vigilant-spa" diff --git a/examples/android/README.md b/examples/android/README.md new file mode 100644 index 0000000..9ef2fd1 --- /dev/null +++ b/examples/android/README.md @@ -0,0 +1,6 @@ +# Bevy OpenXR Android example + +Running on Meta Quest can be done with https://github.com/rust-mobile/cargo-apk and requires disabling default features. +```sh +cargo apk run --release +``` \ No newline at end of file diff --git a/examples/android/hotham_examples.keystore b/examples/android/hotham_examples.keystore new file mode 100644 index 0000000000000000000000000000000000000000..62623c4d30c143b63d33e39fb5b742e403ab5dbe GIT binary patch literal 2726 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