commit fc8b331858747f8207e3861c0ada2c4fd359f648
author Colin Cross <ccross@android.com> Wed Oct 21 00:15:33 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 21 00:15:33 2015 +0000
tree 91a0709bd8c8964c0cc7f7e6fdeb1ab79072397a
parent 6c45f4493e125f4632ee0d0ed95d0198018cbb80
parent 466ea35202f5e858f6f9191cb43d99d113698f5d

Merge changes I2ba90314,I5f47307d

* changes:
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 2b67d6b..848a462 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -660,21 +660,14 @@
 endif
 
 # Flags for DEX2OAT
+first_non_empty_of_three = $(if $(1),$(1),$(if $(2),$(2),$(3)))
 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_CPU_VARIANT := $(call first_non_empty_of_three,$(TARGET_CPU_VARIANT),$(TARGET_ARCH_VARIANT),default)
 DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
 
 ifdef TARGET_2ND_ARCH
 $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH := $(TARGET_2ND_ARCH)
-$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_2ND_CPU_VARIANT)
+$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(call first_non_empty_of_three,$(TARGET_2ND_CPU_VARIANT),$(TARGET_2ND_ARCH_VARIANT),default)
 $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
 endif