diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-20 19:56:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-20 19:56:22 +0000 |
| commit | 2a39584820c46c18c3b013e13d758c707e9f363e (patch) | |
| tree | 693b528462ed70b4d2dfff40e3b022b3c26b0111 /build | |
| parent | dbd065a8df06e7595a0ed05d3c18e68b6dac9cd1 (diff) | |
| parent | 3d12eadf67e263ebc7e533f8daa65029feb41313 (diff) | |
| download | art-2a39584820c46c18c3b013e13d758c707e9f363e.zip art-2a39584820c46c18c3b013e13d758c707e9f363e.tar.gz art-2a39584820c46c18c3b013e13d758c707e9f363e.tar.bz2 | |
Merge "ART: Change the isa defaults for Mips"
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) |