Skip to content

Commit 987b6c7

Browse files
Pass environment variables to NDK build
1 parent 464fd78 commit 987b6c7

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

android-database-sqlcipher/native.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,11 @@ def executeNdkBuild(outputDir, androidMkDirectory, applicationMkFile, cflags) {
114114
exec {
115115
def outputDirectory = "NDK_LIBS_OUT=${outputDir}"
116116
def applicationFile = "NDK_APPLICATION_MK=${applicationMkFile}"
117-
environment("SQLCIPHER_CFLAGS", "${cflags}")
117+
def environmentVariables = ["SQLCIPHER_CFLAGS": "${cflags}",
118+
"OPENSSL_DIR": "${opensslDir}",
119+
"SQLCIPHER_DIR": "${sqlcipherDir}",
120+
"ANDROID_NATIVE_ROOT_DIR": "${androidNativeRootDir}"]
121+
environment(environmentVariables)
118122
commandLine "ndk-build",
119123
"--environment-overrides", outputDirectory,
120124
"-C", androidMkDirectory, applicationFile

android-database-sqlcipher/src/main/cpp/Android.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ LOCAL_PATH := $(call my-dir)
22
MY_PATH := $(LOCAL_PATH)
33
include $(CLEAR_VARS)
44
LOCAL_PATH := $(MY_PATH)
5-
SQLCIPHER_DIR := $(LOCAL_PATH)/../external/sqlcipher
6-
SQLCIPHER_SRC := $(SQLCIPHER_DIR)/sqlite3.c
75

6+
SQLCIPHER_SRC := $(SQLCIPHER_DIR)/sqlite3.c
87
LOCAL_CFLAGS += $(SQLCIPHER_CFLAGS) -DLOG_NDEBUG
98
LOCAL_C_INCLUDES := $(SQLCIPHER_DIR) $(LOCAL_PATH)
109
LOCAL_LDLIBS := -llog -latomic
11-
LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../external/android-libs/$(TARGET_ARCH_ABI) -fuse-ld=bfd
10+
LOCAL_LDFLAGS += -L$(ANDROID_NATIVE_ROOT_DIR)/$(TARGET_ARCH_ABI) -fuse-ld=bfd
1211
LOCAL_STATIC_LIBRARIES += static-libcrypto
1312
LOCAL_MODULE := libsqlcipher
1413
LOCAL_SRC_FILES := $(SQLCIPHER_SRC) \
@@ -25,6 +24,6 @@ include $(BUILD_SHARED_LIBRARY)
2524

2625
include $(CLEAR_VARS)
2726
LOCAL_MODULE := static-libcrypto
28-
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../external/openssl/include
29-
LOCAL_SRC_FILES := $(LOCAL_PATH)/../external/android-libs/$(TARGET_ARCH_ABI)/libcrypto.a
27+
LOCAL_EXPORT_C_INCLUDES := $(OPENSSL_DIR)/include
28+
LOCAL_SRC_FILES := $(ANDROID_NATIVE_ROOT_DIR)/$(TARGET_ARCH_ABI)/libcrypto.a
3029
include $(PREBUILT_STATIC_LIBRARY)

0 commit comments

Comments
 (0)