diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-09-13 00:52:46 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-09-13 16:24:10 -0700 |
| commit | dc43b33cb50252bde27c11e54f8f977d32660028 (patch) | |
| tree | d604a955a375974fc623d726901d54a8ac1548a6 /dexdump | |
| parent | 11b9618dafa67f78500ee43b489dae48b6410336 (diff) | |
| download | android_dalvik-dc43b33cb50252bde27c11e54f8f977d32660028.tar.gz android_dalvik-dc43b33cb50252bde27c11e54f8f977d32660028.tar.bz2 android_dalvik-dc43b33cb50252bde27c11e54f8f977d32660028.zip | |
Make the rest of libdex and dexdump LOCAL_32_BIT_ONLY
Bug: 17442393
Change-Id: I10a9398efd7e78fac01fc49b9cb2f377331a76cd
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index 9aa4ae913..d9a06d136 100644 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -43,6 +43,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS += LOCAL_32_BIT_ONLY := true +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -53,6 +54,7 @@ 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 @@ -69,11 +71,12 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) liblog libutils - ifneq ($(strip $(USE_MINGW)),) LOCAL_STATIC_LIBRARIES += libz else LOCAL_LDLIBS += -lpthread -lz endif - +# TODO: Move dexdump from libdex to libart and lose the 32-bit limitation. +LOCAL_32_BIT_ONLY := true +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_EXECUTABLE) |