diff options
| -rw-r--r-- | dex2oat/dex2oat.cc | 12 | ||||
| -rw-r--r-- | runtime/oat_file_assistant.cc | 5 | ||||
| -rw-r--r-- | runtime/oat_file_assistant.h | 6 | ||||
| -rw-r--r-- | runtime/oat_file_assistant_test.cc | 19 |
4 files changed, 5 insertions, 37 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 70939c72b7..53e73c344e 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -112,18 +112,13 @@ static std::string CommandLine() { static std::string StrippedCommandLine() { std::vector<std::string> command; - // Do a pre-pass to look for zip-fd and the compiler filter. + // Do a pre-pass to look for zip-fd. bool saw_zip_fd = false; - bool saw_compiler_filter = false; for (int i = 0; i < original_argc; ++i) { if (android::base::StartsWith(original_argv[i], "--zip-fd=")) { saw_zip_fd = true; break; } - if (android::base::StartsWith(original_argv[i], "--compiler-filter=")) { - saw_compiler_filter = true; - break; - } } // Now filter out things. @@ -166,11 +161,6 @@ static std::string StrippedCommandLine() { command.push_back(original_argv[i]); } - if (!saw_compiler_filter) { - command.push_back("--compiler-filter=" + - CompilerFilter::NameOfFilter(CompilerFilter::kDefaultCompilerFilter)); - } - // Construct the final output. if (command.size() <= 1U) { // It seems only "/system/bin/dex2oat" is left, or not even that. Use a pretty line. diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index f0912cfa65..9e08b34b27 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -239,7 +239,7 @@ OatFileAssistant::MakeUpToDate(bool profile_changed, std::string* error_msg) { case kDex2OatForBootImage: case kDex2OatForRelocation: case kDex2OatForFilter: - return GenerateOatFileNoChecks(info, target, error_msg); + return GenerateOatFileNoChecks(info, error_msg); } UNREACHABLE(); } @@ -614,7 +614,7 @@ static bool PrepareOdexDirectories(const std::string& dex_location, } OatFileAssistant::ResultOfAttemptToUpdate OatFileAssistant::GenerateOatFileNoChecks( - OatFileAssistant::OatFileInfo& info, CompilerFilter::Filter filter, std::string* error_msg) { + OatFileAssistant::OatFileInfo& info, std::string* error_msg) { CHECK(error_msg != nullptr); Runtime* runtime = Runtime::Current(); @@ -689,7 +689,6 @@ OatFileAssistant::ResultOfAttemptToUpdate OatFileAssistant::GenerateOatFileNoChe args.push_back("--output-vdex-fd=" + std::to_string(vdex_file->Fd())); args.push_back("--oat-fd=" + std::to_string(oat_file->Fd())); args.push_back("--oat-location=" + oat_file_name); - args.push_back("--compiler-filter=" + CompilerFilter::NameOfFilter(filter)); if (!Dex2Oat(args, error_msg)) { // Manually delete the oat and vdex files. This ensures there is no garbage diff --git a/runtime/oat_file_assistant.h b/runtime/oat_file_assistant.h index 03d9ca38a8..7e2385ec6c 100644 --- a/runtime/oat_file_assistant.h +++ b/runtime/oat_file_assistant.h @@ -366,16 +366,14 @@ class OatFileAssistant { }; // Generate the oat file for the given info from the dex file using the - // current runtime compiler options and the specified filter. + // current runtime compiler options. // This does not check the current status before attempting to generate the // oat file. // // If the result is not kUpdateSucceeded, the value of error_msg will be set // to a string describing why there was a failure or the update was not // attempted. error_msg must not be null. - ResultOfAttemptToUpdate GenerateOatFileNoChecks(OatFileInfo& info, - CompilerFilter::Filter target, - std::string* error_msg); + ResultOfAttemptToUpdate GenerateOatFileNoChecks(OatFileInfo& info, std::string* error_msg); // Return info for the best oat file. OatFileInfo& GetBestInfo(); diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc index c7082d831a..b2b86ee289 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat_file_assistant_test.cc @@ -1232,25 +1232,6 @@ TEST_F(OatFileAssistantTest, DexOptStatusValues) { } } -// Verify that when no compiler filter is passed the default one from OatFileAssistant is used. -TEST_F(OatFileAssistantTest, DefaultMakeUpToDateFilter) { - std::string dex_location = GetScratchDir() + "/TestDex.jar"; - Copy(GetDexSrc1(), dex_location); - - OatFileAssistant oat_file_assistant(dex_location.c_str(), kRuntimeISA, false); - - const CompilerFilter::Filter default_filter = - OatFileAssistant::kDefaultCompilerFilterForDexLoading; - std::string error_msg; - EXPECT_EQ(OatFileAssistant::kUpdateSucceeded, - oat_file_assistant.MakeUpToDate(false, &error_msg)) << error_msg; - EXPECT_EQ(-OatFileAssistant::kNoDexOptNeeded, - oat_file_assistant.GetDexOptNeeded(default_filter)); - std::unique_ptr<OatFile> oat_file = oat_file_assistant.GetBestOatFile(); - EXPECT_NE(nullptr, oat_file.get()); - EXPECT_EQ(default_filter, oat_file->GetCompilerFilter()); -} - // TODO: More Tests: // * Test class linker falls back to unquickened dex for DexNoOat // * Test class linker falls back to unquickened dex for MultiDexNoOat |