Delete obsolete --compact-dex-level flag.

Test: art_artd_tests
Bug: 325430813
Change-Id: I2fcc34c60b3abfba5dbbe9182b3b5b3f579ad8f1

3 files changed, 5 insertions, 10 deletions

diff --git a/artd/artd.cc b/artd/artd.cc
index b72dc114b6..f7be4cdcc4 100644
--- a/artd/artd.cc
+++ b/artd/artd.cc
@@ -1172,8 +1172,7 @@ ndk::ScopedAStatus Artd::dexopt(
   }
 
   AddBootImageFlags(args);
-  AddCompilerConfigFlags(
-      in_instructionSet, in_compilerFilter, in_priorityClass, in_dexoptOptions, args);
+  AddCompilerConfigFlags(in_instructionSet, in_compilerFilter, in_dexoptOptions, args);
   AddPerfConfigFlags(in_priorityClass, art_exec_args, args);
 
   // For being surfaced in crash reports on crashes.
@@ -1794,7 +1793,6 @@ void Artd::AddBootImageFlags(/*out*/ CmdlineBuilder& args) {
 
 void Artd::AddCompilerConfigFlags(const std::string& instruction_set,
                                   const std::string& compiler_filter,
-                                  PriorityClass priority_class,
                                   const DexoptOptions& dexopt_options,
                                   /*out*/ CmdlineBuilder& args) {
   args.Add("--instruction-set=%s", instruction_set);
@@ -1806,8 +1804,6 @@ void Artd::AddCompilerConfigFlags(const std::string& instruction_set,
   args.Add("--compiler-filter=%s", compiler_filter)
       .Add("--compilation-reason=%s", dexopt_options.compilationReason);
 
-  args.AddIf(priority_class >= PriorityClass::INTERACTIVE, "--compact-dex-level=none");
-
   args.AddIfNonEmpty("--max-image-block-size=%s",
                      props_->GetOrEmpty("dalvik.vm.dex2oat-max-image-block-size"))
       .AddIfNonEmpty("--very-large-app-threshold=%s",
diff --git a/artd/artd.h b/artd/artd.h
index fd601302d9..7426901688 100644
--- a/artd/artd.h
+++ b/artd/artd.h
@@ -334,7 +334,6 @@ class Artd : public aidl::com::android::server::art::BnArtd {
 
   void AddCompilerConfigFlags(const std::string& instruction_set,
                               const std::string& compiler_filter,
-                              aidl::com::android::server::art::PriorityClass priority_class,
                               const aidl::com::android::server::art::DexoptOptions& dexopt_options,
                               /*out*/ art::tools::CmdlineBuilder& args);
 
diff --git a/artd/artd_test.cc b/artd/artd_test.cc
index 8fecb084ae..76167c58fb 100644
--- a/artd/artd_test.cc
+++ b/artd/artd_test.cc
@@ -811,7 +811,7 @@ TEST_F(ArtdTest, dexoptPriorityClassBoot) {
               DoExecAndReturnCode(WhenSplitBy("--",
                                               AllOf(Not(Contains(Flag("--set-task-profile=", _))),
                                                     Not(Contains(Flag("--set-priority=", _)))),
-                                              Contains(Flag("--compact-dex-level=", "none"))),
+                                              _),
                                   _,
                                   _))
       .WillOnce(Return(0));
@@ -825,7 +825,7 @@ TEST_F(ArtdTest, dexoptPriorityClassInteractive) {
                   WhenSplitBy("--",
                               AllOf(Contains(Flag("--set-task-profile=", "Dex2OatBootComplete")),
                                     Contains(Flag("--set-priority=", "background"))),
-                              Contains(Flag("--compact-dex-level=", "none"))),
+                              _),
                   _,
                   _))
       .WillOnce(Return(0));
@@ -839,7 +839,7 @@ TEST_F(ArtdTest, dexoptPriorityClassInteractiveFast) {
                   WhenSplitBy("--",
                               AllOf(Contains(Flag("--set-task-profile=", "Dex2OatBootComplete")),
                                     Contains(Flag("--set-priority=", "background"))),
-                              Contains(Flag("--compact-dex-level=", "none"))),
+                              _),
                   _,
                   _))
       .WillOnce(Return(0));
@@ -853,7 +853,7 @@ TEST_F(ArtdTest, dexoptPriorityClassBackground) {
                   WhenSplitBy("--",
                               AllOf(Contains(Flag("--set-task-profile=", "Dex2OatBackground")),
                                     Contains(Flag("--set-priority=", "background"))),
-                              Not(Contains(Flag("--compact-dex-level=", _)))),
+                              _),
                   _,
                   _))
       .WillOnce(Return(0));