Skip to content

Commit e8bf0e2

Browse files
committed
fix(android): update AAR clean process to remove conflicting OpenSSL files
1 parent aab5b02 commit e8bf0e2

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,14 @@ xcframework: $(DIST_DIR)/CloudSync.xcframework
348348

349349
AAR_ARM = packages/android/src/main/jniLibs/arm64-v8a/
350350
AAR_X86 = packages/android/src/main/jniLibs/x86_64/
351+
AAR_USR = $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr/
352+
AAR_CLEAN = rm -rf $(CURL_DIR)/android $(AAR_USR)bin/openssl $(AAR_USR)include/openssl $(AAR_USR)lib/libssl.a $(AAR_USR)lib/libcrypto.a $(AAR_USR)lib/ossl-modules
351353
aar:
352354
mkdir -p $(AAR_ARM) $(AAR_X86)
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.*
355+
$(AAR_CLEAN)
354356
$(MAKE) clean && $(MAKE) PLATFORM=android ARCH=arm64-v8a
355357
mv $(DIST_DIR)/cloudsync.so $(AAR_ARM)
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.*
358+
$(AAR_CLEAN)
357359
$(MAKE) clean && $(MAKE) PLATFORM=android ARCH=x86_64
358360
mv $(DIST_DIR)/cloudsync.so $(AAR_X86)
359361
cd packages/android && ./gradlew clean assembleRelease

src/cloudsync.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
extern "C" {
2121
#endif
2222

23-
#define CLOUDSYNC_VERSION "0.8.38"
23+
#define CLOUDSYNC_VERSION "0.8.39"
2424

2525
int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
2626

0 commit comments

Comments
 (0)