Skip to content

Commit e0699ce

Browse files
Adjust init to configure the OpenSSL source dir
1 parent 52f2072 commit e0699ce

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ EXTERNAL_DIR := ${CURDIR}/external
66
SQLCIPHER_DIR := ${EXTERNAL_DIR}/sqlcipher
77
LICENSE := SQLCIPHER_LICENSE
88
ASSETS_DIR := assets
9+
OPENSSL_DIR := ${EXTERNAL_DIR}/openssl
910
LATEST_TAG := $(shell git tag | sort -r | head -1)
1011
SECOND_LATEST_TAG := $(shell git tag | sort -r | head -2 | tail -1)
1112
RELEASE_DIR := "SQLCipher for Android ${LATEST_TAG}"
@@ -15,6 +16,8 @@ README := ${RELEASE_DIR}/README
1516
init:
1617
git submodule update --init
1718
android update project -p .
19+
cd ${OPENSSL_DIR} && git clean -dfx && \
20+
git checkout -f && ./Configure dist
1821

1922
all: build-external build-jni build-java copy-libs
2023

build-openssl-libraries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
HOST_INFO=`uname -a`
99
case ${HOST_INFO} in
1010
Darwin*)
11-
TOOLCHAIN_SYSTEM=darwin-x86_64
11+
TOOLCHAIN_SYSTEM=darwin-x86
1212
;;
1313
Linux*)
1414
if [[ "${HOST_INFO}" == *i686* ]]

0 commit comments

Comments
 (0)