p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am: 6c45f4493e 

am: 3c131856ee

* commit '3c131856ee9e08c69830675cfc6c3597f783816a':
  Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
This commit is contained in:
Andreas Gampe 2015-10-20 23:54:53 +00:00 committed by android-build-merger
parent 7f07d0bc4d 3c131856ee
commit 92a73a0f6c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/config.mk
View File

@ -660,21 +660,14 @@ ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
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