(Android) Workaround cmake config error

PojavLauncherTeam · Jun 16, 2023 · 0bed421 · 0bed421
1 parent d609dce
commit 0bed421
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -33,6 +33,8 @@ jobs:
       - name: "Build shaderc for Android ${{matrix.arch}}"
         run: |
           ./utils/git-sync-deps
+          # Workaround a cmake bug
+          sed -i'' -e 's/android log/android -llog/g' third_party/spirv-tools/tools/CMakeLists.txt
           cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DANDROID_PLATFORM=24 -DANDROID_ABI=${{matrix.arch}} -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake
           cmake --build build --clean-first -- -j8
           cd build/libshaderc

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CI
+name: iOS build
 
 # Controls when the workflow will run
 on: