Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

1 files changed, 410 insertions, 1 deletions

diff --git a/dist/android/jdbc/Android.mk.template b/dist/android/jdbc/Android.mk.template
index d05af245..b1118095 100644
--- a/dist/android/jdbc/Android.mk.template
+++ b/dist/android/jdbc/Android.mk.template
@@ -9,6 +9,7 @@
 #      Android directly.
 ###################################################################
 LOCAL_PATH := $(call my-dir)
+BDB_ENABLE_ENCRYPTION := false
 
 ###################################################################
 # Common variables
@@ -42,6 +43,10 @@ COMMON_CFLAGS := -Wall -DHAVE_USLEEP=1 \
 	-D_HAVE_SQLITE_CONFIG_H -DSQLITE_THREAD_OVERRIDE_LOCK=-1 \
 	-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_BACKWARDS -Dfdatasync=fsync
 
+ifeq ($(BDB_ENABLE_ENCRYPTION),true)
+COMMON_CFLAGS += -DSQLITE_HAS_CODEC -DHAVE_CRYPTO -DHAVE_SQLITE3_KEY
+endif
+
 # Required for JDBC building
 # Most of these are from configured <db>/lang/sql/jdbc/Makefile.in
 COMMON_CFLAGS += \
@@ -65,7 +70,6 @@ COMMON_CFLAGS += \
 	-DHAVE_SQLITE3_BIND_PARAMETER_INDEX=1 \
 	-DHAVE_SQLITE3_RESULT_ZEROBLOB=1 \
 	-DHAVE_SQLITE3_INCRBLOBIO=1 \
-	-DHAVE_SQLITE3_KEY=0 \
 	-DHAVE_SQLITE3_SHARED_CACHE=1 \
 	-DHAVE_SQLITE3_OPEN_V2=1 \
 	-DHAVE_SQLITE3_LOAD_EXTENSION=0 \
@@ -98,6 +102,17 @@ LOCAL_SRC_FILES := \
 	@SOURCE_FILES@
 	$(BDB_TOP)/lang/sql/generated/sqlite3.c
 
+ifeq ($(BDB_ENABLE_ENCRYPTION),true)
+LOCAL_SRC_FILES += \
+	$(BDB_TOP)/src/crypto/crypto.c \
+	$(BDB_TOP)/src/crypto/aes_method.c \
+	$(BDB_TOP)/src/crypto/mersenne/mt19937db.c \
+	$(BDB_TOP)/src/crypto/rijndael/rijndael-api-fst.c \
+	$(BDB_TOP)/src/crypto/rijndael/rijndael-alg-fst.c
+else
+LOCAL_SRC_FILES += $(BDB_TOP)/src/common/crypto_stub.c
+endif
+
 ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
@@ -159,3 +174,397 @@ LOCAL_MODULE_TAGS := debug
 include $(BUILD_EXECUTABLE)
 endif # !SDK_ONLY
 
+
+################################################################################
+##device commande line tool:db_archive
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_archive
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_archive
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_archive.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_checkpoint
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_checkpoint
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_checkpoint
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_checkpoint.c \
+	$(BDB_TOP)/src/common/util_log.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_deadlock
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_deadlock
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_deadlock
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_deadlock.c \
+	$(BDB_TOP)/src/common/util_log.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_dump
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_dump
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_dump
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_dump.c \
+	$(BDB_TOP)/src/common/util_cache.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_hotbackup
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_hotbackup
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_hotbackup
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_hotbackup.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_load
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_load
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_load
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_load.c \
+	$(BDB_TOP)/src/common/util_cache.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_printlog
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_printlog
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_printlog
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_printlog.c \
+	$(BDB_TOP)/src/common/util_sig.c \
+	$(BDB_TOP)/src/btree/btree_autop.c \
+	$(BDB_TOP)/src/db/crdel_autop.c \
+	$(BDB_TOP)/src/db/db_autop.c \
+	$(BDB_TOP)/src/dbreg/dbreg_autop.c \
+	$(BDB_TOP)/src/fileops/fileops_autop.c \
+	$(BDB_TOP)/src/hash/hash_autop.c \
+	$(BDB_TOP)/src/heap/heap_autop.c \
+	$(BDB_TOP)/src/qam/qam_autop.c \
+	$(BDB_TOP)/src/repmgr/repmgr_autop.c \
+	$(BDB_TOP)/src/txn/txn_autop.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_recover
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_recover
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_recover
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_recover.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_replicate
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_replicate
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_replicate
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_replicate.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_stat
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_stat
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_stat
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_stat.c \
+	$(BDB_TOP)/src/common/util_cache.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_tuner
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_tuner
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_tuner
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_tuner.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_upgrade
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_upgrade
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_upgrade
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_upgrade.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_verify
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_verify
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_verify
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_verify.c \
+	$(BDB_TOP)/src/common/util_cache.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY
+
+
+################################################################################
+##device commande line tool:db_log_verify
+################################################################################
+ifneq ($(SDK_ONLY),true)  # SDK doesn't need device version of db_log_verify
+include $(CLEAR_VARS)
+LOCAL_MODULE := db_log_verify
+
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := libdb_sql_static # Based on above static library
+LOCAL_SRC_FILES := \
+	$(BDB_TOP)/util/db_log_verify.c \
+	$(BDB_TOP)/src/common/util_cache.c \
+	$(BDB_TOP)/src/common/util_sig.c
+
+# Import common flags
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
+
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+include $(BUILD_EXECUTABLE)
+endif # !SDK_ONLY