Skip to content

Commit 2a938c2

Browse files
committed
fix(workflow): add CFLAGS for CURL Android builds and clean up Android build files
1 parent 6d08aef commit 2a938c2

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
@@ -107,7 +107,7 @@ else ifeq ($(PLATFORM),android)
107107

108108
OPENSSL := $(BIN)/../sysroot/usr/include/openssl
109109
CC = $(BIN)/$(ARCH)-linux-$(ANDROID_ABI)-clang
110-
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
110+
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"
111111
TARGET := $(DIST_DIR)/cloudsync.so
112112
LDFLAGS += -shared -lcrypto -lssl
113113
STRIP = $(BIN)/llvm-strip --strip-unneeded $@
@@ -378,6 +378,10 @@ aar:
378378
cd packages/android && ./gradlew clean assembleRelease
379379
cp packages/android/build/outputs/aar/android-release.aar $(DIST_DIR)/cloudsync.aar
380380

381+
clean-aar:
382+
rm -rf packages/android/build $(AAR_ARM64) $(AAR_ARM) $(AAR_X86)
383+
$(AAR_CLEAN)
384+
381385
# Tools
382386
version:
383387
@echo $(shell sed -n 's/^#define CLOUDSYNC_VERSION[[:space:]]*"\([^"]*\)".*/\1/p' src/cloudsync.h)

0 commit comments

Comments
 (0)