Review comments

Signed-off-by: John Nunley <dev@notgull.net>

.github/workflows/ci.yml

@@ -111,8 +111,7 @@ jobs:
 
     - name: Build and package crate for Android
       if: contains(matrix.platform.target, 'android')
-      # TODO: Figure out why this build fails on Github Actions
+      run: x build -p android-xbuild-target --platform android --arch arm64
-      run: x build -p ios-xbuild-target --platform android --arch arm64
 
     - name: Build and package crate for iOS
       if: contains(matrix.platform.target, 'ios')

Cargo.toml

@@ -212,7 +212,7 @@ web-sys = { version = "0.3.22", features = ['CanvasRenderingContext2d'] }
 
 [workspace]
 members = [
-    "android-xbuild-target",
+    "xbuild/android-target",
-    "ios-xbuild-target",
+    "xbuild/ios-target",
     "run-wasm",
 ]

android-xbuild-target/README.md

@@ -1,3 +0,0 @@
-# android-xbuild-target
-
-This is a crate that can be built via `x build` in order to simplify CI testing.

ios-xbuild-target/README.md

@@ -1,3 +0,0 @@
-# ios-xbuild-target
-
-This is a crate that can be built via `x build` in order to simplify CI testing.

xbuild/README.md

@@ -0,0 +1,3 @@
+# xbuild-target
+
+These are crates that can be built via `x build` in order to simplify CI testing.

xbuild/android-target/Cargo.toml

@@ -2,11 +2,12 @@
 name = "android-xbuild-target"
 version = "0.1.0"
 edition = "2021"
+publish = false
 
 [lib]
 crate_type = ["cdylib"]
 
 [dependencies.winit]
 version = "0.29.1-beta"
-path = ".."
+path = "../.."
-features = ["android-game-activity"]
+features = ["android-native-activity"]

xbuild/ios-target/Cargo.toml

@@ -2,7 +2,8 @@
 name = "ios-xbuild-target"
 version = "0.1.0"
 edition = "2021"
+publish = false
 
 [dependencies.winit]
 version = "0.29.1-beta"
-path = ".."
+path = "../.."