remove volumes

decentraland · Jun 18, 2024 · ce11556 · ce11556
1 parent 7d30c6b
commit ce11556
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -2,6 +2,7 @@ on:
   push:
     branches:
       - main
+      - refactor/update-livekit
   workflow_dispatch:
     inputs:
       branch:
@@ -16,8 +17,8 @@ jobs:
     runs-on: bigrunner
     container:
       image: docker://kuruk/dcl-godot-android-builder:latest
-      volumes:
-        - /home/user/.cache/devgodot:/github/home/.cache/devgodot
+#      volumes:
+#        - /home/user/.cache/devgodot:/github/home/.cache/devgodot
 
     steps:
       - uses: actions/checkout@v4

diff --git a/build-android-apk.sh b/build-android-apk.sh
@@ -58,10 +58,6 @@ sed -i 's/architectures\/x86_64=true/architectures\/x86_64=false/' ${EXPLORER_PA
 # remove signed
 sed -i 's/package\/signed=true/package\/signed=false/' ${EXPLORER_PATH}/godot/export_presets.cfg
 
-# copy debug libraries
-cp -r ${EXPLORER_PATH}/godot/android/build/libs/debug/arm64-v8a ${EXPLORER_PATH}/godot/android/build/libs/release/arm64-v8a
-cp -r ${EXPLORER_PATH}/godot/android/build/libs/debug/libwebrtc.jar ${EXPLORER_PATH}/godot/android/build/libs/release/libwebrtc.jar
-
 # Build the .aab without x86_64 architecture
 echo "Export Godot AAB"
 ${EXPLORER_PATH}/.bin/godot/godot4_bin -e --headless --export-release Android ${EXPLORER_PATH}/android-unsigned.aab || true

diff --git a/rust/decentraland-godot-lib/android-build.sh b/rust/decentraland-godot-lib/android-build.sh
@@ -28,10 +28,10 @@ if [[ "$1" == "x86_64" ]]; then
     GN_ARGS=use_custom_libcxx=false RUST_BACKTRACE=full cargo build --release --no-default-features --target x86_64-linux-android -vv --verbose 
 
     mkdir -p ../../godot/lib/android/x86_64/
-    mkdir -p ../../godot/android/build/libs/debug/x86_64/
+    mkdir -p ../../godot/android/build/libs/release/x86_64/
 
     cp target/x86_64-linux-android/release/libdecentraland_godot_lib.so ../../godot/lib/android/x86_64/libdecentraland_godot_lib.so
-    cp target/x86_64-linux-android/release/libdecentraland_godot_lib.so ../../godot/android/build/libs/debug/x86_64/libdecentraland_godot_lib.so
+    cp target/x86_64-linux-android/release/libdecentraland_godot_lib.so ../../godot/android/build/libs/release/x86_64/libdecentraland_godot_lib.so
 
 else
     # Run the specified commands
@@ -48,8 +48,8 @@ else
     # - from web-rtc: libwebrtc.jar 
     # - from ffmpeg: libavcodec, libavfilter, libavdevice, libavformat, libavutil, libswresample, libswscale
     mkdir -p ../../godot/lib/android/arm64/
-    mkdir -p ../../godot/android/build/libs/debug/arm64-v8a/
+    mkdir -p ../../godot/android/build/libs/release/arm64-v8a/
 
     cp target/aarch64-linux-android/release/libdecentraland_godot_lib.so ../../godot/lib/android/arm64/libdecentraland_godot_lib.so
-    cp target/aarch64-linux-android/release/libdecentraland_godot_lib.so ../../godot/android/build/libs/debug/arm64-v8a/libdecentraland_godot_lib.so
+    cp target/aarch64-linux-android/release/libdecentraland_godot_lib.so ../../godot/android/build/libs/release/arm64-v8a/libdecentraland_godot_lib.so
 fi