gen_android_bp: use gn_utils

This change uniforms the behavior of tools/gen_android_bp
with the one of tools/gen_bazel. This is required to add
a third generator (to get rid of checked-in proto->cpp
files).

Before this CL
gen_android_bp was dealing, among the other things, with:
1. Recursively traversing the source_set targets to figure
   out the transitive closure of sources for each linker
   unit. This is because, like bazel, Android.bp does not
   have the concept of source_sets like GN.
2. Detecting proto targets and reverse engineering the
   plugin from the protoc cmdline invocation.

gn_utils deals with these two responsibilities so there is
no reason to keep the ad-hoc behavior in gen_android_bp.
As a side effect, the generated Android.bp is a little bit
easier to reason about. Now we generate one filegroup for
each source set and add the transitive closure of file groups
(NOT the transitive closure of source files) to each linker
unit.

Test: I manually inspected the diff of the generated Android.bp
      and it seems legit. Also builds and passes tests.
Bug: 132880619
Bug: 115873049

Change-Id: If77a85aadbc4edecc8d7874cc14c1f427e1ec646

4 files changed, 2164 insertions, 2039 deletions

diff --git a/Android.bp b/Android.bp
index 55a328461..83e180eb9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,7 @@
 //
 // This file is automatically generated by tools/gen_android_bp. Do not edit.
 
