OSDN Git Service

add static dependency on liblog
authorColin Cross <ccross@android.com>
Wed, 24 Jul 2013 00:45:23 +0000 (17:45 -0700)
committerColin Cross <ccross@android.com>
Wed, 24 Jul 2013 00:45:23 +0000 (17:45 -0700)
Change-Id: Id431382f0fc71ef126dd35e5949d5de2abe2b785

CleanSpec.mk
libdex/Android.mk

index 3fbdc64..2894484 100644 (file)
@@ -54,3 +54,4 @@ $(call add-clean-step, rm -rf $(OUT)/obj/SHARED_LIBRARIES/libdvm*)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
+$(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libdex_intermediates/import_includes)
index 48263c9..7ab0013 100644 (file)
@@ -50,6 +50,7 @@ include $(CLEAR_VARS)
 #LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1
 LOCAL_SRC_FILES := $(dex_src_files)
 LOCAL_C_INCLUDES += $(dex_include_files)
+LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libdex
 include $(BUILD_STATIC_LIBRARY)
@@ -65,6 +66,7 @@ endif # !SDK_ONLY
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(dex_src_files)
 LOCAL_C_INCLUDES += $(dex_include_files)
+LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libdex
 include $(BUILD_HOST_STATIC_LIBRARY)