summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-07-23 18:01:06 -0700
committerColin Cross <ccross@android.com>2013-07-23 18:01:56 -0700
commitbde763528bf07086d010f3a89db0b9475bf7a7d3 (patch)
tree208d4822bee9891aa2086a3d71cd7b99ba7a231c
parent8734f88c49b83be812d1254b9c8abc8760a6770c (diff)
downloadandroid_external_sqlite-bde763528bf07086d010f3a89db0b9475bf7a7d3.tar.gz
android_external_sqlite-bde763528bf07086d010f3a89db0b9475bf7a7d3.tar.bz2
android_external_sqlite-bde763528bf07086d010f3a89db0b9475bf7a7d3.zip
add static dependency on liblog
Change-Id: I21a4e18f0d2aacaf76421b62d693c2ae7eb08f30
-rw-r--r--CleanSpec.mk2
-rw-r--r--android/Android.mk2
2 files changed, 4 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0f535b9..8e9b6d1 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,3 +49,5 @@
# ************************************************
$(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)
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 @@ libsqlite3_android_c_includes := \
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 @@ ifeq ($(WITH_HOST_DALVIK),true)
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