From 89444e6c0e7ed59645504b7aaf0cf77f2beba956 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 9 Oct 2023 17:22:23 +0800 Subject: [PATCH] PATCH: fix x86 & armv7 android build while using ndk r23c --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96481f412..5590bb156 100644 --- 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 }}