diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-07-22 16:35:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 19:51:18 +0000 |
| commit | 2715dc678aa20d445af36c5ace22ef03a78b42cb (patch) | |
| tree | 4154c627b03e849cbbf1243cc9593699217a9fe5 | |
| parent | ab4a98a85d0af425904af81c72627457292c147f (diff) | |
| parent | 16de128da13427357a65cd2304b188bac5d06ddd (diff) | |
| download | build-2715dc678aa20d445af36c5ace22ef03a78b42cb.zip build-2715dc678aa20d445af36c5ace22ef03a78b42cb.tar.gz build-2715dc678aa20d445af36c5ace22ef03a78b42cb.tar.bz2 | |
Merge "Fix the MIPS build." into lmp-dev
| -rw-r--r-- | core/dex_preopt_libart.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 8fc0c67..7b75426 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -20,12 +20,7 @@ PRELOADED_CLASSES := frameworks/base/preloaded-classes # start of image reserved address space LIBART_IMG_HOST_BASE_ADDRESS := 0x60000000 - -ifeq ($(TARGET_ARCH),mips) -LIBART_IMG_TARGET_BASE_ADDRESS := 0x30000000 -else LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000 -endif define get-product-default-property $(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES)))) @@ -36,6 +31,17 @@ 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) +# 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 +# building the image. We therefore limit the Xmx value. This isn't done +# via a property as we want the larger Xmx value if we're running on a +# MIPS device. +LIBART_IMG_TARGET_BASE_ADDRESS := 0x30000000 +DEX2OAT_IMAGE_XMX := 128m +endif + ######################################################################## # The full system boot classpath |