diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-28 10:18:54 +0100 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-06-03 20:40:58 -0700 |
| commit | 6fe795a0dc629710ad27594ea837b234a9e8b289 (patch) | |
| tree | d946f1c894efdc1ab3fdcedddb2fe56a9f10fe63 | |
| parent | 98dcefd36a6751ec2b6b7d846e4d009a880b9746 (diff) | |
| download | android_dalvik-6fe795a0dc629710ad27594ea837b234a9e8b289.tar.gz android_dalvik-6fe795a0dc629710ad27594ea837b234a9e8b289.tar.bz2 android_dalvik-6fe795a0dc629710ad27594ea837b234a9e8b289.zip | |
Add a libbase dependency for dexdump/dexlist.
Required by the libziparchive static dependency. Also fix
a few tabs in the makefile.
Bug: http://b/21558406
Change-Id: Iaa7aad6e7f3dfc6014651385d7182c009e182914
(cherry picked from commit a06ce75c10dce097c0a040562393e5889fa264f1)
| -rw-r--r-- | dexdump/Android.mk | 17 | ||||
| -rw-r--r-- | dexlist/Android.mk | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index 280cab5d5..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 += @@ -59,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 |