Merge "Fix build for oss-fuzz" into main

5 files changed, 39 insertions, 39 deletions

diff --git a/Android.bp b/Android.bp
index 4fe5a6a97..4af731ab0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5629,7 +5629,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:cpp
+// GN: //protos/perfetto/trace/android:winscope_common_cpp
 filegroup {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_cpp",
     srcs: [
@@ -5639,7 +5639,7 @@ filegroup {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:cpp
+// GN: //protos/perfetto/trace/android:winscope_common_cpp
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_cpp_gen",
     srcs: [
@@ -5657,7 +5657,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:cpp
+// GN: //protos/perfetto/trace/android:winscope_common_cpp
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_cpp_gen_headers",
     srcs: [
@@ -5679,7 +5679,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:lite
+// GN: //protos/perfetto/trace/android:winscope_common_lite
 filegroup {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_lite",
     srcs: [
@@ -5689,7 +5689,7 @@ filegroup {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:lite
+// GN: //protos/perfetto/trace/android:winscope_common_lite
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_lite_gen",
     srcs: [
@@ -5706,7 +5706,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:lite
+// GN: //protos/perfetto/trace/android:winscope_common_lite
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_lite_gen_headers",
     srcs: [
@@ -5727,7 +5727,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:zero
+// GN: //protos/perfetto/trace/android:winscope_common_zero
 filegroup {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_zero",
     srcs: [
@@ -5737,7 +5737,7 @@ filegroup {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:zero
+// GN: //protos/perfetto/trace/android:winscope_common_zero
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_zero_gen",
     srcs: [
@@ -5755,7 +5755,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_common:zero
+// GN: //protos/perfetto/trace/android:winscope_common_zero
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_common_zero_gen_headers",
     srcs: [
@@ -5841,7 +5841,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_extensions:zero
+// GN: //protos/perfetto/trace/android:winscope_extensions_zero
 filegroup {
     name: "perfetto_protos_perfetto_trace_android_winscope_extensions_zero",
     srcs: [
@@ -5871,7 +5871,7 @@ filegroup {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_extensions:zero
+// GN: //protos/perfetto/trace/android:winscope_extensions_zero
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_extensions_zero_gen",
     srcs: [
@@ -5911,7 +5911,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_extensions:zero
+// GN: //protos/perfetto/trace/android:winscope_extensions_zero
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_extensions_zero_gen_headers",
     srcs: [
@@ -5955,7 +5955,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:cpp
+// GN: //protos/perfetto/trace/android:winscope_regular_cpp
 filegroup {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_cpp",
     srcs: [
@@ -5967,7 +5967,7 @@ filegroup {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:cpp
+// GN: //protos/perfetto/trace/android:winscope_regular_cpp
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_cpp_gen",
     srcs: [
@@ -5989,7 +5989,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:cpp
+// GN: //protos/perfetto/trace/android:winscope_regular_cpp
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_cpp_gen_headers",
     srcs: [
@@ -6015,7 +6015,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:lite
+// GN: //protos/perfetto/trace/android:winscope_regular_lite
 filegroup {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_lite",
     srcs: [
@@ -6027,7 +6027,7 @@ filegroup {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:lite
+// GN: //protos/perfetto/trace/android:winscope_regular_lite
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_lite_gen",
     srcs: [
@@ -6048,7 +6048,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:lite
+// GN: //protos/perfetto/trace/android:winscope_regular_lite
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_lite_gen_headers",
     srcs: [
@@ -6073,7 +6073,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:zero
+// GN: //protos/perfetto/trace/android:winscope_regular_zero
 filegroup {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_zero",
     srcs: [
@@ -6085,7 +6085,7 @@ filegroup {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:zero
+// GN: //protos/perfetto/trace/android:winscope_regular_zero
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_zero_gen",
     srcs: [
@@ -6107,7 +6107,7 @@ genrule {
     ],
 }
 
-// GN: //protos/perfetto/trace/android:winscope_regular:zero
+// GN: //protos/perfetto/trace/android:winscope_regular_zero
 genrule {
     name: "perfetto_protos_perfetto_trace_android_winscope_regular_zero_gen_headers",
     srcs: [
@@ -15594,7 +15594,7 @@ cc_library_static {
     ],
 }
 
-// GN: [//protos/perfetto/trace:non_minimal_source_set, //protos/perfetto/trace/android:winscope_extensions:source_set]
+// GN: [//protos/perfetto/trace:non_minimal_source_set, //protos/perfetto/trace/android:winscope_extensions_source_set]
 filegroup {
     name: "perfetto_winscope_filegroup_proto",
     srcs: [
diff --git a/BUILD b/BUILD
index 5d1e5bec6..fed606943 100644
--- a/BUILD
+++ b/BUILD
@@ -4658,7 +4658,7 @@ perfetto_proto_library(
     ],
 )
 
-# GN target: //protos/perfetto/trace/android:winscope_common:source_set
+# GN target: //protos/perfetto/trace/android:winscope_common_source_set
 perfetto_proto_library(
     name = "protos_perfetto_trace_android_winscope_common_protos",
     srcs = [
@@ -4671,7 +4671,7 @@ perfetto_proto_library(
     ],
 )
 
-# GN target: //protos/perfetto/trace/android:winscope_common:zero
+# GN target: //protos/perfetto/trace/android:winscope_common_zero
 perfetto_cc_protozero_library(
     name = "protos_perfetto_trace_android_winscope_common_zero",
     deps = [
@@ -4691,7 +4691,7 @@ perfetto_proto_descriptor(
     ],
 )
 
-# GN target: //protos/perfetto/trace/android:winscope_extensions:source_set
+# GN target: //protos/perfetto/trace/android:winscope_extensions_source_set
 perfetto_proto_library(
     name = "protos_perfetto_trace_android_winscope_extensions_protos",
     srcs = [
@@ -4730,7 +4730,7 @@ perfetto_proto_library(
     ],
 )
 
-# GN target: //protos/perfetto/trace/android:winscope_extensions:zero
+# GN target: //protos/perfetto/trace/android:winscope_extensions_zero
 perfetto_cc_protozero_library(
     name = "protos_perfetto_trace_android_winscope_extensions_zero",
     deps = [
@@ -4739,7 +4739,7 @@ perfetto_cc_protozero_library(
     ],
 )
 
-# GN target: //protos/perfetto/trace/android:winscope_regular:source_set
+# GN target: //protos/perfetto/trace/android:winscope_regular_source_set
 perfetto_proto_library(
     name = "protos_perfetto_trace_android_winscope_regular_protos",
     srcs = [
@@ -4758,7 +4758,7 @@ perfetto_proto_library(
     ],
 )
 
-# GN target: //protos/perfetto/trace/android:winscope_regular:zero
+# GN target: //protos/perfetto/trace/android:winscope_regular_zero
 perfetto_cc_protozero_library(
     name = "protos_perfetto_trace_android_winscope_regular_zero",
     deps = [
diff --git a/protos/perfetto/trace/android/BUILD.gn b/protos/perfetto/trace/android/BUILD.gn
index 0c31db6fd..97e9d52c7 100644
--- a/protos/perfetto/trace/android/BUILD.gn
+++ b/protos/perfetto/trace/android/BUILD.gn
@@ -15,7 +15,7 @@
 import("../../../../gn/proto_library.gni")
 
 perfetto_proto_library("@TYPE@") {
-  deps = [ "../../common:@TYPE@", ":winscope_regular:@TYPE@" ]
+  deps = [ "../../common:@TYPE@", ":winscope_regular_@TYPE@" ]
 
   sources = [
     "android_game_intervention_list.proto",
@@ -33,7 +33,7 @@ perfetto_proto_library("@TYPE@") {
   ]
 }
 
-perfetto_proto_library("winscope_common:@TYPE@") {
+perfetto_proto_library("winscope_common_@TYPE@") {
   sources = [
     "graphics/point.proto",
     "graphics/rect.proto",
@@ -42,10 +42,10 @@ perfetto_proto_library("winscope_common:@TYPE@") {
 }
 
 # Winscope messages added to TracePacket directly
-perfetto_proto_library("winscope_regular:@TYPE@") {
+perfetto_proto_library("winscope_regular_@TYPE@") {
   deps = [
     "../../common:@TYPE@",
-    ":winscope_common:@TYPE@",
+    ":winscope_common_@TYPE@",
   ]
   sources = [
     "protolog.proto",
@@ -57,8 +57,8 @@ perfetto_proto_library("winscope_regular:@TYPE@") {
 }
 
 # Winscope messages added to TracePacket as extensions
-perfetto_proto_library("winscope_extensions:@TYPE@") {
-  public_deps = [ ":winscope_common:@TYPE@" ]
+perfetto_proto_library("winscope_extensions_@TYPE@") {
+  public_deps = [ ":winscope_common_@TYPE@" ]
   sources = [
     "inputmethodeditor.proto",
     "graphics/pixelformat.proto",
@@ -91,8 +91,8 @@ perfetto_proto_library("winscope_descriptor") {
   proto_generators = [ "descriptor" ]
   generate_descriptor = "winscope.descriptor"
   deps = [
-    ":winscope_regular:source_set",
-    ":winscope_extensions:source_set",
+    ":winscope_regular_source_set",
+    ":winscope_extensions_source_set",
   ]
   sources = [ "winscope.proto" ]
   import_dirs = [ "${perfetto_protobuf_src_dir}" ]
diff --git a/src/trace_processor/importers/proto/winscope/BUILD.gn b/src/trace_processor/importers/proto/winscope/BUILD.gn
index c5a631656..f557b8415 100644
--- a/src/trace_processor/importers/proto/winscope/BUILD.gn
+++ b/src/trace_processor/importers/proto/winscope/BUILD.gn
@@ -39,8 +39,8 @@ source_set("full") {
     "../../../../../gn:default_deps",
     "../../../../../protos/perfetto/trace:zero",
     "../../../../../protos/perfetto/trace/android:zero",
-    "../../../../../protos/perfetto/trace/android:winscope_regular:zero",
-    "../../../../../protos/perfetto/trace/android:winscope_extensions:zero",
+    "../../../../../protos/perfetto/trace/android:winscope_regular_zero",
+    "../../../../../protos/perfetto/trace/android:winscope_extensions_zero",
     "../../../../../protos/perfetto/trace/interned_data:zero",
     "../../../../../protos/perfetto/trace/profiling:zero",
     "../../../../protozero",
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 82c2d7631..fe73f0135 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -132,7 +132,7 @@ proto_groups = {
         'types': ['filegroup'],
         'targets': [
             '//protos/perfetto/trace:non_minimal_source_set',
-            '//protos/perfetto/trace/android:winscope_extensions:source_set',
+            '//protos/perfetto/trace/android:winscope_extensions_source_set',
         ]
     },
     'config': {