Commit 04f2f559 authored by Oystein Eftevaag's avatar Oystein Eftevaag Committed by Commit Bot

Perfetto: Remove direct deps on generated protozero files

This is needed to avoid ODR violations due to both the generated protozero
sourcesets as well as libperfetto having dependencies on
third_party/perfetto/src/protozero (the protozero base library) which
causes ODR violations in component builds.

Requires https://android-review.googlesource.com/c/platform/external/perfetto/+/711693 to land.

R=hjd@chromium.org
BUG=853872

Change-Id: I805092df1a3e62662f478a7bac015686322d00db
Reviewed-on: https://chromium-review.googlesource.com/1120694Reviewed-by: default avatarHector Dearman <hjd@chromium.org>
Commit-Queue: oysteine <oysteine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575024}
parent 65dc464c
......@@ -41,9 +41,7 @@ source_set("lib") {
]
deps = [
"//third_party/perfetto/protos/perfetto/trace:zero",
"//third_party/perfetto/protos/perfetto/trace/chrome:minimal_complete_lite",
"//third_party/perfetto/protos/perfetto/trace/chrome:zero",
]
public_deps += [ "//third_party/perfetto:libperfetto" ]
......@@ -109,9 +107,7 @@ source_set("tests") {
"//third_party/perfetto/include/perfetto/protozero:protozero",
"//third_party/perfetto/protos/perfetto/common",
"//third_party/perfetto/protos/perfetto/trace:lite",
"//third_party/perfetto/protos/perfetto/trace:zero",
"//third_party/perfetto/protos/perfetto/trace/chrome:lite",
"//third_party/perfetto/protos/perfetto/trace/chrome:zero",
]
}
......
......@@ -35,9 +35,7 @@ component("cpp") {
]
deps = [
"//third_party/perfetto/protos/perfetto/trace:zero",
"//third_party/perfetto/protos/perfetto/trace/chrome:minimal_complete_lite",
"//third_party/perfetto/protos/perfetto/trace/chrome:zero",
]
public_deps += [ "//third_party/perfetto:libperfetto" ]
......
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