From 9de4d5ebb33d28f4095ef2d2db3150a5817ff349 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Fri, 6 Mar 2015 10:19:12 -0800 Subject: [PATCH] Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty. On non-arm architectures, there is no TARGET_CPU_VARIANT set. For x86, art assumes that the CPU variant is actually the TARGET_ARCH_VARIANT. Therefore, if no TARGET_CPU_VARIANT is set, use the TARGET_ARCH_VARIANT. If TARGET_ARCH_VARIANT is not set, then use default as the value. Change-Id: I17fc9e3ac7412462103b8f0b287fce106298b741 --- core/config.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/config.mk b/core/config.mk index e8b650421e..d6449d52dd 100644 --- a/core/config.mk +++ b/core/config.mk @@ -546,7 +546,15 @@ endif # Flags for DEX2OAT DEX2OAT_TARGET_ARCH := $(TARGET_ARCH) +ifeq ($(TARGET_CPU_VARIANT),) +ifeq ($(TARGET_ARCH_VARIANT),) +DEX2OAT_TARGET_CPU_VARIANT := default +else +DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_ARCH_VARIANT) +endif +else DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT) +endif DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default ifdef TARGET_2ND_ARCH