diff options
| -rw-r--r-- | dexdump/Android.mk | 28 | ||||
| -rw-r--r-- | dexlist/Android.mk | 4 |
2 files changed, 12 insertions, 20 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index d9a06d136..e92c8ccaa 100644 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -17,14 +17,17 @@ # LOCAL_PATH:= $(call my-dir) -dexdump_src_files := \ - DexDump.cpp +dexdump_src_files := DexDump.cpp +dexdump_c_includes := dalvik -dexdump_c_includes := \ - dalvik +dexdump_static_libraries_sdk := \ + libdex \ + libbase dexdump_static_libraries := \ - libdex + $(dexdump_static_libraries_sdk) \ + libutils \ + liblog ## ## @@ -38,7 +41,7 @@ LOCAL_MODULE := dexdump LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) LOCAL_SHARED_LIBRARIES := libz liblog libutils -LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) +LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries_sdk) LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS += @@ -46,17 +49,6 @@ LOCAL_32_BIT_ONLY := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) -LOCAL_MODULE := libdexdump_static -LOCAL_SRC_FILES := $(dexdump_src_files) -LOCAL_C_INCLUDES := $(dexdump_c_includes) -LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) -LOCAL_SHARED_LIBRARIES := libutils -LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -include $(BUILD_STATIC_LIBRARY) - endif # !SDK_ONLY @@ -70,7 +62,7 @@ LOCAL_MODULE := dexdump LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) -LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) liblog libutils +LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) ifneq ($(strip $(USE_MINGW)),) LOCAL_STATIC_LIBRARIES += libz else diff --git a/dexlist/Android.mk b/dexlist/Android.mk index 4d4a709f0..7ac2b73ef 100644 --- a/dexlist/Android.mk +++ b/dexlist/Android.mk @@ -32,7 +32,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) LOCAL_SHARED_LIBRARIES := libcutils libz libutils -LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) +LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) libbase LOCAL_LDLIBS += LOCAL_32_BIT_ONLY := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -43,7 +43,7 @@ LOCAL_MODULE := dexlist LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) -LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) libcutils liblog libutils +LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) libcutils liblog libutils libbase LOCAL_LDLIBS += -lpthread -lz # TODO: Move dexlist from libdex to libart and lose the 32-bit limitation. LOCAL_32_BIT_ONLY := true |