+// GN: //src/trace_processor/metrics:gen_merged_sql_metrics
 genrule {
   name: "gen_merged_sql_metrics",
   srcs: [
@@ -49,10 +50,19 @@ genrule {
   ],
 }
 
-// GN target: //src/profiling/memory:heapprofd
+// GN: //src/profiling/memory:heapprofd
 cc_binary {
   name: "heapprofd",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_ipc_ipc",
+    ":perfetto_include_perfetto_ext_tracing_core_core",
+    ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
+    ":perfetto_include_perfetto_profiling_normalize",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -91,82 +101,19 @@ cc_binary {
     ":perfetto_protos_perfetto_trace_sys_stats_zero_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_perfetto_trace_trusted_lite_gen",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/ipc/buffered_frame_deserializer.cc",
-    "src/ipc/client_impl.cc",
-    "src/ipc/deferred.cc",
-    "src/ipc/host_impl.cc",
-    "src/ipc/service_proxy.cc",
-    "src/ipc/virtual_destructors.cc",
-    "src/profiling/memory/bookkeeping.cc",
-    "src/profiling/memory/bookkeeping_dump.cc",
-    "src/profiling/memory/heapprofd_config.cc",
-    "src/profiling/memory/heapprofd_producer.cc",
-    "src/profiling/memory/java_hprof_config.cc",
-    "src/profiling/memory/java_hprof_producer.cc",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_ipc_ipc",
+    ":perfetto_src_profiling_memory_daemon",
+    ":perfetto_src_profiling_memory_proc_utils",
+    ":perfetto_src_profiling_memory_ring_buffer",
+    ":perfetto_src_profiling_memory_scoped_spinlock",
+    ":perfetto_src_profiling_memory_wire_protocol",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_tracing_common",
+    ":perfetto_src_tracing_ipc",
+    ":perfetto_src_tracing_tracing",
     "src/profiling/memory/main.cc",
-    "src/profiling/memory/page_idle_checker.cc",
-    "src/profiling/memory/proc_utils.cc",
-    "src/profiling/memory/scoped_spinlock.cc",
-    "src/profiling/memory/shared_ring_buffer.cc",
-    "src/profiling/memory/system_property.cc",
-    "src/profiling/memory/unwinding.cc",
-    "src/profiling/memory/utils.cc",
-    "src/profiling/memory/wire_protocol.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/tracing/core/chrome_config.cc",
-    "src/tracing/core/commit_data_request.cc",
-    "src/tracing/core/data_source_config.cc",
-    "src/tracing/core/data_source_descriptor.cc",
-    "src/tracing/core/id_allocator.cc",
-    "src/tracing/core/metatrace_writer.cc",
-    "src/tracing/core/null_trace_writer.cc",
-    "src/tracing/core/observable_events.cc",
-    "src/tracing/core/packet_stream_validator.cc",
-    "src/tracing/core/shared_memory_abi.cc",
-    "src/tracing/core/shared_memory_arbiter_impl.cc",
-    "src/tracing/core/sliced_protobuf_input_stream.cc",
-    "src/tracing/core/startup_trace_writer.cc",
-    "src/tracing/core/startup_trace_writer_registry.cc",
-    "src/tracing/core/test_config.cc",
-    "src/tracing/core/trace_buffer.cc",
-    "src/tracing/core/trace_config.cc",
-    "src/tracing/core/trace_packet.cc",
-    "src/tracing/core/trace_stats.cc",
-    "src/tracing/core/trace_writer_impl.cc",
-    "src/tracing/core/tracing_service_impl.cc",
-    "src/tracing/core/tracing_service_state.cc",
-    "src/tracing/core/virtual_destructors.cc",
-    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
-    "src/tracing/ipc/default_socket.cc",
-    "src/tracing/ipc/posix_shared_memory.cc",
-    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
-    "src/tracing/ipc/service/consumer_ipc_service.cc",
-    "src/tracing/ipc/service/producer_ipc_service.cc",
-    "src/tracing/ipc/service/service_ipc_host_impl.cc",
-    "src/tracing/trace_writer_base.cc",
   ],
   shared_libs: [
     "libbase",
@@ -227,34 +174,21 @@ cc_binary {
   ],
 }
 
-// GN target: //src/profiling/memory:heapprofd_client
+// GN: //src/profiling/memory:heapprofd_client
 cc_library_shared {
   name: "heapprofd_client",
   srcs: [
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/profiling/memory/client.cc",
-    "src/profiling/memory/malloc_hooks.cc",
-    "src/profiling/memory/proc_utils.cc",
-    "src/profiling/memory/scoped_spinlock.cc",
-    "src/profiling/memory/shared_ring_buffer.cc",
-    "src/profiling/memory/wire_protocol.cc",
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_profiling_normalize",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_profiling_memory_client",
+    ":perfetto_src_profiling_memory_malloc_hooks",
+    ":perfetto_src_profiling_memory_proc_utils",
+    ":perfetto_src_profiling_memory_ring_buffer",
+    ":perfetto_src_profiling_memory_scoped_spinlock",
+    ":perfetto_src_profiling_memory_wire_protocol",
   ],
   shared_libs: [
     "libbase",
@@ -282,10 +216,42 @@ cc_library_shared {
   ],
 }
 
-// GN target: //:libperfetto
+// GN: //src/ipc/protoc_plugin:ipc_plugin
+cc_binary_host {
+  name: "ipc_plugin",
+  srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_src_base_base",
+    "src/ipc/protoc_plugin/ipc_plugin.cc",
+  ],
+  shared_libs: [
+    "libprotoc",
+  ],
+  defaults: [
+    "perfetto_defaults",
+  ],
+  cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+  ],
+}
+
+// GN: //:libperfetto
 cc_library_shared {
   name: "libperfetto",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_ipc_ipc",
+    ":perfetto_include_perfetto_ext_traced_sys_stats_counters",
+    ":perfetto_include_perfetto_ext_traced_traced",
+    ":perfetto_include_perfetto_ext_tracing_core_core",
+    ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_public_public",
+    ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -324,103 +290,29 @@ cc_library_shared {
     ":perfetto_protos_perfetto_trace_sys_stats_zero_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_perfetto_trace_trusted_lite_gen",
-    "src/android_internal/lazy_library_loader.cc",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/ipc/buffered_frame_deserializer.cc",
-    "src/ipc/client_impl.cc",
-    "src/ipc/deferred.cc",
-    "src/ipc/host_impl.cc",
-    "src/ipc/service_proxy.cc",
-    "src/ipc/virtual_destructors.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/traced/probes/android_log/android_log_data_source.cc",
-    "src/traced/probes/filesystem/file_scanner.cc",
-    "src/traced/probes/filesystem/fs_mount.cc",
-    "src/traced/probes/filesystem/inode_file_data_source.cc",
-    "src/traced/probes/filesystem/lru_inode_cache.cc",
-    "src/traced/probes/filesystem/prefix_finder.cc",
-    "src/traced/probes/filesystem/range_tree.cc",
-    "src/traced/probes/ftrace/atrace_hal_wrapper.cc",
-    "src/traced/probes/ftrace/atrace_wrapper.cc",
-    "src/traced/probes/ftrace/compact_sched.cc",
-    "src/traced/probes/ftrace/cpu_reader.cc",
-    "src/traced/probes/ftrace/cpu_stats_parser.cc",
-    "src/traced/probes/ftrace/event_info.cc",
-    "src/traced/probes/ftrace/event_info_constants.cc",
-    "src/traced/probes/ftrace/format_parser.cc",
-    "src/traced/probes/ftrace/ftrace_config.cc",
-    "src/traced/probes/ftrace/ftrace_config_muxer.cc",
-    "src/traced/probes/ftrace/ftrace_config_utils.cc",
-    "src/traced/probes/ftrace/ftrace_controller.cc",
-    "src/traced/probes/ftrace/ftrace_data_source.cc",
-    "src/traced/probes/ftrace/ftrace_metadata.cc",
-    "src/traced/probes/ftrace/ftrace_procfs.cc",
-    "src/traced/probes/ftrace/ftrace_stats.cc",
-    "src/traced/probes/ftrace/proto_translation_table.cc",
-    "src/traced/probes/metatrace/metatrace_data_source.cc",
-    "src/traced/probes/packages_list/packages_list_data_source.cc",
-    "src/traced/probes/power/android_power_data_source.cc",
-    "src/traced/probes/probes.cc",
-    "src/traced/probes/probes_data_source.cc",
-    "src/traced/probes/probes_producer.cc",
-    "src/traced/probes/ps/process_stats_data_source.cc",
-    "src/traced/probes/sys_stats/sys_stats_data_source.cc",
-    "src/traced/service/builtin_producer.cc",
-    "src/traced/service/service.cc",
-    "src/tracing/api_impl/consumer_api.cc",
-    "src/tracing/core/chrome_config.cc",
-    "src/tracing/core/commit_data_request.cc",
-    "src/tracing/core/data_source_config.cc",
-    "src/tracing/core/data_source_descriptor.cc",
-    "src/tracing/core/id_allocator.cc",
-    "src/tracing/core/metatrace_writer.cc",
-    "src/tracing/core/null_trace_writer.cc",
-    "src/tracing/core/observable_events.cc",
-    "src/tracing/core/packet_stream_validator.cc",
-    "src/tracing/core/shared_memory_abi.cc",
-    "src/tracing/core/shared_memory_arbiter_impl.cc",
-    "src/tracing/core/sliced_protobuf_input_stream.cc",
-    "src/tracing/core/startup_trace_writer.cc",
-    "src/tracing/core/startup_trace_writer_registry.cc",
-    "src/tracing/core/test_config.cc",
-    "src/tracing/core/trace_buffer.cc",
-    "src/tracing/core/trace_config.cc",
-    "src/tracing/core/trace_packet.cc",
-    "src/tracing/core/trace_stats.cc",
-    "src/tracing/core/trace_writer_impl.cc",
-    "src/tracing/core/tracing_service_impl.cc",
-    "src/tracing/core/tracing_service_state.cc",
-    "src/tracing/core/virtual_destructors.cc",
-    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
-    "src/tracing/ipc/default_socket.cc",
-    "src/tracing/ipc/posix_shared_memory.cc",
-    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
-    "src/tracing/ipc/service/consumer_ipc_service.cc",
-    "src/tracing/ipc/service/producer_ipc_service.cc",
-    "src/tracing/ipc/service/service_ipc_host_impl.cc",
-    "src/tracing/trace_writer_base.cc",
+    ":perfetto_src_android_internal_headers",
+    ":perfetto_src_android_internal_lazy_library_loader",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_ipc_ipc",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_traced_probes_android_log_android_log",
+    ":perfetto_src_traced_probes_data_source",
+    ":perfetto_src_traced_probes_filesystem_filesystem",
+    ":perfetto_src_traced_probes_ftrace_format_parser",
+    ":perfetto_src_traced_probes_ftrace_ftrace",
+    ":perfetto_src_traced_probes_metatrace_metatrace",
+    ":perfetto_src_traced_probes_packages_list_packages_list",
+    ":perfetto_src_traced_probes_power_power",
+    ":perfetto_src_traced_probes_probes",
+    ":perfetto_src_traced_probes_probes_src",
+    ":perfetto_src_traced_probes_ps_ps",
+    ":perfetto_src_traced_probes_sys_stats_sys_stats",
+    ":perfetto_src_traced_service_service",
+    ":perfetto_src_tracing_common",
+    ":perfetto_src_tracing_consumer_api_deprecated",
+    ":perfetto_src_tracing_ipc",
+    ":perfetto_src_tracing_tracing",
   ],
   shared_libs: [
     "liblog",
@@ -480,15 +372,12 @@ cc_library_shared {
   ],
 }
 
-// GN target: //src/android_internal:libperfetto_android_internal
+// GN: //src/android_internal:libperfetto_android_internal
 cc_library_shared {
   name: "libperfetto_android_internal",
   srcs: [
-    "src/android_internal/atrace_hal.cc",
-    "src/android_internal/dropbox_service.cc",
-    "src/android_internal/health_hal.cc",
-    "src/android_internal/incident_service.cc",
-    "src/android_internal/power_stats_hal.cc",
+    ":perfetto_src_android_internal_android_internal",
+    ":perfetto_src_android_internal_headers",
   ],
   shared_libs: [
     "android.hardware.atrace@1.0",
@@ -519,10 +408,18 @@ cc_library_shared {
   },
 }
 
-// GN target: //:libperfetto_client_experimental
+// GN: //:libperfetto_client_experimental
 cc_library_static {
   name: "libperfetto_client_experimental",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_ipc_ipc",
+    ":perfetto_include_perfetto_ext_tracing_core_core",
+    ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -561,76 +458,15 @@ cc_library_static {
     ":perfetto_protos_perfetto_trace_sys_stats_zero_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_perfetto_trace_trusted_lite_gen",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/ipc/buffered_frame_deserializer.cc",
-    "src/ipc/client_impl.cc",
-    "src/ipc/deferred.cc",
-    "src/ipc/host_impl.cc",
-    "src/ipc/service_proxy.cc",
-    "src/ipc/virtual_destructors.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/tracing/core/chrome_config.cc",
-    "src/tracing/core/commit_data_request.cc",
-    "src/tracing/core/data_source_config.cc",
-    "src/tracing/core/data_source_descriptor.cc",
-    "src/tracing/core/id_allocator.cc",
-    "src/tracing/core/metatrace_writer.cc",
-    "src/tracing/core/null_trace_writer.cc",
-    "src/tracing/core/observable_events.cc",
-    "src/tracing/core/packet_stream_validator.cc",
-    "src/tracing/core/shared_memory_abi.cc",
-    "src/tracing/core/shared_memory_arbiter_impl.cc",
-    "src/tracing/core/sliced_protobuf_input_stream.cc",
-    "src/tracing/core/startup_trace_writer.cc",
-    "src/tracing/core/startup_trace_writer_registry.cc",
-    "src/tracing/core/test_config.cc",
-    "src/tracing/core/trace_buffer.cc",
-    "src/tracing/core/trace_config.cc",
-    "src/tracing/core/trace_packet.cc",
-    "src/tracing/core/trace_stats.cc",
-    "src/tracing/core/trace_writer_impl.cc",
-    "src/tracing/core/tracing_service_impl.cc",
-    "src/tracing/core/tracing_service_state.cc",
-    "src/tracing/core/virtual_destructors.cc",
-    "src/tracing/data_source.cc",
-    "src/tracing/internal/in_process_tracing_backend.cc",
-    "src/tracing/internal/system_tracing_backend.cc",
-    "src/tracing/internal/tracing_muxer_impl.cc",
-    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
-    "src/tracing/ipc/default_socket.cc",
-    "src/tracing/ipc/posix_shared_memory.cc",
-    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
-    "src/tracing/ipc/service/consumer_ipc_service.cc",
-    "src/tracing/ipc/service/producer_ipc_service.cc",
-    "src/tracing/ipc/service/service_ipc_host_impl.cc",
-    "src/tracing/platform.cc",
-    "src/tracing/platform_posix.cc",
-    "src/tracing/trace_writer_base.cc",
-    "src/tracing/tracing.cc",
-    "src/tracing/track_event.cc",
-    "src/tracing/virtual_destructors.cc",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_ipc_ipc",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_tracing_client_api",
+    ":perfetto_src_tracing_common",
+    ":perfetto_src_tracing_ipc",
+    ":perfetto_src_tracing_platform_posix",
+    ":perfetto_src_tracing_tracing",
   ],
   shared_libs: [
     "libprotobuf-cpp-lite",
@@ -728,10 +564,19 @@ cc_library_static {
   ],
 }
 
-// GN target: //src/perfetto_cmd:perfetto
+// GN: //src/perfetto_cmd:perfetto
 cc_binary {
   name: "perfetto",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_ipc_ipc",
+    ":perfetto_include_perfetto_ext_traced_traced",
+    ":perfetto_include_perfetto_ext_tracing_core_core",
+    ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -770,77 +615,19 @@ cc_binary {
     ":perfetto_protos_perfetto_trace_sys_stats_zero_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_perfetto_trace_trusted_lite_gen",
+    ":perfetto_src_android_internal_headers",
+    ":perfetto_src_android_internal_lazy_library_loader",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_ipc_ipc",
+    ":perfetto_src_perfetto_cmd_perfetto_cmd",
     ":perfetto_src_perfetto_cmd_protos_gen",
-    "src/android_internal/lazy_library_loader.cc",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/ipc/buffered_frame_deserializer.cc",
-    "src/ipc/client_impl.cc",
-    "src/ipc/deferred.cc",
-    "src/ipc/host_impl.cc",
-    "src/ipc/service_proxy.cc",
-    "src/ipc/virtual_destructors.cc",
-    "src/perfetto_cmd/config.cc",
+    ":perfetto_src_perfetto_cmd_trigger_producer",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_tracing_common",
+    ":perfetto_src_tracing_ipc",
+    ":perfetto_src_tracing_tracing",
     "src/perfetto_cmd/main.cc",
-    "src/perfetto_cmd/packet_writer.cc",
-    "src/perfetto_cmd/pbtxt_to_pb.cc",
-    "src/perfetto_cmd/perfetto_cmd.cc",
-    "src/perfetto_cmd/perfetto_cmd_android.cc",
-    "src/perfetto_cmd/rate_limiter.cc",
-    "src/perfetto_cmd/trigger_producer.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/tracing/core/chrome_config.cc",
-    "src/tracing/core/commit_data_request.cc",
-    "src/tracing/core/data_source_config.cc",
-    "src/tracing/core/data_source_descriptor.cc",
-    "src/tracing/core/id_allocator.cc",
-    "src/tracing/core/metatrace_writer.cc",
-    "src/tracing/core/null_trace_writer.cc",
-    "src/tracing/core/observable_events.cc",
-    "src/tracing/core/packet_stream_validator.cc",
-    "src/tracing/core/shared_memory_abi.cc",
-    "src/tracing/core/shared_memory_arbiter_impl.cc",
-    "src/tracing/core/sliced_protobuf_input_stream.cc",
-    "src/tracing/core/startup_trace_writer.cc",
-    "src/tracing/core/startup_trace_writer_registry.cc",
-    "src/tracing/core/test_config.cc",
-    "src/tracing/core/trace_buffer.cc",
-    "src/tracing/core/trace_config.cc",
-    "src/tracing/core/trace_packet.cc",
-    "src/tracing/core/trace_stats.cc",
-    "src/tracing/core/trace_writer_impl.cc",
-    "src/tracing/core/tracing_service_impl.cc",
-    "src/tracing/core/tracing_service_state.cc",
-    "src/tracing/core/virtual_destructors.cc",
-    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
-    "src/tracing/ipc/default_socket.cc",
-    "src/tracing/ipc/posix_shared_memory.cc",
-    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
-    "src/tracing/ipc/service/consumer_ipc_service.cc",
-    "src/tracing/ipc/service/producer_ipc_service.cc",
-    "src/tracing/ipc/service/service_ipc_host_impl.cc",
-    "src/tracing/trace_writer_base.cc",
   ],
   shared_libs: [
     "liblog",
@@ -898,6 +685,7 @@ cc_binary {
   ],
 }
 
+// GN: //gn:default_deps
 cc_defaults {
   name: "perfetto_defaults",
   cflags: [
@@ -927,10 +715,91 @@ cc_defaults {
   },
 }
 
-// GN target: //:perfetto_integrationtests
+// GN: //include/perfetto/base:base
+filegroup {
+  name: "perfetto_include_perfetto_base_base",
+}
+
+// GN: //include/perfetto/ext/base:base
+filegroup {
+  name: "perfetto_include_perfetto_ext_base_base",
+}
+
+// GN: //include/perfetto/ext/ipc:ipc
+filegroup {
+  name: "perfetto_include_perfetto_ext_ipc_ipc",
+}
+
+// GN: //include/perfetto/ext/traced:sys_stats_counters
+filegroup {
+  name: "perfetto_include_perfetto_ext_traced_sys_stats_counters",
+}
+
+// GN: //include/perfetto/ext/traced:traced
+filegroup {
+  name: "perfetto_include_perfetto_ext_traced_traced",
+}
+
+// GN: //include/perfetto/ext/tracing/core:core
+filegroup {
+  name: "perfetto_include_perfetto_ext_tracing_core_core",
+}
+
+// GN: //include/perfetto/ext/tracing/ipc:ipc
+filegroup {
+  name: "perfetto_include_perfetto_ext_tracing_ipc_ipc",
+}
+
+// GN: //include/perfetto/profiling:normalize
+filegroup {
+  name: "perfetto_include_perfetto_profiling_normalize",
+}
+
+// GN: //include/perfetto/profiling:symbolizer
+filegroup {
+  name: "perfetto_include_perfetto_profiling_symbolizer",
+}
+
+// GN: //include/perfetto/protozero:protozero
+filegroup {
+  name: "perfetto_include_perfetto_protozero_protozero",
+}
+
+// GN: //include/perfetto/public:public
+filegroup {
+  name: "perfetto_include_perfetto_public_public",
+}
+
+// GN: //include/perfetto/trace_processor:trace_processor
+filegroup {
+  name: "perfetto_include_perfetto_trace_processor_trace_processor",
+}
+
+// GN: //include/perfetto/tracing/core:core
+filegroup {
+  name: "perfetto_include_perfetto_tracing_core_core",
+}
+
+// GN: //include/perfetto/tracing:tracing
+filegroup {
+  name: "perfetto_include_perfetto_tracing_tracing",
+}
+
+// GN: //:perfetto_integrationtests
 cc_test {
   name: "perfetto_integrationtests",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_ipc_ipc",
+    ":perfetto_include_perfetto_ext_traced_sys_stats_counters",
+    ":perfetto_include_perfetto_ext_traced_traced",
+    ":perfetto_include_perfetto_ext_tracing_core_core",
+    ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
+    ":perfetto_include_perfetto_profiling_normalize",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -982,136 +851,44 @@ cc_test {
     ":perfetto_protos_perfetto_trace_track_event_lite_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_perfetto_trace_trusted_lite_gen",
-    "src/android_internal/lazy_library_loader.cc",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/test/test_task_runner.cc",
-    "src/base/test/utils.cc",
-    "src/base/test/vm_test_utils.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/ipc/buffered_frame_deserializer.cc",
-    "src/ipc/client_impl.cc",
-    "src/ipc/deferred.cc",
-    "src/ipc/host_impl.cc",
-    "src/ipc/service_proxy.cc",
-    "src/ipc/virtual_destructors.cc",
-    "src/profiling/memory/bookkeeping.cc",
-    "src/profiling/memory/bookkeeping_dump.cc",
-    "src/profiling/memory/client.cc",
-    "src/profiling/memory/heapprofd_config.cc",
-    "src/profiling/memory/heapprofd_end_to_end_test.cc",
-    "src/profiling/memory/heapprofd_producer.cc",
-    "src/profiling/memory/java_hprof_config.cc",
-    "src/profiling/memory/java_hprof_producer.cc",
-    "src/profiling/memory/page_idle_checker.cc",
-    "src/profiling/memory/proc_utils.cc",
-    "src/profiling/memory/scoped_spinlock.cc",
-    "src/profiling/memory/shared_ring_buffer.cc",
-    "src/profiling/memory/system_property.cc",
-    "src/profiling/memory/unwinding.cc",
-    "src/profiling/memory/utils.cc",
-    "src/profiling/memory/wire_protocol.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/traced/probes/android_log/android_log_data_source.cc",
-    "src/traced/probes/filesystem/file_scanner.cc",
-    "src/traced/probes/filesystem/fs_mount.cc",
-    "src/traced/probes/filesystem/inode_file_data_source.cc",
-    "src/traced/probes/filesystem/lru_inode_cache.cc",
-    "src/traced/probes/filesystem/prefix_finder.cc",
-    "src/traced/probes/filesystem/range_tree.cc",
-    "src/traced/probes/ftrace/atrace_hal_wrapper.cc",
-    "src/traced/probes/ftrace/atrace_wrapper.cc",
-    "src/traced/probes/ftrace/compact_sched.cc",
-    "src/traced/probes/ftrace/cpu_reader.cc",
-    "src/traced/probes/ftrace/cpu_stats_parser.cc",
-    "src/traced/probes/ftrace/event_info.cc",
-    "src/traced/probes/ftrace/event_info_constants.cc",
-    "src/traced/probes/ftrace/format_parser.cc",
-    "src/traced/probes/ftrace/ftrace_config.cc",
-    "src/traced/probes/ftrace/ftrace_config_muxer.cc",
-    "src/traced/probes/ftrace/ftrace_config_utils.cc",
-    "src/traced/probes/ftrace/ftrace_controller.cc",
-    "src/traced/probes/ftrace/ftrace_data_source.cc",
-    "src/traced/probes/ftrace/ftrace_metadata.cc",
-    "src/traced/probes/ftrace/ftrace_procfs.cc",
-    "src/traced/probes/ftrace/ftrace_procfs_integrationtest.cc",
-    "src/traced/probes/ftrace/ftrace_stats.cc",
-    "src/traced/probes/ftrace/proto_translation_table.cc",
-    "src/traced/probes/ftrace/test/cpu_reader_support.cc",
-    "src/traced/probes/metatrace/metatrace_data_source.cc",
-    "src/traced/probes/packages_list/packages_list_data_source.cc",
-    "src/traced/probes/power/android_power_data_source.cc",
-    "src/traced/probes/probes_data_source.cc",
-    "src/traced/probes/probes_producer.cc",
-    "src/traced/probes/ps/process_stats_data_source.cc",
-    "src/traced/probes/sys_stats/sys_stats_data_source.cc",
-    "src/tracing/api_integrationtest.cc",
-    "src/tracing/core/chrome_config.cc",
-    "src/tracing/core/commit_data_request.cc",
-    "src/tracing/core/data_source_config.cc",
-    "src/tracing/core/data_source_descriptor.cc",
-    "src/tracing/core/id_allocator.cc",
-    "src/tracing/core/metatrace_writer.cc",
-    "src/tracing/core/null_trace_writer.cc",
-    "src/tracing/core/observable_events.cc",
-    "src/tracing/core/packet_stream_validator.cc",
-    "src/tracing/core/shared_memory_abi.cc",
-    "src/tracing/core/shared_memory_arbiter_impl.cc",
-    "src/tracing/core/sliced_protobuf_input_stream.cc",
-    "src/tracing/core/startup_trace_writer.cc",
-    "src/tracing/core/startup_trace_writer_registry.cc",
-    "src/tracing/core/test_config.cc",
-    "src/tracing/core/trace_buffer.cc",
-    "src/tracing/core/trace_config.cc",
-    "src/tracing/core/trace_packet.cc",
-    "src/tracing/core/trace_stats.cc",
-    "src/tracing/core/trace_writer_impl.cc",
-    "src/tracing/core/tracing_service_impl.cc",
-    "src/tracing/core/tracing_service_state.cc",
-    "src/tracing/core/virtual_destructors.cc",
-    "src/tracing/data_source.cc",
-    "src/tracing/internal/in_process_tracing_backend.cc",
-    "src/tracing/internal/system_tracing_backend.cc",
-    "src/tracing/internal/tracing_muxer_impl.cc",
-    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
-    "src/tracing/ipc/default_socket.cc",
-    "src/tracing/ipc/posix_shared_memory.cc",
-    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
-    "src/tracing/ipc/service/consumer_ipc_service.cc",
-    "src/tracing/ipc/service/producer_ipc_service.cc",
-    "src/tracing/ipc/service/service_ipc_host_impl.cc",
-    "src/tracing/platform.cc",
-    "src/tracing/platform_posix.cc",
-    "src/tracing/test/api_test_support.cc",
-    "src/tracing/trace_writer_base.cc",
-    "src/tracing/tracing.cc",
-    "src/tracing/track_event.cc",
-    "src/tracing/virtual_destructors.cc",
-    "test/end_to_end_integrationtest.cc",
-    "test/fake_producer.cc",
-    "test/task_runner_thread.cc",
-    "test/task_runner_thread_delegates.cc",
-    "test/test_helper.cc",
+    ":perfetto_src_android_internal_headers",
+    ":perfetto_src_android_internal_lazy_library_loader",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_test_support",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_ipc_ipc",
+    ":perfetto_src_profiling_memory_client",
+    ":perfetto_src_profiling_memory_daemon",
+    ":perfetto_src_profiling_memory_end_to_end_tests",
+    ":perfetto_src_profiling_memory_proc_utils",
+    ":perfetto_src_profiling_memory_ring_buffer",
+    ":perfetto_src_profiling_memory_scoped_spinlock",
+    ":perfetto_src_profiling_memory_wire_protocol",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_traced_probes_android_log_android_log",
+    ":perfetto_src_traced_probes_data_source",
+    ":perfetto_src_traced_probes_filesystem_filesystem",
+    ":perfetto_src_traced_probes_ftrace_format_parser",
+    ":perfetto_src_traced_probes_ftrace_ftrace",
+    ":perfetto_src_traced_probes_ftrace_integrationtests",
+    ":perfetto_src_traced_probes_ftrace_test_support",
+    ":perfetto_src_traced_probes_metatrace_metatrace",
+    ":perfetto_src_traced_probes_packages_list_packages_list",
+    ":perfetto_src_traced_probes_power_power",
+    ":perfetto_src_traced_probes_probes_src",
+    ":perfetto_src_traced_probes_ps_ps",
+    ":perfetto_src_traced_probes_sys_stats_sys_stats",
+    ":perfetto_src_tracing_client_api",
+    ":perfetto_src_tracing_client_api_integrationtests",
+    ":perfetto_src_tracing_common",
+    ":perfetto_src_tracing_ipc",
+    ":perfetto_src_tracing_platform_posix",
+    ":perfetto_src_tracing_test_api_test_support",
+    ":perfetto_src_tracing_tracing",
+    ":perfetto_test_end_to_end_integrationtests",
+    ":perfetto_test_task_runner_thread",
+    ":perfetto_test_task_runner_thread_delegates",
+    ":perfetto_test_test_helper",
   ],
   shared_libs: [
     "libbase",
@@ -1186,7 +963,7 @@ cc_test {
   ],
 }
 
-// GN target: //protos/perfetto/common:lite_gen
+// GN: //protos/perfetto/common:lite
 genrule {
   name: "perfetto_protos_perfetto_common_lite_gen",
   srcs: [
@@ -1204,7 +981,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/common/android_log_constants.pb.cc",
     "external/perfetto/protos/perfetto/common/commit_data_request.pb.cc",
@@ -1219,7 +996,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/common:lite_gen
+// GN: //protos/perfetto/common:lite
 genrule {
   name: "perfetto_protos_perfetto_common_lite_gen_headers",
   srcs: [
@@ -1237,7 +1014,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/common/android_log_constants.pb.h",
     "external/perfetto/protos/perfetto/common/commit_data_request.pb.h",
@@ -1256,7 +1033,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/common:zero_gen
+// GN: //protos/perfetto/common:zero
 genrule {
   name: "perfetto_protos_perfetto_common_zero_gen",
   srcs: [
@@ -1273,9 +1050,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/common/android_log_constants.pbzero.cc",
     "external/perfetto/protos/perfetto/common/commit_data_request.pbzero.cc",
@@ -1290,7 +1067,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/common:zero_gen
+// GN: //protos/perfetto/common:zero
 genrule {
   name: "perfetto_protos_perfetto_common_zero_gen_headers",
   srcs: [
@@ -1307,9 +1084,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/common/android_log_constants.pbzero.h",
     "external/perfetto/protos/perfetto/common/commit_data_request.pbzero.h",
@@ -1328,7 +1105,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/android:lite_gen
+// GN: //protos/perfetto/config/android:lite
 genrule {
   name: "perfetto_protos_perfetto_config_android_lite_gen",
   srcs: [
@@ -1338,14 +1115,14 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/android/android_log_config.pb.cc",
     "external/perfetto/protos/perfetto/config/android/packages_list_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/android:lite_gen
+// GN: //protos/perfetto/config/android:lite
 genrule {
   name: "perfetto_protos_perfetto_config_android_lite_gen_headers",
   srcs: [
@@ -1355,7 +1132,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/android/android_log_config.pb.h",
     "external/perfetto/protos/perfetto/config/android/packages_list_config.pb.h",
@@ -1366,7 +1143,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/android:zero_gen
+// GN: //protos/perfetto/config/android:zero
 genrule {
   name: "perfetto_protos_perfetto_config_android_zero_gen",
   srcs: [
@@ -1375,16 +1152,16 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/android/android_log_config.pbzero.cc",
     "external/perfetto/protos/perfetto/config/android/packages_list_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/android:zero_gen
+// GN: //protos/perfetto/config/android:zero
 genrule {
   name: "perfetto_protos_perfetto_config_android_zero_gen_headers",
   srcs: [
@@ -1393,9 +1170,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/android/android_log_config.pbzero.h",
     "external/perfetto/protos/perfetto/config/android/packages_list_config.pbzero.h",
@@ -1406,7 +1183,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/ftrace:lite_gen
+// GN: //protos/perfetto/config/ftrace:lite
 genrule {
   name: "perfetto_protos_perfetto_config_ftrace_lite_gen",
   srcs: [
@@ -1415,13 +1192,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/ftrace/ftrace_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/ftrace:lite_gen
+// GN: //protos/perfetto/config/ftrace:lite
 genrule {
   name: "perfetto_protos_perfetto_config_ftrace_lite_gen_headers",
   srcs: [
@@ -1430,7 +1207,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/ftrace/ftrace_config.pb.h",
   ],
@@ -1440,7 +1217,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/ftrace:zero_gen
+// GN: //protos/perfetto/config/ftrace:zero
 genrule {
   name: "perfetto_protos_perfetto_config_ftrace_zero_gen",
   srcs: [
@@ -1448,15 +1225,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/ftrace/ftrace_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/ftrace:zero_gen
+// GN: //protos/perfetto/config/ftrace:zero
 genrule {
   name: "perfetto_protos_perfetto_config_ftrace_zero_gen_headers",
   srcs: [
@@ -1464,9 +1241,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/ftrace/ftrace_config.pbzero.h",
   ],
@@ -1476,7 +1253,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/gpu:lite_gen
+// GN: //protos/perfetto/config/gpu:lite
 genrule {
   name: "perfetto_protos_perfetto_config_gpu_lite_gen",
   srcs: [
@@ -1485,13 +1262,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/gpu/gpu_counter_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/gpu:lite_gen
+// GN: //protos/perfetto/config/gpu:lite
 genrule {
   name: "perfetto_protos_perfetto_config_gpu_lite_gen_headers",
   srcs: [
@@ -1500,7 +1277,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/gpu/gpu_counter_config.pb.h",
   ],
@@ -1510,7 +1287,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/gpu:zero_gen
+// GN: //protos/perfetto/config/gpu:zero
 genrule {
   name: "perfetto_protos_perfetto_config_gpu_zero_gen",
   srcs: [
@@ -1518,15 +1295,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/gpu/gpu_counter_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/gpu:zero_gen
+// GN: //protos/perfetto/config/gpu:zero
 genrule {
   name: "perfetto_protos_perfetto_config_gpu_zero_gen_headers",
   srcs: [
@@ -1534,9 +1311,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/gpu/gpu_counter_config.pbzero.h",
   ],
@@ -1546,7 +1323,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/inode_file:lite_gen
+// GN: //protos/perfetto/config/inode_file:lite
 genrule {
   name: "perfetto_protos_perfetto_config_inode_file_lite_gen",
   srcs: [
@@ -1555,13 +1332,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/inode_file/inode_file_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/inode_file:lite_gen
+// GN: //protos/perfetto/config/inode_file:lite
 genrule {
   name: "perfetto_protos_perfetto_config_inode_file_lite_gen_headers",
   srcs: [
@@ -1570,7 +1347,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/inode_file/inode_file_config.pb.h",
   ],
@@ -1580,7 +1357,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/inode_file:zero_gen
+// GN: //protos/perfetto/config/inode_file:zero
 genrule {
   name: "perfetto_protos_perfetto_config_inode_file_zero_gen",
   srcs: [
@@ -1588,15 +1365,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/inode_file/inode_file_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/inode_file:zero_gen
+// GN: //protos/perfetto/config/inode_file:zero
 genrule {
   name: "perfetto_protos_perfetto_config_inode_file_zero_gen_headers",
   srcs: [
@@ -1604,9 +1381,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/inode_file/inode_file_config.pbzero.h",
   ],
@@ -1616,7 +1393,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config:lite_gen
+// GN: //protos/perfetto/config:lite
 genrule {
   name: "perfetto_protos_perfetto_config_lite_gen",
   srcs: [
@@ -1628,7 +1405,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/chrome/chrome_config.pb.cc",
     "external/perfetto/protos/perfetto/config/data_source_config.pb.cc",
@@ -1637,7 +1414,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config:lite_gen
+// GN: //protos/perfetto/config:lite
 genrule {
   name: "perfetto_protos_perfetto_config_lite_gen_headers",
   srcs: [
@@ -1649,7 +1426,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/chrome/chrome_config.pb.h",
     "external/perfetto/protos/perfetto/config/data_source_config.pb.h",
@@ -1662,7 +1439,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/power:lite_gen
+// GN: //protos/perfetto/config/power:lite
 genrule {
   name: "perfetto_protos_perfetto_config_power_lite_gen",
   srcs: [
@@ -1671,13 +1448,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/power/android_power_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/power:lite_gen
+// GN: //protos/perfetto/config/power:lite
 genrule {
   name: "perfetto_protos_perfetto_config_power_lite_gen_headers",
   srcs: [
@@ -1686,7 +1463,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/power/android_power_config.pb.h",
   ],
@@ -1696,7 +1473,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/power:zero_gen
+// GN: //protos/perfetto/config/power:zero
 genrule {
   name: "perfetto_protos_perfetto_config_power_zero_gen",
   srcs: [
@@ -1704,15 +1481,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/power/android_power_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/power:zero_gen
+// GN: //protos/perfetto/config/power:zero
 genrule {
   name: "perfetto_protos_perfetto_config_power_zero_gen_headers",
   srcs: [
@@ -1720,9 +1497,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/power/android_power_config.pbzero.h",
   ],
@@ -1732,7 +1509,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/process_stats:lite_gen
+// GN: //protos/perfetto/config/process_stats:lite
 genrule {
   name: "perfetto_protos_perfetto_config_process_stats_lite_gen",
   srcs: [
@@ -1741,13 +1518,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/process_stats/process_stats_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/process_stats:lite_gen
+// GN: //protos/perfetto/config/process_stats:lite
 genrule {
   name: "perfetto_protos_perfetto_config_process_stats_lite_gen_headers",
   srcs: [
@@ -1756,7 +1533,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/process_stats/process_stats_config.pb.h",
   ],
@@ -1766,7 +1543,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/process_stats:zero_gen
+// GN: //protos/perfetto/config/process_stats:zero
 genrule {
   name: "perfetto_protos_perfetto_config_process_stats_zero_gen",
   srcs: [
@@ -1774,15 +1551,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/process_stats/process_stats_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/process_stats:zero_gen
+// GN: //protos/perfetto/config/process_stats:zero
 genrule {
   name: "perfetto_protos_perfetto_config_process_stats_zero_gen_headers",
   srcs: [
@@ -1790,9 +1567,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/process_stats/process_stats_config.pbzero.h",
   ],
@@ -1802,7 +1579,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/profiling:lite_gen
+// GN: //protos/perfetto/config/profiling:lite
 genrule {
   name: "perfetto_protos_perfetto_config_profiling_lite_gen",
   srcs: [
@@ -1812,14 +1589,14 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/profiling/heapprofd_config.pb.cc",
     "external/perfetto/protos/perfetto/config/profiling/java_hprof_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/profiling:lite_gen
+// GN: //protos/perfetto/config/profiling:lite
 genrule {
   name: "perfetto_protos_perfetto_config_profiling_lite_gen_headers",
   srcs: [
@@ -1829,7 +1606,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/profiling/heapprofd_config.pb.h",
     "external/perfetto/protos/perfetto/config/profiling/java_hprof_config.pb.h",
@@ -1840,7 +1617,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/profiling:zero_gen
+// GN: //protos/perfetto/config/profiling:zero
 genrule {
   name: "perfetto_protos_perfetto_config_profiling_zero_gen",
   srcs: [
@@ -1849,16 +1626,16 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/profiling/heapprofd_config.pbzero.cc",
     "external/perfetto/protos/perfetto/config/profiling/java_hprof_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/profiling:zero_gen
+// GN: //protos/perfetto/config/profiling:zero
 genrule {
   name: "perfetto_protos_perfetto_config_profiling_zero_gen_headers",
   srcs: [
@@ -1867,9 +1644,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/profiling/heapprofd_config.pbzero.h",
     "external/perfetto/protos/perfetto/config/profiling/java_hprof_config.pbzero.h",
@@ -1880,7 +1657,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/sys_stats:lite_gen
+// GN: //protos/perfetto/config/sys_stats:lite
 genrule {
   name: "perfetto_protos_perfetto_config_sys_stats_lite_gen",
   srcs: [
@@ -1889,13 +1666,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/sys_stats/sys_stats_config.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/sys_stats:lite_gen
+// GN: //protos/perfetto/config/sys_stats:lite
 genrule {
   name: "perfetto_protos_perfetto_config_sys_stats_lite_gen_headers",
   srcs: [
@@ -1904,7 +1681,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/sys_stats/sys_stats_config.pb.h",
   ],
@@ -1914,7 +1691,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config/sys_stats:zero_gen
+// GN: //protos/perfetto/config/sys_stats:zero
 genrule {
   name: "perfetto_protos_perfetto_config_sys_stats_zero_gen",
   srcs: [
@@ -1922,15 +1699,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/sys_stats/sys_stats_config.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/config/sys_stats:zero_gen
+// GN: //protos/perfetto/config/sys_stats:zero
 genrule {
   name: "perfetto_protos_perfetto_config_sys_stats_zero_gen_headers",
   srcs: [
@@ -1938,9 +1715,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/sys_stats/sys_stats_config.pbzero.h",
   ],
@@ -1950,7 +1727,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config:zero_gen
+// GN: //protos/perfetto/config:zero
 genrule {
   name: "perfetto_protos_perfetto_config_zero_gen",
   srcs: [
@@ -1961,9 +1738,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/chrome/chrome_config.pbzero.cc",
     "external/perfetto/protos/perfetto/config/data_source_config.pbzero.cc",
@@ -1972,7 +1749,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/config:zero_gen
+// GN: //protos/perfetto/config:zero
 genrule {
   name: "perfetto_protos_perfetto_config_zero_gen_headers",
   srcs: [
@@ -1983,9 +1760,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/config/chrome/chrome_config.pbzero.h",
     "external/perfetto/protos/perfetto/config/data_source_config.pbzero.h",
@@ -1998,7 +1775,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/ipc:ipc_gen
+// GN: //protos/perfetto/ipc:ipc
 genrule {
   name: "perfetto_protos_perfetto_ipc_ipc_gen",
   srcs: [
@@ -2007,9 +1784,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "ipc_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location ipc_plugin) --plugin_out=:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/ipc/consumer_port.ipc.cc",
     "external/perfetto/protos/perfetto/ipc/consumer_port.pb.cc",
@@ -2018,7 +1795,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/ipc:ipc_gen
+// GN: //protos/perfetto/ipc:ipc
 genrule {
   name: "perfetto_protos_perfetto_ipc_ipc_gen_headers",
   srcs: [
@@ -2027,9 +1804,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "ipc_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location ipc_plugin) --plugin_out=:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/ipc/consumer_port.ipc.h",
     "external/perfetto/protos/perfetto/ipc/consumer_port.pb.h",
@@ -2042,7 +1819,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/ipc:wire_protocol_gen
+// GN: //protos/perfetto/ipc:wire_protocol
 genrule {
   name: "perfetto_protos_perfetto_ipc_wire_protocol_gen",
   srcs: [
@@ -2051,13 +1828,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/ipc/wire_protocol.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/ipc:wire_protocol_gen
+// GN: //protos/perfetto/ipc:wire_protocol
 genrule {
   name: "perfetto_protos_perfetto_ipc_wire_protocol_gen_headers",
   srcs: [
@@ -2066,7 +1843,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/ipc/wire_protocol.pb.h",
   ],
@@ -2076,7 +1853,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/metrics/android:zero_gen
+// GN: //protos/perfetto/metrics/android:zero
 genrule {
   name: "perfetto_protos_perfetto_metrics_android_zero_gen",
   srcs: [
@@ -2095,9 +1872,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/metrics/android/batt_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/cpu_metric.pbzero.cc",
@@ -2114,7 +1891,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/metrics/android:zero_gen
+// GN: //protos/perfetto/metrics/android:zero
 genrule {
   name: "perfetto_protos_perfetto_metrics_android_zero_gen_headers",
   srcs: [
@@ -2133,9 +1910,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/metrics/android/batt_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/cpu_metric.pbzero.h",
@@ -2156,7 +1933,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/metrics:zero_gen
+// GN: //protos/perfetto/metrics:zero
 genrule {
   name: "perfetto_protos_perfetto_metrics_zero_gen",
   srcs: [
@@ -2164,15 +1941,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/metrics/metrics.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/metrics:zero_gen
+// GN: //protos/perfetto/metrics:zero
 genrule {
   name: "perfetto_protos_perfetto_metrics_zero_gen_headers",
   srcs: [
@@ -2180,9 +1957,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/metrics/metrics.pbzero.h",
   ],
@@ -2192,7 +1969,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/android:lite_gen
+// GN: //protos/perfetto/trace/android:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_android_lite_gen",
   srcs: [
@@ -2203,7 +1980,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/android/android_log.pb.cc",
     "external/perfetto/protos/perfetto/trace/android/graphics_frame_event.pb.cc",
@@ -2211,7 +1988,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/android:lite_gen
+// GN: //protos/perfetto/trace/android:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_android_lite_gen_headers",
   srcs: [
@@ -2222,7 +1999,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/android/android_log.pb.h",
     "external/perfetto/protos/perfetto/trace/android/graphics_frame_event.pb.h",
@@ -2234,7 +2011,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/android:zero_gen
+// GN: //protos/perfetto/trace/android:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_android_zero_gen",
   srcs: [
@@ -2244,9 +2021,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/android/android_log.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/android/graphics_frame_event.pbzero.cc",
@@ -2254,7 +2031,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/android:zero_gen
+// GN: //protos/perfetto/trace/android:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_android_zero_gen_headers",
   srcs: [
@@ -2264,9 +2041,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/android/android_log.pbzero.h",
     "external/perfetto/protos/perfetto/trace/android/graphics_frame_event.pbzero.h",
@@ -2278,7 +2055,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/chrome:lite_gen
+// GN: //protos/perfetto/trace/chrome:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_chrome_lite_gen",
   srcs: [
@@ -2289,7 +2066,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/chrome/chrome_benchmark_metadata.pb.cc",
     "external/perfetto/protos/perfetto/trace/chrome/chrome_metadata.pb.cc",
@@ -2297,7 +2074,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/chrome:lite_gen
+// GN: //protos/perfetto/trace/chrome:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_chrome_lite_gen_headers",
   srcs: [
@@ -2308,7 +2085,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/chrome/chrome_benchmark_metadata.pb.h",
     "external/perfetto/protos/perfetto/trace/chrome/chrome_metadata.pb.h",
@@ -2320,7 +2097,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/chrome:zero_gen
+// GN: //protos/perfetto/trace/chrome:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_chrome_zero_gen",
   srcs: [
@@ -2330,9 +2107,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/chrome/chrome_benchmark_metadata.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/chrome/chrome_metadata.pbzero.cc",
@@ -2340,7 +2117,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/chrome:zero_gen
+// GN: //protos/perfetto/trace/chrome:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_chrome_zero_gen_headers",
   srcs: [
@@ -2350,9 +2127,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/chrome/chrome_benchmark_metadata.pbzero.h",
     "external/perfetto/protos/perfetto/trace/chrome/chrome_metadata.pbzero.h",
@@ -2364,7 +2141,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/filesystem:lite_gen
+// GN: //protos/perfetto/trace/filesystem:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_filesystem_lite_gen",
   srcs: [
@@ -2373,13 +2150,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/filesystem/inode_file_map.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/filesystem:lite_gen
+// GN: //protos/perfetto/trace/filesystem:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_filesystem_lite_gen_headers",
   srcs: [
@@ -2388,7 +2165,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/filesystem/inode_file_map.pb.h",
   ],
@@ -2398,7 +2175,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/filesystem:zero_gen
+// GN: //protos/perfetto/trace/filesystem:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_filesystem_zero_gen",
   srcs: [
@@ -2406,15 +2183,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/filesystem/inode_file_map.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/filesystem:zero_gen
+// GN: //protos/perfetto/trace/filesystem:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_filesystem_zero_gen_headers",
   srcs: [
@@ -2422,9 +2199,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/filesystem/inode_file_map.pbzero.h",
   ],
@@ -2434,7 +2211,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/ftrace:lite_gen
+// GN: //protos/perfetto/trace/ftrace:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_ftrace_lite_gen",
   srcs: [
@@ -2475,7 +2252,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ftrace/binder.pb.cc",
     "external/perfetto/protos/perfetto/trace/ftrace/block.pb.cc",
@@ -2513,7 +2290,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/ftrace:lite_gen
+// GN: //protos/perfetto/trace/ftrace:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_ftrace_lite_gen_headers",
   srcs: [
@@ -2554,7 +2331,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ftrace/binder.pb.h",
     "external/perfetto/protos/perfetto/trace/ftrace/block.pb.h",
@@ -2596,7 +2373,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/ftrace:zero_gen
+// GN: //protos/perfetto/trace/ftrace:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_ftrace_zero_gen",
   srcs: [
@@ -2636,9 +2413,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ftrace/binder.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/ftrace/block.pbzero.cc",
@@ -2676,7 +2453,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/ftrace:zero_gen
+// GN: //protos/perfetto/trace/ftrace:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_ftrace_zero_gen_headers",
   srcs: [
@@ -2716,9 +2493,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ftrace/binder.pbzero.h",
     "external/perfetto/protos/perfetto/trace/ftrace/block.pbzero.h",
@@ -2760,7 +2537,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/gpu:lite_gen
+// GN: //protos/perfetto/trace/gpu:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_gpu_lite_gen",
   srcs: [
@@ -2771,7 +2548,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/gpu/gpu_counter_event.pb.cc",
     "external/perfetto/protos/perfetto/trace/gpu/gpu_render_stage_event.pb.cc",
@@ -2779,7 +2556,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/gpu:lite_gen
+// GN: //protos/perfetto/trace/gpu:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_gpu_lite_gen_headers",
   srcs: [
@@ -2790,7 +2567,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/gpu/gpu_counter_event.pb.h",
     "external/perfetto/protos/perfetto/trace/gpu/gpu_render_stage_event.pb.h",
@@ -2802,7 +2579,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/gpu:zero_gen
+// GN: //protos/perfetto/trace/gpu:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_gpu_zero_gen",
   srcs: [
@@ -2812,9 +2589,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/gpu/gpu_counter_event.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/gpu/gpu_render_stage_event.pbzero.cc",
@@ -2822,7 +2599,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/gpu:zero_gen
+// GN: //protos/perfetto/trace/gpu:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_gpu_zero_gen_headers",
   srcs: [
@@ -2832,9 +2609,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/gpu/gpu_counter_event.pbzero.h",
     "external/perfetto/protos/perfetto/trace/gpu/gpu_render_stage_event.pbzero.h",
@@ -2846,7 +2623,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/interned_data:lite_gen
+// GN: //protos/perfetto/trace/interned_data:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_interned_data_lite_gen",
   srcs: [
@@ -2855,13 +2632,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/interned_data/interned_data.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/interned_data:lite_gen
+// GN: //protos/perfetto/trace/interned_data:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_interned_data_lite_gen_headers",
   srcs: [
@@ -2870,7 +2647,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/interned_data/interned_data.pb.h",
   ],
@@ -2880,7 +2657,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/interned_data:zero_gen
+// GN: //protos/perfetto/trace/interned_data:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_interned_data_zero_gen",
   srcs: [
@@ -2888,15 +2665,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/interned_data/interned_data.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/interned_data:zero_gen
+// GN: //protos/perfetto/trace/interned_data:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_interned_data_zero_gen_headers",
   srcs: [
@@ -2904,9 +2681,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/interned_data/interned_data.pbzero.h",
   ],
@@ -2916,7 +2693,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:minimal_lite_gen
+// GN: //protos/perfetto/trace:minimal_lite
 genrule {
   name: "perfetto_protos_perfetto_trace_minimal_lite_gen",
   srcs: [
@@ -2927,7 +2704,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/clock_snapshot.pb.cc",
     "external/perfetto/protos/perfetto/trace/system_info.pb.cc",
@@ -2935,7 +2712,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:minimal_lite_gen
+// GN: //protos/perfetto/trace:minimal_lite
 genrule {
   name: "perfetto_protos_perfetto_trace_minimal_lite_gen_headers",
   srcs: [
@@ -2946,7 +2723,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/clock_snapshot.pb.h",
     "external/perfetto/protos/perfetto/trace/system_info.pb.h",
@@ -2958,7 +2735,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:minimal_zero_gen
+// GN: //protos/perfetto/trace:minimal_zero
 genrule {
   name: "perfetto_protos_perfetto_trace_minimal_zero_gen",
   srcs: [
@@ -2968,9 +2745,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/clock_snapshot.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/system_info.pbzero.cc",
@@ -2978,7 +2755,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:minimal_zero_gen
+// GN: //protos/perfetto/trace:minimal_zero
 genrule {
   name: "perfetto_protos_perfetto_trace_minimal_zero_gen_headers",
   srcs: [
@@ -2988,9 +2765,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/clock_snapshot.pbzero.h",
     "external/perfetto/protos/perfetto/trace/system_info.pbzero.h",
@@ -3002,7 +2779,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:non_minimal_lite_gen
+// GN: //protos/perfetto/trace:non_minimal_lite
 genrule {
   name: "perfetto_protos_perfetto_trace_non_minimal_lite_gen",
   srcs: [
@@ -3014,7 +2791,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/test_event.pb.cc",
     "external/perfetto/protos/perfetto/trace/trace.pb.cc",
@@ -3023,7 +2800,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:non_minimal_lite_gen
+// GN: //protos/perfetto/trace:non_minimal_lite
 genrule {
   name: "perfetto_protos_perfetto_trace_non_minimal_lite_gen_headers",
   srcs: [
@@ -3035,7 +2812,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/test_event.pb.h",
     "external/perfetto/protos/perfetto/trace/trace.pb.h",
@@ -3048,7 +2825,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:non_minimal_zero_gen
+// GN: //protos/perfetto/trace:non_minimal_zero
 genrule {
   name: "perfetto_protos_perfetto_trace_non_minimal_zero_gen",
   srcs: [
@@ -3059,9 +2836,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/test_event.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/trace.pbzero.cc",
@@ -3070,7 +2847,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:non_minimal_zero_gen
+// GN: //protos/perfetto/trace:non_minimal_zero
 genrule {
   name: "perfetto_protos_perfetto_trace_non_minimal_zero_gen_headers",
   srcs: [
@@ -3081,9 +2858,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/test_event.pbzero.h",
     "external/perfetto/protos/perfetto/trace/trace.pbzero.h",
@@ -3096,7 +2873,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/perfetto:lite_gen
+// GN: //protos/perfetto/trace/perfetto:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_perfetto_lite_gen",
   srcs: [
@@ -3105,13 +2882,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/perfetto/perfetto_metatrace.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/perfetto:lite_gen
+// GN: //protos/perfetto/trace/perfetto:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_perfetto_lite_gen_headers",
   srcs: [
@@ -3120,7 +2897,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/perfetto/perfetto_metatrace.pb.h",
   ],
@@ -3130,7 +2907,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/perfetto:zero_gen
+// GN: //protos/perfetto/trace/perfetto:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_perfetto_zero_gen",
   srcs: [
@@ -3138,15 +2915,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/perfetto/perfetto_metatrace.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/perfetto:zero_gen
+// GN: //protos/perfetto/trace/perfetto:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_perfetto_zero_gen_headers",
   srcs: [
@@ -3154,9 +2931,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/perfetto/perfetto_metatrace.pbzero.h",
   ],
@@ -3166,7 +2943,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/power:lite_gen
+// GN: //protos/perfetto/trace/power:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_power_lite_gen",
   srcs: [
@@ -3176,14 +2953,14 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/power/battery_counters.pb.cc",
     "external/perfetto/protos/perfetto/trace/power/power_rails.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/power:lite_gen
+// GN: //protos/perfetto/trace/power:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_power_lite_gen_headers",
   srcs: [
@@ -3193,7 +2970,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/power/battery_counters.pb.h",
     "external/perfetto/protos/perfetto/trace/power/power_rails.pb.h",
@@ -3204,7 +2981,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/power:zero_gen
+// GN: //protos/perfetto/trace/power:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_power_zero_gen",
   srcs: [
@@ -3213,16 +2990,16 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/power/battery_counters.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/power/power_rails.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/power:zero_gen
+// GN: //protos/perfetto/trace/power:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_power_zero_gen_headers",
   srcs: [
@@ -3231,9 +3008,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/power/battery_counters.pbzero.h",
     "external/perfetto/protos/perfetto/trace/power/power_rails.pbzero.h",
@@ -3244,7 +3021,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace_processor:metrics_impl_zero_gen
+// GN: //protos/perfetto/trace_processor:metrics_impl_zero
 genrule {
   name: "perfetto_protos_perfetto_trace_processor_metrics_impl_zero_gen",
   srcs: [
@@ -3252,15 +3029,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace_processor/metrics_impl.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace_processor:metrics_impl_zero_gen
+// GN: //protos/perfetto/trace_processor:metrics_impl_zero
 genrule {
   name: "perfetto_protos_perfetto_trace_processor_metrics_impl_zero_gen_headers",
   srcs: [
@@ -3268,9 +3045,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace_processor/metrics_impl.pbzero.h",
   ],
@@ -3280,7 +3057,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/profiling:lite_gen
+// GN: //protos/perfetto/trace/profiling:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_profiling_lite_gen",
   srcs: [
@@ -3291,7 +3068,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/profiling/heap_graph.pb.cc",
     "external/perfetto/protos/perfetto/trace/profiling/profile_common.pb.cc",
@@ -3299,7 +3076,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/profiling:lite_gen
+// GN: //protos/perfetto/trace/profiling:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_profiling_lite_gen_headers",
   srcs: [
@@ -3310,7 +3087,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/profiling/heap_graph.pb.h",
     "external/perfetto/protos/perfetto/trace/profiling/profile_common.pb.h",
@@ -3322,7 +3099,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/profiling:zero_gen
+// GN: //protos/perfetto/trace/profiling:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_profiling_zero_gen",
   srcs: [
@@ -3332,9 +3109,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/profiling/heap_graph.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/profiling/profile_common.pbzero.cc",
@@ -3342,7 +3119,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/profiling:zero_gen
+// GN: //protos/perfetto/trace/profiling:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_profiling_zero_gen_headers",
   srcs: [
@@ -3352,9 +3129,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/profiling/heap_graph.pbzero.h",
     "external/perfetto/protos/perfetto/trace/profiling/profile_common.pbzero.h",
@@ -3366,7 +3143,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/ps:lite_gen
+// GN: //protos/perfetto/trace/ps:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_ps_lite_gen",
   srcs: [
@@ -3376,14 +3153,14 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ps/process_stats.pb.cc",
     "external/perfetto/protos/perfetto/trace/ps/process_tree.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/ps:lite_gen
+// GN: //protos/perfetto/trace/ps:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_ps_lite_gen_headers",
   srcs: [
@@ -3393,7 +3170,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ps/process_stats.pb.h",
     "external/perfetto/protos/perfetto/trace/ps/process_tree.pb.h",
@@ -3404,7 +3181,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/ps:zero_gen
+// GN: //protos/perfetto/trace/ps:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_ps_zero_gen",
   srcs: [
@@ -3413,16 +3190,16 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ps/process_stats.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/ps/process_tree.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/ps:zero_gen
+// GN: //protos/perfetto/trace/ps:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_ps_zero_gen_headers",
   srcs: [
@@ -3431,9 +3208,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/ps/process_stats.pbzero.h",
     "external/perfetto/protos/perfetto/trace/ps/process_tree.pbzero.h",
@@ -3444,7 +3221,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/sys_stats:lite_gen
+// GN: //protos/perfetto/trace/sys_stats:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_sys_stats_lite_gen",
   srcs: [
@@ -3453,13 +3230,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/sys_stats/sys_stats.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/sys_stats:lite_gen
+// GN: //protos/perfetto/trace/sys_stats:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_sys_stats_lite_gen_headers",
   srcs: [
@@ -3468,7 +3245,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/sys_stats/sys_stats.pb.h",
   ],
@@ -3478,7 +3255,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/sys_stats:zero_gen
+// GN: //protos/perfetto/trace/sys_stats:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_sys_stats_zero_gen",
   srcs: [
@@ -3486,15 +3263,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/sys_stats/sys_stats.pbzero.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace/sys_stats:zero_gen
+// GN: //protos/perfetto/trace/sys_stats:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_sys_stats_zero_gen_headers",
   srcs: [
@@ -3502,9 +3279,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/sys_stats/sys_stats.pbzero.h",
   ],
@@ -3514,7 +3291,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/track_event:lite_gen
+// GN: //protos/perfetto/trace/track_event:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_track_event_lite_gen",
   srcs: [
@@ -3530,7 +3307,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pb.cc",
     "external/perfetto/protos/perfetto/trace/track_event/log_message.pb.cc",
@@ -3543,7 +3320,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/track_event:lite_gen
+// GN: //protos/perfetto/trace/track_event:lite
 genrule {
   name: "perfetto_protos_perfetto_trace_track_event_lite_gen_headers",
   srcs: [
@@ -3559,7 +3336,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pb.h",
     "external/perfetto/protos/perfetto/trace/track_event/log_message.pb.h",
@@ -3576,7 +3353,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/track_event:zero_gen
+// GN: //protos/perfetto/trace/track_event:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_track_event_zero_gen",
   srcs: [
@@ -3591,9 +3368,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pbzero.cc",
     "external/perfetto/protos/perfetto/trace/track_event/log_message.pbzero.cc",
@@ -3606,7 +3383,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace/track_event:zero_gen
+// GN: //protos/perfetto/trace/track_event:zero
 genrule {
   name: "perfetto_protos_perfetto_trace_track_event_zero_gen_headers",
   srcs: [
@@ -3621,9 +3398,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pbzero.h",
     "external/perfetto/protos/perfetto/trace/track_event/log_message.pbzero.h",
@@ -3640,7 +3417,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:trusted_lite_gen
+// GN: //protos/perfetto/trace:trusted_lite
 genrule {
   name: "perfetto_protos_perfetto_trace_trusted_lite_gen",
   srcs: [
@@ -3649,13 +3426,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/trusted_packet.pb.cc",
   ],
 }
 
-// GN target: //protos/perfetto/trace:trusted_lite_gen
+// GN: //protos/perfetto/trace:trusted_lite
 genrule {
   name: "perfetto_protos_perfetto_trace_trusted_lite_gen_headers",
   srcs: [
@@ -3664,7 +3441,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/perfetto/trace/trusted_packet.pb.h",
   ],
@@ -3674,7 +3451,7 @@ genrule {
   ],
 }
 
-// GN target: //protos/third_party/pprof:lite_gen
+// GN: //protos/third_party/pprof:lite
 genrule {
   name: "perfetto_protos_third_party_pprof_lite_gen",
   srcs: [
@@ -3683,13 +3460,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/third_party/pprof/profile.pb.cc",
   ],
 }
 
-// GN target: //protos/third_party/pprof:lite_gen
+// GN: //protos/third_party/pprof:lite
 genrule {
   name: "perfetto_protos_third_party_pprof_lite_gen_headers",
   srcs: [
@@ -3698,7 +3475,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/protos/third_party/pprof/profile.pb.h",
   ],
@@ -3708,9 +3485,34 @@ genrule {
   ],
 }
 
-// GN target: //src/ipc/protoc_plugin:ipc_plugin(//gn/standalone/toolchain:gcc_like_host)
-cc_binary_host {
-  name: "perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_",
+// GN: //src/android_internal:android_internal
+filegroup {
+  name: "perfetto_src_android_internal_android_internal",
+  srcs: [
+    "src/android_internal/atrace_hal.cc",
+    "src/android_internal/dropbox_service.cc",
+    "src/android_internal/health_hal.cc",
+    "src/android_internal/incident_service.cc",
+    "src/android_internal/power_stats_hal.cc",
+  ],
+}
+
+// GN: //src/android_internal:headers
+filegroup {
+  name: "perfetto_src_android_internal_headers",
+}
+
+// GN: //src/android_internal:lazy_library_loader
+filegroup {
+  name: "perfetto_src_android_internal_lazy_library_loader",
+  srcs: [
+    "src/android_internal/lazy_library_loader.cc",
+  ],
+}
+
+// GN: //src/base:base
+filegroup {
+  name: "perfetto_src_base_base",
   srcs: [
     "src/base/event_fd.cc",
     "src/base/file_utils.cc",
@@ -3729,21 +3531,69 @@ cc_binary_host {
     "src/base/virtual_destructors.cc",
     "src/base/waitable_event.cc",
     "src/base/watchdog_posix.cc",
-    "src/ipc/protoc_plugin/ipc_plugin.cc",
   ],
-  shared_libs: [
-    "libprotoc",
+}
+
+// GN: //src/base:test_support
+filegroup {
+  name: "perfetto_src_base_test_support",
+  srcs: [
+    "src/base/test/test_task_runner.cc",
+    "src/base/test/utils.cc",
+    "src/base/test/vm_test_utils.cc",
   ],
-  defaults: [
-    "perfetto_defaults",
+}
+
+// GN: //src/base:unittests
+filegroup {
+  name: "perfetto_src_base_unittests",
+  srcs: [
+    "src/base/circular_queue_unittest.cc",
+    "src/base/copyable_ptr_unittest.cc",
+    "src/base/metatrace_unittest.cc",
+    "src/base/no_destructor_unittest.cc",
+    "src/base/optional_unittest.cc",
+    "src/base/paged_memory_unittest.cc",
+    "src/base/scoped_file_unittest.cc",
+    "src/base/string_splitter_unittest.cc",
+    "src/base/string_utils_unittest.cc",
+    "src/base/string_view_unittest.cc",
+    "src/base/string_writer_unittest.cc",
+    "src/base/task_runner_unittest.cc",
+    "src/base/temp_file_unittest.cc",
+    "src/base/thread_checker_unittest.cc",
+    "src/base/thread_task_runner_unittest.cc",
+    "src/base/time_unittest.cc",
+    "src/base/unix_socket_unittest.cc",
+    "src/base/utils_unittest.cc",
+    "src/base/uuid_unittest.cc",
+    "src/base/watchdog_unittest.cc",
+    "src/base/weak_ptr_unittest.cc",
   ],
-  cflags: [
-    "-DGOOGLE_PROTOBUF_NO_RTTI",
-    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+}
+
+// GN: //src/base:unix_socket
+filegroup {
+  name: "perfetto_src_base_unix_socket",
+  srcs: [
+    "src/base/unix_socket.cc",
   ],
 }
 
-// GN target: //src/ipc:test_messages_gen
+// GN: //src/ipc:ipc
+filegroup {
+  name: "perfetto_src_ipc_ipc",
+  srcs: [
+    "src/ipc/buffered_frame_deserializer.cc",
+    "src/ipc/client_impl.cc",
+    "src/ipc/deferred.cc",
+    "src/ipc/host_impl.cc",
+    "src/ipc/service_proxy.cc",
+    "src/ipc/virtual_destructors.cc",
+  ],
+}
+
+// GN: //src/ipc:test_messages
 genrule {
   name: "perfetto_src_ipc_test_messages_gen",
   srcs: [
@@ -3753,9 +3603,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "ipc_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location ipc_plugin) --plugin_out=:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/src/ipc/test/client_unittest_messages.ipc.cc",
     "external/perfetto/src/ipc/test/client_unittest_messages.pb.cc",
@@ -3766,7 +3616,7 @@ genrule {
   ],
 }
 
-// GN target: //src/ipc:test_messages_gen
+// GN: //src/ipc:test_messages
 genrule {
   name: "perfetto_src_ipc_test_messages_gen_headers",
   srcs: [
@@ -3776,9 +3626,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "ipc_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location ipc_plugin) --plugin_out=:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/src/ipc/test/client_unittest_messages.ipc.h",
     "external/perfetto/src/ipc/test/client_unittest_messages.pb.h",
@@ -3793,7 +3643,32 @@ genrule {
   ],
 }
 
-// GN target: //src/perfetto_cmd:protos_gen
+// GN: //src/ipc:unittests
+filegroup {
+  name: "perfetto_src_ipc_unittests",
+  srcs: [
+    "src/ipc/buffered_frame_deserializer_unittest.cc",
+    "src/ipc/client_impl_unittest.cc",
+    "src/ipc/deferred_unittest.cc",
+    "src/ipc/host_impl_unittest.cc",
+    "src/ipc/test/ipc_integrationtest.cc",
+  ],
+}
+
+// GN: //src/perfetto_cmd:perfetto_cmd
+filegroup {
+  name: "perfetto_src_perfetto_cmd_perfetto_cmd",
+  srcs: [
+    "src/perfetto_cmd/config.cc",
+    "src/perfetto_cmd/packet_writer.cc",
+    "src/perfetto_cmd/pbtxt_to_pb.cc",
+    "src/perfetto_cmd/perfetto_cmd.cc",
+    "src/perfetto_cmd/perfetto_cmd_android.cc",
+    "src/perfetto_cmd/rate_limiter.cc",
+  ],
+}
+
+// GN: //src/perfetto_cmd:protos
 genrule {
   name: "perfetto_src_perfetto_cmd_protos_gen",
   srcs: [
@@ -3802,13 +3677,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/src/perfetto_cmd/perfetto_cmd_state.pb.cc",
   ],
 }
 
-// GN target: //src/perfetto_cmd:protos_gen
+// GN: //src/perfetto_cmd:protos
 genrule {
   name: "perfetto_src_perfetto_cmd_protos_gen_headers",
   srcs: [
@@ -3817,7 +3692,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/src/perfetto_cmd/perfetto_cmd_state.pb.h",
   ],
@@ -3827,42 +3702,145 @@ genrule {
   ],
 }
 
-// GN target: //src/protozero/protoc_plugin:protozero_plugin(//gn/standalone/toolchain:gcc_like_host)
-cc_binary_host {
-  name: "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+// GN: //src/perfetto_cmd:trigger_perfetto_cmd
+filegroup {
+  name: "perfetto_src_perfetto_cmd_trigger_perfetto_cmd",
   srcs: [
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/protozero/protoc_plugin/protozero_plugin.cc",
+    "src/perfetto_cmd/trigger_perfetto.cc",
   ],
-  shared_libs: [
-    "libprotoc",
+}
+
+// GN: //src/perfetto_cmd:trigger_producer
+filegroup {
+  name: "perfetto_src_perfetto_cmd_trigger_producer",
+  srcs: [
+    "src/perfetto_cmd/trigger_producer.cc",
   ],
-  defaults: [
-    "perfetto_defaults",
+}
+
+// GN: //src/perfetto_cmd:unittests
+filegroup {
+  name: "perfetto_src_perfetto_cmd_unittests",
+  srcs: [
+    "src/perfetto_cmd/config_unittest.cc",
+    "src/perfetto_cmd/packet_writer_unittest.cc",
+    "src/perfetto_cmd/pbtxt_to_pb_unittest.cc",
+    "src/perfetto_cmd/rate_limiter_unittest.cc",
   ],
-  cflags: [
-    "-DGOOGLE_PROTOBUF_NO_RTTI",
-    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+}
+
+// GN: //src/profiling/memory:client
+filegroup {
+  name: "perfetto_src_profiling_memory_client",
+  srcs: [
+    "src/profiling/memory/client.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:daemon
+filegroup {
+  name: "perfetto_src_profiling_memory_daemon",
+  srcs: [
+    "src/profiling/memory/bookkeeping.cc",
+    "src/profiling/memory/bookkeeping_dump.cc",
+    "src/profiling/memory/heapprofd_config.cc",
+    "src/profiling/memory/heapprofd_producer.cc",
+    "src/profiling/memory/java_hprof_config.cc",
+    "src/profiling/memory/java_hprof_producer.cc",
+    "src/profiling/memory/page_idle_checker.cc",
+    "src/profiling/memory/system_property.cc",
+    "src/profiling/memory/unwinding.cc",
+    "src/profiling/memory/utils.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:end_to_end_tests
+filegroup {
+  name: "perfetto_src_profiling_memory_end_to_end_tests",
+  srcs: [
+    "src/profiling/memory/heapprofd_end_to_end_test.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:malloc_hooks
+filegroup {
+  name: "perfetto_src_profiling_memory_malloc_hooks",
+  srcs: [
+    "src/profiling/memory/malloc_hooks.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:proc_utils
+filegroup {
+  name: "perfetto_src_profiling_memory_proc_utils",
+  srcs: [
+    "src/profiling/memory/proc_utils.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:ring_buffer
+filegroup {
+  name: "perfetto_src_profiling_memory_ring_buffer",
+  srcs: [
+    "src/profiling/memory/shared_ring_buffer.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:ring_buffer_unittests
+filegroup {
+  name: "perfetto_src_profiling_memory_ring_buffer_unittests",
+  srcs: [
+    "src/profiling/memory/shared_ring_buffer_unittest.cc",
   ],
 }
 
-// GN target: //src/protozero:testing_messages_lite_gen
+// GN: //src/profiling/memory:scoped_spinlock
+filegroup {
+  name: "perfetto_src_profiling_memory_scoped_spinlock",
+  srcs: [
+    "src/profiling/memory/scoped_spinlock.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:unittests
+filegroup {
+  name: "perfetto_src_profiling_memory_unittests",
+  srcs: [
+    "src/profiling/memory/bookkeeping_unittest.cc",
+    "src/profiling/memory/client_unittest.cc",
+    "src/profiling/memory/heapprofd_producer_unittest.cc",
+    "src/profiling/memory/interner_unittest.cc",
+    "src/profiling/memory/page_idle_checker_unittest.cc",
+    "src/profiling/memory/proc_utils_unittest.cc",
+    "src/profiling/memory/sampler_unittest.cc",
+    "src/profiling/memory/system_property_unittest.cc",
+    "src/profiling/memory/unwinding_unittest.cc",
+    "src/profiling/memory/wire_protocol_unittest.cc",
+  ],
+}
+
+// GN: //src/profiling/memory:wire_protocol
+filegroup {
+  name: "perfetto_src_profiling_memory_wire_protocol",
+  srcs: [
+    "src/profiling/memory/wire_protocol.cc",
+  ],
+}
+
+// GN: //src/protozero:protozero
+filegroup {
+  name: "perfetto_src_protozero_protozero",
+  srcs: [
+    "src/protozero/message.cc",
+    "src/protozero/message_handle.cc",
+    "src/protozero/proto_decoder.cc",
+    "src/protozero/scattered_heap_buffer.cc",
+    "src/protozero/scattered_stream_null_delegate.cc",
+    "src/protozero/scattered_stream_writer.cc",
+  ],
+}
+
+// GN: //src/protozero:testing_messages_lite
 genrule {
   name: "perfetto_src_protozero_testing_messages_lite_gen",
   srcs: [
@@ -3874,7 +3852,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/src/protozero/test/example_proto/library.pb.cc",
     "external/perfetto/src/protozero/test/example_proto/library_internals/galaxies.pb.cc",
@@ -3883,7 +3861,7 @@ genrule {
   ],
 }
 
-// GN target: //src/protozero:testing_messages_lite_gen
+// GN: //src/protozero:testing_messages_lite
 genrule {
   name: "perfetto_src_protozero_testing_messages_lite_gen_headers",
   srcs: [
@@ -3895,7 +3873,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/src/protozero/test/example_proto/library.pb.h",
     "external/perfetto/src/protozero/test/example_proto/library_internals/galaxies.pb.h",
@@ -3908,7 +3886,7 @@ genrule {
   ],
 }
 
-// GN target: //src/protozero:testing_messages_zero_gen
+// GN: //src/protozero:testing_messages_zero
 genrule {
   name: "perfetto_src_protozero_testing_messages_zero_gen",
   srcs: [
@@ -3919,9 +3897,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/src/protozero/test/example_proto/library.pbzero.cc",
     "external/perfetto/src/protozero/test/example_proto/library_internals/galaxies.pbzero.cc",
@@ -3930,7 +3908,7 @@ genrule {
   ],
 }
 
-// GN target: //src/protozero:testing_messages_zero_gen
+// GN: //src/protozero:testing_messages_zero
 genrule {
   name: "perfetto_src_protozero_testing_messages_zero_gen_headers",
   srcs: [
@@ -3941,9 +3919,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/src/protozero/test/example_proto/library.pbzero.h",
     "external/perfetto/src/protozero/test/example_proto/library_internals/galaxies.pbzero.h",
@@ -3956,7 +3934,279 @@ genrule {
   ],
 }
 
-// GN target: //src/traced/probes/ftrace:test_messages_lite_gen
+// GN: //src/protozero:unittests
+filegroup {
+  name: "perfetto_src_protozero_unittests",
+  srcs: [
+    "src/protozero/message_handle_unittest.cc",
+    "src/protozero/message_unittest.cc",
+    "src/protozero/proto_decoder_unittest.cc",
+    "src/protozero/proto_utils_unittest.cc",
+    "src/protozero/scattered_stream_writer_unittest.cc",
+    "src/protozero/test/fake_scattered_buffer.cc",
+    "src/protozero/test/protozero_conformance_unittest.cc",
+  ],
+}
+
+// GN: //src/trace_processor:common
+filegroup {
+  name: "perfetto_src_trace_processor_common",
+  srcs: [
+    "src/trace_processor/string_pool.cc",
+  ],
+}
+
+// GN: //src/trace_processor/db:lib
+filegroup {
+  name: "perfetto_src_trace_processor_db_lib",
+  srcs: [
+    "src/trace_processor/db/bit_vector.cc",
+    "src/trace_processor/db/column.cc",
+    "src/trace_processor/db/row_map.cc",
+    "src/trace_processor/db/table.cc",
+  ],
+}
+
+// GN: //src/trace_processor/db:unittests
+filegroup {
+  name: "perfetto_src_trace_processor_db_unittests",
+  srcs: [
+    "src/trace_processor/db/bit_vector_unittest.cc",
+    "src/trace_processor/db/row_map_unittest.cc",
+    "src/trace_processor/db/sparse_vector_unittest.cc",
+  ],
+}
+
+// GN: //src/trace_processor:lib
+filegroup {
+  name: "perfetto_src_trace_processor_lib",
+  srcs: [
+    "src/trace_processor/android_logs_table.cc",
+    "src/trace_processor/args_table.cc",
+    "src/trace_processor/args_tracker.cc",
+    "src/trace_processor/clock_tracker.cc",
+    "src/trace_processor/counter_definitions_table.cc",
+    "src/trace_processor/counter_values_table.cc",
+    "src/trace_processor/cpu_profile_stack_sample_table.cc",
+    "src/trace_processor/event_tracker.cc",
+    "src/trace_processor/filtered_row_index.cc",
+    "src/trace_processor/forwarding_trace_parser.cc",
+    "src/trace_processor/ftrace_descriptors.cc",
+    "src/trace_processor/ftrace_utils.cc",
+    "src/trace_processor/fuchsia_provider_view.cc",
+    "src/trace_processor/fuchsia_trace_parser.cc",
+    "src/trace_processor/fuchsia_trace_tokenizer.cc",
+    "src/trace_processor/fuchsia_trace_utils.cc",
+    "src/trace_processor/graphics_event_parser.cc",
+    "src/trace_processor/gzip_trace_parser.cc",
+    "src/trace_processor/heap_graph_tracker.cc",
+    "src/trace_processor/heap_profile_allocation_table.cc",
+    "src/trace_processor/heap_profile_tracker.cc",
+    "src/trace_processor/instants_table.cc",
+    "src/trace_processor/metadata_table.cc",
+    "src/trace_processor/process_table.cc",
+    "src/trace_processor/process_tracker.cc",
+    "src/trace_processor/proto_trace_parser.cc",
+    "src/trace_processor/proto_trace_tokenizer.cc",
+    "src/trace_processor/raw_table.cc",
+    "src/trace_processor/row_iterators.cc",
+    "src/trace_processor/sched_slice_table.cc",
+    "src/trace_processor/slice_table.cc",
+    "src/trace_processor/slice_tracker.cc",
+    "src/trace_processor/span_join_operator_table.cc",
+    "src/trace_processor/sql_stats_table.cc",
+    "src/trace_processor/stack_profile_callsite_table.cc",
+    "src/trace_processor/stack_profile_frame_table.cc",
+    "src/trace_processor/stack_profile_mapping_table.cc",
+    "src/trace_processor/stack_profile_tracker.cc",
+    "src/trace_processor/stats_table.cc",
+    "src/trace_processor/storage_columns.cc",
+    "src/trace_processor/storage_schema.cc",
+    "src/trace_processor/storage_table.cc",
+    "src/trace_processor/syscall_tracker.cc",
+    "src/trace_processor/systrace_parser.cc",
+    "src/trace_processor/systrace_trace_parser.cc",
+    "src/trace_processor/thread_table.cc",
+    "src/trace_processor/trace_processor.cc",
+    "src/trace_processor/trace_processor_context.cc",
+    "src/trace_processor/trace_processor_impl.cc",
+    "src/trace_processor/trace_sorter.cc",
+    "src/trace_processor/trace_storage.cc",
+    "src/trace_processor/track_tracker.cc",
+    "src/trace_processor/virtual_destructors.cc",
+    "src/trace_processor/vulkan_memory_tracker.cc",
+    "src/trace_processor/window_operator_table.cc",
+  ],
+}
+
+// GN: //src/trace_processor/metrics:lib
+filegroup {
+  name: "perfetto_src_trace_processor_metrics_lib",
+  srcs: [
+    "src/trace_processor/metrics/descriptors.cc",
+    "src/trace_processor/metrics/metrics.cc",
+  ],
+}
+
+// GN: //src/trace_processor/metrics:unittests
+filegroup {
+  name: "perfetto_src_trace_processor_metrics_unittests",
+  srcs: [
+    "src/trace_processor/metrics/metrics_unittest.cc",
+  ],
+}
+
+// GN: //src/trace_processor/sqlite:sqlite
+filegroup {
+  name: "perfetto_src_trace_processor_sqlite_sqlite",
+  srcs: [
+    "src/trace_processor/sqlite/db_sqlite_table.cc",
+    "src/trace_processor/sqlite/query_constraints.cc",
+    "src/trace_processor/sqlite/sqlite3_str_split.cc",
+    "src/trace_processor/sqlite/sqlite_table.cc",
+  ],
+}
+
+// GN: //src/trace_processor/sqlite:unittests
+filegroup {
+  name: "perfetto_src_trace_processor_sqlite_unittests",
+  srcs: [
+    "src/trace_processor/sqlite/query_constraints_unittest.cc",
+    "src/trace_processor/sqlite/sqlite3_str_split_unittest.cc",
+  ],
+}
+
+// GN: //src/trace_processor/tables:tables
+filegroup {
+  name: "perfetto_src_trace_processor_tables_tables",
+}
+
+// GN: //src/trace_processor/tables:unittests
+filegroup {
+  name: "perfetto_src_trace_processor_tables_unittests",
+  srcs: [
+    "src/trace_processor/tables/macros_unittest.cc",
+  ],
+}
+
+// GN: //src/trace_processor:unittests
+filegroup {
+  name: "perfetto_src_trace_processor_unittests",
+  srcs: [
+    "src/trace_processor/args_table_unittest.cc",
+    "src/trace_processor/clock_tracker_unittest.cc",
+    "src/trace_processor/event_tracker_unittest.cc",
+    "src/trace_processor/filtered_row_index_unittest.cc",
+    "src/trace_processor/forwarding_trace_parser_unittest.cc",
+    "src/trace_processor/ftrace_utils_unittest.cc",
+    "src/trace_processor/fuchsia_trace_utils_unittest.cc",
+    "src/trace_processor/heap_profile_tracker_unittest.cc",
+    "src/trace_processor/metadata_table_unittest.cc",
+    "src/trace_processor/null_term_string_view_unittest.cc",
+    "src/trace_processor/process_table_unittest.cc",
+    "src/trace_processor/process_tracker_unittest.cc",
+    "src/trace_processor/proto_trace_parser_unittest.cc",
+    "src/trace_processor/sched_slice_table_unittest.cc",
+    "src/trace_processor/slice_tracker_unittest.cc",
+    "src/trace_processor/span_join_operator_table_unittest.cc",
+    "src/trace_processor/string_pool_unittest.cc",
+    "src/trace_processor/syscall_tracker_unittest.cc",
+    "src/trace_processor/systrace_parser_unittest.cc",
+    "src/trace_processor/thread_table_unittest.cc",
+    "src/trace_processor/trace_sorter_unittest.cc",
+  ],
+}
+
+// GN: //src/traced/probes/android_log:android_log
+filegroup {
+  name: "perfetto_src_traced_probes_android_log_android_log",
+  srcs: [
+    "src/traced/probes/android_log/android_log_data_source.cc",
+  ],
+}
+
+// GN: //src/traced/probes/android_log:unittests
+filegroup {
+  name: "perfetto_src_traced_probes_android_log_unittests",
+  srcs: [
+    "src/traced/probes/android_log/android_log_data_source_unittest.cc",
+  ],
+}
+
+// GN: //src/traced/probes:data_source
+filegroup {
+  name: "perfetto_src_traced_probes_data_source",
+  srcs: [
+    "src/traced/probes/probes_data_source.cc",
+  ],
+}
+
+// GN: //src/traced/probes/filesystem:filesystem
+filegroup {
+  name: "perfetto_src_traced_probes_filesystem_filesystem",
+  srcs: [
+    "src/traced/probes/filesystem/file_scanner.cc",
+    "src/traced/probes/filesystem/fs_mount.cc",
+    "src/traced/probes/filesystem/inode_file_data_source.cc",
+    "src/traced/probes/filesystem/lru_inode_cache.cc",
+    "src/traced/probes/filesystem/prefix_finder.cc",
+    "src/traced/probes/filesystem/range_tree.cc",
+  ],
+}
+
+// GN: //src/traced/probes/filesystem:unittests
+filegroup {
+  name: "perfetto_src_traced_probes_filesystem_unittests",
+  srcs: [
+    "src/traced/probes/filesystem/file_scanner_unittest.cc",
+    "src/traced/probes/filesystem/fs_mount_unittest.cc",
+    "src/traced/probes/filesystem/inode_file_data_source_unittest.cc",
+    "src/traced/probes/filesystem/lru_inode_cache_unittest.cc",
+    "src/traced/probes/filesystem/prefix_finder_unittest.cc",
+    "src/traced/probes/filesystem/range_tree_unittest.cc",
+  ],
+}
+
+// GN: //src/traced/probes/ftrace:format_parser
+filegroup {
+  name: "perfetto_src_traced_probes_ftrace_format_parser",
+  srcs: [
+    "src/traced/probes/ftrace/format_parser.cc",
+  ],
+}
+
+// GN: //src/traced/probes/ftrace:ftrace
+filegroup {
+  name: "perfetto_src_traced_probes_ftrace_ftrace",
+  srcs: [
+    "src/traced/probes/ftrace/atrace_hal_wrapper.cc",
+    "src/traced/probes/ftrace/atrace_wrapper.cc",
+    "src/traced/probes/ftrace/compact_sched.cc",
+    "src/traced/probes/ftrace/cpu_reader.cc",
+    "src/traced/probes/ftrace/cpu_stats_parser.cc",
+    "src/traced/probes/ftrace/event_info.cc",
+    "src/traced/probes/ftrace/event_info_constants.cc",
+    "src/traced/probes/ftrace/ftrace_config.cc",
+    "src/traced/probes/ftrace/ftrace_config_muxer.cc",
+    "src/traced/probes/ftrace/ftrace_config_utils.cc",
+    "src/traced/probes/ftrace/ftrace_controller.cc",
+    "src/traced/probes/ftrace/ftrace_data_source.cc",
+    "src/traced/probes/ftrace/ftrace_metadata.cc",
+    "src/traced/probes/ftrace/ftrace_procfs.cc",
+    "src/traced/probes/ftrace/ftrace_stats.cc",
+    "src/traced/probes/ftrace/proto_translation_table.cc",
+  ],
+}
+
+// GN: //src/traced/probes/ftrace:integrationtests
+filegroup {
+  name: "perfetto_src_traced_probes_ftrace_integrationtests",
+  srcs: [
+    "src/traced/probes/ftrace/ftrace_procfs_integrationtest.cc",
+  ],
+}
+
+// GN: //src/traced/probes/ftrace:test_messages_lite
 genrule {
   name: "perfetto_src_traced_probes_ftrace_test_messages_lite_gen",
   srcs: [
@@ -3965,13 +4215,13 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/src/traced/probes/ftrace/test/test_messages.pb.cc",
   ],
 }
 
-// GN target: //src/traced/probes/ftrace:test_messages_lite_gen
+// GN: //src/traced/probes/ftrace:test_messages_lite
 genrule {
   name: "perfetto_src_traced_probes_ftrace_test_messages_lite_gen_headers",
   srcs: [
@@ -3980,7 +4230,7 @@ genrule {
   tools: [
     "aprotoc",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto $(in)",
   out: [
     "external/perfetto/src/traced/probes/ftrace/test/test_messages.pb.h",
   ],
@@ -3990,7 +4240,7 @@ genrule {
   ],
 }
 
-// GN target: //src/traced/probes/ftrace:test_messages_zero_gen
+// GN: //src/traced/probes/ftrace:test_messages_zero
 genrule {
   name: "perfetto_src_traced_probes_ftrace_test_messages_zero_gen",
   srcs: [
@@ -3998,15 +4248,15 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/src/traced/probes/ftrace/test/test_messages.pbzero.cc",
   ],
 }
 
-// GN target: //src/traced/probes/ftrace:test_messages_zero_gen
+// GN: //src/traced/probes/ftrace:test_messages_zero
 genrule {
   name: "perfetto_src_traced_probes_ftrace_test_messages_zero_gen_headers",
   srcs: [
@@ -4014,9 +4264,9 @@ genrule {
   ],
   tools: [
     "aprotoc",
-    "perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_",
+    "protozero_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protozero_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/ --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
   out: [
     "external/perfetto/src/traced/probes/ftrace/test/test_messages.pbzero.h",
   ],
@@ -4026,7 +4276,359 @@ genrule {
   ],
 }
 
-// GN target: //protos/perfetto/trace:perfetto_trace_protos
+// GN: //src/traced/probes/ftrace:test_support
+filegroup {
+  name: "perfetto_src_traced_probes_ftrace_test_support",
+  srcs: [
+    "src/traced/probes/ftrace/test/cpu_reader_support.cc",
+  ],
+}
+
+// GN: //src/traced/probes/ftrace:unittests
+filegroup {
+  name: "perfetto_src_traced_probes_ftrace_unittests",
+  srcs: [
+    "src/traced/probes/ftrace/cpu_reader_unittest.cc",
+    "src/traced/probes/ftrace/cpu_stats_parser_unittest.cc",
+    "src/traced/probes/ftrace/event_info_unittest.cc",
+    "src/traced/probes/ftrace/format_parser_unittest.cc",
+    "src/traced/probes/ftrace/ftrace_config_muxer_unittest.cc",
+    "src/traced/probes/ftrace/ftrace_config_unittest.cc",
+    "src/traced/probes/ftrace/ftrace_controller_unittest.cc",
+    "src/traced/probes/ftrace/ftrace_procfs_unittest.cc",
+    "src/traced/probes/ftrace/proto_translation_table_unittest.cc",
+  ],
+}
+
+// GN: //src/traced/probes/metatrace:metatrace
+filegroup {
+  name: "perfetto_src_traced_probes_metatrace_metatrace",
+  srcs: [
+    "src/traced/probes/metatrace/metatrace_data_source.cc",
+  ],
+}
+
+// GN: //src/traced/probes/packages_list:packages_list
+filegroup {
+  name: "perfetto_src_traced_probes_packages_list_packages_list",
+  srcs: [
+    "src/traced/probes/packages_list/packages_list_data_source.cc",
+  ],
+}
+
+// GN: //src/traced/probes/packages_list:unittests
+filegroup {
+  name: "perfetto_src_traced_probes_packages_list_unittests",
+  srcs: [
+    "src/traced/probes/packages_list/packages_list_data_source_unittest.cc",
+  ],
+}
+
+// GN: //src/traced/probes/power:power
+filegroup {
+  name: "perfetto_src_traced_probes_power_power",
+  srcs: [
+    "src/traced/probes/power/android_power_data_source.cc",
+  ],
+}
+
+// GN: //src/traced/probes:probes
+filegroup {
+  name: "perfetto_src_traced_probes_probes",
+  srcs: [
+    "src/traced/probes/probes.cc",
+  ],
+}
+
+// GN: //src/traced/probes:probes_src
+filegroup {
+  name: "perfetto_src_traced_probes_probes_src",
+  srcs: [
+    "src/traced/probes/probes_producer.cc",
+  ],
+}
+
+// GN: //src/traced/probes/ps:ps
+filegroup {
+  name: "perfetto_src_traced_probes_ps_ps",
+  srcs: [
+    "src/traced/probes/ps/process_stats_data_source.cc",
+  ],
+}
+
+// GN: //src/traced/probes/ps:unittests
+filegroup {
+  name: "perfetto_src_traced_probes_ps_unittests",
+  srcs: [
+    "src/traced/probes/ps/process_stats_data_source_unittest.cc",
+  ],
+}
+
+// GN: //src/traced/probes/sys_stats:sys_stats
+filegroup {
+  name: "perfetto_src_traced_probes_sys_stats_sys_stats",
+  srcs: [
+    "src/traced/probes/sys_stats/sys_stats_data_source.cc",
+  ],
+}
+
+// GN: //src/traced/probes/sys_stats:unittests
+filegroup {
+  name: "perfetto_src_traced_probes_sys_stats_unittests",
+  srcs: [
+    "src/traced/probes/sys_stats/sys_stats_data_source_unittest.cc",
+  ],
+}
+
+// GN: //src/traced/probes:unittests
+filegroup {
+  name: "perfetto_src_traced_probes_unittests",
+}
+
+// GN: //src/traced/service:service
+filegroup {
+  name: "perfetto_src_traced_service_service",
+  srcs: [
+    "src/traced/service/builtin_producer.cc",
+    "src/traced/service/service.cc",
+  ],
+}
+
+// GN: //src/traced/service:unittests
+filegroup {
+  name: "perfetto_src_traced_service_unittests",
+  srcs: [
+    "src/traced/service/builtin_producer_unittest.cc",
+  ],
+}
+
+// GN: //src/tracing:client_api
+filegroup {
+  name: "perfetto_src_tracing_client_api",
+  srcs: [
+    "src/tracing/data_source.cc",
+    "src/tracing/internal/in_process_tracing_backend.cc",
+    "src/tracing/internal/system_tracing_backend.cc",
+    "src/tracing/internal/tracing_muxer_impl.cc",
+    "src/tracing/platform.cc",
+    "src/tracing/tracing.cc",
+    "src/tracing/track_event.cc",
+    "src/tracing/virtual_destructors.cc",
+  ],
+}
+
+// GN: //src/tracing:client_api_integrationtests
+filegroup {
+  name: "perfetto_src_tracing_client_api_integrationtests",
+  srcs: [
+    "src/tracing/api_integrationtest.cc",
+  ],
+}
+
+// GN: //src/tracing:common
+filegroup {
+  name: "perfetto_src_tracing_common",
+  srcs: [
+    "src/tracing/trace_writer_base.cc",
+  ],
+}
+
+// GN: //src/tracing:consumer_api_deprecated
+filegroup {
+  name: "perfetto_src_tracing_consumer_api_deprecated",
+  srcs: [
+    "src/tracing/api_impl/consumer_api.cc",
+  ],
+}
+
+// GN: //src/tracing:ipc
+filegroup {
+  name: "perfetto_src_tracing_ipc",
+  srcs: [
+    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
+    "src/tracing/ipc/default_socket.cc",
+    "src/tracing/ipc/posix_shared_memory.cc",
+    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
+    "src/tracing/ipc/service/consumer_ipc_service.cc",
+    "src/tracing/ipc/service/producer_ipc_service.cc",
+    "src/tracing/ipc/service/service_ipc_host_impl.cc",
+  ],
+}
+
+// GN: //src/tracing:platform_posix
+filegroup {
+  name: "perfetto_src_tracing_platform_posix",
+  srcs: [
+    "src/tracing/platform_posix.cc",
+  ],
+}
+
+// GN: //src/tracing/test:api_test_support
+filegroup {
+  name: "perfetto_src_tracing_test_api_test_support",
+  srcs: [
+    "src/tracing/test/api_test_support.cc",
+  ],
+}
+
+// GN: //src/tracing:test_support
+filegroup {
+  name: "perfetto_src_tracing_test_support",
+  srcs: [
+    "src/tracing/core/trace_writer_for_testing.cc",
+  ],
+}
+
+// GN: //src/tracing:tracing
+filegroup {
+  name: "perfetto_src_tracing_tracing",
+  srcs: [
+    "src/tracing/core/chrome_config.cc",
+    "src/tracing/core/commit_data_request.cc",
+    "src/tracing/core/data_source_config.cc",
+    "src/tracing/core/data_source_descriptor.cc",
+    "src/tracing/core/id_allocator.cc",
+    "src/tracing/core/metatrace_writer.cc",
+    "src/tracing/core/null_trace_writer.cc",
+    "src/tracing/core/observable_events.cc",
+    "src/tracing/core/packet_stream_validator.cc",
+    "src/tracing/core/shared_memory_abi.cc",
+    "src/tracing/core/shared_memory_arbiter_impl.cc",
+    "src/tracing/core/sliced_protobuf_input_stream.cc",
+    "src/tracing/core/startup_trace_writer.cc",
+    "src/tracing/core/startup_trace_writer_registry.cc",
+    "src/tracing/core/test_config.cc",
+    "src/tracing/core/trace_buffer.cc",
+    "src/tracing/core/trace_config.cc",
+    "src/tracing/core/trace_packet.cc",
+    "src/tracing/core/trace_stats.cc",
+    "src/tracing/core/trace_writer_impl.cc",
+    "src/tracing/core/tracing_service_impl.cc",
+    "src/tracing/core/tracing_service_state.cc",
+    "src/tracing/core/virtual_destructors.cc",
+  ],
+}
+
+// GN: //src/tracing:unittests
+filegroup {
+  name: "perfetto_src_tracing_unittests",
+  srcs: [
+    "src/tracing/core/id_allocator_unittest.cc",
+    "src/tracing/core/null_trace_writer_unittest.cc",
+    "src/tracing/core/packet_stream_validator_unittest.cc",
+    "src/tracing/core/patch_list_unittest.cc",
+    "src/tracing/core/shared_memory_abi_unittest.cc",
+    "src/tracing/core/shared_memory_arbiter_impl_unittest.cc",
+    "src/tracing/core/sliced_protobuf_input_stream_unittest.cc",
+    "src/tracing/core/startup_trace_writer_unittest.cc",
+    "src/tracing/core/trace_buffer_unittest.cc",
+    "src/tracing/core/trace_packet_unittest.cc",
+    "src/tracing/core/trace_writer_impl_unittest.cc",
+    "src/tracing/core/tracing_service_impl_unittest.cc",
+    "src/tracing/ipc/posix_shared_memory_unittest.cc",
+    "src/tracing/test/aligned_buffer_test.cc",
+    "src/tracing/test/fake_packet.cc",
+    "src/tracing/test/mock_consumer.cc",
+    "src/tracing/test/mock_producer.cc",
+    "src/tracing/test/test_shared_memory.cc",
+    "src/tracing/test/tracing_integration_test.cc",
+  ],
+}
+
+// GN: //test:end_to_end_integrationtests
+filegroup {
+  name: "perfetto_test_end_to_end_integrationtests",
+  srcs: [
+    "test/end_to_end_integrationtest.cc",
+  ],
+}
+
+// GN: //test:task_runner_thread
+filegroup {
+  name: "perfetto_test_task_runner_thread",
+  srcs: [
+    "test/task_runner_thread.cc",
+  ],
+}
+
+// GN: //test:task_runner_thread_delegates
+filegroup {
+  name: "perfetto_test_task_runner_thread_delegates",
+  srcs: [
+    "test/fake_producer.cc",
+    "test/task_runner_thread_delegates.cc",
+  ],
+}
+
+// GN: //test:test_helper
+filegroup {
+  name: "perfetto_test_test_helper",
+  srcs: [
+    "test/test_helper.cc",
+  ],
+}
+
+// GN: //tools/sanitizers_unittests:sanitizers_unittests
+filegroup {
+  name: "perfetto_tools_sanitizers_unittests_sanitizers_unittests",
+  srcs: [
+    "tools/sanitizers_unittests/sanitizers_unittest.cc",
+  ],
+}
+
+// GN: //tools/trace_to_text:common
+filegroup {
+  name: "perfetto_tools_trace_to_text_common",
+  srcs: [
+    "tools/trace_to_text/main.cc",
+    "tools/trace_to_text/symbolize_profile.cc",
+    "tools/trace_to_text/trace_to_profile.cc",
+    "tools/trace_to_text/trace_to_systrace.cc",
+  ],
+}
+
+// GN: //tools/trace_to_text:full
+filegroup {
+  name: "perfetto_tools_trace_to_text_full",
+  srcs: [
+    "tools/trace_to_text/proto_full_utils.cc",
+    "tools/trace_to_text/trace_to_text.cc",
+  ],
+}
+
+// GN: //tools/trace_to_text:local_symbolizer
+filegroup {
+  name: "perfetto_tools_trace_to_text_local_symbolizer",
+  srcs: [
+    "tools/trace_to_text/local_symbolizer.cc",
+  ],
+}
+
+// GN: //tools/trace_to_text:pprofbuilder
+filegroup {
+  name: "perfetto_tools_trace_to_text_pprofbuilder",
+  srcs: [
+    "tools/trace_to_text/pprof_builder.cc",
+  ],
+}
+
+// GN: //tools/trace_to_text:symbolizer
+filegroup {
+  name: "perfetto_tools_trace_to_text_symbolizer",
+  srcs: [
+    "tools/trace_to_text/symbolizer.cc",
+  ],
+}
+
+// GN: //tools/trace_to_text:utils
+filegroup {
+  name: "perfetto_tools_trace_to_text_utils",
+  srcs: [
+    "tools/trace_to_text/utils.cc",
+  ],
+}
+
+// GN: //protos/perfetto/trace:perfetto_trace_protos
 cc_library_static {
   name: "perfetto_trace_protos",
   srcs: [
@@ -4124,10 +4726,22 @@ cc_library_static {
   ],
 }
 
-// GN target: //:perfetto_unittests
+// GN: //:perfetto_unittests
 cc_test {
   name: "perfetto_unittests",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_ipc_ipc",
+    ":perfetto_include_perfetto_ext_traced_sys_stats_counters",
+    ":perfetto_include_perfetto_ext_traced_traced",
+    ":perfetto_include_perfetto_ext_tracing_core_core",
+    ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
+    ":perfetto_include_perfetto_profiling_normalize",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_trace_processor_trace_processor",
+    ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -4182,316 +4796,71 @@ cc_test {
     ":perfetto_protos_perfetto_trace_track_event_lite_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_perfetto_trace_trusted_lite_gen",
+    ":perfetto_src_android_internal_headers",
+    ":perfetto_src_android_internal_lazy_library_loader",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_test_support",
+    ":perfetto_src_base_unittests",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_ipc_ipc",
     ":perfetto_src_ipc_test_messages_gen",
+    ":perfetto_src_ipc_unittests",
+    ":perfetto_src_perfetto_cmd_perfetto_cmd",
     ":perfetto_src_perfetto_cmd_protos_gen",
+    ":perfetto_src_perfetto_cmd_trigger_producer",
+    ":perfetto_src_perfetto_cmd_unittests",
+    ":perfetto_src_profiling_memory_client",
+    ":perfetto_src_profiling_memory_daemon",
+    ":perfetto_src_profiling_memory_proc_utils",
+    ":perfetto_src_profiling_memory_ring_buffer",
+    ":perfetto_src_profiling_memory_ring_buffer_unittests",
+    ":perfetto_src_profiling_memory_scoped_spinlock",
+    ":perfetto_src_profiling_memory_unittests",
+    ":perfetto_src_profiling_memory_wire_protocol",
+    ":perfetto_src_protozero_protozero",
     ":perfetto_src_protozero_testing_messages_lite_gen",
     ":perfetto_src_protozero_testing_messages_zero_gen",
+    ":perfetto_src_protozero_unittests",
+    ":perfetto_src_trace_processor_common",
+    ":perfetto_src_trace_processor_db_lib",
+    ":perfetto_src_trace_processor_db_unittests",
+    ":perfetto_src_trace_processor_lib",
+    ":perfetto_src_trace_processor_metrics_lib",
+    ":perfetto_src_trace_processor_metrics_unittests",
+    ":perfetto_src_trace_processor_sqlite_sqlite",
+    ":perfetto_src_trace_processor_sqlite_unittests",
+    ":perfetto_src_trace_processor_tables_tables",
+    ":perfetto_src_trace_processor_tables_unittests",
+    ":perfetto_src_trace_processor_unittests",
+    ":perfetto_src_traced_probes_android_log_android_log",
+    ":perfetto_src_traced_probes_android_log_unittests",
+    ":perfetto_src_traced_probes_data_source",
+    ":perfetto_src_traced_probes_filesystem_filesystem",
+    ":perfetto_src_traced_probes_filesystem_unittests",
+    ":perfetto_src_traced_probes_ftrace_format_parser",
+    ":perfetto_src_traced_probes_ftrace_ftrace",
     ":perfetto_src_traced_probes_ftrace_test_messages_lite_gen",
     ":perfetto_src_traced_probes_ftrace_test_messages_zero_gen",
-    "src/android_internal/lazy_library_loader.cc",
-    "src/base/circular_queue_unittest.cc",
-    "src/base/copyable_ptr_unittest.cc",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/metatrace_unittest.cc",
-    "src/base/no_destructor_unittest.cc",
-    "src/base/optional_unittest.cc",
-    "src/base/paged_memory.cc",
-    "src/base/paged_memory_unittest.cc",
-    "src/base/pipe.cc",
-    "src/base/scoped_file_unittest.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_splitter_unittest.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_utils_unittest.cc",
-    "src/base/string_view.cc",
-    "src/base/string_view_unittest.cc",
-    "src/base/string_writer_unittest.cc",
-    "src/base/task_runner_unittest.cc",
-    "src/base/temp_file.cc",
-    "src/base/temp_file_unittest.cc",
-    "src/base/test/test_task_runner.cc",
-    "src/base/test/utils.cc",
-    "src/base/test/vm_test_utils.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_checker_unittest.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/thread_task_runner_unittest.cc",
-    "src/base/time.cc",
-    "src/base/time_unittest.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_socket_unittest.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/utils_unittest.cc",
-    "src/base/uuid.cc",
-    "src/base/uuid_unittest.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/base/watchdog_unittest.cc",
-    "src/base/weak_ptr_unittest.cc",
-    "src/ipc/buffered_frame_deserializer.cc",
-    "src/ipc/buffered_frame_deserializer_unittest.cc",
-    "src/ipc/client_impl.cc",
-    "src/ipc/client_impl_unittest.cc",
-    "src/ipc/deferred.cc",
-    "src/ipc/deferred_unittest.cc",
-    "src/ipc/host_impl.cc",
-    "src/ipc/host_impl_unittest.cc",
-    "src/ipc/service_proxy.cc",
-    "src/ipc/test/ipc_integrationtest.cc",
-    "src/ipc/virtual_destructors.cc",
-    "src/perfetto_cmd/config.cc",
-    "src/perfetto_cmd/config_unittest.cc",
-    "src/perfetto_cmd/packet_writer.cc",
-    "src/perfetto_cmd/packet_writer_unittest.cc",
-    "src/perfetto_cmd/pbtxt_to_pb.cc",
-    "src/perfetto_cmd/pbtxt_to_pb_unittest.cc",
-    "src/perfetto_cmd/perfetto_cmd.cc",
-    "src/perfetto_cmd/perfetto_cmd_android.cc",
-    "src/perfetto_cmd/rate_limiter.cc",
-    "src/perfetto_cmd/rate_limiter_unittest.cc",
-    "src/perfetto_cmd/trigger_producer.cc",
-    "src/profiling/memory/bookkeeping.cc",
-    "src/profiling/memory/bookkeeping_dump.cc",
-    "src/profiling/memory/bookkeeping_unittest.cc",
-    "src/profiling/memory/client.cc",
-    "src/profiling/memory/client_unittest.cc",
-    "src/profiling/memory/heapprofd_config.cc",
-    "src/profiling/memory/heapprofd_producer.cc",
-    "src/profiling/memory/heapprofd_producer_unittest.cc",
-    "src/profiling/memory/interner_unittest.cc",
-    "src/profiling/memory/java_hprof_config.cc",
-    "src/profiling/memory/java_hprof_producer.cc",
-    "src/profiling/memory/page_idle_checker.cc",
-    "src/profiling/memory/page_idle_checker_unittest.cc",
-    "src/profiling/memory/proc_utils.cc",
-    "src/profiling/memory/proc_utils_unittest.cc",
-    "src/profiling/memory/sampler_unittest.cc",
-    "src/profiling/memory/scoped_spinlock.cc",
-    "src/profiling/memory/shared_ring_buffer.cc",
-    "src/profiling/memory/shared_ring_buffer_unittest.cc",
-    "src/profiling/memory/system_property.cc",
-    "src/profiling/memory/system_property_unittest.cc",
-    "src/profiling/memory/unwinding.cc",
-    "src/profiling/memory/unwinding_unittest.cc",
-    "src/profiling/memory/utils.cc",
-    "src/profiling/memory/wire_protocol.cc",
-    "src/profiling/memory/wire_protocol_unittest.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/message_handle_unittest.cc",
-    "src/protozero/message_unittest.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/proto_decoder_unittest.cc",
-    "src/protozero/proto_utils_unittest.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/protozero/scattered_stream_writer_unittest.cc",
-    "src/protozero/test/fake_scattered_buffer.cc",
-    "src/protozero/test/protozero_conformance_unittest.cc",
-    "src/trace_processor/android_logs_table.cc",
-    "src/trace_processor/args_table.cc",
-    "src/trace_processor/args_table_unittest.cc",
-    "src/trace_processor/args_tracker.cc",
-    "src/trace_processor/clock_tracker.cc",
-    "src/trace_processor/clock_tracker_unittest.cc",
-    "src/trace_processor/counter_definitions_table.cc",
-    "src/trace_processor/counter_values_table.cc",
-    "src/trace_processor/cpu_profile_stack_sample_table.cc",
-    "src/trace_processor/db/bit_vector.cc",
-    "src/trace_processor/db/bit_vector_unittest.cc",
-    "src/trace_processor/db/column.cc",
-    "src/trace_processor/db/row_map.cc",
-    "src/trace_processor/db/row_map_unittest.cc",
-    "src/trace_processor/db/sparse_vector_unittest.cc",
-    "src/trace_processor/db/table.cc",
-    "src/trace_processor/event_tracker.cc",
-    "src/trace_processor/event_tracker_unittest.cc",
-    "src/trace_processor/filtered_row_index.cc",
-    "src/trace_processor/filtered_row_index_unittest.cc",
-    "src/trace_processor/forwarding_trace_parser.cc",
-    "src/trace_processor/forwarding_trace_parser_unittest.cc",
-    "src/trace_processor/ftrace_descriptors.cc",
-    "src/trace_processor/ftrace_utils.cc",
-    "src/trace_processor/ftrace_utils_unittest.cc",
-    "src/trace_processor/fuchsia_provider_view.cc",
-    "src/trace_processor/fuchsia_trace_parser.cc",
-    "src/trace_processor/fuchsia_trace_tokenizer.cc",
-    "src/trace_processor/fuchsia_trace_utils.cc",
-    "src/trace_processor/fuchsia_trace_utils_unittest.cc",
-    "src/trace_processor/graphics_event_parser.cc",
-    "src/trace_processor/gzip_trace_parser.cc",
-    "src/trace_processor/heap_graph_tracker.cc",
-    "src/trace_processor/heap_profile_allocation_table.cc",
-    "src/trace_processor/heap_profile_tracker.cc",
-    "src/trace_processor/heap_profile_tracker_unittest.cc",
-    "src/trace_processor/instants_table.cc",
-    "src/trace_processor/metadata_table.cc",
-    "src/trace_processor/metadata_table_unittest.cc",
-    "src/trace_processor/metrics/descriptors.cc",
-    "src/trace_processor/metrics/metrics.cc",
-    "src/trace_processor/metrics/metrics_unittest.cc",
-    "src/trace_processor/null_term_string_view_unittest.cc",
-    "src/trace_processor/process_table.cc",
-    "src/trace_processor/process_table_unittest.cc",
-    "src/trace_processor/process_tracker.cc",
-    "src/trace_processor/process_tracker_unittest.cc",
-    "src/trace_processor/proto_trace_parser.cc",
-    "src/trace_processor/proto_trace_parser_unittest.cc",
-    "src/trace_processor/proto_trace_tokenizer.cc",
-    "src/trace_processor/raw_table.cc",
-    "src/trace_processor/row_iterators.cc",
-    "src/trace_processor/sched_slice_table.cc",
-    "src/trace_processor/sched_slice_table_unittest.cc",
-    "src/trace_processor/slice_table.cc",
-    "src/trace_processor/slice_tracker.cc",
-    "src/trace_processor/slice_tracker_unittest.cc",
-    "src/trace_processor/span_join_operator_table.cc",
-    "src/trace_processor/span_join_operator_table_unittest.cc",
-    "src/trace_processor/sql_stats_table.cc",
-    "src/trace_processor/sqlite/db_sqlite_table.cc",
-    "src/trace_processor/sqlite/query_constraints.cc",
-    "src/trace_processor/sqlite/query_constraints_unittest.cc",
-    "src/trace_processor/sqlite/sqlite3_str_split.cc",
-    "src/trace_processor/sqlite/sqlite3_str_split_unittest.cc",
-    "src/trace_processor/sqlite/sqlite_table.cc",
-    "src/trace_processor/stack_profile_callsite_table.cc",
-    "src/trace_processor/stack_profile_frame_table.cc",
-    "src/trace_processor/stack_profile_mapping_table.cc",
-    "src/trace_processor/stack_profile_tracker.cc",
-    "src/trace_processor/stats_table.cc",
-    "src/trace_processor/storage_columns.cc",
-    "src/trace_processor/storage_schema.cc",
-    "src/trace_processor/storage_table.cc",
-    "src/trace_processor/string_pool.cc",
-    "src/trace_processor/string_pool_unittest.cc",
-    "src/trace_processor/syscall_tracker.cc",
-    "src/trace_processor/syscall_tracker_unittest.cc",
-    "src/trace_processor/systrace_parser.cc",
-    "src/trace_processor/systrace_parser_unittest.cc",
-    "src/trace_processor/systrace_trace_parser.cc",
-    "src/trace_processor/tables/macros_unittest.cc",
-    "src/trace_processor/thread_table.cc",
-    "src/trace_processor/thread_table_unittest.cc",
-    "src/trace_processor/trace_processor.cc",
-    "src/trace_processor/trace_processor_context.cc",
-    "src/trace_processor/trace_processor_impl.cc",
-    "src/trace_processor/trace_sorter.cc",
-    "src/trace_processor/trace_sorter_unittest.cc",
-    "src/trace_processor/trace_storage.cc",
-    "src/trace_processor/track_tracker.cc",
-    "src/trace_processor/virtual_destructors.cc",
-    "src/trace_processor/vulkan_memory_tracker.cc",
-    "src/trace_processor/window_operator_table.cc",
-    "src/traced/probes/android_log/android_log_data_source.cc",
-    "src/traced/probes/android_log/android_log_data_source_unittest.cc",
-    "src/traced/probes/filesystem/file_scanner.cc",
-    "src/traced/probes/filesystem/file_scanner_unittest.cc",
-    "src/traced/probes/filesystem/fs_mount.cc",
-    "src/traced/probes/filesystem/fs_mount_unittest.cc",
-    "src/traced/probes/filesystem/inode_file_data_source.cc",
-    "src/traced/probes/filesystem/inode_file_data_source_unittest.cc",
-    "src/traced/probes/filesystem/lru_inode_cache.cc",
-    "src/traced/probes/filesystem/lru_inode_cache_unittest.cc",
-    "src/traced/probes/filesystem/prefix_finder.cc",
-    "src/traced/probes/filesystem/prefix_finder_unittest.cc",
-    "src/traced/probes/filesystem/range_tree.cc",
-    "src/traced/probes/filesystem/range_tree_unittest.cc",
-    "src/traced/probes/ftrace/atrace_hal_wrapper.cc",
-    "src/traced/probes/ftrace/atrace_wrapper.cc",
-    "src/traced/probes/ftrace/compact_sched.cc",
-    "src/traced/probes/ftrace/cpu_reader.cc",
-    "src/traced/probes/ftrace/cpu_reader_unittest.cc",
-    "src/traced/probes/ftrace/cpu_stats_parser.cc",
-    "src/traced/probes/ftrace/cpu_stats_parser_unittest.cc",
-    "src/traced/probes/ftrace/event_info.cc",
-    "src/traced/probes/ftrace/event_info_constants.cc",
-    "src/traced/probes/ftrace/event_info_unittest.cc",
-    "src/traced/probes/ftrace/format_parser.cc",
-    "src/traced/probes/ftrace/format_parser_unittest.cc",
-    "src/traced/probes/ftrace/ftrace_config.cc",
-    "src/traced/probes/ftrace/ftrace_config_muxer.cc",
-    "src/traced/probes/ftrace/ftrace_config_muxer_unittest.cc",
-    "src/traced/probes/ftrace/ftrace_config_unittest.cc",
-    "src/traced/probes/ftrace/ftrace_config_utils.cc",
-    "src/traced/probes/ftrace/ftrace_controller.cc",
-    "src/traced/probes/ftrace/ftrace_controller_unittest.cc",
-    "src/traced/probes/ftrace/ftrace_data_source.cc",
-    "src/traced/probes/ftrace/ftrace_metadata.cc",
-    "src/traced/probes/ftrace/ftrace_procfs.cc",
-    "src/traced/probes/ftrace/ftrace_procfs_unittest.cc",
-    "src/traced/probes/ftrace/ftrace_stats.cc",
-    "src/traced/probes/ftrace/proto_translation_table.cc",
-    "src/traced/probes/ftrace/proto_translation_table_unittest.cc",
-    "src/traced/probes/ftrace/test/cpu_reader_support.cc",
-    "src/traced/probes/metatrace/metatrace_data_source.cc",
-    "src/traced/probes/packages_list/packages_list_data_source.cc",
-    "src/traced/probes/packages_list/packages_list_data_source_unittest.cc",
-    "src/traced/probes/power/android_power_data_source.cc",
-    "src/traced/probes/probes_data_source.cc",
-    "src/traced/probes/probes_producer.cc",
-    "src/traced/probes/ps/process_stats_data_source.cc",
-    "src/traced/probes/ps/process_stats_data_source_unittest.cc",
-    "src/traced/probes/sys_stats/sys_stats_data_source.cc",
-    "src/traced/probes/sys_stats/sys_stats_data_source_unittest.cc",
-    "src/traced/service/builtin_producer.cc",
-    "src/traced/service/builtin_producer_unittest.cc",
-    "src/traced/service/service.cc",
-    "src/tracing/core/chrome_config.cc",
-    "src/tracing/core/commit_data_request.cc",
-    "src/tracing/core/data_source_config.cc",
-    "src/tracing/core/data_source_descriptor.cc",
-    "src/tracing/core/id_allocator.cc",
-    "src/tracing/core/id_allocator_unittest.cc",
-    "src/tracing/core/metatrace_writer.cc",
-    "src/tracing/core/null_trace_writer.cc",
-    "src/tracing/core/null_trace_writer_unittest.cc",
-    "src/tracing/core/observable_events.cc",
-    "src/tracing/core/packet_stream_validator.cc",
-    "src/tracing/core/packet_stream_validator_unittest.cc",
-    "src/tracing/core/patch_list_unittest.cc",
-    "src/tracing/core/shared_memory_abi.cc",
-    "src/tracing/core/shared_memory_abi_unittest.cc",
-    "src/tracing/core/shared_memory_arbiter_impl.cc",
-    "src/tracing/core/shared_memory_arbiter_impl_unittest.cc",
-    "src/tracing/core/sliced_protobuf_input_stream.cc",
-    "src/tracing/core/sliced_protobuf_input_stream_unittest.cc",
-    "src/tracing/core/startup_trace_writer.cc",
-    "src/tracing/core/startup_trace_writer_registry.cc",
-    "src/tracing/core/startup_trace_writer_unittest.cc",
-    "src/tracing/core/test_config.cc",
-    "src/tracing/core/trace_buffer.cc",
-    "src/tracing/core/trace_buffer_unittest.cc",
-    "src/tracing/core/trace_config.cc",
-    "src/tracing/core/trace_packet.cc",
-    "src/tracing/core/trace_packet_unittest.cc",
-    "src/tracing/core/trace_stats.cc",
-    "src/tracing/core/trace_writer_for_testing.cc",
-    "src/tracing/core/trace_writer_impl.cc",
-    "src/tracing/core/trace_writer_impl_unittest.cc",
-    "src/tracing/core/tracing_service_impl.cc",
-    "src/tracing/core/tracing_service_impl_unittest.cc",
-    "src/tracing/core/tracing_service_state.cc",
-    "src/tracing/core/virtual_destructors.cc",
-    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
-    "src/tracing/ipc/default_socket.cc",
-    "src/tracing/ipc/posix_shared_memory.cc",
-    "src/tracing/ipc/posix_shared_memory_unittest.cc",
-    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
-    "src/tracing/ipc/service/consumer_ipc_service.cc",
-    "src/tracing/ipc/service/producer_ipc_service.cc",
-    "src/tracing/ipc/service/service_ipc_host_impl.cc",
-    "src/tracing/test/aligned_buffer_test.cc",
-    "src/tracing/test/fake_packet.cc",
-    "src/tracing/test/mock_consumer.cc",
-    "src/tracing/test/mock_producer.cc",
-    "src/tracing/test/test_shared_memory.cc",
-    "src/tracing/test/tracing_integration_test.cc",
-    "src/tracing/trace_writer_base.cc",
-    "tools/sanitizers_unittests/sanitizers_unittest.cc",
+    ":perfetto_src_traced_probes_ftrace_test_support",
+    ":perfetto_src_traced_probes_ftrace_unittests",
+    ":perfetto_src_traced_probes_metatrace_metatrace",
+    ":perfetto_src_traced_probes_packages_list_packages_list",
+    ":perfetto_src_traced_probes_packages_list_unittests",
+    ":perfetto_src_traced_probes_power_power",
+    ":perfetto_src_traced_probes_probes_src",
+    ":perfetto_src_traced_probes_ps_ps",
+    ":perfetto_src_traced_probes_ps_unittests",
+    ":perfetto_src_traced_probes_sys_stats_sys_stats",
+    ":perfetto_src_traced_probes_sys_stats_unittests",
+    ":perfetto_src_traced_probes_unittests",
+    ":perfetto_src_traced_service_service",
+    ":perfetto_src_traced_service_unittests",
+    ":perfetto_src_tracing_common",
+    ":perfetto_src_tracing_ipc",
+    ":perfetto_src_tracing_test_support",
+    ":perfetto_src_tracing_tracing",
+    ":perfetto_src_tracing_unittests",
+    ":perfetto_tools_sanitizers_unittests_sanitizers_unittests",
   ],
   shared_libs: [
     "libbase",
@@ -4596,10 +4965,36 @@ cc_test {
   },
 }
 
-// GN target: //src/trace_processor:trace_processor_shell
+// GN: //src/protozero/protoc_plugin:protozero_plugin
+cc_binary_host {
+  name: "protozero_plugin",
+  srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_src_base_base",
+    "src/protozero/protoc_plugin/protozero_plugin.cc",
+  ],
+  shared_libs: [
+    "libprotoc",
+  ],
+  defaults: [
+    "perfetto_defaults",
+  ],
+  cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+  ],
+}
+
+// GN: //src/trace_processor:trace_processor_shell
 cc_binary_host {
   name: "trace_processor_shell",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_traced_sys_stats_counters",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_trace_processor_trace_processor",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_zero_gen",
     ":perfetto_protos_perfetto_config_ftrace_zero_gen",
@@ -4627,100 +5022,18 @@ cc_binary_host {
     ":perfetto_protos_perfetto_trace_ps_zero_gen",
     ":perfetto_protos_perfetto_trace_sys_stats_zero_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/trace_processor/android_logs_table.cc",
-    "src/trace_processor/args_table.cc",
-    "src/trace_processor/args_tracker.cc",
-    "src/trace_processor/clock_tracker.cc",
-    "src/trace_processor/counter_definitions_table.cc",
-    "src/trace_processor/counter_values_table.cc",
-    "src/trace_processor/cpu_profile_stack_sample_table.cc",
-    "src/trace_processor/db/bit_vector.cc",
-    "src/trace_processor/db/column.cc",
-    "src/trace_processor/db/row_map.cc",
-    "src/trace_processor/db/table.cc",
-    "src/trace_processor/event_tracker.cc",
-    "src/trace_processor/filtered_row_index.cc",
-    "src/trace_processor/forwarding_trace_parser.cc",
-    "src/trace_processor/ftrace_descriptors.cc",
-    "src/trace_processor/ftrace_utils.cc",
-    "src/trace_processor/fuchsia_provider_view.cc",
-    "src/trace_processor/fuchsia_trace_parser.cc",
-    "src/trace_processor/fuchsia_trace_tokenizer.cc",
-    "src/trace_processor/fuchsia_trace_utils.cc",
-    "src/trace_processor/graphics_event_parser.cc",
-    "src/trace_processor/gzip_trace_parser.cc",
-    "src/trace_processor/heap_graph_tracker.cc",
-    "src/trace_processor/heap_profile_allocation_table.cc",
-    "src/trace_processor/heap_profile_tracker.cc",
-    "src/trace_processor/instants_table.cc",
-    "src/trace_processor/metadata_table.cc",
-    "src/trace_processor/metrics/descriptors.cc",
-    "src/trace_processor/metrics/metrics.cc",
-    "src/trace_processor/process_table.cc",
-    "src/trace_processor/process_tracker.cc",
+    ":perfetto_src_base_base",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_trace_processor_common",
+    ":perfetto_src_trace_processor_db_lib",
+    ":perfetto_src_trace_processor_lib",
+    ":perfetto_src_trace_processor_metrics_lib",
+    ":perfetto_src_trace_processor_sqlite_sqlite",
+    ":perfetto_src_trace_processor_tables_tables",
     "src/trace_processor/proto_to_json.cc",
-    "src/trace_processor/proto_trace_parser.cc",
-    "src/trace_processor/proto_trace_tokenizer.cc",
-    "src/trace_processor/raw_table.cc",
-    "src/trace_processor/row_iterators.cc",
-    "src/trace_processor/sched_slice_table.cc",
-    "src/trace_processor/slice_table.cc",
-    "src/trace_processor/slice_tracker.cc",
-    "src/trace_processor/span_join_operator_table.cc",
-    "src/trace_processor/sql_stats_table.cc",
-    "src/trace_processor/sqlite/db_sqlite_table.cc",
-    "src/trace_processor/sqlite/query_constraints.cc",
-    "src/trace_processor/sqlite/sqlite3_str_split.cc",
-    "src/trace_processor/sqlite/sqlite_table.cc",
-    "src/trace_processor/stack_profile_callsite_table.cc",
-    "src/trace_processor/stack_profile_frame_table.cc",
-    "src/trace_processor/stack_profile_mapping_table.cc",
-    "src/trace_processor/stack_profile_tracker.cc",
-    "src/trace_processor/stats_table.cc",
-    "src/trace_processor/storage_columns.cc",
-    "src/trace_processor/storage_schema.cc",
-    "src/trace_processor/storage_table.cc",
-    "src/trace_processor/string_pool.cc",
-    "src/trace_processor/syscall_tracker.cc",
-    "src/trace_processor/systrace_parser.cc",
-    "src/trace_processor/systrace_trace_parser.cc",
-    "src/trace_processor/thread_table.cc",
-    "src/trace_processor/trace_processor.cc",
-    "src/trace_processor/trace_processor_context.cc",
-    "src/trace_processor/trace_processor_impl.cc",
     "src/trace_processor/trace_processor_shell.cc",
-    "src/trace_processor/trace_sorter.cc",
-    "src/trace_processor/trace_storage.cc",
-    "src/trace_processor/track_tracker.cc",
-    "src/trace_processor/virtual_destructors.cc",
-    "src/trace_processor/vulkan_memory_tracker.cc",
-    "src/trace_processor/window_operator_table.cc",
   ],
   shared_libs: [
-    "liblog",
     "libprotoc",
     "libz",
   ],
@@ -4767,10 +5080,16 @@ cc_binary_host {
   ],
 }
 
-// GN target: //tools/trace_to_text:trace_to_text
+// GN: //tools/trace_to_text:trace_to_text
 cc_binary_host {
   name: "trace_to_text",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_traced_sys_stats_counters",
+    ":perfetto_include_perfetto_profiling_symbolizer",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_trace_processor_trace_processor",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -4823,108 +5142,22 @@ cc_binary_host {
     ":perfetto_protos_perfetto_trace_track_event_lite_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_third_party_pprof_lite_gen",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/trace_processor/android_logs_table.cc",
-    "src/trace_processor/args_table.cc",
-    "src/trace_processor/args_tracker.cc",
-    "src/trace_processor/clock_tracker.cc",
-    "src/trace_processor/counter_definitions_table.cc",
-    "src/trace_processor/counter_values_table.cc",
-    "src/trace_processor/cpu_profile_stack_sample_table.cc",
-    "src/trace_processor/db/bit_vector.cc",
-    "src/trace_processor/db/column.cc",
-    "src/trace_processor/db/row_map.cc",
-    "src/trace_processor/db/table.cc",
-    "src/trace_processor/event_tracker.cc",
-    "src/trace_processor/filtered_row_index.cc",
-    "src/trace_processor/forwarding_trace_parser.cc",
-    "src/trace_processor/ftrace_descriptors.cc",
-    "src/trace_processor/ftrace_utils.cc",
-    "src/trace_processor/fuchsia_provider_view.cc",
-    "src/trace_processor/fuchsia_trace_parser.cc",
-    "src/trace_processor/fuchsia_trace_tokenizer.cc",
-    "src/trace_processor/fuchsia_trace_utils.cc",
-    "src/trace_processor/graphics_event_parser.cc",
-    "src/trace_processor/gzip_trace_parser.cc",
-    "src/trace_processor/heap_graph_tracker.cc",
-    "src/trace_processor/heap_profile_allocation_table.cc",
-    "src/trace_processor/heap_profile_tracker.cc",
-    "src/trace_processor/instants_table.cc",
-    "src/trace_processor/metadata_table.cc",
-    "src/trace_processor/metrics/descriptors.cc",
-    "src/trace_processor/metrics/metrics.cc",
-    "src/trace_processor/process_table.cc",
-    "src/trace_processor/process_tracker.cc",
-    "src/trace_processor/proto_trace_parser.cc",
-    "src/trace_processor/proto_trace_tokenizer.cc",
-    "src/trace_processor/raw_table.cc",
-    "src/trace_processor/row_iterators.cc",
-    "src/trace_processor/sched_slice_table.cc",
-    "src/trace_processor/slice_table.cc",
-    "src/trace_processor/slice_tracker.cc",
-    "src/trace_processor/span_join_operator_table.cc",
-    "src/trace_processor/sql_stats_table.cc",
-    "src/trace_processor/sqlite/db_sqlite_table.cc",
-    "src/trace_processor/sqlite/query_constraints.cc",
-    "src/trace_processor/sqlite/sqlite3_str_split.cc",
-    "src/trace_processor/sqlite/sqlite_table.cc",
-    "src/trace_processor/stack_profile_callsite_table.cc",
-    "src/trace_processor/stack_profile_frame_table.cc",
-    "src/trace_processor/stack_profile_mapping_table.cc",
-    "src/trace_processor/stack_profile_tracker.cc",
-    "src/trace_processor/stats_table.cc",
-    "src/trace_processor/storage_columns.cc",
-    "src/trace_processor/storage_schema.cc",
-    "src/trace_processor/storage_table.cc",
-    "src/trace_processor/string_pool.cc",
-    "src/trace_processor/syscall_tracker.cc",
-    "src/trace_processor/systrace_parser.cc",
-    "src/trace_processor/systrace_trace_parser.cc",
-    "src/trace_processor/thread_table.cc",
-    "src/trace_processor/trace_processor.cc",
-    "src/trace_processor/trace_processor_context.cc",
-    "src/trace_processor/trace_processor_impl.cc",
-    "src/trace_processor/trace_sorter.cc",
-    "src/trace_processor/trace_storage.cc",
-    "src/trace_processor/track_tracker.cc",
-    "src/trace_processor/virtual_destructors.cc",
-    "src/trace_processor/vulkan_memory_tracker.cc",
-    "src/trace_processor/window_operator_table.cc",
-    "tools/trace_to_text/local_symbolizer.cc",
-    "tools/trace_to_text/main.cc",
-    "tools/trace_to_text/pprof_builder.cc",
-    "tools/trace_to_text/proto_full_utils.cc",
-    "tools/trace_to_text/symbolize_profile.cc",
-    "tools/trace_to_text/symbolizer.cc",
-    "tools/trace_to_text/trace_to_profile.cc",
-    "tools/trace_to_text/trace_to_systrace.cc",
-    "tools/trace_to_text/trace_to_text.cc",
-    "tools/trace_to_text/utils.cc",
+    ":perfetto_src_base_base",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_trace_processor_common",
+    ":perfetto_src_trace_processor_db_lib",
+    ":perfetto_src_trace_processor_lib",
+    ":perfetto_src_trace_processor_metrics_lib",
+    ":perfetto_src_trace_processor_sqlite_sqlite",
+    ":perfetto_src_trace_processor_tables_tables",
+    ":perfetto_tools_trace_to_text_common",
+    ":perfetto_tools_trace_to_text_full",
+    ":perfetto_tools_trace_to_text_local_symbolizer",
+    ":perfetto_tools_trace_to_text_pprofbuilder",
+    ":perfetto_tools_trace_to_text_symbolizer",
+    ":perfetto_tools_trace_to_text_utils",
   ],
   shared_libs: [
-    "liblog",
     "libprotobuf-cpp-full",
     "libprotobuf-cpp-lite",
     "libz",
@@ -4997,10 +5230,11 @@ cc_binary_host {
   ],
 }
 
-// GN target: //src/traced/service:traced
+// GN: //src/traced/service:traced
 cc_binary {
   name: "traced",
   srcs: [
+    ":perfetto_include_perfetto_ext_traced_traced",
     "src/traced/service/main.cc",
   ],
   shared_libs: [
@@ -5015,10 +5249,11 @@ cc_binary {
   ],
 }
 
-// GN target: //src/traced/probes:traced_probes
+// GN: //src/traced/probes:traced_probes
 cc_binary {
   name: "traced_probes",
   srcs: [
+    ":perfetto_include_perfetto_ext_traced_traced",
     "src/traced/probes/main.cc",
   ],
   shared_libs: [
@@ -5034,10 +5269,19 @@ cc_binary {
   ],
 }
 
-// GN target: //src/perfetto_cmd:trigger_perfetto
+// GN: //src/perfetto_cmd:trigger_perfetto
 cc_binary {
   name: "trigger_perfetto",
   srcs: [
+    ":perfetto_include_perfetto_base_base",
+    ":perfetto_include_perfetto_ext_base_base",
+    ":perfetto_include_perfetto_ext_ipc_ipc",
+    ":perfetto_include_perfetto_ext_traced_traced",
+    ":perfetto_include_perfetto_ext_tracing_core_core",
+    ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
+    ":perfetto_include_perfetto_protozero_protozero",
+    ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_lite_gen",
     ":perfetto_protos_perfetto_common_zero_gen",
     ":perfetto_protos_perfetto_config_android_lite_gen",
@@ -5076,71 +5320,17 @@ cc_binary {
     ":perfetto_protos_perfetto_trace_sys_stats_zero_gen",
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_protos_perfetto_trace_trusted_lite_gen",
+    ":perfetto_src_base_base",
+    ":perfetto_src_base_unix_socket",
+    ":perfetto_src_ipc_ipc",
     ":perfetto_src_perfetto_cmd_protos_gen",
-    "src/base/event_fd.cc",
-    "src/base/file_utils.cc",
-    "src/base/metatrace.cc",
-    "src/base/paged_memory.cc",
-    "src/base/pipe.cc",
-    "src/base/string_splitter.cc",
-    "src/base/string_utils.cc",
-    "src/base/string_view.cc",
-    "src/base/temp_file.cc",
-    "src/base/thread_checker.cc",
-    "src/base/thread_task_runner.cc",
-    "src/base/time.cc",
-    "src/base/unix_socket.cc",
-    "src/base/unix_task_runner.cc",
-    "src/base/uuid.cc",
-    "src/base/virtual_destructors.cc",
-    "src/base/waitable_event.cc",
-    "src/base/watchdog_posix.cc",
-    "src/ipc/buffered_frame_deserializer.cc",
-    "src/ipc/client_impl.cc",
-    "src/ipc/deferred.cc",
-    "src/ipc/host_impl.cc",
-    "src/ipc/service_proxy.cc",
-    "src/ipc/virtual_destructors.cc",
-    "src/perfetto_cmd/trigger_perfetto.cc",
+    ":perfetto_src_perfetto_cmd_trigger_perfetto_cmd",
+    ":perfetto_src_perfetto_cmd_trigger_producer",
+    ":perfetto_src_protozero_protozero",
+    ":perfetto_src_tracing_common",
+    ":perfetto_src_tracing_ipc",
+    ":perfetto_src_tracing_tracing",
     "src/perfetto_cmd/trigger_perfetto_main.cc",
-    "src/perfetto_cmd/trigger_producer.cc",
-    "src/protozero/message.cc",
-    "src/protozero/message_handle.cc",
-    "src/protozero/proto_decoder.cc",
-    "src/protozero/scattered_heap_buffer.cc",
-    "src/protozero/scattered_stream_null_delegate.cc",
-    "src/protozero/scattered_stream_writer.cc",
-    "src/tracing/core/chrome_config.cc",
-    "src/tracing/core/commit_data_request.cc",
-    "src/tracing/core/data_source_config.cc",
-    "src/tracing/core/data_source_descriptor.cc",
-    "src/tracing/core/id_allocator.cc",
-    "src/tracing/core/metatrace_writer.cc",
-    "src/tracing/core/null_trace_writer.cc",
-    "src/tracing/core/observable_events.cc",
-    "src/tracing/core/packet_stream_validator.cc",
-    "src/tracing/core/shared_memory_abi.cc",
-    "src/tracing/core/shared_memory_arbiter_impl.cc",
-    "src/tracing/core/sliced_protobuf_input_stream.cc",
-    "src/tracing/core/startup_trace_writer.cc",
-    "src/tracing/core/startup_trace_writer_registry.cc",
-    "src/tracing/core/test_config.cc",
-    "src/tracing/core/trace_buffer.cc",
-    "src/tracing/core/trace_config.cc",
-    "src/tracing/core/trace_packet.cc",
-    "src/tracing/core/trace_stats.cc",
-    "src/tracing/core/trace_writer_impl.cc",
-    "src/tracing/core/tracing_service_impl.cc",
-    "src/tracing/core/tracing_service_state.cc",
-    "src/tracing/core/virtual_destructors.cc",
-    "src/tracing/ipc/consumer/consumer_ipc_client_impl.cc",
-    "src/tracing/ipc/default_socket.cc",
-    "src/tracing/ipc/posix_shared_memory.cc",
-    "src/tracing/ipc/producer/producer_ipc_client_impl.cc",
-    "src/tracing/ipc/service/consumer_ipc_service.cc",
-    "src/tracing/ipc/service/producer_ipc_service.cc",
-    "src/tracing/ipc/service/service_ipc_host_impl.cc",
-    "src/tracing/trace_writer_base.cc",
   ],
   shared_libs: [
     "liblog",
diff --git a/gn/perfetto_host_executable.gni b/gn/perfetto_host_executable.gni
index 2f00737a1..ccadc2e71 100644
--- a/gn/perfetto_host_executable.gni
+++ b/gn/perfetto_host_executable.gni
@@ -21,47 +21,38 @@ import("perfetto.gni")
 # This template takes care takes care of building the target only on the host
 # toolchain and copy it over in the root build directory.
 template("perfetto_host_executable") {
-  if (is_perfetto_build_generator) {
-    # On Android in-tree builds we don't need anything special in GN. However
-    # remember to add the target to the |target_host_only| list in
-    # tools/gen_android_bp to instruct the Android.bp generator.
+  if (current_toolchain == host_toolchain) {
     executable(target_name) {
       forward_variables_from(invoker, "*")
     }
   } else {
-    if (current_toolchain == host_toolchain) {
-      executable(target_name) {
-        forward_variables_from(invoker, "*")
+    not_needed(invoker, "*", [ "testonly" ])
+    _host_target = ":$target_name($host_toolchain)"
+    _testonly = defined(invoker.testonly) && invoker.testonly
+    if (perfetto_build_with_embedder || is_perfetto_build_generator) {
+      # Don't copy anythin in Chromium, just add a dependency to the host
+      # target. V8 and other GN embedder builds. This causes problems on
+      # some bot (see crbug.com/1002599).
+      group(target_name) {
+        testonly = _testonly
+        deps = [
+          _host_target,
+        ]
       }
     } else {
-      not_needed(invoker, "*", [ "testonly" ])
-      _host_target = ":$target_name($host_toolchain)"
-      _testonly = defined(invoker.testonly) && invoker.testonly
-      if (perfetto_build_with_embedder) {
-        # Don't copy anythin in Chromium, just add a dependency to the host
-        # target. V8 and other GN embedder builds. This causes problems on
-        # some bot (see crbug.com/1002599).
-        group(target_name) {
-          testonly = _testonly
-          deps = [
-            _host_target,
-          ]
-        }
-      } else {
-        copy(target_name) {
-          testonly = _testonly
-          deps = [
-            _host_target,
-          ]
-          _host_out_dir = get_label_info(_host_target, "root_out_dir")
-          sources = [
-            "$_host_out_dir/$target_name",
-          ]
-          outputs = [
-            "$root_out_dir/$target_name",
-          ]
-        }
+      copy(target_name) {
+        testonly = _testonly
+        deps = [
+          _host_target,
+        ]
+        _host_out_dir = get_label_info(_host_target, "root_out_dir")
+        sources = [
+          "$_host_out_dir/$target_name",
+        ]
+        outputs = [
+          "$root_out_dir/$target_name",
+        ]
       }
     }
-  }  # if (is_perfetto_build_generator)
+  }
 }
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 82cd5bd00..dd7d2c442 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -37,17 +37,6 @@ from compat import itervalues
 
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-def EnumerateDataDeps():
-  with open(os.path.join(ROOT_DIR, 'tools', 'test_data.txt')) as f:
-    lines = f.readlines()
-  for line in (line.strip() for line in lines if not line.startswith('#')):
-    assert os.path.exists(line), line
-    if line.endswith('/'):
-        yield line + '**/*'
-    else:
-        yield line
-
-
 # Arguments for the GN output directory.
 gn_args = ' '.join([
     'is_debug=false',
@@ -69,17 +58,26 @@ default_targets = [
     '//src/perfetto_cmd:trigger_perfetto',
     '//src/profiling/memory:heapprofd_client',
     '//src/profiling/memory:heapprofd',
-    '//src/trace_processor:trace_processor_shell',
     '//src/traced/probes:traced_probes',
     '//src/traced/service:traced',
-    '//tools/trace_to_text:trace_to_text',
+]
+
+# Host targets
+ipc_plugin = '//src/ipc/protoc_plugin:ipc_plugin(%s)' % gn_utils.HOST_TOOLCHAIN
+protozero_plugin = '//src/protozero/protoc_plugin:protozero_plugin(%s)' % (
+    gn_utils.HOST_TOOLCHAIN)
+default_targets += [
+    '//src/trace_processor:trace_processor_shell(%s)' % gn_utils.HOST_TOOLCHAIN,
+    '//tools/trace_to_text:trace_to_text(%s)' % gn_utils.HOST_TOOLCHAIN,
+    protozero_plugin,
+    ipc_plugin,
 ]
 
 # Defines a custom init_rc argument to be applied to the corresponding output
 # blueprint target.
 target_initrc = {
-    '//src/traced/service:traced': 'perfetto.rc',
-    '//src/profiling/memory:heapprofd': 'heapprofd.rc',
+    '//src/traced/service:traced': {'perfetto.rc'},
+    '//src/profiling/memory:heapprofd': {'heapprofd.rc'},
 }
 
 target_host_supported = [
@@ -87,11 +85,6 @@ target_host_supported = [
     '//:libperfetto',
 ]
 
-target_host_only = [
-    '//tools/trace_to_text:trace_to_text',
-    '//src/trace_processor:trace_processor_shell',
-]
-
 # All module names are prefixed with this string to avoid collisions.
 module_prefix = 'perfetto_'
 
@@ -134,62 +127,81 @@ library_not_in_pdk = {
 # The directory where the generated perfetto_build_flags.h will be copied into.
 buildflags_dir = 'include/perfetto/base/build_configs/android_tree'
 
+
+def enumerate_data_deps():
+  with open(os.path.join(ROOT_DIR, 'tools', 'test_data.txt')) as f:
+    lines = f.readlines()
+  for line in (line.strip() for line in lines if not line.startswith('#')):
+    assert os.path.exists(line), line
+    if line.endswith('/'):
+      yield line + '**/*'
+    else:
+      yield line
+
+
 # Additional arguments to apply to Android.bp rules.
 additional_args = {
     'heapprofd_client': [
-        ('include_dirs', ['bionic/libc']),
-        ('static_libs', ['libasync_safe']),
-        ('header_libs', ['bionic_libc_platform_headers']),
-    ],
-    'perfetto_unittests': [
-        ('data', list(EnumerateDataDeps())),
-    ],
-    'traced_probes': [
-      ('required', ['libperfetto_android_internal', 'trigger_perfetto']),
-    ],
-    'libperfetto_android_internal': [
-      ('static_libs', ['libhealthhalutils']),
+        ('include_dirs', {'bionic/libc'}),
+        ('static_libs', {'libasync_safe'}),
+        ('header_libs', {'bionic_libc_platform_headers'}),
     ],
+    'perfetto_unittests': [('data', set(enumerate_data_deps())),],
+    'traced_probes': [('required',
+                       {'libperfetto_android_internal', 'trigger_perfetto'}),],
+    'libperfetto_android_internal': [('static_libs', {'libhealthhalutils'}),],
 }
 
+
 def enable_gmock(module):
-    module.static_libs.append('libgmock')
+  module.static_libs.add('libgmock')
+
 
 def enable_protobuf_full(module):
-    module.shared_libs.append('libprotobuf-cpp-full')
+  module.shared_libs.add('libprotobuf-cpp-full')
+
 
 def enable_protobuf_lite(module):
-    module.shared_libs.append('libprotobuf-cpp-lite')
+  module.shared_libs.add('libprotobuf-cpp-lite')
+
 
 def enable_protoc_lib(module):
-    module.shared_libs.append('libprotoc')
+  module.shared_libs.add('libprotoc')
+
 
 def enable_libunwindstack(module):
-    module.shared_libs.append('libunwindstack')
-    module.shared_libs.append('libprocinfo')
-    module.shared_libs.append('libbase')
+  module.shared_libs.add('libunwindstack')
+  module.shared_libs.add('libprocinfo')
+  module.shared_libs.add('libbase')
+
 
 def enable_libunwind(module):
-    # libunwind is disabled on Darwin so we cannot depend on it.
-    pass
+  # libunwind is disabled on Darwin so we cannot depend on it.
+  pass
+
 
 def enable_sqlite(module):
-    if module.type == 'cc_binary_host':
-        module.static_libs.append('libsqlite')
-    else:
-        # Copy what the sqlite3 command line tool does.
-        module.android.shared_libs.append('libsqlite')
-        module.android.shared_libs.append('libandroidicu')
-        module.android.shared_libs.append('liblog')
-        module.android.shared_libs.append('libutils')
-        module.host.static_libs.append('libsqlite')
+  if module.type == 'cc_binary_host':
+    module.static_libs.add('libsqlite')
+  else:
+    # Copy what the sqlite3 command line tool does.
+    module.android.shared_libs.add('libsqlite')
+    module.android.shared_libs.add('libandroidicu')
+    module.android.shared_libs.add('liblog')
+    module.android.shared_libs.add('libutils')
+    module.host.static_libs.add('libsqlite')
+
 
 def enable_zlib(module):
-    module.shared_libs.append('libz')
+  module.shared_libs.add('libz')
+
 
 # Android equivalents for third-party libraries that the upstream project
 # depends on.
 builtin_deps = {
+    '//gn:default_deps': lambda x: None,
+    '//gn:gtest_main': lambda x: None,
+    '//gn:protoc': lambda x: None,
     '//gn:gtest_and_gmock': enable_gmock,
     '//gn:libunwind': enable_libunwind,
     '//gn:protobuf_full': enable_protobuf_full,
@@ -206,279 +218,208 @@ builtin_deps = {
 
 
 class Error(Exception):
-    pass
+  pass
 
 
 class ThrowingArgumentParser(argparse.ArgumentParser):
-    def __init__(self, context):
-        super(ThrowingArgumentParser, self).__init__()
-        self.context = context
 
-    def error(self, message):
-        raise Error('%s: %s' % (self.context, message))
+  def __init__(self, context):
+    super(ThrowingArgumentParser, self).__init__()
+    self.context = context
+
+  def error(self, message):
+    raise Error('%s: %s' % (self.context, message))
 
 
 def write_blueprint_key_value(output, name, value, sort=True):
-    """Writes an Blueprint key-value pair to the output"""
-
-    if not value:
-        return
-    if isinstance(value, set):
-        value = sorted(value)
-    if isinstance(value, list):
-        output.append('  %s: [' % name)
-        for item in sorted(value) if sort else value:
-            output.append('    "%s",' % item)
-        output.append('  ],')
-        return
-    if isinstance(value, bool):
-        output.append('  %s: true,' % name)
-        return
-    if isinstance(value, Target):
-        value.to_string(output)
-        return
-    output.append('  %s: "%s",' % (name, value))
+  """Writes a Blueprint key-value pair to the output"""
+
+  if not value:
+    return
+  if isinstance(value, set):
+    value = sorted(value)
+  if isinstance(value, list):
+    output.append('  %s: [' % name)
+    for item in sorted(value) if sort else value:
+      output.append('    "%s",' % item)
+    output.append('  ],')
+    return
+  if isinstance(value, bool):
+    output.append('  %s: true,' % name)
+    return
+  if isinstance(value, Target):
+    value.to_string(output)
+    return
+  output.append('  %s: "%s",' % (name, value))
+
 
 class Target(object):
-    """A target-scoped part of a module"""
-
-    def __init__(self, name):
-        self.name = name
-        self.shared_libs = []
-        self.static_libs = []
-        self.cflags = set()
-
-    def to_string(self, output):
-        nested_out = []
-        self._output_field(nested_out, 'shared_libs')
-        self._output_field(nested_out, 'static_libs')
-        self._output_field(nested_out, 'cflags')
-
-        if nested_out:
-            output.append('  %s: {' % self.name)
-            for line in nested_out:
-              output.append('  %s' % line)
-            output.append('  },')
-
-    def _output_field(self, output, name, sort=True):
-        value = getattr(self, name)
-        return write_blueprint_key_value(output, name, value, sort)
+  """A target-scoped part of a module"""
+
+  def __init__(self, name):
+    self.name = name
+    self.shared_libs = set()
+    self.static_libs = set()
+    self.cflags = set()
+
+  def to_string(self, output):
+    nested_out = []
+    self._output_field(nested_out, 'shared_libs')
+    self._output_field(nested_out, 'static_libs')
+    self._output_field(nested_out, 'cflags')
+
+    if nested_out:
+      output.append('  %s: {' % self.name)
+      for line in nested_out:
+        output.append('  %s' % line)
+      output.append('  },')
+
+  def _output_field(self, output, name, sort=True):
+    value = getattr(self, name)
+    return write_blueprint_key_value(output, name, value, sort)
+
 
 class Module(object):
-    """A single module (e.g., cc_binary, cc_test) in a blueprint."""
-
-    def __init__(self, mod_type, name):
-        self.type = mod_type
-        self.name = name
-        self.srcs = []
-        self.comment = None
-        self.shared_libs = []
-        self.static_libs = []
-        self.tools = []
-        self.cmd = None
-        self.host_supported = False
-        self.init_rc = []
-        self.out = []
-        self.export_include_dirs = []
-        self.generated_headers = []
-        self.export_generated_headers = []
-        self.defaults = []
-        self.cflags = set()
-        self.local_include_dirs = []
-        self.include_dirs = []
-        self.header_libs = []
-        self.required = []
-        self.user_debug_flag = False
-        self.tool_files = None
-        self.android = Target('android')
-        self.host = Target('host')
-        self.lto = None
-        self.data = []
-
-    def to_string(self, output):
-        if self.comment:
-            output.append('// %s' % self.comment)
-        output.append('%s {' % self.type)
-        self._output_field(output, 'name')
-        self._output_field(output, 'srcs')
-        self._output_field(output, 'shared_libs')
-        self._output_field(output, 'static_libs')
-        self._output_field(output, 'tools')
-        self._output_field(output, 'cmd', sort=False)
-        self._output_field(output, 'host_supported')
-        self._output_field(output, 'init_rc')
-        self._output_field(output, 'out')
-        self._output_field(output, 'export_include_dirs')
-        self._output_field(output, 'generated_headers')
-        self._output_field(output, 'export_generated_headers')
-        self._output_field(output, 'defaults')
-        self._output_field(output, 'cflags')
-        self._output_field(output, 'local_include_dirs')
-        self._output_field(output, 'include_dirs')
-        self._output_field(output, 'header_libs')
-        self._output_field(output, 'required')
-        self._output_field(output, 'tool_files')
-        self._output_field(output, 'data')
-
-        target_out = []
-        self._output_field(target_out, 'android')
-        self._output_field(target_out, 'host')
-        if target_out:
-            output.append('  target: {')
-            for line in target_out:
-              output.append('  %s' % line)
-            output.append('  },')
-
-        disable_pdk = any(name in library_not_in_pdk for name in self.shared_libs)
-        if self.user_debug_flag or disable_pdk:
-            output.append('  product_variables: {')
-            if disable_pdk:
-                output.append('    pdk: {')
-                output.append('      enabled: false,')
-                output.append('    },')
-            if self.user_debug_flag:
-                output.append('    debuggable: {')
-                output.append('      cflags: ["-DPERFETTO_BUILD_WITH_ANDROID_USERDEBUG"],')
-                output.append('    },')
-            output.append('  },')
-        if self.lto is not None:
-          output.append('  target: {')
-          output.append('    android: {')
-          output.append('      lto: {')
-          output.append('        thin: %s,' % 'true' if self.lto else 'false')
-          output.append('      },')
-          output.append('    },')
-          output.append('  },')
-        output.append('}')
-        output.append('')
-
-    def _output_field(self, output, name, sort=True):
-        value = getattr(self, name)
-        return write_blueprint_key_value(output, name, value, sort)
+  """A single module (e.g., cc_binary, cc_test) in a blueprint."""
+
+  def __init__(self, mod_type, name, gn_target):
+    self.type = mod_type
+    self.gn_target = gn_target
+    self.name = name
+    self.srcs = set()
+    self.comment = 'GN: ' + gn_utils.label_without_toolchain(gn_target)
+    self.shared_libs = set()
+    self.static_libs = set()
+    self.tools = set()
+    self.cmd = None
+    self.host_supported = False
+    self.init_rc = set()
+    self.out = set()
+    self.export_include_dirs = set()
+    self.generated_headers = set()
+    self.export_generated_headers = set()
+    self.defaults = set()
+    self.cflags = set()
+    self.include_dirs = set()
+    self.header_libs = set()
+    self.required = set()
+    self.user_debug_flag = False
+    self.tool_files = None
+    self.android = Target('android')
+    self.host = Target('host')
+    self.lto = None
+    self.data = set()
+    # The genrule_XXX below are properties that must to be propagated back
+    # on the module(s) that depend on the genrule.
+    self.genrule_headers = set()
+    self.genrule_srcs = set()
+    self.genrule_shared_libs = set()
+
+  def to_string(self, output):
+    if self.comment:
+      output.append('// %s' % self.comment)
+    output.append('%s {' % self.type)
+    self._output_field(output, 'name')
+    self._output_field(output, 'srcs')
+    self._output_field(output, 'shared_libs')
+    self._output_field(output, 'static_libs')
+    self._output_field(output, 'tools')
+    self._output_field(output, 'cmd', sort=False)
+    self._output_field(output, 'host_supported')
+    self._output_field(output, 'init_rc')
+    self._output_field(output, 'out')
+    self._output_field(output, 'export_include_dirs')
+    self._output_field(output, 'generated_headers')
+    self._output_field(output, 'export_generated_headers')
+    self._output_field(output, 'defaults')
+    self._output_field(output, 'cflags')
+    self._output_field(output, 'include_dirs')
+    self._output_field(output, 'header_libs')
+    self._output_field(output, 'required')
+    self._output_field(output, 'tool_files')
+    self._output_field(output, 'data')
+
+    target_out = []
+    self._output_field(target_out, 'android')
+    self._output_field(target_out, 'host')
+    if target_out:
+      output.append('  target: {')
+      for line in target_out:
+        output.append('  %s' % line)
+      output.append('  },')
+
+    disable_pdk = any(name in library_not_in_pdk for name in self.shared_libs)
+    if self.user_debug_flag or disable_pdk:
+      output.append('  product_variables: {')
+      if disable_pdk:
+        output.append('    pdk: {')
+        output.append('      enabled: false,')
+        output.append('    },')
+      if self.user_debug_flag:
+        output.append('    debuggable: {')
+        output.append(
+            '      cflags: ["-DPERFETTO_BUILD_WITH_ANDROID_USERDEBUG"],')
+        output.append('    },')
+      output.append('  },')
+    if self.lto is not None:
+      output.append('  target: {')
+      output.append('    android: {')
+      output.append('      lto: {')
+      output.append('        thin: %s,' % 'true' if self.lto else 'false')
+      output.append('      },')
+      output.append('    },')
+      output.append('  },')
+    output.append('}')
+    output.append('')
+
+  def _output_field(self, output, name, sort=True):
+    value = getattr(self, name)
+    return write_blueprint_key_value(output, name, value, sort)
 
 
 class Blueprint(object):
-    """In-memory representation of an Android.bp file."""
+  """In-memory representation of an Android.bp file."""
 
-    def __init__(self):
-        self.modules = {}
+  def __init__(self):
+    self.modules = {}
 
-    def add_module(self, module):
-        """Adds a new module to the blueprint, replacing any existing module
+  def add_module(self, module):
+    """Adds a new module to the blueprint, replacing any existing module
         with the same name.
 
         Args:
             module: Module instance.
         """
-        self.modules[module.name] = module
+    self.modules[module.name] = module
 
-    def to_string(self, output):
-        for m in sorted(itervalues(self.modules), key=lambda m: m.name):
-            m.to_string(output)
+  def to_string(self, output):
+    for m in sorted(itervalues(self.modules), key=lambda m: m.name):
+      m.to_string(output)
 
 
 def label_to_module_name(label):
-    """Turn a GN label (e.g., //:perfetto_tests) into a module name."""
-    # If the label is explicibly listed in the default target list, don't prefix
-    # its name and return just the target name. This is so tools like
-    # "trace_to_text" stay as such in the Android tree.
-    if label in default_targets:
-        return label.split(':')[-1]
+  """Turn a GN label (e.g., //:perfetto_tests) into a module name."""
+  # If the label is explicibly listed in the default target list, don't prefix
+  # its name and return just the target name. This is so tools like
+  # "trace_to_text" stay as such in the Android tree.
+  label_without_toolchain = gn_utils.label_without_toolchain(label)
+  if label in default_targets or label_without_toolchain in default_targets:
+    return label_without_toolchain.split(':')[-1]
 
-    module = re.sub(r'^//:?', '', label)
-    module = re.sub(r'[^a-zA-Z0-9_]', '_', module)
-    if not module.startswith(module_prefix) and label not in default_targets:
-        return module_prefix + module
-    return module
+  module = re.sub(r'^//:?', '', label_without_toolchain)
+  module = re.sub(r'[^a-zA-Z0-9_]', '_', module)
+  if not module.startswith(module_prefix):
+    return module_prefix + module
+  return module
 
 
 def is_supported_source_file(name):
-    """Returns True if |name| can appear in a 'srcs' list."""
-    return os.path.splitext(name)[1] in ['.c', '.cc', '.proto']
-
-
-def is_generated_by_action(desc, label):
-    """Checks if a label is generated by an action.
-
-    Returns True if a GN output label |label| is an output for any action,
-    i.e., the file is generated dynamically.
-    """
-    for target in itervalues(desc):
-        if target['type'] == 'action' and label in target['outputs']:
-            return True
-    return False
-
+  """Returns True if |name| can appear in a 'srcs' list."""
+  return os.path.splitext(name)[1] in ['.c', '.cc', '.proto']
 
-def apply_module_dependency(blueprint, desc, module, dep_name):
-    """Recursively collect dependencies for a given module.
 
-    Walk the transitive dependencies for a GN target and apply them to a given
-    module. This effectively flattens the dependency tree so that |module|
-    directly contains all the sources, libraries, etc. in the corresponding GN
-    dependency tree.
-
-    Args:
-        blueprint: Blueprint instance which is being generated.
-        desc: JSON GN description.
-        module: Module to which dependencies should be added.
-        dep_name: GN target of the dependency.
-    """
-    # If the dependency refers to a library which we can replace with an Android
-    # equivalent, stop recursing and patch the dependency in. Don't recurse into
-    # //buildtools, builtin_deps are intercepted at the //gn:xxx level.
-    if dep_name.startswith('//buildtools'):
-        return
-    if gn_utils.label_without_toolchain(dep_name) in builtin_deps:
-        builtin_deps[gn_utils.label_without_toolchain(dep_name)](module)
-        return
-
-    # Similarly some shared libraries are directly mapped to Android
-    # equivalents.
-    target = desc[dep_name]
-    for lib in target.get('libs', []):
-        # Generally library names should be mangled as 'libXXX', unless they are
-        # HAL libraries (e.g., android.hardware.health@2.0).
-        android_lib = lib if '@' in lib else 'lib' + lib
-        if lib in library_whitelist and not android_lib in module.shared_libs:
-            module.shared_libs.append(android_lib)
-
-    type = target['type']
-    if type == 'action':
-        if "gen_merged_sql_metrics" in dep_name:
-          dep_mod = create_merged_sql_metrics_target(blueprint, desc, dep_name)
-          module.generated_headers.append(dep_mod.name)
-        elif dep_name.startswith(gn_utils.BUILDFLAGS_TARGET):
-            # Ignore the dependency on the gen_buildflags genrule. That is run
-            # separately in this generator and the generated file is copied over
-            # into the repo (see usage of |buildflags_dir| in this script).
-            return
-        else:
-          create_modules_from_target(blueprint, desc, dep_name)
-          # Depend both on the generated sources and headers -- see
-          # make_genrules_for_action.
-          module.srcs.append(':' + label_to_module_name(dep_name))
-          module.generated_headers.append(
-              label_to_module_name(dep_name) + '_headers')
-    elif type == 'static_library' and label_to_module_name(
-            dep_name) != module.name:
-        create_modules_from_target(blueprint, desc, dep_name)
-        module.static_libs.append(label_to_module_name(dep_name))
-    elif type == 'shared_library' and label_to_module_name(
-            dep_name) != module.name:
-        module.shared_libs.append(label_to_module_name(dep_name))
-    elif type in ['group', 'source_set', 'executable', 'static_library'
-                  ] and 'sources' in target:
-        # Ignore source files that are generated by actions since they will be
-        # implicitly added by the genrule dependencies.
-        module.srcs.extend(
-            gn_utils.label_to_path(src) for src in target['sources']
-            if is_supported_source_file(src)
-            and not is_generated_by_action(desc, src))
-    module.cflags |= _get_cflags(target)
-
-
-def make_genrules_for_action(blueprint, desc, target_name):
-    """Generate genrules for a GN action.
+def create_proto_modules(blueprint, gn, target):
+  """Generate genrules for a proto GN target.
 
     GN actions are used to dynamically generate files during the build. The
     Soong equivalent is a genrule. This function turns a specific kind of
@@ -487,318 +428,309 @@ def make_genrules_for_action(blueprint, desc, target_name):
 
     Args:
         blueprint: Blueprint instance which is being generated.
-        desc: JSON GN description.
-        target_name: GN target for genrule generation.
+        target: gn_utils.Target object.
 
     Returns:
-        A (source_genrule, header_genrule) module tuple.
+        The source_genrule module.
     """
-    target = desc[target_name]
-
-    # We only support genrules which call protoc (with or without a plugin) to
-    # turn .proto files into header and source files.
-    args = target['args']
-    if '/protoc' not in args[0]:
-        raise Error('Unsupported action in target %s: %s' % (target_name,
-                                                             target['args']))
-    parser = ThrowingArgumentParser('Action in target %s (%s)' %
-                                    (target_name, ' '.join(target['args'])))
-    parser.add_argument('--proto_path')
-    parser.add_argument('--cpp_out')
-    parser.add_argument('--plugin')
-    parser.add_argument('--plugin_out')
-    parser.add_argument('--descriptor_set_out')
-    parser.add_argument('--include_imports', action='store_true')
-    parser.add_argument('protos', nargs=argparse.REMAINDER)
-    args = parser.parse_args(args[2:])
-
-    # Depending on whether we are using the default protoc C++ generator or the
-    # protozero plugin, the output dir is passed as:
-    # --cpp_out=gen/xxx or
-    # --plugin_out=:gen/xxx or
-    # --plugin_out=wrapper_namespace=pbzero:gen/xxx
-    gen_dir = args.cpp_out if args.cpp_out else args.plugin_out.split(':')[1]
-    assert gen_dir.startswith('gen/')
-    gen_dir = gen_dir[4:]
-    cpp_out_dir = ('$(genDir)/%s/%s' % (tree_path, gen_dir)).rstrip('/')
-    gen_dir = gen_dir or '.'
-
-    # TODO(skyostil): Is there a way to avoid hardcoding the tree path here?
-    # TODO(skyostil): Find a way to avoid creating the directory.
-    cmd = [
-        'mkdir -p %s &&' % cpp_out_dir,
-        '$(location aprotoc)',
-        '--cpp_out=%s' % cpp_out_dir
-    ]
-
-    # We create two genrules for each action: one for the protobuf headers and
-    # another for the sources. This is because the module that depends on the
-    # generated files needs to declare two different types of dependencies --
-    # source files in 'srcs' and headers in 'generated_headers' -- and it's not
-    # valid to generate .h files from a source dependency and vice versa.
-    source_module = Module('genrule', label_to_module_name(target_name))
-    source_module.srcs.extend(
-        gn_utils.label_to_path(src) for src in target['sources'])
-    source_module.tools = ['aprotoc']
-
-    header_module = Module('genrule',
-                           label_to_module_name(target_name) + '_headers')
-    header_module.srcs = source_module.srcs[:]
-    header_module.tools = source_module.tools[:]
-
-    # TODO(primiano): at some point we should remove this. This was introduced
-    # by aosp/1108421 when adding "protos/" to .proto include paths, in order to
-    # avoid doing multi-repo changes and allow old clients in the android tree
-    # to still do the old #include "perfetto/..." rather than
-    # #include "protos/perfetto/...".
-    header_module.export_include_dirs = [gen_dir, 'protos']
-
-    # In GN builds the proto path is always relative to the output directory
-    # (out/tmp.xxx).
-    assert args.proto_path == '../../'
-    cmd += [ '--proto_path=%s' % tree_path ]
-
-    namespaces = ['pb']
-    if args.plugin:
-        _, plugin = os.path.split(args.plugin)
-        # TODO(skyostil): Can we detect this some other way?
-        if plugin == 'ipc_plugin':
-            namespaces.append('ipc')
-        elif plugin == 'protozero_plugin':
-            namespaces = ['pbzero']
-        for dep in target['deps']:
-            if desc[dep]['type'] != 'executable':
-                continue
-            _, executable = os.path.split(desc[dep]['outputs'][0])
-            if executable == plugin:
-                cmd += [
-                    '--plugin=protoc-gen-plugin=$(location %s)' %
-                    label_to_module_name(dep)
-                ]
-                source_module.tools.append(label_to_module_name(dep))
-                # Also make sure the module for the tool is generated.
-                create_modules_from_target(blueprint, desc, dep)
-                break
-        else:
-            raise Error('Unrecognized protoc plugin in target %s: %s' %
-                        (target_name, args[i]))
-    if args.plugin_out:
-        plugin_args = args.plugin_out.split(':')[0]
-        cmd += ['--plugin_out=%s:%s' % (plugin_args, cpp_out_dir)]
-
-    cmd += ['$(in)']
-    source_module.cmd = ' '.join(cmd)
-    header_module.cmd = source_module.cmd
-    header_module.tools = source_module.tools[:]
-
-    for ns in namespaces:
-        source_module.out += [
-            '%s/%s' % (tree_path, src.replace('.proto', '.%s.cc' % ns))
-            for src in source_module.srcs
-        ]
-        header_module.out += [
-            '%s/%s' % (tree_path, src.replace('.proto', '.%s.h' % ns))
-            for src in header_module.srcs
-        ]
-    return source_module, header_module
-
-
-def create_merged_sql_metrics_target(blueprint, desc, gn_target_name):
-    target_desc = desc[gn_target_name]
-    module = Module(
-        'genrule',
-        'gen_merged_sql_metrics',
-    )
-    module.tool_files = [
-        'tools/gen_merged_sql_metrics.py',
-    ]
-    module.cmd = ' '.join([
-        '$(location tools/gen_merged_sql_metrics.py)',
-        '--cpp_out=$(out)',
-        '$(in)',
-    ])
-    module.out = set(
-        src[src.index('gen/') + len('gen/'):]
-        for src in target_desc.get('outputs', [])
-    )
-    module.srcs.extend(
-      gn_utils.label_to_path(src)
-      for src in target_desc.get('inputs', [])
-    )
-    blueprint.add_module(module)
-    return module
+  assert (target.type == 'proto_library')
+  cpp_out_dir = '$(genDir)/%s/' % tree_path
+  cmd = [
+      'mkdir -p %s &&' % cpp_out_dir, '$(location aprotoc)',
+      '--cpp_out=%s' % cpp_out_dir
+  ]
+
+  # We create two genrules for each proto target: one for the headers and
+  # another for the sources. This is because the module that depends on the
+  # generated files needs to declare two different types of dependencies --
+  # source files in 'srcs' and headers in 'generated_headers' -- and it's not
+  # valid to generate .h files from a source dependency and vice versa.
+  source_module_name = label_to_module_name(target.name) + '_gen'
+  source_module = Module('genrule', source_module_name, target.name)
+  blueprint.add_module(source_module)
+  source_module.srcs.update(
+      gn_utils.label_to_path(src) for src in target.sources)
+  tools = {'aprotoc'}
+
+  header_module = Module('genrule', source_module_name + '_headers',
+                         target.name)
+  blueprint.add_module(header_module)
+  header_module.srcs = set(source_module.srcs)
+
+  # TODO(primiano): at some point we should remove this. This was introduced
+  # by aosp/1108421 when adding "protos/" to .proto include paths, in order to
+  # avoid doing multi-repo changes and allow old clients in the android tree
+  # to still do the old #include "perfetto/..." rather than
+  # #include "protos/perfetto/...".
+  header_module.export_include_dirs = {'.', 'protos'}
+
+  source_module.genrule_srcs.add(':' + source_module.name)
+  source_module.genrule_headers.add(header_module.name)
+
+  # In GN builds the proto path is always relative to the output directory
+  # (out/tmp.xxx).
+  cmd += ['--proto_path=%s' % tree_path]
+
+  suffixes = ['pb']
+  if target.proto_plugin == 'proto':
+    source_module.genrule_shared_libs.add('libprotobuf-cpp-lite')
+  elif target.proto_plugin == 'protozero':
+    suffixes = ['pbzero']
+    plugin = create_modules_from_target(blueprint, gn, protozero_plugin)
+    tools.add(plugin.name)
+    cmd += ['--plugin=protoc-gen-plugin=$(location %s)' % plugin.name]
+    cmd += ['--plugin_out=wrapper_namespace=pbzero:' + cpp_out_dir]
+  elif target.proto_plugin == 'ipc':
+    suffixes.append('ipc')
+    plugin = create_modules_from_target(blueprint, gn, ipc_plugin)
+    tools.add(plugin.name)
+    cmd += ['--plugin=protoc-gen-plugin=$(location %s)' % plugin.name]
+    cmd += ['--plugin_out=:' + cpp_out_dir]
+  else:
+    raise Error('Unsupported proto plugin: %s' % target.proto_plugin)
+
+  cmd += ['$(in)']
+  source_module.cmd = ' '.join(cmd)
+  header_module.cmd = source_module.cmd
+  source_module.tools = tools
+  header_module.tools = tools
+
+  for sfx in suffixes:
+    source_module.out.update(
+        '%s/%s' % (tree_path, src.replace('.proto', '.%s.cc' % sfx))
+        for src in source_module.srcs)
+    header_module.out.update(
+        '%s/%s' % (tree_path, src.replace('.proto', '.%s.h' % sfx))
+        for src in header_module.srcs)
+  return source_module
+
+
+def create_merged_sql_metrics_module(blueprint, target):
+  module = Module('genrule', 'gen_merged_sql_metrics',
+                  '//src/trace_processor/metrics:gen_merged_sql_metrics')
+  module.genrule_headers.add('gen_merged_sql_metrics')
+  module.tool_files = [
+      'tools/gen_merged_sql_metrics.py',
+  ]
+  module.cmd = ' '.join([
+      '$(location tools/gen_merged_sql_metrics.py)',
+      '--cpp_out=$(out)',
+      '$(in)',
+  ])
+  module.out.update(target.outputs)
+  module.srcs.update(gn_utils.label_to_path(src) for src in target.inputs)
+  blueprint.add_module(module)
+  return module
 
 
 def _get_cflags(target):
-    cflags = set(flag for flag in target.get('cflags', [])
-        if re.match(cflag_whitelist, flag))
-    cflags |= set("-D%s" % define for define in target.get('defines', [])
-                  if re.match(define_whitelist, define))
-    return cflags
+  cflags = {flag for flag in target.cflags if re.match(cflag_whitelist, flag)}
+  cflags |= set("-D%s" % define
+                for define in target.defines
+                if re.match(define_whitelist, define))
+  return cflags
 
 
-def create_modules_from_target(blueprint, desc, target_name):
-    """Generate module(s) for a given GN target.
+def create_modules_from_target(blueprint, gn, gn_target_name):
+  """Generate module(s) for a given GN target.
 
     Given a GN target name, generate one or more corresponding modules into a
-    blueprint.
+    blueprint. The only case when this generates >1 module is proto libraries.
 
     Args:
         blueprint: Blueprint instance which is being generated.
-        desc: JSON GN description.
-        target_name: GN target for module generation.
+        gn: gn_utils.GnParser object.
+        gn_target_name: GN target for module generation.
     """
-    target = desc[target_name]
-    export_include_dirs = [ 'include', buildflags_dir ]
-    if target['type'] == 'executable':
-        if 'host' in target['toolchain'] or target_name in target_host_only:
-            module_type = 'cc_binary_host'
-        elif target.get('testonly'):
-            module_type = 'cc_test'
-        else:
-            module_type = 'cc_binary'
-        modules = [Module(module_type, label_to_module_name(target_name))]
-    elif target['type'] == 'action':
-        modules = make_genrules_for_action(blueprint, desc, target_name)
-    elif target['type'] == 'static_library':
-        module = Module('cc_library_static', label_to_module_name(target_name))
-        module.export_include_dirs = export_include_dirs
-        modules = [module]
-    elif target['type'] == 'shared_library':
-        module = Module('cc_library_shared', label_to_module_name(target_name))
-        module.export_include_dirs = export_include_dirs
-        modules = [module]
+  bp_module_name = label_to_module_name(gn_target_name)
+  if bp_module_name in blueprint.modules:
+    return blueprint.modules[bp_module_name]
+  target = gn.get_target(gn_target_name)
+  export_include_dirs = {'include', buildflags_dir}
+
+  if target.type == 'executable':
+    if target.toolchain == gn_utils.HOST_TOOLCHAIN:
+      module_type = 'cc_binary_host'
+    elif target.testonly:
+      module_type = 'cc_test'
     else:
-        raise Error('Unknown target type: %s' % target['type'])
-
-    for module in modules:
-        module.comment = 'GN target: %s' % target_name
-        if target_name in target_initrc:
-          module.init_rc = [target_initrc[target_name]]
-        if target_name in target_host_supported:
-          module.host_supported = True
-
-        # Don't try to inject library/source dependencies into genrules because
-        # they are not compiled in the traditional sense.
-        if module.type != 'genrule':
-            module.defaults = [defaults_module]
-            apply_module_dependency(blueprint, desc, module, target_name)
-            for dep in resolve_dependencies(desc, target_name):
-                apply_module_dependency(blueprint, desc, module, dep)
-
-        # If the module is a static library, export all the generated headers.
-        if module.type == 'cc_library_static':
-            module.export_generated_headers = module.generated_headers
-
-        # Merge in additional hardcoded arguments.
-        for key, add_val in additional_args.get(module.name, []):
-          curr = getattr(module, key)
-          if add_val and isinstance(add_val, list) and isinstance(curr, list):
-            curr.extend(add_val)
-          else:
-            raise Error('Unimplemented type of additional_args: %r' % key)
+      module_type = 'cc_binary'
+    module = Module(module_type, bp_module_name, gn_target_name)
+  elif target.type == 'static_library':
+    module = Module('cc_library_static', bp_module_name, gn_target_name)
+    module.export_include_dirs = export_include_dirs
+  elif target.type == 'shared_library':
+    module = Module('cc_library_shared', bp_module_name, gn_target_name)
+    module.export_include_dirs = export_include_dirs
+  elif target.type == 'source_set':
+    module = Module('filegroup', bp_module_name, gn_target_name)
+  elif target.type == 'group':
+    # "group" targets are resolved recursively by gn_utils.get_target().
+    # There's nothing we need to do at this level for them.
+    return None
+  elif target.type == 'proto_library':
+    module = create_proto_modules(blueprint, gn, target)
+  elif target.type == 'action' and 'gen_merged_sql_metrics' in target.name:
+    module = create_merged_sql_metrics_module(blueprint, target)
+  else:
+    raise Error('Unknown target %s (%s)' % (target.name, target.type))
+
+  blueprint.add_module(module)
+  module.host_supported = target.name in target_host_supported
+  module.init_rc = target_initrc.get(target.name, [])
+  module.srcs.update(
+      gn_utils.label_to_path(src)
+      for src in target.sources
+      if is_supported_source_file(src))
+
+  if target.type in gn_utils.LINKER_UNIT_TYPES:
+    module.cflags.update(_get_cflags(target))
+
+  module_is_compiled = module.type not in ('genrule', 'filegroup')
+  if module_is_compiled:
+    # Don't try to inject library/source dependencies into genrules or
+    # filegroups because they are not compiled in the traditional sense.
+    module.defaults = [defaults_module]
+    for lib in target.libs:
+      # Generally library names should be mangled as 'libXXX', unless they
+      # are HAL libraries (e.g., android.hardware.health@2.0).
+      android_lib = lib if '@' in lib else 'lib' + lib
+      if lib in library_whitelist:
+        module.shared_libs.add(android_lib)
+
+  # If the module is a static library, export all the generated headers.
+  if module.type == 'cc_library_static':
+    module.export_generated_headers = module.generated_headers
+
+  # Merge in additional hardcoded arguments.
+  for key, add_val in additional_args.get(module.name, []):
+    curr = getattr(module, key)
+    if add_val and isinstance(add_val, set) and isinstance(curr, set):
+      curr.update(add_val)
+    else:
+      raise Error('Unimplemented type of additional_args: %r' % key)
+
+  # dep_name is an unmangled GN target name (e.g. //foo:bar(toolchain)).
+  for dep_name in target.deps | target.source_set_deps | target.proto_deps:
+    # If the dependency refers to a library which we can replace with an
+    # Android equivalent, stop recursing and patch the dependency in.
+    # Don't recurse into //buildtools, builtin_deps are intercepted at
+    # the //gn:xxx level.
+    if dep_name.startswith('//buildtools'):
+      continue
 
-        blueprint.add_module(module)
+    # Ignore the dependency on the gen_buildflags genrule. That is run
+    # separately in this generator and the generated file is copied over
+    # into the repo (see usage of |buildflags_dir| in this script).
+    if dep_name.startswith(gn_utils.BUILDFLAGS_TARGET):
+      continue
 
+    dep_module = create_modules_from_target(blueprint, gn, dep_name)
 
-def resolve_dependencies(desc, target_name):
-    """Return the transitive set of dependent-on targets for a GN target.
+    # For filegroups and genrule, recurse but don't apply the deps.
+    if not module_is_compiled:
+      continue
 
-    Args:
-        blueprint: Blueprint instance which is being generated.
-        desc: JSON GN description.
-
-    Returns:
-        A set of transitive dependencies in the form of GN targets.
-    """
-
-    if gn_utils.label_without_toolchain(target_name) in builtin_deps:
-        return set()
-    target = desc[target_name]
-    resolved_deps = set()
-    for dep in target.get('deps', []):
-        resolved_deps.add(dep)
-        # Ignore the transitive dependencies of actions because they are
-        # explicitly converted to genrules.
-        if desc[dep]['type'] == 'action':
-            continue
-        # Dependencies on shared libraries shouldn't propagate any transitive
-        # dependencies but only depend on the shared library target
-        if desc[dep]['type'] == 'shared_library':
-            continue
-        resolved_deps.update(resolve_dependencies(desc, dep))
-    return resolved_deps
-
-
-def create_blueprint_for_targets(desc, targets):
-    """Generate a blueprint for a list of GN targets."""
-    blueprint = Blueprint()
-
-    # Default settings used by all modules.
-    defaults = Module('cc_defaults', defaults_module)
-
-    # We have to use include_dirs passing the path relative to the android tree.
-    # This is because: (i) perfetto_cc_defaults is used also by
-    # test/**/Android.bp; (ii) if we use local_include_dirs instead, paths
-    # become relative to the Android.bp that *uses* cc_defaults (not the one
-    # that defines it).s
-    defaults.include_dirs = [tree_path,
-                             tree_path + '/include',
-                             tree_path + '/' + buildflags_dir]
-    defaults.cflags = [
-        '-Wno-error=return-type',
-        '-Wno-sign-compare',
-        '-Wno-sign-promo',
-        '-Wno-unused-parameter',
-        '-fvisibility=hidden',
-        '-O2',
-    ]
-    defaults.user_debug_flag = True
-    defaults.lto = True
-
-    blueprint.add_module(defaults)
-    for target in targets:
-        create_modules_from_target(blueprint, desc, target)
-    return blueprint
+    # |builtin_deps| override GN deps with Android-specific ones. See the
+    # config in the top of this file.
+    if gn_utils.label_without_toolchain(dep_name) in builtin_deps:
+      builtin_deps[gn_utils.label_without_toolchain(dep_name)](module)
+      continue
+
+    # Don't recurse in any other //gn dep if not handled by builtin_deps.
+    if dep_name.startswith('//gn:'):
+      continue
+
+    if dep_module is None:
+      continue
+    if dep_module.type == 'cc_library_shared':
+      module.shared_libs.add(dep_module.name)
+    elif dep_module.type == 'cc_library_static':
+      module.static_libs.add(dep_module.name)
+    elif dep_module.type == 'filegroup':
+      module.srcs.add(':' + dep_module.name)
+    elif dep_module.type == 'genrule':
+      module.generated_headers.update(dep_module.genrule_headers)
+      module.srcs.update(dep_module.genrule_srcs)
+      module.shared_libs.update(dep_module.genrule_shared_libs)
+    else:
+      raise Error('Unknown dep %s (%s) for target %s' %
+                  (dep_module.name, dep_module.type, module.name))
+
+  return module
+
+
+def create_blueprint_for_targets(gn, desc, targets):
+  """Generate a blueprint for a list of GN targets."""
+  blueprint = Blueprint()
+
+  # Default settings used by all modules.
+  defaults = Module('cc_defaults', defaults_module, '//gn:default_deps')
+
+  # We have to use include_dirs passing the path relative to the android tree.
+  # This is because: (i) perfetto_cc_defaults is used also by
+  # test/**/Android.bp; (ii) if we use local_include_dirs instead, paths
+  # become relative to the Android.bp that *uses* cc_defaults (not the one
+  # that defines it).s
+  defaults.include_dirs = {
+      tree_path, tree_path + '/include', tree_path + '/' + buildflags_dir
+  }
+  defaults.cflags = [
+      '-Wno-error=return-type',
+      '-Wno-sign-compare',
+      '-Wno-sign-promo',
+      '-Wno-unused-parameter',
+      '-fvisibility=hidden',
+      '-O2',
+  ]
+  defaults.user_debug_flag = True
+  defaults.lto = True
+
+  blueprint.add_module(defaults)
+  gn = gn_utils.GnParser(desc)
+  for target in targets:
+    create_modules_from_target(blueprint, gn, target)
+  return blueprint
 
 
 def main():
-    parser = argparse.ArgumentParser(
-        description='Generate Android.bp from a GN description.')
-    parser.add_argument(
-        '--check-only', help='Don\'t keep the generated files',
-        action='store_true')
-    parser.add_argument(
-        '--desc',
-        help=
-        'GN description (e.g., gn desc out --format=json --all-toolchains "//*"'
-    )
-    parser.add_argument(
-        '--extras',
-        help='Extra targets to include at the end of the Blueprint file',
-        default=os.path.join(gn_utils.repo_root(), 'Android.bp.extras'),
-    )
-    parser.add_argument(
-        '--output',
-        help='Blueprint file to create',
-        default=os.path.join(gn_utils.repo_root(), 'Android.bp'),
-    )
-    parser.add_argument(
-        'targets',
-        nargs=argparse.REMAINDER,
-        help='Targets to include in the blueprint (e.g., "//:perfetto_tests")')
-    args = parser.parse_args()
-
-    if args.desc:
-        with open(args.desc) as f:
-            desc = json.load(f)
-    else:
-        desc = gn_utils.create_build_description(gn_args)
-
-    blueprint = create_blueprint_for_targets(desc, args.targets or
-                                             default_targets)
-    output = [
-        """// Copyright (C) 2017 The Android Open Source Project
+  parser = argparse.ArgumentParser(
+      description='Generate Android.bp from a GN description.')
+  parser.add_argument(
+      '--check-only',
+      help='Don\'t keep the generated files',
+      action='store_true')
+  parser.add_argument(
+      '--desc',
+      help=
+      'GN description (e.g., gn desc out --format=json --all-toolchains "//*"')
+  parser.add_argument(
+      '--extras',
+      help='Extra targets to include at the end of the Blueprint file',
+      default=os.path.join(gn_utils.repo_root(), 'Android.bp.extras'),
+  )
+  parser.add_argument(
+      '--output',
+      help='Blueprint file to create',
+      default=os.path.join(gn_utils.repo_root(), 'Android.bp'),
+  )
+  parser.add_argument(
+      'targets',
+      nargs=argparse.REMAINDER,
+      help='Targets to include in the blueprint (e.g., "//:perfetto_tests")')
+  args = parser.parse_args()
+
+  if args.desc:
+    with open(args.desc) as f:
+      desc = json.load(f)
+  else:
+    desc = gn_utils.create_build_description(gn_args)
+
+  gn = gn_utils.GnParser(desc)
+  blueprint = create_blueprint_for_targets(gn, desc, args.targets or
+                                           default_targets)
+  output = [
+      """// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -814,26 +746,26 @@ def main():
 //
 // This file is automatically generated by %s. Do not edit.
 """ % (__file__)
-    ]
-    blueprint.to_string(output)
-    with open(args.extras, 'r') as r:
-        for line in r:
-            output.append(line.rstrip("\n\r"))
+  ]
+  blueprint.to_string(output)
+  with open(args.extras, 'r') as r:
+    for line in r:
+      output.append(line.rstrip("\n\r"))
 
-    out_files = []
+  out_files = []
 
-    # Generate the Android.bp file.
-    out_files.append(args.output + '.swp')
-    with open(out_files[-1], 'w') as f:
-        f.write('\n'.join(output))
+  # Generate the Android.bp file.
+  out_files.append(args.output + '.swp')
+  with open(out_files[-1], 'w') as f:
+    f.write('\n'.join(output))
 
-    # Generate the perfetto_build_flags.h file.
-    out_files.append(os.path.join(buildflags_dir, 'perfetto_build_flags.h.swp'))
-    gn_utils.gen_buildflags(gn_args, out_files[-1])
+  # Generate the perfetto_build_flags.h file.
+  out_files.append(os.path.join(buildflags_dir, 'perfetto_build_flags.h.swp'))
+  gn_utils.gen_buildflags(gn_args, out_files[-1])
 
-    # Either check the contents or move the files to their final destination.
-    return gn_utils.check_or_commit_generated_files (out_files, args.check_only)
+  # Either check the contents or move the files to their final destination.
+  return gn_utils.check_or_commit_generated_files(out_files, args.check_only)
 
 
 if __name__ == '__main__':
-    sys.exit(main())
+  sys.exit(main())
diff --git a/tools/gn_utils.py b/tools/gn_utils.py
index 8594aeda9..149427979 100644
--- a/tools/gn_utils.py
+++ b/tools/gn_utils.py
@@ -27,6 +27,8 @@ import sys
 from compat import iteritems
 
 BUILDFLAGS_TARGET = '//gn:gen_buildflags'
+TARGET_TOOLCHAIN = '//gn/standalone/toolchain:gcc_like_host'
+HOST_TOOLCHAIN = '//gn/standalone/toolchain:gcc_like_host'
 LINKER_UNIT_TYPES = ('executable', 'shared_library', 'static_library')
 
 
@@ -219,6 +221,8 @@ class GnParser(object):
                      'action', 'source_set', 'proto_library')
       assert (type in VALID_TYPES)
       self.type = type
+      self.testonly = False
+      self.toolchain = None
 
       # Only set when type == proto_library.
       # This is typically: 'proto', 'protozero', 'ipc'.
@@ -237,6 +241,7 @@ class GnParser(object):
       self.cflags = set()
       self.defines = set()
       self.deps = set()
+      self.libs = set()
       self.include_dirs = set()
       self.ldflags = set()
       self.source_set_deps = set()  # Transitive set of source_set deps.
@@ -266,7 +271,7 @@ class GnParser(object):
 
     def update(self, other):
       for key in ('cflags', 'defines', 'deps', 'include_dirs', 'ldflags',
-                  'source_set_deps', 'proto_deps'):
+                  'source_set_deps', 'proto_deps', 'libs'):
         self.__dict__[key].update(other.__dict__.get(key, []))
 
   def __init__(self, gn_desc):
@@ -289,6 +294,8 @@ class GnParser(object):
 
     desc = self.gn_desc_[gn_target_name]
     target = GnParser.Target(gn_target_name, desc['type'])
+    target.testonly = desc.get('testonly', False)
+    target.toolchain = desc.get('toolchain', None)
     self.all_targets[gn_target_name] = target
 
     # We should never have GN targets directly depend on buidtools. They
@@ -302,12 +309,11 @@ class GnParser(object):
       target.is_third_party_dep_ = True
       return target
 
-    proto_target_type = self.get_proto_target_type_(target)
+    proto_target_type, proto_desc = self.get_proto_target_type_(target)
     if proto_target_type is not None:
       self.proto_libs[target.name] = target
       target.type = 'proto_library'
       target.proto_plugin = proto_target_type
-      proto_desc = self.gn_desc_[target.name + '_gen']
       target.sources.update(proto_desc.get('sources', []))
       assert (all(x.endswith('.proto') for x in target.sources))
     elif target.type == 'source_set':
@@ -319,7 +325,7 @@ class GnParser(object):
     elif target.type == 'action':
       self.actions[gn_target_name] = target
       target.inputs.update(desc['inputs'])
-      outs = [re.sub('^//out/[^/]+/gen/', '', x) for x in desc['outputs']]
+      outs = [re.sub('^//out/.+?/gen/', '', x) for x in desc['outputs']]
       target.outputs.update(outs)
       target.script = desc['script']
       # Args are typically relative to the root build dir (../../xxx)
@@ -327,6 +333,7 @@ class GnParser(object):
       target.args = [re.sub('^../../', '//', x) for x in desc['args']]
 
     target.cflags.update(desc.get('cflags', []) + desc.get('cflags_cc', []))
+    target.libs.update(desc.get('libs', []))
     target.ldflags.update(desc.get('ldflags', []))
     target.defines.update(desc.get('defines', []))
     target.include_dirs.update(desc.get('include_dirs', []))
@@ -345,7 +352,8 @@ class GnParser(object):
       elif dep.type == 'group':
         target.update(dep)  # Bubble up groups's cflags/ldflags etc.
       elif dep.type == 'action':
-        target.deps.add(dep_name)
+        if proto_target_type is None:
+          target.deps.add(dep_name)
       elif dep.type in LINKER_UNIT_TYPES:
         target.deps.add(dep_name)
 
@@ -355,21 +363,25 @@ class GnParser(object):
     """ Checks if the target is a proto library and return the plugin.
 
         Returns:
-            None: if the target is not a proto library.
-            The plugin name (or 'proto' in the default case) for proto library
-            targets.
+            (None, None): if the target is not a proto library.
+            (plugin, gen_desc) where |plugin| is 'proto' in the default (lite)
+            case or 'protozero' or 'ipc'; |gen_desc| is the GN json descriptor
+            of the _gen target (the one with .proto sources).
         """
-    gen_desc = self.gn_desc_.get(target.name + '_gen')
+    parts = target.name.split('(', 1)
+    name = parts[0]
+    toolchain = '(' + parts[1] if len(parts) > 1 else ''
+    gen_desc = self.gn_desc_.get('%s_gen%s' % (name, toolchain))
     if gen_desc is None or gen_desc['type'] != 'action':
-      return None
+      return None, None
     args = gen_desc.get('args', [])
     if '/protoc' not in args[0]:
-      return None
-    for arg in args:
-      if arg.startswith('--plugin='):
-        # |arg| at this point looks like:
-        #  --plugin=protoc-gen-plugin=gcc_like_host/protozero_plugin
-        # or
-        #  --plugin=protoc-gen-plugin=protozero_plugin
-        return arg.split('=')[-1].split('/')[-1].replace('_plugin', '')
-    return 'proto'
+      return None, None
+    plugin = 'proto'
+    for arg in (arg for arg in args if arg.startswith('--plugin=')):
+      # |arg| at this point looks like:
+      #  --plugin=protoc-gen-plugin=gcc_like_host/protozero_plugin
+      # or
+      #  --plugin=protoc-gen-plugin=protozero_plugin
+      plugin = arg.split('=')[-1].split('/')[-1].replace('_plugin', '')
+    return plugin, gen_desc