diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-19 16:59:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 16:59:16 +0000 |
| commit | 8074ff4d0f962a933586b9809d1f1bdffe1fe5ed (patch) | |
| tree | 108acf44d993774c54a67c70c72a15bb108bcf58 /core/config.mk | |
| parent | d9f11a3f2b0670ac68bfae782c5fe8c58032efc6 (diff) | |
| parent | a8355ecaadf9a0d052165d0cc14564927eb9a202 (diff) | |
| download | build-8074ff4d0f962a933586b9809d1f1bdffe1fe5ed.zip build-8074ff4d0f962a933586b9809d1f1bdffe1fe5ed.tar.gz build-8074ff4d0f962a933586b9809d1f1bdffe1fe5ed.tar.bz2 | |
am a8355eca: am 64f3a191: Merge "Multilib support for odex"
* commit 'a8355ecaadf9a0d052165d0cc14564927eb9a202':
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 1844e40..487bc69 100644 --- a/core/config.mk +++ b/core/config.mk @@ -533,20 +533,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 |