From 6c561228c2873398729c9f4dce49cd6f33ba4c9f Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 21 Mar 2023 10:34:42 -0400 Subject: [PATCH] Use the latest version of the Android NDK --- .github/workflows/test-android.yaml | 12 ------------ .../org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt | 9 ++++++--- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml index 9a961408..7591fd14 100644 --- a/.github/workflows/test-android.yaml +++ b/.github/workflows/test-android.yaml @@ -9,22 +9,10 @@ on: - "bdk-ffi/**" - "bdk-android/**" -env: - ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529 - # By default, the new ubuntu-20.04 images use the following ANDROID_NDK_ROOT - # ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.0.8775105 - jobs: build: runs-on: ubuntu-20.04 steps: - - name: "Install Android NDK 21.4.7075529" - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - - name: "Check out PR branch" uses: actions/checkout@v2 diff --git a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt index 7125126c..a0eab1c0 100644 --- a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt +++ b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt @@ -36,7 +36,8 @@ internal class UniFfiAndroidPlugin : Plugin { environment( // add build toolchain to PATH Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"), - Pair("CFLAGS", "-D__ANDROID_API__=21"), + Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"), + Pair("AR", "llvm-ar"), Pair("CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER", "aarch64-linux-android21-clang"), Pair("CC", "aarch64-linux-android21-clang") ) @@ -65,7 +66,8 @@ internal class UniFfiAndroidPlugin : Plugin { environment( // add build toolchain to PATH Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"), - Pair("CFLAGS", "-D__ANDROID_API__=21"), + Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"), + Pair("AR", "llvm-ar"), Pair("CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER", "x86_64-linux-android21-clang"), Pair("CC", "x86_64-linux-android21-clang") ) @@ -94,7 +96,8 @@ internal class UniFfiAndroidPlugin : Plugin { environment( // add build toolchain to PATH Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"), - Pair("CFLAGS", "-D__ANDROID_API__=21"), + Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"), + Pair("AR", "llvm-ar"), Pair("CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER", "armv7a-linux-androideabi21-clang"), Pair("CC", "armv7a-linux-androideabi21-clang") )