diff options
| author | Lalit Maganti <lalitm@google.com> | 2022-02-24 20:35:23 +0000 |
|---|---|---|
| committer | Lalit Maganti <lalitm@google.com> | 2022-02-24 20:35:23 +0000 |
| commit | 8d6d7c1e833160b7cc33d87ba4883068b1a9d281 (patch) | |
| tree | 24ffd490e99c742e9eea0a2e3f1604d092cfc2f1 /BUILD.extras | |
| parent | b9922c2e9532411ad9d2d2368b613e4cb78723f1 (diff) | |
| download | perfetto-8d6d7c1e833160b7cc33d87ba4883068b1a9d281.tar.gz | |
perfetto: remove merged protos from Bazel and reduce usage elsewhere
This CL removes the merged protos from being built in Bazel as they
cause a lot of problems with ODR violations in G3 (i.e. if one static
lib depends on the merged trace, another on the merged config)
Instead, expose the non_minimal and config protos directly to be
depended on.
Change-Id: I24a05e5c42f270b15d0e68d4fcedc37a5dcd2b9b
Bug: 221191510
Diffstat (limited to 'BUILD.extras')
| -rw-r--r-- | BUILD.extras | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/BUILD.extras b/BUILD.extras index f91b2f47f..dbf18af8b 100644 --- a/BUILD.extras +++ b/BUILD.extras @@ -36,6 +36,7 @@ perfetto_java_proto_library( deps = [ ":protos_perfetto_metrics_protos", ], + visibility = PERFETTO_CONFIG.public_visibility, ) perfetto_java_proto_library( @@ -43,27 +44,7 @@ perfetto_java_proto_library( deps = [ ":protos_perfetto_metrics_android_protos", ], -) - -perfetto_java_proto_library( - name = "protos_perfetto_trace_merged_trace_java", - deps = [ - ":protos_perfetto_trace_merged_trace_protos", - ], -) - -perfetto_java_proto_library( - name = "protos_perfetto_config_merged_config_java", - deps = [ - ":protos_perfetto_config_merged_config_protos", - ], -) - -perfetto_java_lite_proto_library( - name = "protos_perfetto_config_merged_config_java_lite", - deps = [ - ":protos_perfetto_config_merged_config_protos", - ], + visibility = PERFETTO_CONFIG.public_visibility, ) perfetto_gensignature_internal_only( |