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 /vm/compiler/codegen | |
| 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 'vm/compiler/codegen')
| -rw-r--r-- | vm/compiler/codegen/x86/libenc/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vm/compiler/codegen/x86/libenc/Android.mk b/vm/compiler/codegen/x86/libenc/Android.mk index 6fe9cdbb4..85bea56df 100644 --- a/vm/compiler/codegen/x86/libenc/Android.mk +++ b/vm/compiler/codegen/x86/libenc/Android.mk @@ -43,6 +43,7 @@ LOCAL_SRC_FILES := $(enc_src_files) LOCAL_C_INCLUDES += $(enc_include_files) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libenc +LOCAL_32_BIT_ONLY := true include $(BUILD_STATIC_LIBRARY) endif # !SDK_ONLY |