commit 390f9fdc0723c01bc80d97e6f80d2e6db0d5e3ae
author Christopher Ferris <cferris@google.com> Sun Mar 08 00:12:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Mar 08 00:12:48 2015 +0000
tree d7ed204f1bb7b3b4a4aaa9d4ba74a492fd75f5f8
parent 8b73c76a30414c23e079b99a5b85885f0a2ec9c5
parent f3382443cde82feeb1ceee32a2538f96fba44b80

am f3382443: am 46ba5456: am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."

* commit 'f3382443cde82feeb1ceee32a2538f96fba44b80':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index aa5efc4..ac43d41 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -577,7 +577,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