[WIP] No hope on fixes

codde-pi · Apr 8, 2024 · 3349a9c · 3349a9c
1 parent be7b500
commit 3349a9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -217,7 +217,6 @@ jobs:
           action: reactivecircus/android-emulator-runner@v2
           with: |
             api-level: 33
-            target: google_apis
             arch: arm64-v8a
             ram-size: 1024M
             disk-size: 2048M

diff --git a/scripts/build-apple.sh b/scripts/build-apple.sh
@@ -5,22 +5,21 @@ ROOT="$(pwd)"
 BUILD_DIR="$ROOT/platform-build"
 mkdir $BUILD_DIR
 
-# Build the android libraries in the jniLibs directory
 cd "$ROOT/packages/codde_protocol/native/client" || exit
 # Build static libs
 for TARGET in \
 	aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim \
 	x86_64-apple-darwin aarch64-apple-darwin; do
 	rustup target add $TARGET
-	cargo build -r --target=$TARGET
+	cargo build -r --target=$TARGET --target-dir=target
 done
 
 # Create XCFramework zip
 FRAMEWORK="CoddeProtocol.xcframework"
 LIBNAME=libcodde_protocol.a
 mkdir mac-lipo ios-sim-lipo
-IOS_SIM_LIPO=ios-sim-lipo/$LIBNAME
 MAC_LIPO=mac-lipo/$LIBNAME
+IOS_SIM_LIPO=ios-sim-lipo/$LIBNAME
 lipo -create -output $IOS_SIM_LIPO \
 	target/aarch64-apple-ios-sim/release/$LIBNAME \
 	target/x86_64-apple-ios/release/$LIBNAME