diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-09 04:07:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-08 22:56:31 +0000 |
| commit | 02a5b51798b06434b08ffe2f6e6c485e73cd42bc (patch) | |
| tree | ed89d20244e8993786f8c9d0d45372cfa1a7f3e6 /core | |
| parent | bc7501e10324caf1318769901d8a382d46be0b60 (diff) | |
| parent | cffe289dc6a5a248ac28805e1ad129681da002fe (diff) | |
| download | build-02a5b51798b06434b08ffe2f6e6c485e73cd42bc.zip build-02a5b51798b06434b08ffe2f6e6c485e73cd42bc.tar.gz build-02a5b51798b06434b08ffe2f6e6c485e73cd42bc.tar.bz2 | |
Merge "Make dex2oat heap size product configurable [build]"
Diffstat (limited to 'core')
| -rw-r--r-- | core/dex_preopt_libart.mk | 11 | ||||
| -rw-r--r-- | core/dex_preopt_libart_boot.mk | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 411af75..90ba543 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -27,6 +27,15 @@ else LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000 endif +define get-product-property + $(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_PROPERTY_OVERRIDES)))) +endef + +DEX2OAT_IMAGE_XMS := $(get-product-property dalvik.vm.image-dex2oat-Xms) +DEX2OAT_IMAGE_XMX := $(get-product-property dalvik.vm.image-dex2oat-Xmx) +DEX2OAT_XMS := $(get-product-property dalvik.vm.dex2oat-Xms) +DEX2OAT_XMX := $(get-product-property dalvik.vm.dex2oat-Xmx) + ######################################################################## # The full system boot classpath @@ -68,7 +77,7 @@ define dex2oat-one-file $(hide) rm -f $(2) $(hide) mkdir -p $(dir $(2)) $(hide) $(DEX2OATD) \ - --runtime-arg -Xms64m --runtime-arg -Xmx64m \ + --runtime-arg $(DEX2OAT_XMS) --runtime-arg $(DEX2OAT_XMX) \ --boot-image=$(PRIVATE_DEX_PREOPT_IMAGE_LOCATION) \ --dex-file=$(1) \ --dex-location=$(PRIVATE_DEX_LOCATION) \ diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index 70130b6..e48e3f9 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -43,7 +43,8 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE @echo "target dex2oat: $@ ($?)" @mkdir -p $(dir $@) @mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED)) - $(hide) $(DEX2OATD) --runtime-arg -Xms256m --runtime-arg -Xmx256m --image-classes=$(PRELOADED_CLASSES) \ + $(hide) $(DEX2OATD) --runtime-arg $(DEX2OAT_IMAGE_XMS) --runtime-arg $(DEX2OAT_IMAGE_XMX) \ + --image-classes=$(PRELOADED_CLASSES) \ $(addprefix --dex-file=,$(LIBART_TARGET_BOOT_DEX_FILES)) \ $(addprefix --dex-location=,$(LIBART_TARGET_BOOT_DEX_LOCATIONS)) \ --oat-symbols=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED) \ |