summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHidehiko Abe <hidehiko@google.com>2018-04-16 14:40:49 +0900
committerHidehiko Abe <hidehiko@google.com>2018-04-16 14:40:49 +0900
commit28fbe310b77de4522ee7c21508ec1a99778a0887 (patch)
treed3c6b871bf9ac424f868202f58fdced4c03d9519
parent34c1558fedad7b65b8595d9e452e3190efa3ed12 (diff)
downloadlibchrome-28fbe310b77de4522ee7c21508ec1a99778a0887.tar.gz
Update comment.
To address remaining review comments in https://android-review.googlesource.com/c/platform/external/libchrome/+/638248 Bug: None Test: Ran update_libchrom.py. Change-Id: If7738fb4419f597b21dff287b23f6888f91d4625
-rw-r--r--base/process/process_metrics_unittest.cc2
-rw-r--r--base/test/multiprocess_test.cc2
-rw-r--r--libchrome_tools/patch/subprocess.patch4
-rw-r--r--libchrome_tools/update_libchrome.py3
4 files changed, 5 insertions, 6 deletions
diff --git a/base/process/process_metrics_unittest.cc b/base/process/process_metrics_unittest.cc
index 288cde9fc6..d9c8aaa2fe 100644
--- a/base/process/process_metrics_unittest.cc
+++ b/base/process/process_metrics_unittest.cc
@@ -549,7 +549,7 @@ MULTIPROCESS_TEST_MAIN(ChildMain) {
} // namespace
-// Arc++ note: don't compile as SpawnMultiProcessTestChild brings in a lot of
+// ARC note: don't compile as SpawnMultiProcessTestChild brings in a lot of
// extra dependency.
#if !defined(OS_ANDROID) && !defined(__ANDROID__) && !defined(__ANDROID_HOST__)
TEST(ProcessMetricsTest, GetOpenFdCount) {
diff --git a/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc
index c8fd3eddad..3e09e69399 100644
--- a/base/test/multiprocess_test.cc
+++ b/base/test/multiprocess_test.cc
@@ -54,7 +54,7 @@ CommandLine GetMultiProcessTestChildBaseCommandLine() {
MultiProcessTest::MultiProcessTest() {
}
-// Don't compile on Arc++.
+// Don't compile on ARC.
#if 0
SpawnChildResult MultiProcessTest::SpawnChild(const std::string& procname) {
LaunchOptions options;
diff --git a/libchrome_tools/patch/subprocess.patch b/libchrome_tools/patch/subprocess.patch
index ad4457d2d0..ff1d02d3dd 100644
--- a/libchrome_tools/patch/subprocess.patch
+++ b/libchrome_tools/patch/subprocess.patch
@@ -4,7 +4,7 @@
} // namespace
-+// Arc++ note: don't compile as SpawnMultiProcessTestChild brings in a lot of
++// ARC note: don't compile as SpawnMultiProcessTestChild brings in a lot of
+// extra dependency.
+#if !defined(OS_ANDROID) && !defined(__ANDROID__) && !defined(__ANDROID_HOST__)
TEST(ProcessMetricsTest, GetOpenFdCount) {
@@ -59,7 +59,7 @@
MultiProcessTest::MultiProcessTest() {
}
-+// Don't compile on Arc++.
++// Don't compile on ARC.
+#if 0
SpawnChildResult MultiProcessTest::SpawnChild(const std::string& procname) {
LaunchOptions options;
diff --git a/libchrome_tools/update_libchrome.py b/libchrome_tools/update_libchrome.py
index 89d97c26b1..b92615b624 100644
--- a/libchrome_tools/update_libchrome.py
+++ b/libchrome_tools/update_libchrome.py
@@ -62,8 +62,7 @@ _IMPORT_BLACKLIST = [
'base/allocator/features.h',
'base/debug/debugging_flags.h',
- # Blacklist several third party libraries, instead system libraries should
- # be used.
+ # Blacklist several third party libraries; system libraries should be used.
'base/third_party/libevent/*',
'base/third_party/symbolize/*',
'testing/gmock/*',