diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 48403b16b..5de12b4e0 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -54,10 +54,13 @@ jobs: target: aarch64-unknown-linux-gnu - os: ubuntu-20.04 target: aarch64-linux-android + ndk_arch: aarch64-unknown-linux-musl - os: ubuntu-20.04 target: armv7-linux-androideabi + ndk_arch: arm-unknown-linux-musleabihf - os: ubuntu-20.04 target: x86_64-linux-android + ndk_arch: x86_64-unknown-linux-musl name: Build (${{ matrix.target }}) runs-on: ${{ matrix.os }} @@ -85,5 +88,6 @@ jobs: - name: Build (Android) if: ${{ contains(matrix.target, 'android') }} run: | + ln -sf $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib/${{ matrix.ndk_arch }}/{libunwind.so, libc++*} $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib/ cargo install cargo-ndk cargo ndk --target ${{ matrix.target }} build --release -p livekit --workspace -vv diff --git a/.github/workflows/ffi-builds.yml b/.github/workflows/ffi-builds.yml index 99f4c1a4b..156ddd8bc 100644 --- a/.github/workflows/ffi-builds.yml +++ b/.github/workflows/ffi-builds.yml @@ -159,7 +159,7 @@ jobs: if: ${{ matrix.platform == 'android' }} run: | cd livekit-ffi/ - ln -sf $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib/${{ matrix.ndk_arch }}/libunwind.so $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib/ + ln -sf $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib/${{ matrix.ndk_arch }}/{libunwind.so, libc++*} $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/lib/ cargo install cargo-ndk cargo ndk --bindgen --target ${{ matrix.target }} build --release ${{ matrix.buildargs }}