diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-09 04:07:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-08 21:53:44 +0000 |
| commit | 6e524ddc060f10a493dc63fa5b6dde0deef22219 (patch) | |
| tree | 8e23be4f3732ea585f369dfcd989d0d0d9a57b76 /build | |
| parent | 3d30b073541f19470e8b5dddef9377411fa587c3 (diff) | |
| parent | 670134e8555d40fc880271b1ab97483094b4b816 (diff) | |
| download | art-6e524ddc060f10a493dc63fa5b6dde0deef22219.tar.gz art-6e524ddc060f10a493dc63fa5b6dde0deef22219.tar.bz2 art-6e524ddc060f10a493dc63fa5b6dde0deef22219.zip | |
Merge "Make dex2oat heap size product configurable [art]"
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.oat.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index d3c8d7ee40..dd87f4a58e 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) \ |