Remove store_aggregation_counters argument from profile merging
Profiles no longer have aggregation counters and the flag has no effect.
Bug: 139884006
Test: m
Change-Id: I4af047782933280dd2eb79a94a4da11d8741633e
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 7eee749..8cba7e4 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -709,8 +709,7 @@
const unique_fd& reference_profile_fd,
const std::vector<unique_fd>& apk_fds,
const std::vector<std::string>& dex_locations,
- bool copy_and_update,
- bool store_aggregation_counters) {
+ bool copy_and_update) {
// TODO(calin): Assume for now we run in the bg compile job (which is in
// most of the invocation). With the current data flow, is not very easy or
@@ -742,10 +741,6 @@
AddArg("--copy-and-update-profile-key");
}
- if (store_aggregation_counters) {
- AddArg("--store-aggregation-counters");
- }
-
// Do not add after dex2oat_flags, they should override others for debugging.
PrepareArgs(profman_bin);
}
@@ -753,14 +748,12 @@
void SetupMerge(const std::vector<unique_fd>& profiles_fd,
const unique_fd& reference_profile_fd,
const std::vector<unique_fd>& apk_fds = std::vector<unique_fd>(),
- const std::vector<std::string>& dex_locations = std::vector<std::string>(),
- bool store_aggregation_counters = false) {
+ const std::vector<std::string>& dex_locations = std::vector<std::string>()) {
SetupArgs(profiles_fd,
reference_profile_fd,
apk_fds,
dex_locations,
- /*copy_and_update=*/false,
- store_aggregation_counters);
+ /*copy_and_update=*/false);
}
void SetupCopyAndUpdate(unique_fd&& profile_fd,
@@ -777,8 +770,7 @@
reference_profile_fd_,
apk_fds_,
dex_locations,
- /*copy_and_update=*/true,
- /*store_aggregation_counters=*/false);
+ /*copy_and_update=*/true);
}
void SetupDump(const std::vector<unique_fd>& profiles_fd,
@@ -792,8 +784,7 @@
reference_profile_fd,
apk_fds,
dex_locations,
- /*copy_and_update=*/false,
- /*store_aggregation_counters=*/false);
+ /*copy_and_update=*/false);
}
void Exec() {
@@ -2828,8 +2819,7 @@
args.SetupMerge(profiles_fd,
snapshot_fd,
apk_fds,
- dex_locations,
- /*store_aggregation_counters=*/true);
+ dex_locations);
pid_t pid = fork();
if (pid == 0) {
/* child -- drop privileges before continuing */