diff options
| author | Narayan Kamath <narayan@google.com> | 2013-12-16 16:46:10 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2013-12-16 16:53:36 +0000 |
| commit | e499a20c4ec764348e230c38d56b301df1aebc3d (patch) | |
| tree | 8b8ac081a9bea0eaa268996c340a02dec9f1f0c3 /dexdump | |
| parent | 0a09de93903e3f0ba11e4c3952f0979b4e29604b (diff) | |
| download | android_dalvik-e499a20c4ec764348e230c38d56b301df1aebc3d.tar.gz android_dalvik-e499a20c4ec764348e230c38d56b301df1aebc3d.tar.bz2 android_dalvik-e499a20c4ec764348e230c38d56b301df1aebc3d.zip | |
Fix libutils dependencies for dexdump & dexlist.
We should always use a libutils SHARED_LIBRARY on the target &
a STATIC_LIBRARY on the host.
(cherry picked from commit 2ac78805e1b4d80308c5c4a48a997abc3a2ac37b)
Change-Id: I06c9b8f0cf663e00da0eeba54c893d8eec1d8a9f
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/Android.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index b825146d6..a6c954539 100644 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -23,8 +23,6 @@ dexdump_src_files := \ dexdump_c_includes := \ dalvik -dexdump_shared_libraries := - dexdump_static_libraries := \ libdex @@ -39,7 +37,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := dexdump LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) -LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries) libz liblog +LOCAL_SHARED_LIBRARIES := libz liblog libutils LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE_TAGS := optional @@ -51,6 +49,7 @@ 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 include $(BUILD_STATIC_LIBRARY) @@ -67,8 +66,7 @@ LOCAL_MODULE := dexdump LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) -LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries) -LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) liblog +LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) liblog libutils ifneq ($(strip $(USE_MINGW)),) LOCAL_STATIC_LIBRARIES += libz |