commit 708b56edc879847f418108cf360bc990bb2a502a
author Christopher Ferris <cferris@google.com> Fri Mar 06 21:27:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 06 21:27:47 2015 +0000
tree 1063c79a8b23d74ef3250d675310be18f39a9715
parent 9a0382ffe64ad8ccecc15141779627a882f31ee0
parent 9de4d5ebb33d28f4095ef2d2db3150a5817ff349

Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index e8b6504..d6449d5 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -546,7 +546,15 @@
 
 # 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