Skip to content

Commit a809bc6

Browse files
committed
fix android makefile only openssl dependency
1 parent 37b723b commit a809bc6

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,7 @@ else ifeq ($(PLATFORM),android)
8888
override ARCH := aarch64
8989
endif
9090

91-
SSL := $(BIN)/../sysroot/usr/lib/libssl.a
92-
CRYPTO := $(BIN)/../sysroot/usr/lib/libcrypto.a
9391
OPENSSL := $(BIN)/../sysroot/usr/include/openssl
94-
9592
CC = $(BIN)/$(ARCH)-linux-android26-clang
9693
CURL_CONFIG = --host $(ARCH)-$(HOST)-android26 --with-openssl=$(BIN)/../sysroot/usr LIBS="-lssl -lcrypto" AR=$(BIN)/llvm-ar AS=$(BIN)/llvm-as CC=$(BIN)/$(ARCH)-linux-android26-clang CXX=$(BIN)/$(ARCH)-linux-android26-clang++ LD=$(BIN)/ld RANLIB=$(BIN)/llvm-ranlib STRIP=$(BIN)/llvm-strip
9794
TARGET := $(DIST_DIR)/cloudsync.so
@@ -177,7 +174,7 @@ ifneq ($(COVERAGE),false)
177174
genhtml $(COV_DIR)/coverage.info --output-directory $(COV_DIR)
178175
endif
179176

180-
openssl:
177+
$(OPENSSL):
181178
git clone https://github.com/openssl/openssl.git $(CURL_DIR)/src/openssl
182179

183180
cd $(CURL_DIR)/src/openssl && \
@@ -187,10 +184,8 @@ openssl:
187184
-D__ANDROID_API__=26 && \
188185
make && make install_sw
189186

190-
$(SSL) $(CRYPTO) $(OPENSSL): openssl
191-
192187
ifeq ($(PLATFORM),android)
193-
$(CURL_LIB): $(SSL) $(CRYPTO) $(OPENSSL)
188+
$(CURL_LIB): $(OPENSSL)
194189
else
195190
$(CURL_LIB):
196191
endif

0 commit comments

Comments
 (0)