summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiakai Zhang <jiakaiz@google.com>2021-08-11 04:26:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-11 04:26:57 +0000
commit45723ff037e5e91f67b2b247fc15049427e4ad06 (patch)
treeb27b01463388755905959e32acc9072ac333e7c0
parent7fc95508b5fd0fbf159cd6302f206f0484a6624b (diff)
parent7b4fead5e9441eeb9ff5a9336d500b49ffae8d97 (diff)
odrefresh: Respect "dalvik.vm.systemservercompilerfilter". am: 7b4fead5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15516271 Change-Id: I6e12120554b3bf4003747574f570266e5b7f13d1
-rw-r--r--odrefresh/odrefresh.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/odrefresh/odrefresh.cc b/odrefresh/odrefresh.cc
index e9c0c637bb..2cef50dfb2 100644
--- a/odrefresh/odrefresh.cc
+++ b/odrefresh/odrefresh.cc
@@ -1140,11 +1140,11 @@ class OnDeviceRefresh final {
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, 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);