diff options
| author | Colin Cross <ccross@android.com> | 2014-07-09 22:14:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-07-09 23:08:03 -0700 |
| commit | 44a3c1914032dc97aab152c83929e97ad41fb538 (patch) | |
| tree | 5e52be9ed4e1a7baa3a0ad7734df19b7b11e9984 /build/Android.oat.mk | |
| parent | 62526c377fe5242a723f154a373eccf5b9db416d (diff) | |
| download | art-44a3c1914032dc97aab152c83929e97ad41fb538.zip art-44a3c1914032dc97aab152c83929e97ad41fb538.tar.gz art-44a3c1914032dc97aab152c83929e97ad41fb538.tar.bz2 | |
art: fix host dex2oat runtime args
The runtime arguments need to be prefixed with -Xmx or -Xms.
This only worked before because DEX2OAT_XMS, etc. were blank
due to bugs in build/, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.
Change-Id: I18607a6fd8d0004466404045f8dc4495eb6ab275
Diffstat (limited to 'build/Android.oat.mk')
| -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 dd87f4a..61a2cde 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 $(DEX2OAT_IMAGE_XMS) --runtime-arg $(DEX2OAT_IMAGE_XMX) \ + $$(hide) $$(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) --runtime-arg -Xmx$(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 $(DEX2OAT_XMS) --runtime-arg $(DEX2OAT_XMX) \ + $$(hide) $$(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(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) \ |