Skip to content

Commit aab5b02

Browse files
committed
fix(android): update AAR build process to remove OpenSSL arch related libs
1 parent b1444e6 commit aab5b02

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,10 @@ AAR_ARM = packages/android/src/main/jniLibs/arm64-v8a/
350350
AAR_X86 = packages/android/src/main/jniLibs/x86_64/
351351
aar:
352352
mkdir -p $(AAR_ARM) $(AAR_X86)
353-
rm -rf $(CURL_DIR)/android $(CURL_DIR)/src
353+
rm -rf $(CURL_DIR)/android $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/bin/openssl $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/include/openssl $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/lib/libssl.* $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/lib/libcrypto.*
354354
$(MAKE) clean && $(MAKE) PLATFORM=android ARCH=arm64-v8a
355355
mv $(DIST_DIR)/cloudsync.so $(AAR_ARM)
356-
rm -rf $(CURL_DIR)/android $(CURL_DIR)/src
356+
rm -rf $(CURL_DIR)/android $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/bin/openssl $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/include/openssl $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/lib/libssl.* $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/lib/libcrypto.*
357357
$(MAKE) clean && $(MAKE) PLATFORM=android ARCH=x86_64
358358
mv $(DIST_DIR)/cloudsync.so $(AAR_X86)
359359
cd packages/android && ./gradlew clean assembleRelease

0 commit comments

Comments
 (0)