diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-17 01:05:50 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-11-08 17:07:23 -0800 |
| commit | a18a28305d5bf2176f8aff197cf18cde81539379 (patch) | |
| tree | 0a8a20658cb10eab43c5035d8972c688df8c705a /core/main.mk | |
| parent | ebc320900cf208fa4a495db4b3788179425cd898 (diff) | |
| download | build-a18a28305d5bf2176f8aff197cf18cde81539379.zip build-a18a28305d5bf2176f8aff197cf18cde81539379.tar.gz build-a18a28305d5bf2176f8aff197cf18cde81539379.tar.bz2 | |
Pass instruction set variant to dex2oat.
Also, add it to the ANDROID_BUILD_PROPERTIES.
Remove non-default instruction set features.
Bug: 18056890
Change-Id: I9169cdfecbb176f62b941852948222edc3f511fd
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/main.mk b/core/main.mk index 4234b30..7f4b217 100644 --- a/core/main.mk +++ b/core/main.mk @@ -305,9 +305,18 @@ ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),) is_sdk_build := true endif -ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) +# Add build properties for ART. These define system properties used by installd +# to pass flags to dex2oat. +ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).variant=$(DEX2OAT_TARGET_CPU_VARIANT) +ifneq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),) + ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) +endif + ifdef TARGET_2ND_ARCH -ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_2ND_ARCH).features=$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) + ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_2ND_ARCH).variant=$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) + ifneq ($($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),) + ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_2ND_ARCH).features=$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) + endif endif ## user/userdebug ## |