diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | build/Android.oat.mk | 4 | ||||
| -rw-r--r-- | runtime/class_linker.cc | 4 | ||||
| -rw-r--r-- | runtime/gc/space/image_space.cc | 7 | ||||
| -rw-r--r-- | test/Android.oat.mk | 2 |
5 files changed, 4 insertions, 15 deletions
diff --git a/Android.mk b/Android.mk index 9c206400fc..3f4ead60d1 100644 --- a/Android.mk +++ b/Android.mk @@ -324,7 +324,7 @@ oat-target-$(1): $$(OUT_OAT_FILE) $$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OATD_DEPENDENCY) @mkdir -p $$(dir $$@) - $(DEX2OATD) --runtime-arg -Xms64m --runtime-arg -Xmx64m \ + $(DEX2OATD) --runtime-arg $(DEX2OAT_XMS) --runtime-arg $(DEX2OAT_XMX) \ --boot-image=$(DEFAULT_DEX_PREOPT_BUILT_IMAGE) --dex-file=$(PRODUCT_OUT)/$(1) \ --dex-location=/$(1) --oat-file=$$@ \ --instruction-set=$(DEX2OAT_TARGET_ARCH) \ 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) \ diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 0e4028b4c9..860cbd207e 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -581,10 +581,6 @@ bool ClassLinker::GenerateOatFile(const char* dex_filename, std::vector<std::string> argv; argv.push_back(dex2oat); argv.push_back("--runtime-arg"); - argv.push_back("-Xms64m"); - argv.push_back("--runtime-arg"); - argv.push_back("-Xmx64m"); - argv.push_back("--runtime-arg"); argv.push_back("-classpath"); argv.push_back("--runtime-arg"); argv.push_back(Runtime::Current()->GetClassPathString()); diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc index 891ace8206..a87aa890c8 100644 --- a/runtime/gc/space/image_space.cc +++ b/runtime/gc/space/image_space.cc @@ -61,13 +61,6 @@ static bool GenerateImage(const std::string& image_filename, std::string* error_ image_option_string += image_filename; arg_vector.push_back(image_option_string); - arg_vector.push_back("--runtime-arg"); - arg_vector.push_back("-Xms64m"); - - arg_vector.push_back("--runtime-arg"); - arg_vector.push_back("-Xmx64m"); - - for (size_t i = 0; i < boot_class_path.size(); i++) { arg_vector.push_back(std::string("--dex-file=") + boot_class_path[i]); } diff --git a/test/Android.oat.mk b/test/Android.oat.mk index 13d452c7e8..fec2540e9c 100644 --- a/test/Android.oat.mk +++ b/test/Android.oat.mk @@ -193,7 +193,7 @@ $(3): PRIVATE_OAT_FILE := $$(oat_file) $(3): $$(ART_TEST_HOST_OAT_$(1)_DEX) $(ART_TEST_HOST_OAT_DEPENDENCIES) $(hide) mkdir -p $(ART_HOST_TEST_DIR)/android-data-$$@/dalvik-cache/$$($(2)HOST_ARCH) $(hide) cp $$(realpath $$<) $(ART_HOST_TEST_DIR)/android-data-$$@/oat-test-dex-$(1).jar - $(hide) $(DEX2OATD) $(DEX2OAT_FLAGS) --runtime-arg -Xms16m --runtime-arg -Xmx16m $(4) \ + $(hide) $(DEX2OATD) $(DEX2OAT_FLAGS) --runtime-arg $(DEX2OAT_XMS) --runtime-arg $(DEX2OAT_XMX) $(4) \ --boot-image=$$(HOST_CORE_IMG_LOCATION) \ --dex-file=$$(PRIVATE_DEX_FILE) --oat-file=$$(PRIVATE_OAT_FILE) \ --instruction-set=$($(2)ART_HOST_ARCH) --host --android-root=$(HOST_OUT) \ |