diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-07 17:09:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-07 17:09:20 +0000 |
| commit | 46ba5456ad33e0674929eefff0753e21301e6eba (patch) | |
| tree | d0e0d54002d3baddc6086b033a09df78c88f3b25 | |
| parent | e380c11dde6a9bffa786c0ea7a72608001c7d48e (diff) | |
| parent | 708b56edc879847f418108cf360bc990bb2a502a (diff) | |
| download | build-46ba5456ad33e0674929eefff0753e21301e6eba.zip build-46ba5456ad33e0674929eefff0753e21301e6eba.tar.gz build-46ba5456ad33e0674929eefff0753e21301e6eba.tar.bz2 | |
am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
* commit '708b56edc879847f418108cf360bc990bb2a502a':
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
| -rw-r--r-- | core/config.mk | 8 |
1 files changed, 8 insertions, 0 deletions
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 @@ 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 |