From 8afeb85d3def12b559b7565fb6d3956f81b55132 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 2 Apr 2014 14:55:49 -0700 Subject: Pass instruction-set from runtime through to spawned dex2oat. Change-Id: I1727af7beb9f710c29124d4d6bc9175e4856f3cc --- runtime/gc/space/image_space.cc | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'runtime/gc') diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc index 9a2815a..faa539f 100644 --- a/runtime/gc/space/image_space.cc +++ b/runtime/gc/space/image_space.cc @@ -67,36 +67,6 @@ static bool GenerateImage(const std::string& image_file_name, std::string* error arg_vector.push_back("--runtime-arg"); arg_vector.push_back("-Xmx64m"); - arg_vector.push_back("--runtime-arg"); - std::string checkstr = "-implicit-checks"; - int nchecks = 0; - char checksep = ':'; - - if (!Runtime::Current()->ExplicitNullChecks()) { - checkstr += checksep; - checksep = ','; - checkstr += "null"; - ++nchecks; - } - if (!Runtime::Current()->ExplicitSuspendChecks()) { - checkstr += checksep; - checksep = ','; - checkstr += "suspend"; - ++nchecks; - } - - if (!Runtime::Current()->ExplicitStackOverflowChecks()) { - checkstr += checksep; - checksep = ','; - checkstr += "stack"; - ++nchecks; - } - - if (nchecks == 0) { - checkstr += ":none"; - } - - arg_vector.push_back(checkstr); for (size_t i = 0; i < boot_class_path.size(); i++) { arg_vector.push_back(std::string("--dex-file=") + boot_class_path[i]); @@ -108,6 +78,8 @@ static bool GenerateImage(const std::string& image_file_name, std::string* error oat_file_option_string += "oat"; arg_vector.push_back(oat_file_option_string); + Runtime::Current()->AddCurrentRuntimeFeaturesAsDex2OatArguments(&arg_vector); + arg_vector.push_back(StringPrintf("--base=0x%x", ART_BASE_ADDRESS)); if (kIsTargetBuild) { -- cgit v1.1