summaryrefslogtreecommitdiffstats
path: root/vm/ReconfigureDvm.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-04-02 22:19:15 -0700
committerBrian Carlstrom <bdc@google.com>2011-04-02 22:19:15 -0700
commit2cd0cb8b3cba2141d39a7edee6510d5eb48d84a4 (patch)
treeb5bf97d3e992eee387fa90f037199cc845643e65 /vm/ReconfigureDvm.mk
parent5e910a20f24124de351be1dd0e296612a9aee093 (diff)
downloadandroid_dalvik-2cd0cb8b3cba2141d39a7edee6510d5eb48d84a4.tar.gz
android_dalvik-2cd0cb8b3cba2141d39a7edee6510d5eb48d84a4.tar.bz2
android_dalvik-2cd0cb8b3cba2141d39a7edee6510d5eb48d84a4.zip
Use x86 variant in dalvik for TARGET_ARCH_VARIANT=x86-atom
Change-Id: I1f7968a5bf8e24f3a3feb5f5a40ee2c21294a0c3
Diffstat (limited to 'vm/ReconfigureDvm.mk')
-rw-r--r--vm/ReconfigureDvm.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/vm/ReconfigureDvm.mk b/vm/ReconfigureDvm.mk
index aada6fe52..8b6eb16f5 100644
--- 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