tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '708b56edc879847f418108cf360bc990bb2a502a':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
This commit is contained in:
Christopher Ferris 2015-03-07 17:09:20 +00:00 committed by Android Git Automerger
commit 46ba5456ad
1 changed files with 8 additions and 0 deletions
Show stats 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
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