commit 8d6d7c1e833160b7cc33d87ba4883068b1a9d281
author Lalit Maganti <lalitm@google.com> Thu Feb 24 20:35:23 2022 +0000
committer Lalit Maganti <lalitm@google.com> Thu Feb 24 20:35:23 2022 +0000
tree 24ffd490e99c742e9eea0a2e3f1604d092cfc2f1
parent b9922c2e9532411ad9d2d2368b613e4cb78723f1

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

Android.bp

diff --git a/Android.bp b/Android.bp
index c42d742..c6f7526 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2934,21 +2934,6 @@
     ],
 }
 
-// GN: //protos/perfetto/config:merged_config_descriptor
-genrule {
-    name: "perfetto_protos_perfetto_config_merged_config_descriptor",
-    srcs: [
-        "protos/perfetto/config/perfetto_config.proto",
-    ],
-    tools: [
-        "aprotoc",
-    ],
-    cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --descriptor_set_out=$(out) $(in)",
-    out: [
-        "perfetto_protos_perfetto_config_merged_config_descriptor.bin",
-    ],
-}
-
 // GN: //protos/perfetto/config/power:cpp
 genrule {
     name: "perfetto_protos_perfetto_config_power_cpp_gen",
@@ -7235,11 +7220,11 @@
 genrule {
     name: "perfetto_src_perfetto_cmd_gen_cc_config_descriptor",
     srcs: [
-        ":perfetto_protos_perfetto_config_merged_config_descriptor",
+        ":perfetto_protos_perfetto_config_descriptor",
     ],
     cmd: "$(location tools/gen_cc_proto_descriptor.py) --gen_dir=$(genDir) --cpp_out=$(out) $(in)",
     out: [
-        "src/perfetto_cmd/perfetto_config.descriptor.h",
+        "src/perfetto_cmd/config.descriptor.h",
     ],
     tool_files: [
         "tools/gen_cc_proto_descriptor.py",