From 93a264eba965b0c6072369a7001f8d8c647a73c3 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 21 Mar 2014 22:11:08 -0700
Subject: 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
---
 vm/compiler/codegen/x86/libenc/Android.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'vm/compiler/codegen')

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
-- 
cgit v1.2.3