summaryrefslogtreecommitdiffstats
path: root/build/Android.oat.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-07-08 10:34:02 -0700
committerBrian Carlstrom <bdc@google.com>2014-07-08 11:33:38 -0700
commit670134e8555d40fc880271b1ab97483094b4b816 (patch)
treebc9cac50dbcfe518d1f54005bb3b4d035637578c /build/Android.oat.mk
parente8a30f37bf1530a80a7df17692dbe7a68764ac30 (diff)
downloadart-670134e8555d40fc880271b1ab97483094b4b816.zip
art-670134e8555d40fc880271b1ab97483094b4b816.tar.gz
art-670134e8555d40fc880271b1ab97483094b4b816.tar.bz2
Make dex2oat heap size product configurable [art]
Bug: 15919420 Change-Id: I1b4f3256f6352b2d3e268991406def9e8efab945
Diffstat (limited to 'build/Android.oat.mk')
-rw-r--r--build/Android.oat.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index d3c8d7e..dd87f4a 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -29,7 +29,7 @@ define create-core-oat-host-rules
$$($(1)HOST_CORE_IMG_OUT): $$(HOST_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENCY)
@echo "host dex2oat: $$@ ($$?)"
@mkdir -p $$(dir $$@)
- $$(hide) $$(DEX2OATD) --runtime-arg -Xms16m --runtime-arg -Xmx16m \
+ $$(hide) $$(DEX2OATD) --runtime-arg $(DEX2OAT_IMAGE_XMS) --runtime-arg $(DEX2OAT_IMAGE_XMX) \
--image-classes=$$(PRELOADED_CLASSES) $$(addprefix --dex-file=,$$(HOST_CORE_DEX_FILES)) \
$$(addprefix --dex-location=,$$(HOST_CORE_DEX_LOCATIONS)) --oat-file=$$($(1)HOST_CORE_OAT_OUT) \
--oat-location=$$($(1)HOST_CORE_OAT) --image=$$($(1)HOST_CORE_IMG_OUT) \
@@ -57,7 +57,7 @@ define create-core-oat-target-rules
$$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENCY)
@echo "target dex2oat: $$@ ($$?)"
@mkdir -p $$(dir $$@)
- $$(hide) $$(DEX2OATD) --runtime-arg -Xms16m --runtime-arg -Xmx16m \
+ $$(hide) $$(DEX2OATD) --runtime-arg $(DEX2OAT_XMS) --runtime-arg $(DEX2OAT_XMX) \
--image-classes=$$(PRELOADED_CLASSES) $$(addprefix --dex-file=,$$(TARGET_CORE_DEX_FILES)) \
$$(addprefix --dex-location=,$$(TARGET_CORE_DEX_LOCATIONS)) --oat-file=$$($(1)TARGET_CORE_OAT_OUT) \
--oat-location=$$($(1)TARGET_CORE_OAT) --image=$$($(1)TARGET_CORE_IMG_OUT) \