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

* commit 'a0b98c738012d5bc37356bd0b16ad9c965ec56dd':
  [MIPS64] Set ART base address for mips64
This commit is contained in:
Brian Carlstrom 2015-01-09 19:36:39 +00:00 committed by Android Git Automerger
commit ad156cdd8d

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_XMS := $(call get-product-default-property,dalvik.vm.dex2oat-Xms)
DEX2OAT_XMX := $(call get-product-default-property,dalvik.vm.dex2oat-Xmx) 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. # MIPS specific overrides.
# For MIPS the ART image is loaded at a lower address. This causes issues # 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 # with the image overlapping with memory on the host cross-compiling and