Merge "Allow x86+arm multilib build."
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 6952d69..6befec5 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -63,7 +63,11 @@
ART_TARGET_ARCH_64 := $(TARGET_ARCH)
else
# TODO: ???
- $(error Do not know what to do with this multi-target configuration!)
+ $(warning Do not know what to do with this multi-target configuration!)
+ ART_PHONY_TEST_TARGET_SUFFIX := 32
+ 2ND_ART_PHONY_TEST_TARGET_SUFFIX :=
+ ART_TARGET_ARCH_32 := $(TARGET_ARCH)
+ ART_TARGET_ARCH_64 :=
endif
else
ifneq ($(filter %64,$(TARGET_ARCH)),)
diff --git a/compiler/Android.mk b/compiler/Android.mk
index f12f007..e6ff8f6 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -299,28 +299,6 @@
endif
endif
- ifeq ($$(art_target_or_host),target)
- ifeq ($$(art_ndebug_or_debug),debug)
- $(TARGET_OUT_EXECUTABLES)/dex2oatd: $$(LOCAL_INSTALLED_MODULE)
- else
- $(TARGET_OUT_EXECUTABLES)/dex2oat: $$(LOCAL_INSTALLED_MODULE)
- endif
- else # host
- ifeq ($$(art_ndebug_or_debug),debug)
- ifeq ($$(art_static_or_shared),static)
- $(HOST_OUT_EXECUTABLES)/dex2oatds: $$(LOCAL_INSTALLED_MODULE)
- else
- $(HOST_OUT_EXECUTABLES)/dex2oatd: $$(LOCAL_INSTALLED_MODULE)
- endif
- else
- ifeq ($$(art_static_or_shared),static)
- $(HOST_OUT_EXECUTABLES)/dex2oats: $$(LOCAL_INSTALLED_MODULE)
- else
- $(HOST_OUT_EXECUTABLES)/dex2oat: $$(LOCAL_INSTALLED_MODULE)
- endif
- endif
- endif
-
# Clear locally defined variables.
art_target_or_host :=
art_ndebug_or_debug :=
