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)
diff --git a/dexdump/Android.mk b/dexdump/Android.mk
index 280cab5..e92c8cc 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_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_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 4d4a709..7ac2b73 100644
--- a/dexlist/Android.mk
+++ b/dexlist/Android.mk
@@ -32,7 +32,7 @@
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_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
