commit 875521e13c0780547a43b23ce9e2c1297b1fb72c
author Jiakai Zhang <jiakaiz@google.com> Tue Aug 10 15:50:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 10 15:50:40 2021 +0000
tree 377cd41fc2ea30dd2f3eb50e4426808ad1ee626c
parent ded7b4a389df14e1f68cc1977c3306bfde3829e4
parent 5503a8aef8019e536b9702326eccdc92e7be7644

odrefresh: Respect "dalvik.vm.systemservercompilerfilter". am: 5503a8aef8

Original change: https://android-review.googlesource.com/c/platform/art/+/1791510

Change-Id: Id4453cdb0e6093d1e605dd491f37f709461400a3

odrefresh/odrefresh.cc

diff --git a/odrefresh/odrefresh.cc b/odrefresh/odrefresh.cc
index 12199b3..bf76010 100644
--- a/odrefresh/odrefresh.cc
+++ b/odrefresh/odrefresh.cc
@@ -1291,11 +1291,11 @@
       const std::string jar_name(android::base::Basename(jar));
       const std::string profile = Concatenate({GetAndroidRoot(), "/framework/", jar_name, ".prof"});
       std::string compiler_filter =
-          android::base::GetProperty("dalvik.vm.systemservercompilerfilter", {});
+          android::base::GetProperty("dalvik.vm.systemservercompilerfilter", "speed");
       if (compiler_filter == "speed-profile") {
         AddDex2OatProfileAndCompilerFilter(&args, &readonly_files_raii, profile);
       } else {
-        args.emplace_back("--compiler-filter=speed");
+        args.emplace_back("--compiler-filter=" + compiler_filter);
       }
 
       const std::string image_location = GetSystemServerImagePath(/*on_system=*/false, jar);