Adjust Android.mk to link dynamic OpenSSL, build libsqlcipher.so

Author: developernotes

sqlcipher/src/main/jni/sqlcipher/Android.mk

@@ -1,42 +1,24 @@
-
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-# If using SEE, uncomment the following:
-# LOCAL_CFLAGS += -DSQLITE_HAS_CODEC
-
-#Define HAVE_USLEEP, otherwise ALL sleep() calls take at least 1000ms
-LOCAL_CFLAGS += -DHAVE_USLEEP=1
-
-# Enable SQLite extensions.
-LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS5 
-LOCAL_CFLAGS += -DSQLITE_ENABLE_RTREE
-LOCAL_CFLAGS += -DSQLITE_ENABLE_JSON1
-LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS3
-LOCAL_CFLAGS += -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE
-
-# This is important - it causes SQLite to use memory for temp files. Since 
-# Android has no globally writable temp directory, if this is not defined the
-# application throws an exception when it tries to create a temp file.
-#
-LOCAL_CFLAGS += -DSQLITE_TEMP_STORE=3
-
-LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
-LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
-LOCAL_CFLAGS += -U__APPLE__
-LOCAL_CFLAGS += -DHAVE_STRCHRNUL=0
-LOCAL_CFLAGS += -DSQLITE_USE_URI=1
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
-LOCAL_CFLAGS += -Wno-uninitialized -Wno-parentheses
-LOCAL_CPPFLAGS += -Wno-conversion-null
-
-
-ifeq ($(TARGET_ARCH), arm)
-	LOCAL_CFLAGS += -DPACKED="__attribute__ ((packed))"
+ifdef $SSQLCIPHER_CFLAGS
+LOCAL_CFLAGS += ${SQLCIPHER_CFLAGS}
 else
-	LOCAL_CFLAGS += -DPACKED=""
+LOCAL_CFLAGS += -DSQLITE_HAS_CODEC -DSQLCIPHER_CRYPTO_OPENSSL -DSQLITE_TEMP_STORE=2 \
+	-DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS3_PARENTHESIS \
+	-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS4_UNICODE61 -DSQLITE_ENABLE_FTS5 \
+	-DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_RTREE \
+	-DSQLITE_SOUNDEX -DHAVE_USLEEP -DSQLITE_ENABLE_LOAD_EXTENSION -DSQLITE_ENABLE_STAT3 \
+	-DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
+	-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_MAX_VARIABLE_NUMBER=99999 \
+	-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 -DSQLITE_ENABLE_SESSION \
+	-DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_DBSTAT_VTAB
 endif
 
+LOCAL_CPPFLAGS += -Wno-conversion-null
+
+#$(info "SQLCipher LOCAL CFLAGS:${LOCAL_CFLAGS}")
+
 LOCAL_SRC_FILES:=                             \
 	android_database_SQLiteCommon.cpp     \
 	android_database_SQLiteConnection.cpp \
@@ -46,10 +28,15 @@ LOCAL_SRC_FILES:=                             \
 
 LOCAL_SRC_FILES += sqlite3.c
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/nativehelper/
+LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/nativehelper/ $(LOCAL_PATH)/android-libs/include/
 
-LOCAL_MODULE:= libsqliteX
-LOCAL_LDLIBS += -ldl -llog 
+LOCAL_MODULE:= libsqlcipher
+LOCAL_LDLIBS += -ldl -llog
+LOCAL_SHARED_LIBRARIES += shared-libcrypto
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := shared-libcrypto
+LOCAL_SRC_FILES := $(LOCAL_PATH)/android-libs/$(TARGET_ARCH_ABI)/libcrypto.so
+include $(PREBUILT_SHARED_LIBRARY)