1 files changed, 24 insertions, 13 deletions
diff --git a/protos/perfetto/trace/BUILD.gn b/protos/perfetto/trace/BUILD.gn
index ed7b6aedb..2a9032f80 100644
--- a/protos/perfetto/trace/BUILD.gn
+++ b/protos/perfetto/trace/BUILD.gn
@@ -71,11 +71,21 @@ group("cpp") {
   ]
 }
 
+# This is only for Bazel build generation.
+group("source_set") {
+  testonly = true
+  public_deps = [
+    ":minimal_source_set",
+    ":non_minimal_source_set",
+  ]
+}
+
 perfetto_proto_library("non_minimal_@TYPE@") {
   proto_generators = [
     "cpp",
     "lite",
     "zero",
+    "source_set",
   ]
   deps = [
     ":minimal_@TYPE@",
@@ -93,8 +103,10 @@ perfetto_proto_library("non_minimal_@TYPE@") {
     "sys_stats:@TYPE@",
     "system_info:@TYPE@",
     "track_event:@TYPE@",
+    "translation:@TYPE@",
   ]
   sources = proto_sources_non_minimal
+  public_deps = [ "track_event:@TYPE@" ]
 }
 
 perfetto_proto_library("minimal_@TYPE@") {
@@ -102,19 +114,11 @@ perfetto_proto_library("minimal_@TYPE@") {
   sources = proto_sources_minimal
 }
 
-# This target is not used in the tree and is built only to guarantee that the
-# autogenerated merged proto has a valid syntax.
-perfetto_proto_library("merged_trace") {
-  proto_generators = [ "lite" ]
-  sources = [ "perfetto_trace.proto" ]
-}
-
-if (perfetto_build_standalone) {
-  perfetto_proto_library("descriptor") {
-    proto_generators = [ "descriptor" ]
-    generate_descriptor = "trace.descriptor"
-    sources = [ "trace.proto" ]
-  }
+perfetto_proto_library("descriptor") {
+  proto_generators = [ "descriptor" ]
+  generate_descriptor = "trace.descriptor"
+  sources = [ "trace.proto" ]
+  deps = [ ":non_minimal_source_set" ]
 }
 
 # This target exports perfetto trace protos allowing both host and device
@@ -130,3 +134,10 @@ perfetto_proto_library("test_extensions_descriptor") {
   sources = [ "test_extensions.proto" ]
   deps = [ "track_event:source_set" ]
 }
+
+# This target are not used in the tree and is built only to guarantee that the
+# autogenerated merged proto has a valid syntax.
+perfetto_proto_library("merged_trace_@TYPE@") {
+  proto_generators = [ "lite" ]
+  sources = [ "perfetto_trace.proto" ]
+}