8000 Link atomic · s1h/android-database-sqlcipher@6cc26ff · GitHub
[go: up one dir, main page]
Skip to content

Commit 6cc26ff

Browse files
developernotesdevelopernotes
committed
Link atomic
1 parent 93fa8f9 commit 6cc26ff

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

‎jni/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SQLCIPHER_SRC := $(SQLCIPHER_DIR)/sqlite3.c
77

88
LOCAL_CFLAGS += $(SQLCIPHER_CFLAGS)
99
LOCAL_C_INCLUDES := $(SQLCIPHER_DIR) $(LOCAL_PATH)
10-
LOCAL_LDLIBS := -llog
10+
LOCAL_LDLIBS := -llog -latomic
1111
LOCAL_LDFLAGS += -L$(LOCAL_PATH)/android-libs/$(TARGET_ARCH_ABI) -fuse-ld=bfd
1212
LOCAL_STATIC_LIBRARIES += static-libcrypto
1313
LOCAL_MODULE := libsqlcipher

‎jni/Application.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ APP_PROJECT_PATH := $(shell pwd)
22
APP_ABI := armeabi armeabi-v7a x86
33
# APP_ABI := armeabi
44
APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
5+
APP_STL := c++_static

0 commit comments

Comments
 (0)
0