commit a0b98c738012d5bc37356bd0b16ad9c965ec56dd
author Brian Carlstrom <bdc@google.com> Fri Jan 09 19:23:39 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 09 19:23:40 2015 +0000
tree 154a128187cabf91fe72e852bc999d36d1c3a909
parent 7a1125bc632e150b934538036102807374406d2f
parent a57aaa3664b8791cebc209c96d1369dff61727ed

Merge "[MIPS64] Set ART base address for mips64"

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 62ad170..9dc8af3 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -44,7 +44,7 @@
 DEX2OAT_XMS := $(call get-product-default-property,dalvik.vm.dex2oat-Xms)
 DEX2OAT_XMX := $(call get-product-default-property,dalvik.vm.dex2oat-Xmx)
 
-ifeq ($(TARGET_ARCH),mips)
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),mips mips64))
 # MIPS specific overrides.
 # For MIPS the ART image is loaded at a lower address. This causes issues
 # with the image overlapping with memory on the host cross-compiling and