Remove armv7 ABI target instead of i686
This commit is contained in:
		
							parent
							
								
									be8b31684f
								
							
						
					
					
						commit
						63cbcb1aa3
					
				
							
								
								
									
										10
									
								
								build.sh
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								build.sh
									
									
									
									
									
								
							| @ -100,9 +100,9 @@ build_android() { | ||||
|   export CFLAGS="-D__ANDROID_API__=21" | ||||
| 
 | ||||
|   # IMPORTANT: make sure every target is not a substring of a different one. We check for them with grep later on | ||||
|   BUILD_TARGETS="${BUILD_TARGETS:-aarch64,armv7,x86_64,i686}" | ||||
|   BUILD_TARGETS="${BUILD_TARGETS:-aarch64,x86_64,i686}" | ||||
| 
 | ||||
|   mkdir -p bindings/bdk-kotlin/android/src/main/jniLibs/ bindings/bdk-kotlin/android/src/main/jniLibs/arm64-v8a bindings/bdk-kotlin/android/src/main/jniLibs/x86_64 bindings/bdk-kotlin/android/src/main/jniLibs/armeabi-v7a bindings/bdk-kotlin/android/src/main/jniLibs/x86 | ||||
|   mkdir -p bindings/bdk-kotlin/android/src/main/jniLibs/ bindings/bdk-kotlin/android/src/main/jniLibs/arm64-v8a bindings/bdk-kotlin/android/src/main/jniLibs/x86_64 bindings/bdk-kotlin/android/src/main/jniLibs/x86 | ||||
| 
 | ||||
|   if echo $BUILD_TARGETS | grep "aarch64"; then | ||||
|       CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android21-clang" CC="aarch64-linux-android21-clang" cargo build --target=aarch64-linux-android | ||||
| @ -112,13 +112,9 @@ build_android() { | ||||
|       CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android21-clang" CC="x86_64-linux-android21-clang" cargo build --target=x86_64-linux-android | ||||
|       cp target/x86_64-linux-android/debug/libbdkffi.so bindings/bdk-kotlin/android/src/main/jniLibs/x86_64 | ||||
|   fi | ||||
|   if echo $BUILD_TARGETS | grep "armv7"; then | ||||
|       CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="armv7a-linux-androideabi21-clang" CC="armv7a-linux-androideabi21-clang" cargo build --target=armv7-linux-androideabi | ||||
|       cp target/armv7-linux-androideabi/debug/libbdkffi.so bindings/bdk-kotlin/android/src/main/jniLibs/armeabi-v7a | ||||
|   fi | ||||
|   if echo $BUILD_TARGETS | grep "i686"; then | ||||
|       CARGO_TARGET_I686_LINUX_ANDROID_LINKER="i686-linux-android21-clang" CC="i686-linux-android21-clang" cargo build --target=i686-linux-android | ||||
|       # cp target/i686-linux-android/debug/libbdkffi.so bindings/bdk-kotlin/android/src/main/jniLibs/x86 | ||||
|       cp target/i686-linux-android/debug/libbdkffi.so bindings/bdk-kotlin/android/src/main/jniLibs/x86 | ||||
|   fi | ||||
| 
 | ||||
|   # copy sources | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user