diff options
| author | Colin Cross <ccross@android.com> | 2014-03-21 22:11:08 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-21 22:11:08 -0700 |
| commit | 93a264eba965b0c6072369a7001f8d8c647a73c3 (patch) | |
| tree | d109df85b810b6565f8628b215aab7b7c6ba47dd /dexdump | |
| parent | c6a926398c25da1c00dd526628c48ddba1792008 (diff) | |
| download | android_dalvik-93a264eba965b0c6072369a7001f8d8c647a73c3.tar.gz android_dalvik-93a264eba965b0c6072369a7001f8d8c647a73c3.tar.bz2 android_dalvik-93a264eba965b0c6072369a7001f8d8c647a73c3.zip | |
dalvik: let 32-bit dalvik build on multilib targets
Set LOCAL_32_BIT_ONLY for all target modules
Use LOCAL_LDFLAGS_x86 instead of ifeq ($(TARGET_ARCH),x86)
Set dvm_arch to TARGET_2ND_ARCH instead of TARGET_ARCH on 64-bit
targets
This will allow "make checkbuild" to succeed on 64-bit platforms.
Change-Id: Idd51dda26b54855c0c8640f8fcfbf4274baf8845
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index a6c954539..9aa4ae913 100644 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -42,6 +42,7 @@ LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS += +LOCAL_32_BIT_ONLY := true include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -51,6 +52,7 @@ 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 include $(BUILD_STATIC_LIBRARY) endif # !SDK_ONLY |