diff options
| author | Douglas Leung <douglas.leung@imgtec.com> | 2015-03-18 11:29:14 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-20 12:54:23 -0700 |
| commit | 3d12eadf67e263ebc7e533f8daa65029feb41313 (patch) | |
| tree | 3d6c19a669df665c09ef6c4bcaf1ca0840a51999 /build | |
| parent | 157fb9e52b8f11daeec5fbd6286853e0b920c215 (diff) | |
| download | art-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 'build')
| -rw-r--r-- | build/Android.oat.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 4d2fa41..710b130 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -230,6 +230,7 @@ $$(core_image_name): $$(TARGET_CORE_DEX_FILES) $$(core_dex2oat_dependency) $$(addprefix --dex-location=,$$(TARGET_CORE_DEX_LOCATIONS)) --oat-file=$$(PRIVATE_CORE_OAT_NAME) \ --oat-location=$$(PRIVATE_CORE_OAT_NAME) --image=$$(PRIVATE_CORE_IMG_NAME) \ --base=$$(LIBART_IMG_TARGET_BASE_ADDRESS) --instruction-set=$$($(3)TARGET_ARCH) \ + --instruction-set-variant=$$($(3)DEX2OAT_TARGET_CPU_VARIANT) \ --instruction-set-features=$$($(3)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ --android-root=$$(PRODUCT_OUT)/system --include-patch-information \ $$(PRIVATE_CORE_COMPILE_OPTIONS) || (rm $$(PRIVATE_CORE_OAT_NAME); exit 1) |