commit cffe289dc6a5a248ac28805e1ad129681da002fe
author Brian Carlstrom <bdc@google.com> Tue Jul 08 10:35:29 2014 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jul 08 11:33:45 2014 -0700
tree 102fc852122da4acdd69e67ecdcb7fc4b037cc18
parent 979d578ee40c0a7d3e25915049350a23165f7a5a

Make dex2oat heap size product configurable [build]

Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45

core/dex_preopt_libart.mk

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 @@
 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 @@
 $(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) \