diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-03-14 10:55:53 -0700 |
|---|---|---|
| committer | Jakub Pawlowski <jpawlowski@google.com> | 2017-12-21 08:29:21 -0800 |
| commit | fe2f52931e8e50253d06329d7bf0a4164c7ba580 (patch) | |
| tree | 6bb5a209c8ffd63c3c197e938ad4a62b7328b83b /Android.bp | |
| parent | 70cd4fac31a9b0865dab6574540f70cc103337dc (diff) | |
| download | libchrome-fe2f52931e8e50253d06329d7bf0a4164c7ba580.tar.gz | |
Uprev the library to r462023 from Chromium
This merge was done against r462023 which corresponds to git commit
32eb7c31af9cab6231f0d3d05206072079177605 from Apr 05, 2017
Previous attempt, in commit bf8c17f71511c1e90cd8cccfe71f0852c566bd3b was
badly squashed, causing automated test failure in system/bt.
Test: manually ran all test from system/bt that failed on previous
attempt, plus libchrome_unittest
Change-Id: I539a868af1d06baad3e80a89b8c16fb3d86ab77a
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index fdbcd93923..ab3bfb1924 100644 --- a/Android.bp +++ b/Android.bp @@ -156,6 +156,7 @@ libchromeCommonSrc = [ "base/process/memory.cc", "base/process/process_handle.cc", "base/process/process_handle_posix.cc", + "base/process/process_info_linux.cc", "base/process/process_iterator.cc", "base/process/process_metrics.cc", "base/process/process_metrics_posix.cc", @@ -249,6 +250,7 @@ libchromeCommonSrc = [ "base/trace_event/process_memory_totals.cc", "base/trace_event/trace_buffer.cc", "base/trace_event/trace_config.cc", + "base/trace_event/trace_config_category_filter.cc", "base/trace_event/trace_event_argument.cc", "base/trace_event/trace_event_filter.cc", "base/trace_event/trace_event_impl.cc", @@ -491,6 +493,7 @@ cc_test { "base/pickle_unittest.cc", "base/posix/file_descriptor_shuffle_unittest.cc", "base/posix/unix_domain_socket_linux_unittest.cc", + "base/process/process_info_unittest.cc", "base/process/process_metrics_unittest.cc", "base/profiler/tracked_time_unittest.cc", "base/rand_util_unittest.cc", @@ -498,7 +501,7 @@ cc_test { "base/scoped_generic_unittest.cc", "base/security_unittest.cc", "base/sequence_checker_unittest.cc", - "base/sequence_token_unittest.cc", + "base/sequence_token_unittest.cc", "base/sha1_unittest.cc", "base/stl_util_unittest.cc", "base/strings/pattern_unittest.cc", |