diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 3fdec71..09fa13c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -66,9 +66,14 @@ jobs: run: | scripts/build.sh android arm64 - - name: Build V8 x64 - run: | - scripts/build.sh android x64 + ############################################################### + # FIXME + # ld.lld: error: cannot open ../third_party/llvm-build/Release+Asserts/lib/clang/15.0.0/lib/linux/libclang_rt.asan-x86_64-android.so: No such file or directory + # ld.lld: error: cannot open ../third_party/llvm-build/Release+Asserts/lib/clang/15.0.0/lib/linux/libclang_rt.asan_static-x86_64-android.a: No such file or directory + ############################################################### + # - name: Build V8 x64 + # run: | + # scripts/build.sh android x64 - name: Archive run: | diff --git a/lib/v8-android/build.gradle b/lib/v8-android/build.gradle index c65364e..0a982df 100644 --- a/lib/v8-android/build.gradle +++ b/lib/v8-android/build.gradle @@ -12,7 +12,7 @@ android { sourceSets { main { - jniLibs.srcDirs = ["${rootDir}/../build/lib"] + jniLibs.srcDirs += ["${rootDir}/../build/lib"] } } } diff --git a/lib/v8-android/src/main/jniLibs/arm64-v8a/libclang_rt.asan-aarch64-android.so b/lib/v8-android/src/main/jniLibs/arm64-v8a/libclang_rt.asan-aarch64-android.so new file mode 100755 index 0000000..7f4ea61 Binary files /dev/null and b/lib/v8-android/src/main/jniLibs/arm64-v8a/libclang_rt.asan-aarch64-android.so differ diff --git a/lib/v8-android/src/main/jniLibs/armeabi-v7a/libclang_rt.asan-arm-android.so b/lib/v8-android/src/main/jniLibs/armeabi-v7a/libclang_rt.asan-arm-android.so new file mode 100755 index 0000000..03e7fbf Binary files /dev/null and b/lib/v8-android/src/main/jniLibs/armeabi-v7a/libclang_rt.asan-arm-android.so differ diff --git a/lib/v8-android/src/main/jniLibs/x86/libclang_rt.asan-i686-android.so b/lib/v8-android/src/main/jniLibs/x86/libclang_rt.asan-i686-android.so new file mode 100755 index 0000000..a5f138e Binary files /dev/null and b/lib/v8-android/src/main/jniLibs/x86/libclang_rt.asan-i686-android.so differ diff --git a/scripts/build.sh b/scripts/build.sh index 8c93e35..dfebb0d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -11,6 +11,7 @@ GN_ARGS_BASE=" use_custom_libcxx=false icu_use_data_file=false treat_warnings_as_errors=false + is_asan=true " if [[ ${PLATFORM} = "macos_android" ]]; then