diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-16 18:06:02 -0700 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2014-07-22 09:46:37 +0200 |
| commit | 16de128da13427357a65cd2304b188bac5d06ddd (patch) | |
| tree | d85cc31fe22bcfc8e3c29f4b27b2d3e80c314bfa | |
| parent | 0ea63e0cbd974863f9c828951d3a9228de962db6 (diff) | |
| download | build-16de128da13427357a65cd2304b188bac5d06ddd.zip build-16de128da13427357a65cd2304b188bac5d06ddd.tar.gz build-16de128da13427357a65cd2304b188bac5d06ddd.tar.bz2 | |
Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224
(cherry picked from commit 7d70f830bce969575b358a39e041e85013881cd4)
Change-Id: Ic13b471c74325e8145a0a9c93a417355505e484a
| -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 |