Use x86 variant in dalvik for TARGET_ARCH_VARIANT=x86-atom

Change-Id: I1f7968a5bf8e24f3a3feb5f5a40ee2c21294a0c3

diff --git a/vm/ReconfigureDvm.mk b/vm/ReconfigureDvm.mk
index aada6fe..8b6eb16 100644 (file)
--- a/vm/ReconfigureDvm.mk
+++ b/vm/ReconfigureDvm.mk
@@ -20,6 +20,11 @@ dvm_arch := $(TARGET_ARCH)
 dvm_arch_variant := $(TARGET_ARCH_VARIANT)
 dvm_simulator := $(TARGET_SIMULATOR)
 
+# for now, disable x86-atom variant
+ifeq ($(dvm_arch_variant),x86-atom)
+dvm_arch_variant := x86
+endif
+
 include $(LOCAL_PATH)/Dvm.mk
 
 LOCAL_SHARED_LIBRARIES += liblog libcutils libnativehelper libz