PATCH: fix x86 & armv7 android build while using ndk r23c

cocos · Oct 9, 2023 · 89444e6 · 89444e6
1 parent ec866b5
commit 89444e6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -335,8 +335,13 @@ jobs:
         run: |
           sed -i "s@\"-gsimple-template-names\"@@g" build/config/compiler/BUILD.gn
           sed -i "s@\"-ffile-compilation-dir=.\"@@g" build/config/compiler/BUILD.gn
-          rm $NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/12.0.9/lib/linux/x86_64/libatomic.a
+          sed -i "s@if (is_ubsan && (v8_current_cpu@if ((v8_current_cpu@g" BUILD.gn
+          if [[ "${{ matrix.arch }}" == "arm" || "${{ matrix.arch }}" == "x86" ]];then
+            sed -i "s@#error@//#error@g" src/base/ubsan.cc
+          fi
 
+          rm $NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/12.0.9/lib/linux/x86_64/libatomic.a
+          rm $NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/12.0.9/lib/linux/i386/libatomic.a
         env:
             NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}