diff options
| author | Hidehiko Abe <hidehiko@google.com> | 2018-04-16 00:46:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-16 00:46:17 -0700 |
| commit | dc297ddb2d397e7b705a68fddaf3cb42ea0c6451 (patch) | |
| tree | d3c6b871bf9ac424f868202f58fdced4c03d9519 | |
| parent | f0f7cc4ae2d84ba0d0b0b937b2900abc46e719c2 (diff) | |
| parent | d6a631d50e647ddc9e591e1810c54701fa670133 (diff) | |
| download | libchrome-dc297ddb2d397e7b705a68fddaf3cb42ea0c6451.tar.gz | |
Update comment. am: 28fbe310b7
am: d6a631d50e
Change-Id: I5f4f428c0d663bd333de1889f9159f2b34bf85d1
| -rw-r--r-- | base/process/process_metrics_unittest.cc | 2 | ||||
| -rw-r--r-- | base/test/multiprocess_test.cc | 2 | ||||
| -rw-r--r-- | libchrome_tools/patch/subprocess.patch | 4 | ||||
| -rw-r--r-- | libchrome_tools/update_libchrome.py | 3 |
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/*', |