summaryrefslogtreecommitdiffstats
path: root/core/dex_preopt_libart_boot.mk
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-10-17 01:05:50 -0700
committerIan Rogers <irogers@google.com>2014-11-08 17:07:23 -0800
commita18a28305d5bf2176f8aff197cf18cde81539379 (patch)
tree0a8a20658cb10eab43c5035d8972c688df8c705a /core/dex_preopt_libart_boot.mk
parentebc320900cf208fa4a495db4b3788179425cd898 (diff)
downloadbuild-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/dex_preopt_libart_boot.mk')
-rw-r--r--core/dex_preopt_libart_boot.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk
index 90a3b5a..49b6680 100644
--- a/core/dex_preopt_libart_boot.mk
+++ b/core/dex_preopt_libart_boot.mk
@@ -52,6 +52,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE
--oat-location=$(patsubst %.art,%.oat,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_BOOT_IMAGE_FILENAME)) \
--image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \
--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \
+ --instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \
$(PRODUCT_DEX_PREOPT_BOOT_FLAGS)