Skip to content

Commit c0e7154

Browse files
committed
fix(workflow): add CFLAGS for CURL Android builds and clean up Android build files
1 parent 657d6d1 commit c0e7154

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ else ifeq ($(PLATFORM),android)
115115

116116
OPENSSL := $(BIN)/../sysroot/usr/include/openssl
117117
CC = $(BIN)/$(ARCH)-linux-$(ANDROID_ABI)-clang
118-
CURL_CONFIG = --host $(ARCH)-linux-$(ANDROID_ABI) --with-openssl=$(BIN)/../sysroot/usr LIBS="-lssl -lcrypto" AR=$(BIN)/llvm-ar AS=$(BIN)/llvm-as CC=$(CC) CXX=$(BIN)/$(ARCH)-linux-$(ANDROID_ABI)-clang++ LD=$(BIN)/ld RANLIB=$(BIN)/llvm-ranlib STRIP=$(BIN)/llvm-strip
118+
CURL_CONFIG = --host $(ARCH)-linux-$(ANDROID_ABI) --with-openssl=$(BIN)/../sysroot/usr LIBS="-lssl -lcrypto" AR=$(BIN)/llvm-ar AS=$(BIN)/llvm-as CC=$(CC) CXX=$(BIN)/$(ARCH)-linux-$(ANDROID_ABI)-clang++ LD=$(BIN)/ld RANLIB=$(BIN)/llvm-ranlib STRIP=$(BIN)/llvm-strip CFLAGS="-fPIC"
119119
TARGET := $(DIST_DIR)/cloudsync.so
120120
LDFLAGS += -shared -lcrypto -lssl
121121
STRIP = $(BIN)/llvm-strip --strip-unneeded $@
@@ -393,6 +393,10 @@ aar:
393393
cd packages/android && ./gradlew clean assembleRelease
394394
cp packages/android/build/outputs/aar/android-release.aar $(DIST_DIR)/cloudsync.aar
395395

396+
clean-aar:
397+
rm -rf packages/android/build $(AAR_ARM64) $(AAR_ARM) $(AAR_X86)
398+
$(AAR_CLEAN)
399+
396400
# Tools
397401
version:
398402
@echo $(shell sed -n 's/^#define CLOUDSYNC_VERSION[[:space:]]*"\([^"]*\)".*/\1/p' src/cloudsync.h)

0 commit comments

Comments
 (0)