am 6ecc6e17: am e6db643f: am f6d9fa68: am 20f7eeb8: am 9ff7db77: am f764dbb5: disable fts3_tokenizer
* commit '6ecc6e17f3da9f6307a9f0077ef9b66a02b84e9a':
disable fts3_tokenizer
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0f535b9..185d0c1 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,3 +49,6 @@
# ************************************************
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libsqlite_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libsqlite3_android_intermediates/import_includes)
+$(call add-clean-step, rm -rf $(HOST_OUT)/obj/STATIC_LIBRARIES/libsqlite3_android_intermediates/import_includes)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libsqlite_intermediates)
diff --git a/android/Android.mk b/android/Android.mk
index 9284903..ce346b4 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -13,6 +13,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files)
LOCAL_C_INCLUDES := $(libsqlite3_android_c_includes)
+LOCAL_STATIC_LIBRARIES := liblog
LOCAL_MODULE:= libsqlite3_android
include $(BUILD_STATIC_LIBRARY)
@@ -20,6 +21,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files)
LOCAL_C_INCLUDES := $(libsqlite3_android_c_includes)
+ LOCAL_STATIC_LIBRARIES := liblog
LOCAL_MODULE:= libsqlite3_android
include $(BUILD_HOST_STATIC_LIBRARY)
endif
diff --git a/dist/Android.mk b/dist/Android.mk
index 3456e59..3e39229 100644
--- a/dist/Android.mk
+++ b/dist/Android.mk
@@ -40,7 +40,8 @@
LOCAL_LDLIBS += -lpthread -ldl
endif
-LOCAL_CFLAGS += $(common_sqlite_flags) -DUSE_PREAD64 -Dfdatasync=fdatasync
+LOCAL_CFLAGS += $(common_sqlite_flags) -DUSE_PREAD64 -Dfdatasync=fdatasync \
+ -DHAVE_MALLOC_USABLE_SIZE
LOCAL_SHARED_LIBRARIES := libdl
