@@ -21,7 +21,8 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
21
21
val buildAndroidAarch64Binary by tasks.register<Exec >(" buildAndroidAarch64Binary" ) {
22
22
23
23
workingDir(" ${projectDir} /../../bdk-ffi" )
24
- val cargoArgs: List <String > = listOf (" build" , " --profile" , " release-smaller" , " --target" , " aarch64-linux-android" )
24
+ val cargoArgs: MutableList <String > =
25
+ mutableListOf (" build" , " --profile" , " release-smaller" , " --target" , " aarch64-linux-android" )
25
26
26
27
executable(" cargo" )
27
28
args(cargoArgs)
@@ -35,9 +36,10 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
35
36
36
37
environment(
37
38
// add build toolchain to PATH
38
- Pair (" PATH" , " ${System .getenv(" PATH" )} :${System .getenv(" ANDROID_NDK_ROOT" )} /toolchains/llvm/prebuilt/$llvmArchPath /bin" ),
39
- Pair (" CFLAGS" , " -D__ANDROID_MIN_SDK_VERSION__=21" ),
40
- Pair (" AR" , " llvm-ar" ),
39
+ Pair (" PATH" ,
40
+ " ${System .getenv(" PATH" )} :${System .getenv(" ANDROID_NDK_ROOT" )} /toolchains/llvm/prebuilt/$llvmArchPath /bin" ),
41
+
42
+ Pair (" CFLAGS" , " -D__ANDROID_API__=21" ),
41
43
Pair (" CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER" , " aarch64-linux-android21-clang" ),
42
44
Pair (" CC" , " aarch64-linux-android21-clang" )
43
45
)
@@ -51,7 +53,8 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
51
53
val buildAndroidX86_64Binary by tasks.register<Exec >(" buildAndroidX86_64Binary" ) {
52
54
53
55
workingDir(" ${project.projectDir} /../../bdk-ffi" )
54
- val cargoArgs: List <String > = listOf (" build" , " --profile" , " release-smaller" , " --target" , " x86_64-linux-android" )
56
+ val cargoArgs: MutableList <String > =
57
+ mutableListOf (" build" , " --profile" , " release-smaller" , " --target" , " x86_64-linux-android" )
55
58
56
59
executable(" cargo" )
57
60
args(cargoArgs)
@@ -65,9 +68,10 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
65
68
66
69
environment(
67
70
// add build toolchain to PATH
68
- Pair (" PATH" , " ${System .getenv(" PATH" )} :${System .getenv(" ANDROID_NDK_ROOT" )} /toolchains/llvm/prebuilt/$llvmArchPath /bin" ),
69
- Pair (" CFLAGS" , " -D__ANDROID_MIN_SDK_VERSION__=21" ),
70
- Pair (" AR" , " llvm-ar" ),
71
+ Pair (" PATH" ,
72
+ " ${System .getenv(" PATH" )} :${System .getenv(" ANDROID_NDK_ROOT" )} /toolchains/llvm/prebuilt/$llvmArchPath /bin" ),
73
+
74
+ Pair (" CFLAGS" , " -D__ANDROID_API__=21" ),
71
75
Pair (" CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER" , " x86_64-linux-android21-clang" ),
72
76
Pair (" CC" , " x86_64-linux-android21-clang" )
73
77
)
@@ -81,7 +85,8 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
81
85
val buildAndroidArmv7Binary by tasks.register<Exec >(" buildAndroidArmv7Binary" ) {
82
86
83
87
workingDir(" ${project.projectDir} /../../bdk-ffi" )
84
- val cargoArgs: List <String > = listOf (" build" , " --profile" , " release-smaller" , " --target" , " armv7-linux-androideabi" )
88
+ val cargoArgs: MutableList <String > =
89
+ mutableListOf (" build" , " --profile" , " release-smaller" , " --target" , " armv7-linux-androideabi" )
85
90
86
91
executable(" cargo" )
87
92
args(cargoArgs)
@@ -95,10 +100,12 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
95
100
96
101
environment(
97
102
// add build toolchain to PATH
98
- Pair (" PATH" , " ${System .getenv(" PATH" )} :${System .getenv(" ANDROID_NDK_ROOT" )} /toolchains/llvm/prebuilt/$llvmArchPath /bin" ),
99
- Pair (" CFLAGS" , " -D__ANDROID_MIN_SDK_VERSION__=21" ),
100
- Pair (" AR" , " llvm-ar" ),
101
- Pair (" CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER" , " armv7a-linux-androideabi21-clang" ),
103
+ Pair (" PATH" ,
104
+ " ${System .getenv(" PATH" )} :${System .getenv(" ANDROID_NDK_ROOT" )} /toolchains/llvm/prebuilt/$llvmArchPath /bin" ),
105
+
106
+ Pair (" CFLAGS" , " -D__ANDROID_API__=21" ),
107
+ Pair (" CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER" ,
108
+ " armv7a-linux-androideabi21-clang" ),
102
109
Pair (" CC" , " armv7a-linux-androideabi21-clang" )
103
110
)
104
111
0 commit comments