diff --git a/.cargo/config.toml b/.cargo/config.toml index 455b6014b..64fcc6aea 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -13,8 +13,6 @@ linker = "aarch64-linux-gnu-gcc" [target.aarch64-linux-android] linker = "aarch64-linux-android29-clang" -rustflags = ["-C", "link-arg=-static-libstdc++"] [target.x86_64-linux-android] linker = "x86_64-linux-android29-clang" -rustflags = ["-C", "link-arg=-static-libstdc++"] diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 3933f4a98..2563c8fe8 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -572,6 +572,9 @@ jobs: cp -v "artifact/$artifact_name"/* "crates/voicevox_core_java_api/lib/src/main/resources/jniLibs/${target}/" done + cp ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so crates/voicevox_core_java_api/lib/src/main/resources/jniLibs/arm64-v8a/ + cp ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so crates/voicevox_core_java_api/lib/src/main/resources/jniLibs/x86_64/ + cd crates/voicevox_core_java_api OS=android DEVICE=cpu gradle publishToMavenLocal