Skip to content

Commit 916c019

Browse files
Fix use of ANDROID_API environment variable in Android plugin
1 parent e86909a commit 916c019

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
3636
environment(
3737
// add build toolchain to PATH
3838
Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"),
39-
Pair("CFLAGS", "-D__ANDROID_API__=21"),
39+
Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"),
4040
Pair("CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER", "aarch64-linux-android21-clang"),
4141
Pair("CC", "aarch64-linux-android21-clang")
4242
)
@@ -65,7 +65,7 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
6565
environment(
6666
// add build toolchain to PATH
6767
Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"),
68-
Pair("CFLAGS", "-D__ANDROID_API__=21"),
68+
Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"),
6969
Pair("CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER", "x86_64-linux-android21-clang"),
7070
Pair("CC", "x86_64-linux-android21-clang")
7171
)
@@ -94,7 +94,7 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
9494
environment(
9595
// add build toolchain to PATH
9696
Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"),
97-
Pair("CFLAGS", "-D__ANDROID_API__=21"),
97+
Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"),
9898
Pair("CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER", "armv7a-linux-androideabi21-clang"),
9999
Pair("CC", "armv7a-linux-androideabi21-clang")
100100
)

0 commit comments

Comments
 (0)