Merge "Perfprofd: Update comments"
diff --git a/perfprofd/binder_interface/perfprofd_config.proto b/perfprofd/binder_interface/perfprofd_config.proto
index 349947b..cfd85ed 100644
--- a/perfprofd/binder_interface/perfprofd_config.proto
+++ b/perfprofd/binder_interface/perfprofd_config.proto
@@ -21,8 +21,7 @@
// loop. Value of zero indicates that we should loop forever.
optional uint32 main_loop_iterations = 3;
- // Destination directory (where to write profiles). This location
- // chosen since it is accessible to the uploader service.
+ // Destination directory (where to write profiles).
optional string destination_directory = 4;
// Config directory (where to read configs).
optional string config_directory = 5;
diff --git a/perfprofd/config.h b/perfprofd/config.h
index 0ee2309..0124770 100644
--- a/perfprofd/config.h
+++ b/perfprofd/config.h
@@ -42,8 +42,7 @@
// the whole system will be profiled.
int32_t process = -1;
- // Destination directory (where to write profiles). This location
- // chosen since it is accessible to the uploader service.
+ // Destination directory (where to write profiles).
std::string destination_directory = "/data/misc/perfprofd";
// Config directory (where to read configs).
std::string config_directory = "/data/data/com.google.android.gms/files";
diff --git a/perfprofd/configreader.cc b/perfprofd/configreader.cc
index def3f18..842adcb 100644
--- a/perfprofd/configreader.cc
+++ b/perfprofd/configreader.cc
@@ -80,8 +80,7 @@
// loop. Value of zero indicates that we should loop forever.
addUnsignedEntry("main_loop_iterations", config.main_loop_iterations, 0, UINT32_MAX);
- // Destination directory (where to write profiles). This location
- // chosen since it is accessible to the uploader service.
+ // Destination directory (where to write profiles).
addStringEntry("destination_directory", config.destination_directory.c_str());
// Config directory (where to read configs).
diff --git a/perfprofd/perfprofd_cmdline.cc b/perfprofd/perfprofd_cmdline.cc
index fb9c2c1..0bc6bdc 100644
--- a/perfprofd/perfprofd_cmdline.cc
+++ b/perfprofd/perfprofd_cmdline.cc
@@ -215,8 +215,7 @@
return config;
};
auto reread_config = [&config_reader, config]() {
- // Reread config file -- the uploader may have rewritten it as a result
- // of a gservices change
+ // Reread config file -- the uploader may have rewritten it.
config_reader.readFile();
config_reader.FillConfig(config);
};