am ad156cdd: am a0b98c73: Merge "[MIPS64] Set ART base address for mips64"

* commit 'ad156cdd8d2ea2d98281b6d43a98073a5b86f5ab':
  [MIPS64] Set ART base address for mips64
This commit is contained in:
Brian Carlstrom 2015-01-09 19:43:41 +00:00 committed by Android Git Automerger
commit 25588e7125
1 changed files with 1 additions and 1 deletions

View File

@ -44,7 +44,7 @@ DEX2OAT_IMAGE_XMX := $(call get-product-default-property,dalvik.vm.image-dex2oat
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