diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-19 17:04:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 17:04:54 +0000 |
| commit | 8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862 (patch) | |
| tree | 5018529aac7cae890da3770fe8f40889e21faf30 /core/config.mk | |
| parent | d9af5a545855f5919c6a8655c2011c9a9c0b30c7 (diff) | |
| parent | 8074ff4d0f962a933586b9809d1f1bdffe1fe5ed (diff) | |
| download | build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.zip build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.tar.gz build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.tar.bz2 | |
am 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex"
* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
Multilib support for odex
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/core/config.mk b/core/config.mk index 12aff6c..cc0e19f 100644 --- a/core/config.mk +++ b/core/config.mk @@ -536,20 +536,17 @@ TARGET_CPU_SMP ?= true DEX2OAT_TARGET_ARCH := $(TARGET_ARCH) DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default +ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver)) + DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div +endif -# If for a 64bit build we have a 2nd architecture but the zygote isn't 64bit, -# assume DEX2OAT should DEXPREOPT for the 2nd architecture. ifdef TARGET_2ND_ARCH - ifeq (true,$(TARGET_IS_64_BIT)) - ifeq ($(filter ro.zygote=zygote64,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES)),) - DEX2OAT_TARGET_ARCH := $(TARGET_2ND_ARCH) - DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_2ND_CPU_VARIANT) - endif - endif +$(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_INSTRUCTION_SET_FEATURES := default +ifneq (,$(filter $($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver)) + $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div endif - -ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver)) - DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div endif # define clang/llvm tools and global flags |