summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDouglas Leung <douglas.leung@imgtec.com>2015-03-18 11:29:14 -0700
committerAndreas Gampe <agampe@google.com>2015-03-20 12:54:23 -0700
commit3d12eadf67e263ebc7e533f8daa65029feb41313 (patch)
tree3d6c19a669df665c09ef6c4bcaf1ca0840a51999 /Android.mk
parent157fb9e52b8f11daeec5fbd6286853e0b920c215 (diff)
downloadart-3d12eadf67e263ebc7e533f8daa65029feb41313.zip
art-3d12eadf67e263ebc7e533f8daa65029feb41313.tar.gz
art-3d12eadf67e263ebc7e533f8daa65029feb41313.tar.bz2
ART: Change the isa defaults for Mips
Select the correct cpu variant for ART and select the default features based on compile flags for when the variant is not defined. Change-Id: I13622db85446ed6fbb467a699d8d3e27833f6f88
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index c740a0d..216e865 100644
--- a/Android.mk
+++ b/Android.mk
@@ -360,6 +360,7 @@ $$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OA
--boot-image=$(DEFAULT_DEX_PREOPT_BUILT_IMAGE) --dex-file=$(PRODUCT_OUT)/$(1) \
--dex-location=/$(1) --oat-file=$$@ \
--instruction-set=$(DEX2OAT_TARGET_ARCH) \
+ --instruction-set-variant=$(DEX2OAT_TARGET_CPU_VARIANT) \
--instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
--android-root=$(PRODUCT_OUT)/system --include-patch-information \
--runtime-arg -Xnorelocate