Commit 89fedbda authored by Primiano Tucci's avatar Primiano Tucci Committed by Commit Bot

Roll src/third_party/perfetto b62621c1dd8e..1b1f18689958 (6 commits)

https://android.googlesource.com/platform/external/perfetto.git/+log/b62621c1dd8e..1b1f18689958

git log b62621c1dd8e..1b1f18689958 --date=short --first-parent --format='%ad %ae %s'
2019-11-26 primiano@google.com Fix chromium build, remove some assert_no_deps
2019-11-26 treehugger-gerrit@google.com Merge "Refactor: define oom_score_adj span once"
2019-11-26 fmayer@google.com Merge "Handle DeobfuscationMapping."
2019-11-26 treehugger-gerrit@google.com Merge "perfetto-ui: Changing picture in the record page for heap profiling"
2019-11-26 primiano@google.com Merge "Remove libprotobuf from IPC layer"
2019-11-26 primiano@google.com Merge "tools(tmux): correctly find ninja"

Change-Id: I3d771fa153e89ac0b8edf1a7c40b27f3d151bb89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937169
Commit-Queue: Primiano Tucci <primiano@chromium.org>
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Auto-Submit: Primiano Tucci <primiano@chromium.org>
Reviewed-by: default avatarEric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719234}
parent b0af8423
...@@ -1293,7 +1293,7 @@ deps = { ...@@ -1293,7 +1293,7 @@ deps = {
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + 'b62621c1dd8e1ada5f5469e3b64167d5c3cfb689', Var('android_git') + '/platform/external/perfetto.git' + '@' + '1b1f186899582cb3e558692b1b04cf2b1ee81635',
'src/third_party/perl': { 'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
......
...@@ -16,10 +16,7 @@ ...@@ -16,10 +16,7 @@
#include "services/tracing/public/mojom/perfetto_service.mojom.h" #include "services/tracing/public/mojom/perfetto_service.mojom.h"
#include "third_party/perfetto/include/perfetto/ext/tracing/core/producer.h" #include "third_party/perfetto/include/perfetto/ext/tracing/core/producer.h"
#include "third_party/perfetto/include/perfetto/ext/tracing/core/tracing_service.h" #include "third_party/perfetto/include/perfetto/ext/tracing/core/tracing_service.h"
#include "third_party/perfetto/include/perfetto/tracing/core/forward_decls.h"
namespace perfetto {
class CommitDataRequest;
} // namespace perfetto
namespace tracing { namespace tracing {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment