StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."

Browse Source
This commit is contained in:
Christopher Ferris
2015-03-06 21:27:47 +00:00
committed by Gerrit Code Review
parent 9a0382ffe6 9de4d5ebb3
commit 708b56edc8
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/config.mk
View File

@@ -546,7 +546,15 @@ endif
# Flags for DEX2OAT # Flags for DEX2OAT
DEX2OAT_TARGET_ARCH := $(TARGET_ARCH) 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) DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)
endif
DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH