From dace8fa1a4f83cd6e959173f0ec03b1b636accbc Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Wed, 8 May 2024 14:56:43 -0700
Subject: [PATCH] horrid vendoring

Change-Id: Idf7891fe0fdbfed4e9ad660aa7613a67cb55e304
---
 src/libtracing/perfetto/base/BUILD.gn         |    33 +
 src/libtracing/perfetto/base/build_config.h   |   160 +
 .../android_tree/perfetto_build_flags.h       |    51 +
 .../bazel/perfetto_build_flags.h              |    51 +
 src/libtracing/perfetto/base/compiler.h       |   157 +
 src/libtracing/perfetto/base/export.h         |    41 +
 src/libtracing/perfetto/base/flat_set.h       |   100 +
 src/libtracing/perfetto/base/logging.h        |   248 +
 .../perfetto/base/platform_handle.h           |    71 +
 src/libtracing/perfetto/base/proc_utils.h     |    59 +
 src/libtracing/perfetto/base/status.h         |   117 +
 src/libtracing/perfetto/base/task_runner.h    |    78 +
 src/libtracing/perfetto/base/template_util.h  |    75 +
 src/libtracing/perfetto/base/thread_utils.h   |    85 +
 src/libtracing/perfetto/base/time.h           |   294 +
 src/libtracing/perfetto/ext/base/BUILD.gn     |    73 +
 .../perfetto/ext/base/android_utils.h         |    39 +
 src/libtracing/perfetto/ext/base/base64.h     |    68 +
 .../perfetto/ext/base/circular_queue.h        |   337 +
 .../perfetto/ext/base/container_annotations.h |    59 +
 src/libtracing/perfetto/ext/base/crash_keys.h |   162 +
 .../perfetto/ext/base/ctrl_c_handler.h        |    32 +
 src/libtracing/perfetto/ext/base/endian.h     |    58 +
 src/libtracing/perfetto/ext/base/event_fd.h   |    64 +
 src/libtracing/perfetto/ext/base/file_utils.h |   114 +
 .../perfetto/ext/base/flat_hash_map.h         |   395 +
 src/libtracing/perfetto/ext/base/getopt.h     |    51 +
 .../perfetto/ext/base/getopt_compat.h         |    71 +
 src/libtracing/perfetto/ext/base/hash.h       |   137 +
 .../perfetto/ext/base/http/BUILD.gn           |    21 +
 .../perfetto/ext/base/http/http_server.h      |   189 +
 src/libtracing/perfetto/ext/base/http/sha1.h  |    39 +
 src/libtracing/perfetto/ext/base/metatrace.h  |   318 +
 .../perfetto/ext/base/metatrace_events.h      |   117 +
 .../perfetto/ext/base/no_destructor.h         |    78 +
 .../perfetto/ext/base/paged_memory.h          |   105 +
 .../perfetto/ext/base/periodic_task.h         |    90 +
 src/libtracing/perfetto/ext/base/pipe.h       |    50 +
 src/libtracing/perfetto/ext/base/platform.h   |    40 +
 .../perfetto/ext/base/scoped_file.h           |   122 +
 .../perfetto/ext/base/scoped_mmap.h           |    92 +
 src/libtracing/perfetto/ext/base/small_set.h  |    62 +
 .../perfetto/ext/base/small_vector.h          |   197 +
 src/libtracing/perfetto/ext/base/status_or.h  |    83 +
 .../perfetto/ext/base/string_splitter.h       |    90 +
 .../perfetto/ext/base/string_utils.h          |   233 +
 .../perfetto/ext/base/string_view.h           |   201 +
 .../perfetto/ext/base/string_writer.h         |   183 +
 src/libtracing/perfetto/ext/base/subprocess.h |   281 +
 src/libtracing/perfetto/ext/base/sys_types.h  |    63 +
 src/libtracing/perfetto/ext/base/temp_file.h  |    80 +
 .../perfetto/ext/base/thread_annotations.h    |    38 +
 .../perfetto/ext/base/thread_checker.h        |    68 +
 .../perfetto/ext/base/thread_task_runner.h    |    85 +
 .../perfetto/ext/base/thread_utils.h          |    90 +
 .../perfetto/ext/base/threading/BUILD.gn      |    33 +
 .../perfetto/ext/base/threading/channel.h     |   180 +
 .../perfetto/ext/base/threading/future.h      |   149 +
 .../ext/base/threading/future_combinators.h   |    76 +
 .../perfetto/ext/base/threading/poll.h        |   245 +
 .../perfetto/ext/base/threading/spawn.h       |   149 +
 .../perfetto/ext/base/threading/stream.h      |   190 +
 .../ext/base/threading/stream_combinators.h   |   315 +
 .../perfetto/ext/base/threading/thread_pool.h |    80 +
 .../perfetto/ext/base/threading/util.h        |   210 +
 .../perfetto/ext/base/unix_socket.h           |   464 +
 .../perfetto/ext/base/unix_task_runner.h      |   133 +
 src/libtracing/perfetto/ext/base/utils.h      |   196 +
 src/libtracing/perfetto/ext/base/uuid.h       |    75 +
 src/libtracing/perfetto/ext/base/version.h    |    47 +
 .../perfetto/ext/base/waitable_event.h        |    50 +
 src/libtracing/perfetto/ext/base/watchdog.h   |    79 +
 .../perfetto/ext/base/watchdog_noop.h         |    51 +
 .../perfetto/ext/base/watchdog_posix.h        |   202 +
 src/libtracing/perfetto/ext/base/weak_ptr.h   |   120 +
 src/libtracing/perfetto/ext/ipc/BUILD.gn      |    32 +
 .../perfetto/ext/ipc/async_result.h           |    74 +
 src/libtracing/perfetto/ext/ipc/basic_types.h |    55 +
 src/libtracing/perfetto/ext/ipc/client.h      |    89 +
 src/libtracing/perfetto/ext/ipc/client_info.h |    77 +
 .../perfetto/ext/ipc/codegen_helpers.h        |    54 +
 src/libtracing/perfetto/ext/ipc/deferred.h    |   136 +
 src/libtracing/perfetto/ext/ipc/host.h        |    83 +
 src/libtracing/perfetto/ext/ipc/service.h     |    80 +
 .../perfetto/ext/ipc/service_descriptor.h     |    72 +
 .../perfetto/ext/ipc/service_proxy.h          |   102 +
 .../perfetto/ext/protozero/BUILD.gn           |    21 +
 .../ext/protozero/proto_ring_buffer.h         |   153 +
 .../perfetto/ext/trace_processor/BUILD.gn     |    27 +
 .../perfetto/ext/trace_processor/demangle.h   |    34 +
 .../ext/trace_processor/export_json.h         |    63 +
 .../importers/memory_tracker/BUILD.gn         |    31 +
 .../importers/memory_tracker/graph.h          |   316 +
 .../memory_tracker/graph_processor.h          |   250 +
 .../memory_tracker/memory_allocator_node_id.h |    62 +
 .../memory_tracker/memory_graph_edge.h        |    55 +
 .../memory_tracker/raw_memory_graph_node.h    |   147 +
 .../memory_tracker/raw_process_memory_node.h  |    86 +
 .../perfetto/ext/trace_processor/rpc/BUILD.gn |    19 +
 .../rpc/query_result_serializer.h             |   102 +
 src/libtracing/perfetto/ext/traced/BUILD.gn   |    29 +
 .../perfetto/ext/traced/data_source_types.h   |    62 +
 .../perfetto/ext/traced/sys_stats_counters.h  |   384 +
 src/libtracing/perfetto/ext/traced/traced.h   |    29 +
 .../perfetto/ext/tracing/core/BUILD.gn        |    41 +
 .../perfetto/ext/tracing/core/basic_types.h   |   107 +
 .../ext/tracing/core/client_identity.h        |    51 +
 .../ext/tracing/core/commit_data_request.h    |    28 +
 .../perfetto/ext/tracing/core/consumer.h      |    95 +
 .../core/null_consumer_endpoint_for_testing.h |    56 +
 .../ext/tracing/core/observable_events.h      |    28 +
 .../perfetto/ext/tracing/core/producer.h      |   134 +
 .../perfetto/ext/tracing/core/shared_memory.h |    54 +
 .../ext/tracing/core/shared_memory_abi.h      |   627 +
 .../ext/tracing/core/shared_memory_arbiter.h  |   215 +
 .../perfetto/ext/tracing/core/slice.h         |    77 +
 .../perfetto/ext/tracing/core/trace_packet.h  |   106 +
 .../perfetto/ext/tracing/core/trace_stats.h   |    28 +
 .../perfetto/ext/tracing/core/trace_writer.h  |    53 +
 .../ext/tracing/core/tracing_service.h        |   442 +
 .../perfetto/ext/tracing/ipc/BUILD.gn         |    25 +
 .../ext/tracing/ipc/consumer_ipc_client.h     |    54 +
 .../ext/tracing/ipc/producer_ipc_client.h     |   102 +
 .../ext/tracing/ipc/service_ipc_host.h        |    84 +
 .../protozero/contiguous_memory_range.h       |    38 +
 .../perfetto/protozero/copyable_ptr.h         |    87 +
 .../perfetto/protozero/cpp_message_obj.h      |    46 +
 src/libtracing/perfetto/protozero/field.h     |   214 +
 .../perfetto/protozero/field_writer.h         |   188 +
 .../perfetto/protozero/gen_field_helpers.h    |   163 +
 src/libtracing/perfetto/protozero/meson.build |    19 +
 src/libtracing/perfetto/protozero/message.h   |   260 +
 .../perfetto/protozero/message_arena.h        |    95 +
 .../perfetto/protozero/message_handle.h       |   179 +
 .../protozero/packed_repeated_fields.h        |   115 +
 .../perfetto/protozero/proto_decoder.h        |   470 +
 .../perfetto/protozero/proto_utils.h          |   296 +
 .../perfetto/protozero/root_message.h         |    53 +
 .../protozero/scattered_heap_buffer.h         |   185 +
 .../scattered_stream_null_delegate.h          |    46 +
 .../protozero/scattered_stream_writer.h       |   179 +
 .../perfetto/protozero/static_buffer.h        |   102 +
 src/libtracing/perfetto/public/BUILD.gn       |    45 +
 src/libtracing/perfetto/public/abi/BUILD.gn   |    37 +
 src/libtracing/perfetto/public/abi/atomic.h   |    67 +
 .../perfetto/public/abi/backend_type.h        |    34 +
 .../perfetto/public/abi/data_source_abi.h     |   372 +
 src/libtracing/perfetto/public/abi/export.h   |    48 +
 .../perfetto/public/abi/heap_buffer.h         |    54 +
 .../perfetto/public/abi/pb_decoder_abi.h      |    93 +
 .../perfetto/public/abi/producer_abi.h        |    51 +
 .../perfetto/public/abi/stream_writer_abi.h   |   111 +
 .../perfetto/public/abi/thread_utils_abi.h    |    55 +
 .../perfetto/public/abi/tracing_session_abi.h |   123 +
 .../perfetto/public/abi/track_event_abi.h     |   152 +
 .../perfetto/public/abi/track_event_hl_abi.h  |   196 +
 .../perfetto/public/abi/track_event_ll_abi.h  |   117 +
 src/libtracing/perfetto/public/compiler.h     |    54 +
 src/libtracing/perfetto/public/data_source.h  |   272 +
 src/libtracing/perfetto/public/fnv1a.h        |    38 +
 src/libtracing/perfetto/public/pb_decoder.h   |   170 +
 src/libtracing/perfetto/public/pb_macros.h    |   280 +
 src/libtracing/perfetto/public/pb_msg.h       |   251 +
 src/libtracing/perfetto/public/pb_packed.h    |   168 +
 src/libtracing/perfetto/public/pb_utils.h     |   164 +
 src/libtracing/perfetto/public/producer.h     |    61 +
 .../perfetto/public/protos/BUILD.gn           |    32 +
 .../public/protos/common/builtin_clock.pzc.h  |    39 +
 .../common/data_source_descriptor.pzc.h       |    79 +
 .../protos/config/data_source_config.pzc.h    |   257 +
 .../public/protos/config/trace_config.pzc.h   |   570 +
 .../track_event/track_event_config.pzc.h      |    75 +
 .../trace/interned_data/interned_data.pzc.h   |   197 +
 .../public/protos/trace/test_event.pzc.h      |    79 +
 .../perfetto/public/protos/trace/trace.pzc.h  |    37 +
 .../public/protos/trace/trace_packet.pzc.h    |   548 +
 .../track_event/counter_descriptor.pzc.h      |    80 +
 .../trace/track_event/debug_annotation.pzc.h  |   185 +
 .../trace/track_event/track_descriptor.pzc.h  |    77 +
 .../trace/track_event/track_event.pzc.h       |   391 +
 .../public/protos/trace/trigger.pzc.h         |    42 +
 .../perfetto/public/stream_writer.h           |   103 +
 .../perfetto/public/te_category_macros.h      |   168 +
 src/libtracing/perfetto/public/te_macros.h    |   320 +
 src/libtracing/perfetto/public/thread_utils.h |    49 +
 .../perfetto/public/tracing_session.h         |    34 +
 src/libtracing/perfetto/public/track_event.h  |   508 +
 src/libtracing/protos/README.md               |    20 +
 .../android_energy_consumer_descriptor.proto  |    43 +
 .../common/android_log_constants.proto        |    47 +
 .../perfetto/common/builtin_clock.proto       |    33 +
 .../perfetto/common/commit_data_request.proto |    84 +
 .../common/data_source_descriptor.proto       |    69 +
 .../protos/perfetto/common/descriptor.proto   |   238 +
 .../perfetto/common/ftrace_descriptor.proto   |    31 +
 .../common/gpu_counter_descriptor.proto       |   139 +
 .../common/interceptor_descriptor.proto       |    25 +
 .../perfetto/common/observable_events.proto   |    71 +
 .../protos/perfetto/common/perf_events.proto  |   153 +
 .../perfetto/common/protolog_common.proto     |    29 +
 .../perfetto/common/sys_stats_counters.proto  |   253 +
 .../protos/perfetto/common/trace_stats.proto  |   227 +
 .../common/tracing_service_capabilities.proto |    41 +
 .../common/tracing_service_state.proto        |   129 +
 .../common/track_event_descriptor.proto       |    29 +
 ...ndroid_game_intervention_list_config.proto |    27 +
 .../android/android_input_event_config.proto  |   120 +
 .../config/android/android_log_config.proto   |    34 +
 .../android/android_polled_state_config.proto |    28 +
 .../android_sdk_sysprop_guard_config.proto    |    82 +
 .../android_system_property_config.proto      |    30 +
 .../config/android/network_trace_config.proto |    54 +
 .../config/android/packages_list_config.proto |    27 +
 .../config/android/protolog_config.proto      |    53 +
 .../surfaceflinger_layers_config.proto        |    58 +
 .../surfaceflinger_transactions_config.proto  |    38 +
 .../config/chrome/chrome_config.proto         |    48 +
 .../config/chrome/scenario_config.proto       |   127 +
 .../perfetto/config/chrome/v8_config.proto    |    31 +
 .../perfetto/config/data_source_config.proto  |   214 +
 .../perfetto/config/etw/etw_config.proto      |    36 +
 .../config/ftrace/ftrace_config.proto         |   236 +
 .../config/gpu/gpu_counter_config.proto       |    34 +
 .../config/gpu/vulkan_memory_config.proto     |    27 +
 .../config/inode_file/inode_file_config.proto |    46 +
 .../perfetto/config/interceptor_config.proto  |    31 +
 .../config/interceptors/console_config.proto  |    28 +
 .../perfetto/config/perfetto_config.proto     |  4075 +++++
 .../config/power/android_power_config.proto   |    53 +
 .../process_stats/process_stats_config.proto  |    79 +
 .../config/profiling/heapprofd_config.proto   |   202 +
 .../config/profiling/java_hprof_config.proto  |    90 +
 .../config/profiling/perf_event_config.proto  |   218 +
 .../perfetto/config/statsd/atom_ids.proto     |   907 +
 .../config/statsd/statsd_tracing_config.proto |    44 +
 .../perfetto/config/stress_test_config.proto  |    77 +
 .../config/sys_stats/sys_stats_config.proto   |    82 +
 .../config/system_info/system_info.proto      |    27 +
 .../protos/perfetto/config/test_config.proto  |    63 +
 .../protos/perfetto/config/trace_config.proto |   695 +
 .../track_event/track_event_config.proto      |   102 +
 src/libtracing/protos/perfetto/ipc/OWNERS     |     9 +
 .../protos/perfetto/ipc/consumer_port.proto   |   312 +
 .../protos/perfetto/ipc/producer_port.proto   |   352 +
 .../protos/perfetto/ipc/relay_port.proto      |    58 +
 .../protos/perfetto/ipc/wire_protocol.proto   |   104 +
 .../protos/perfetto/metrics/android/OWNERS    |     1 +
 .../metrics/android/ad_services_metric.proto  |    56 +
 .../android/android_blocking_call.proto       |    39 +
 .../android_blocking_calls_cuj_metric.proto   |    49 +
 .../android_blocking_calls_unagg.proto        |    36 +
 .../metrics/android/android_boot.proto        |    63 +
 .../metrics/android/android_boot_unagg.proto  |    29 +
 .../android_frame_timeline_metric.proto       |    86 +
 ...roid_garbage_collection_unagg_metric.proto |    63 +
 ..._notifications_blocking_calls_metric.proto |    26 +
 .../android/android_trusty_workqueues.proto   |    22 +
 .../perfetto/metrics/android/anr_metric.proto |    41 +
 .../android/app_process_starts_metric.proto   |    41 +
 .../metrics/android/batt_metric.proto         |    60 +
 .../metrics/android/binder_metric.proto       |    92 +
 .../metrics/android/camera_metric.proto       |    42 +
 .../metrics/android/camera_unagg_metric.proto |    45 +
 .../metrics/android/codec_metrics.proto       |    73 +
 .../perfetto/metrics/android/cpu_metric.proto |    81 +
 .../metrics/android/display_metrics.proto     |    65 +
 .../metrics/android/dma_heap_metric.proto     |    30 +
 .../metrics/android/dvfs_metric.proto         |    43 +
 .../metrics/android/fastrpc_metric.proto      |    35 +
 .../perfetto/metrics/android/g2d_metric.proto |    56 +
 .../perfetto/metrics/android/gpu_metric.proto |    68 +
 .../perfetto/metrics/android/hwcomposer.proto |   138 +
 .../metrics/android/hwui_metric.proto         |   103 +
 .../perfetto/metrics/android/io_metric.proto  |    48 +
 .../metrics/android/io_unagg_metric.proto     |    36 +
 .../perfetto/metrics/android/ion_metric.proto |    35 +
 .../metrics/android/irq_runtime_metric.proto  |    53 +
 .../metrics/android/jank_cuj_metric.proto     |   155 +
 .../metrics/android/java_heap_histogram.proto |    50 +
 .../metrics/android/java_heap_stats.proto     |    61 +
 .../perfetto/metrics/android/lmk_metric.proto |    35 +
 .../metrics/android/lmk_reason_metric.proto   |    55 +
 .../perfetto/metrics/android/mem_metric.proto |    56 +
 .../metrics/android/mem_unagg_metric.proto    |    43 +
 .../monitor_contention_agg_metric.proto       |    34 +
 .../android/monitor_contention_metric.proto   |    73 +
 .../metrics/android/multiuser_metric.proto    |    48 +
 .../metrics/android/network_metric.proto      |   176 +
 .../metrics/android/other_traces.proto        |    25 +
 .../metrics/android/package_list.proto        |    28 +
 .../metrics/android/powrails_metric.proto     |    46 +
 .../metrics/android/process_metadata.proto    |    51 +
 .../metrics/android/profiler_smaps.proto      |    36 +
 .../metrics/android/rt_runtime_metric.proto   |    38 +
 .../perfetto/metrics/android/simpleperf.proto |    60 +
 .../metrics/android/startup_metric.proto      |   315 +
 .../metrics/android/surfaceflinger.proto      |    85 +
 ...ysui_notif_shade_list_builder_metric.proto |    41 +
 ...i_slice_performance_statistical_data.proto |    35 +
 ...date_notif_on_ui_mode_changed_metric.proto |    39 +
 .../perfetto/metrics/android/task_names.proto |    43 +
 .../android/thread_time_in_state_metric.proto |    48 +
 .../metrics/android/trace_quality.proto       |    32 +
 .../metrics/android/unsymbolized_frames.proto |    36 +
 .../metrics/chrome/all_chrome_metrics.proto   |    56 +
 .../metrics/chrome/args_class_names.proto     |    31 +
 .../metrics/chrome/dropped_frames.proto       |    29 +
 .../perfetto/metrics/chrome/frame_times.proto |    28 +
 .../metrics/chrome/histogram_hashes.proto     |    26 +
 .../metrics/chrome/long_latency.proto         |    40 +
 .../metrics/chrome/media_metric.proto         |    37 +
 .../chrome/performance_mark_hashes.proto      |    27 +
 .../metrics/chrome/reported_by_page.proto     |    31 +
 .../perfetto/metrics/chrome/scroll_jank.proto |    34 +
 .../metrics/chrome/scroll_jank_v3.proto       |    65 +
 .../perfetto/metrics/chrome/slice_names.proto |    27 +
 .../metrics/chrome/test_chrome_metric.proto   |    25 +
 .../perfetto/metrics/chrome/touch_jank.proto  |    35 +
 .../metrics/chrome/unsymbolized_args.proto    |    39 +
 .../metrics/chrome/user_event_hashes.proto    |    26 +
 .../perfetto/metrics/custom_options.proto     |    26 +
 .../protos/perfetto/metrics/metrics.proto     |   312 +
 .../metrics/perfetto_merged_metrics.proto     |  2735 +++
 .../metrics/webview/all_webview_metrics.proto |    26 +
 .../webview/webview_jank_approximation.proto  |    27 +
 .../android_game_intervention_list.proto      |    42 +
 .../trace/android/android_input_event.proto   |   134 +
 .../perfetto/trace/android/android_log.proto  |    77 +
 .../android/android_system_property.proto     |    27 +
 .../perfetto/trace/android/camera_event.proto |   160 +
 .../trace/android/frame_timeline_event.proto  |   194 +
 .../trace/android/gpu_mem_event.proto         |    25 +
 .../trace/android/graphics_frame_event.proto  |    52 +
 .../trace/android/initial_display_state.proto |    24 +
 .../trace/android/network_trace.proto         |    97 +
 .../trace/android/packages_list.proto         |    36 +
 .../perfetto/trace/android/protolog.proto     |    62 +
 .../trace/android/shell_transition.proto      |   113 +
 .../trace/android/surfaceflinger_common.proto |    93 +
 .../trace/android/surfaceflinger_layers.proto |   262 +
 .../android/surfaceflinger_transactions.proto |   317 +
 .../perfetto/trace/android/winscope.proto     |    33 +
 .../chrome/chrome_benchmark_metadata.proto    |    50 +
 .../trace/chrome/chrome_metadata.proto        |   103 +
 .../trace/chrome/chrome_trace_event.proto     |   126 +
 .../trace/chrome/chrome_trace_packet.proto    |    68 +
 .../trace/chrome/chrome_trigger.proto         |    28 +
 .../protos/perfetto/trace/chrome/v8.proto     |   271 +
 .../perfetto/trace/clock_snapshot.proto       |    76 +
 .../protos/perfetto/trace/etw/all_protos.gni  |    19 +
 .../protos/perfetto/trace/etw/etw.proto       |   153 +
 .../protos/perfetto/trace/etw/etw_event.proto |    30 +
 .../perfetto/trace/etw/etw_event_bundle.proto |    29 +
 .../perfetto/trace/extension_descriptor.proto |    29 +
 .../trace/filesystem/inode_file_map.proto     |    47 +
 .../perfetto/trace/ftrace/all_protos.gni      |    86 +
 .../perfetto/trace/ftrace/android_fs.proto    |    47 +
 .../protos/perfetto/trace/ftrace/binder.proto |    47 +
 .../protos/perfetto/trace/ftrace/block.proto  |   140 +
 .../protos/perfetto/trace/ftrace/cgroup.proto |    68 +
 .../protos/perfetto/trace/ftrace/clk.proto    |    17 +
 .../protos/perfetto/trace/ftrace/cma.proto    |    24 +
 .../perfetto/trace/ftrace/compaction.proto    |    95 +
 .../protos/perfetto/trace/ftrace/cpuhp.proto  |    37 +
 .../perfetto/trace/ftrace/cros_ec.proto       |    15 +
 .../perfetto/trace/ftrace/dma_fence.proto     |    37 +
 .../perfetto/trace/ftrace/dmabuf_heap.proto   |    12 +
 .../protos/perfetto/trace/ftrace/dpu.proto    |    29 +
 .../protos/perfetto/trace/ftrace/drm.proto    |    18 +
 .../protos/perfetto/trace/ftrace/ext4.proto   |   696 +
 .../protos/perfetto/trace/ftrace/f2fs.proto   |   324 +
 .../perfetto/trace/ftrace/fastrpc.proto       |    38 +
 .../protos/perfetto/trace/ftrace/fence.proto  |    31 +
 .../perfetto/trace/ftrace/filemap.proto       |    21 +
 .../protos/perfetto/trace/ftrace/ftrace.proto |    22 +
 .../perfetto/trace/ftrace/ftrace_event.proto  |   622 +
 .../trace/ftrace/ftrace_event_bundle.proto    |   135 +
 .../perfetto/trace/ftrace/ftrace_stats.proto  |   140 +
 .../protos/perfetto/trace/ftrace/g2d.proto    |    13 +
 .../perfetto/trace/ftrace/generic.proto       |    35 +
 .../perfetto/trace/ftrace/gpu_mem.proto       |    12 +
 .../perfetto/trace/ftrace/gpu_scheduler.proto |    26 +
 .../protos/perfetto/trace/ftrace/hyp.proto    |    21 +
 .../protos/perfetto/trace/ftrace/i2c.proto    |    67 +
 .../protos/perfetto/trace/ftrace/ion.proto    |    12 +
 .../protos/perfetto/trace/ftrace/ipi.proto    |    17 +
 .../protos/perfetto/trace/ftrace/irq.proto    |    25 +
 .../protos/perfetto/trace/ftrace/kfree.proto  |    11 +
 .../perfetto/trace/ftrace/kmalloc.proto       |    14 +
 .../protos/perfetto/trace/ftrace/kmem.proto   |   241 +
 .../protos/perfetto/trace/ftrace/kvm.proto    |   170 +
 .../trace/ftrace/lowmemorykiller.proto        |    14 +
 .../protos/perfetto/trace/ftrace/lwis.proto   |    14 +
 .../protos/perfetto/trace/ftrace/mali.proto   |    65 +
 .../protos/perfetto/trace/ftrace/mdss.proto   |   154 +
 .../perfetto/trace/ftrace/mm_event.proto      |    13 +
 .../protos/perfetto/trace/ftrace/net.proto    |    42 +
 .../protos/perfetto/trace/ftrace/oom.proto    |    15 +
 .../protos/perfetto/trace/ftrace/panel.proto  |    28 +
 .../trace/ftrace/perf_trace_counters.proto    |    26 +
 .../protos/perfetto/trace/ftrace/power.proto  |    59 +
 .../protos/perfetto/trace/ftrace/print.proto  |    11 +
 .../protos/perfetto/trace/ftrace/printk.proto |    10 +
 .../perfetto/trace/ftrace/raw_syscalls.proto  |    15 +
 .../perfetto/trace/ftrace/regulator.proto     |    31 +
 .../protos/perfetto/trace/ftrace/rpm.proto    |    11 +
 .../perfetto/trace/ftrace/samsung.proto       |    14 +
 .../protos/perfetto/trace/ftrace/sched.proto  |   110 +
 .../protos/perfetto/trace/ftrace/scm.proto    |    13 +
 .../protos/perfetto/trace/ftrace/sde.proto    |    57 +
 .../protos/perfetto/trace/ftrace/signal.proto |    20 +
 .../protos/perfetto/trace/ftrace/skb.proto    |    12 +
 .../protos/perfetto/trace/ftrace/sock.proto   |    18 +
 .../protos/perfetto/trace/ftrace/sync.proto   |    20 +
 .../perfetto/trace/ftrace/synthetic.proto     |    16 +
 .../perfetto/trace/ftrace/systrace.proto      |    13 +
 .../protos/perfetto/trace/ftrace/task.proto   |    19 +
 .../protos/perfetto/trace/ftrace/tcp.proto    |    16 +
 .../trace/ftrace/test_bundle_wrapper.proto    |    26 +
 .../perfetto/trace/ftrace/thermal.proto       |    17 +
 .../protos/perfetto/trace/ftrace/trusty.proto |    96 +
 .../protos/perfetto/trace/ftrace/ufs.proto    |    23 +
 .../protos/perfetto/trace/ftrace/v4l2.proto   |   115 +
 .../perfetto/trace/ftrace/virtio_gpu.proto    |    29 +
 .../perfetto/trace/ftrace/virtio_video.proto  |    35 +
 .../protos/perfetto/trace/ftrace/vmscan.proto |    45 +
 .../perfetto/trace/ftrace/workqueue.proto     |    25 +
 .../trace/gpu/gpu_counter_event.proto         |    40 +
 .../protos/perfetto/trace/gpu/gpu_log.proto   |    36 +
 .../trace/gpu/gpu_render_stage_event.proto    |   146 +
 .../perfetto/trace/gpu/vulkan_api_event.proto |    52 +
 .../trace/gpu/vulkan_memory_event.proto       |   103 +
 .../trace/interned_data/interned_data.proto   |   140 +
 .../protos/perfetto/trace/memory_graph.proto  |   123 +
 .../trace/perfetto/perfetto_metatrace.proto   |    68 +
 .../perfetto/tracing_service_event.proto      |    67 +
 .../perfetto/trace/perfetto_trace.proto       | 14990 ++++++++++++++++
 .../android_energy_estimation_breakdown.proto |    49 +
 .../android_entity_state_residency.proto      |    60 +
 .../trace/power/battery_counters.proto        |    46 +
 .../perfetto/trace/power/power_rails.proto    |    51 +
 .../trace/profiling/deobfuscation.proto       |    44 +
 .../perfetto/trace/profiling/heap_graph.proto |   150 +
 .../trace/profiling/profile_common.proto      |   152 +
 .../trace/profiling/profile_packet.proto      |   363 +
 .../perfetto/trace/profiling/smaps.proto      |    47 +
 .../perfetto/trace/ps/process_stats.proto     |   103 +
 .../perfetto/trace/ps/process_tree.proto      |    89 +
 .../perfetto/trace/remote_clock_sync.proto    |    35 +
 .../perfetto/trace/statsd/statsd_atom.proto   |    35 +
 .../perfetto/trace/sys_stats/sys_stats.proto  |   162 +
 .../protos/perfetto/trace/system_info.proto   |    57 +
 .../perfetto/trace/system_info/cpu_info.proto |    36 +
 .../protos/perfetto/trace/test_event.proto    |    52 +
 .../perfetto/trace/test_extensions.proto      |    43 +
 .../protos/perfetto/trace/trace.proto         |    31 +
 .../protos/perfetto/trace/trace_packet.proto  |   354 +
 .../trace/trace_packet_defaults.proto         |    44 +
 .../protos/perfetto/trace/trace_uuid.proto    |    30 +
 .../track_event/chrome_active_processes.proto |    24 +
 .../chrome_application_state_info.proto       |    34 +
 .../chrome_compositor_scheduler_state.proto   |   270 +
 .../chrome_content_settings_event_info.proto  |    27 +
 .../track_event/chrome_frame_reporter.proto   |   114 +
 .../track_event/chrome_histogram_sample.proto |    35 +
 .../track_event/chrome_keyed_service.proto    |    26 +
 .../track_event/chrome_latency_info.proto     |    88 +
 .../trace/track_event/chrome_legacy_ipc.proto |    72 +
 .../track_event/chrome_message_pump.proto     |    28 +
 .../track_event/chrome_mojo_event_info.proto  |    55 +
 .../chrome_process_descriptor.proto           |    93 +
 .../chrome_renderer_scheduler_state.proto     |    39 +
 .../chrome_thread_descriptor.proto            |    86 +
 .../trace/track_event/chrome_user_event.proto |    31 +
 .../chrome_window_handle_event_info.proto     |    26 +
 .../track_event/counter_descriptor.proto      |    95 +
 .../trace/track_event/debug_annotation.proto  |   143 +
 .../trace/track_event/log_message.proto       |    46 +
 .../trace/track_event/pixel_modem.proto       |    25 +
 .../track_event/process_descriptor.proto      |    61 +
 .../trace/track_event/range_of_interest.proto |    26 +
 .../trace/track_event/screenshot.proto        |    23 +
 .../trace/track_event/source_location.proto   |    40 +
 .../trace/track_event/task_execution.proto    |    26 +
 .../trace/track_event/thread_descriptor.proto |    75 +
 .../trace/track_event/track_descriptor.proto  |    94 +
 .../trace/track_event/track_event.proto       |   435 +
 .../trace/translation/translation_table.proto |    51 +
 .../protos/perfetto/trace/trigger.proto       |    31 +
 .../protos/perfetto/trace/ui_state.proto      |    54 +
 .../metatrace_categories.proto                |    38 +
 .../trace_processor/metrics_impl.proto        |    57 +
 .../perfetto/trace_processor/proto_files.gni  |    22 +
 .../trace_processor/serialization.proto       |   118 +
 .../perfetto/trace_processor/stack.proto      |    39 +
 .../trace_processor/trace_processor.proto     |   330 +
 .../protos/third_party/CHROMIUM_OWNERS        |    21 +
 src/libtracing/protos/third_party/OWNERS      |     3 +
 .../chromium/chrome_track_event.proto         |  1974 ++
 .../protos/third_party/chromium/sources.gni   |    11 +
 .../protos/third_party/pprof/profile.proto    |   230 +
 .../third_party/statsd/shell_config.proto     |    38 +
 .../third_party/statsd/shell_data.proto       |    27 +
 .../protozero_src/copyable_ptr_unittest.cc    |   118 +
 src/libtracing/protozero_src/field.cc         |    81 +
 .../filtering/filter_bytecode_common.h        |    49 +
 .../filtering/filter_bytecode_generator.cc    |    99 +
 .../filtering/filter_bytecode_generator.h     |    79 +
 .../filter_bytecode_generator_unittest.cc     |   143 +
 .../filtering/filter_bytecode_parser.cc       |   244 +
 .../filtering/filter_bytecode_parser.h        |   140 +
 .../filter_bytecode_parser_fuzzer.cc          |    94 +
 .../filter_bytecode_parser_unittest.cc        |   261 +
 .../protozero_src/filtering/filter_util.cc    |   426 +
 .../protozero_src/filtering/filter_util.h     |   136 +
 .../filtering/filter_util_unittest.cc         |   381 +
 .../protozero_src/filtering/message_filter.cc |   329 +
 .../protozero_src/filtering/message_filter.h  |   241 +
 .../filtering/message_filter_benchmark.cc     |    48 +
 .../filtering/message_filter_fuzzer.cc        |   104 +
 .../filtering/message_filter_unittest.cc      |   934 +
 .../filtering/message_tokenizer.h             |   199 +
 .../filtering/message_tokenizer_unittest.cc   |   179 +
 .../protozero_src/filtering/string_filter.cc  |   161 +
 .../protozero_src/filtering/string_filter.h   |    66 +
 .../filtering/string_filter_benchmark.cc      |   165 +
 .../filtering/string_filter_unittest.cc       |   282 +
 .../protozero_src/gen_field_helpers.cc        |   105 +
 src/libtracing/protozero_src/message.cc       |   220 +
 src/libtracing/protozero_src/message_arena.cc |    72 +
 .../protozero_src/message_arena_unittest.cc   |    66 +
 .../protozero_src/message_handle_unittest.cc  |    35 +
 .../protozero_src/message_unittest.cc         |   474 +
 .../protozero_src/packed_repeated_fields.cc   |    43 +
 src/libtracing/protozero_src/proto_decoder.cc |   269 +
 .../protozero_src/proto_decoder_fuzzer.cc     |    44 +
 .../protozero_src/proto_decoder_unittest.cc   |   651 +
 .../protozero_src/proto_ring_buffer.cc        |   192 +
 .../proto_ring_buffer_unittest.cc             |   268 +
 .../protozero_src/proto_utils_unittest.cc     |   232 +
 .../protoc_plugin/cppgen_plugin.cc            |   913 +
 .../protoc_plugin/protozero_c_plugin.cc       |   623 +
 .../protoc_plugin/protozero_plugin.cc         |  1136 ++
 .../protozero_src/scattered_heap_buffer.cc    |   121 +
 .../scattered_stream_null_delegate.cc         |    37 +
 .../protozero_src/scattered_stream_writer.cc  |    92 +
 .../scattered_stream_writer_unittest.cc       |   133 +
 src/libtracing/protozero_src/static_buffer.cc |    35 +
 .../test/cppgen_conformance_unittest.cc       |   401 +
 .../test/example_proto/extensions.proto       |    44 +
 .../test/example_proto/library.proto          |    34 +
 .../library_internals/galaxies.proto          |    27 +
 .../other_package/test_messages.proto         |    40 +
 .../subpackage/test_messages.proto            |    40 +
 .../test/example_proto/test_messages.proto    |   195 +
 .../test/example_proto/upper_import.proto     |    21 +
 .../test/fake_scattered_buffer.cc             |    74 +
 .../test/fake_scattered_buffer.h              |    54 +
 .../test/proto_ring_buffer_benchmark.cc       |    75 +
 .../protozero_src/test/protozero_benchmark.cc |   200 +
 .../test/protozero_conformance_unittest.cc    |   373 +
 .../protozero_src/virtual_destructors.cc      |    25 +
 562 files changed, 84479 insertions(+)
 create mode 100644 src/libtracing/perfetto/base/BUILD.gn
 create mode 100644 src/libtracing/perfetto/base/build_config.h
 create mode 100644 src/libtracing/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
 create mode 100644 src/libtracing/perfetto/base/build_configs/bazel/perfetto_build_flags.h
 create mode 100644 src/libtracing/perfetto/base/compiler.h
 create mode 100644 src/libtracing/perfetto/base/export.h
 create mode 100644 src/libtracing/perfetto/base/flat_set.h
 create mode 100644 src/libtracing/perfetto/base/logging.h
 create mode 100644 src/libtracing/perfetto/base/platform_handle.h
 create mode 100644 src/libtracing/perfetto/base/proc_utils.h
 create mode 100644 src/libtracing/perfetto/base/status.h
 create mode 100644 src/libtracing/perfetto/base/task_runner.h
 create mode 100644 src/libtracing/perfetto/base/template_util.h
 create mode 100644 src/libtracing/perfetto/base/thread_utils.h
 create mode 100644 src/libtracing/perfetto/base/time.h
 create mode 100644 src/libtracing/perfetto/ext/base/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/base/android_utils.h
 create mode 100644 src/libtracing/perfetto/ext/base/base64.h
 create mode 100644 src/libtracing/perfetto/ext/base/circular_queue.h
 create mode 100644 src/libtracing/perfetto/ext/base/container_annotations.h
 create mode 100644 src/libtracing/perfetto/ext/base/crash_keys.h
 create mode 100644 src/libtracing/perfetto/ext/base/ctrl_c_handler.h
 create mode 100644 src/libtracing/perfetto/ext/base/endian.h
 create mode 100644 src/libtracing/perfetto/ext/base/event_fd.h
 create mode 100644 src/libtracing/perfetto/ext/base/file_utils.h
 create mode 100644 src/libtracing/perfetto/ext/base/flat_hash_map.h
 create mode 100644 src/libtracing/perfetto/ext/base/getopt.h
 create mode 100644 src/libtracing/perfetto/ext/base/getopt_compat.h
 create mode 100644 src/libtracing/perfetto/ext/base/hash.h
 create mode 100644 src/libtracing/perfetto/ext/base/http/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/base/http/http_server.h
 create mode 100644 src/libtracing/perfetto/ext/base/http/sha1.h
 create mode 100644 src/libtracing/perfetto/ext/base/metatrace.h
 create mode 100644 src/libtracing/perfetto/ext/base/metatrace_events.h
 create mode 100644 src/libtracing/perfetto/ext/base/no_destructor.h
 create mode 100644 src/libtracing/perfetto/ext/base/paged_memory.h
 create mode 100644 src/libtracing/perfetto/ext/base/periodic_task.h
 create mode 100644 src/libtracing/perfetto/ext/base/pipe.h
 create mode 100644 src/libtracing/perfetto/ext/base/platform.h
 create mode 100644 src/libtracing/perfetto/ext/base/scoped_file.h
 create mode 100644 src/libtracing/perfetto/ext/base/scoped_mmap.h
 create mode 100644 src/libtracing/perfetto/ext/base/small_set.h
 create mode 100644 src/libtracing/perfetto/ext/base/small_vector.h
 create mode 100644 src/libtracing/perfetto/ext/base/status_or.h
 create mode 100644 src/libtracing/perfetto/ext/base/string_splitter.h
 create mode 100644 src/libtracing/perfetto/ext/base/string_utils.h
 create mode 100644 src/libtracing/perfetto/ext/base/string_view.h
 create mode 100644 src/libtracing/perfetto/ext/base/string_writer.h
 create mode 100644 src/libtracing/perfetto/ext/base/subprocess.h
 create mode 100644 src/libtracing/perfetto/ext/base/sys_types.h
 create mode 100644 src/libtracing/perfetto/ext/base/temp_file.h
 create mode 100644 src/libtracing/perfetto/ext/base/thread_annotations.h
 create mode 100644 src/libtracing/perfetto/ext/base/thread_checker.h
 create mode 100644 src/libtracing/perfetto/ext/base/thread_task_runner.h
 create mode 100644 src/libtracing/perfetto/ext/base/thread_utils.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/base/threading/channel.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/future.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/future_combinators.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/poll.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/spawn.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/stream.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/stream_combinators.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/thread_pool.h
 create mode 100644 src/libtracing/perfetto/ext/base/threading/util.h
 create mode 100644 src/libtracing/perfetto/ext/base/unix_socket.h
 create mode 100644 src/libtracing/perfetto/ext/base/unix_task_runner.h
 create mode 100644 src/libtracing/perfetto/ext/base/utils.h
 create mode 100644 src/libtracing/perfetto/ext/base/uuid.h
 create mode 100644 src/libtracing/perfetto/ext/base/version.h
 create mode 100644 src/libtracing/perfetto/ext/base/waitable_event.h
 create mode 100644 src/libtracing/perfetto/ext/base/watchdog.h
 create mode 100644 src/libtracing/perfetto/ext/base/watchdog_noop.h
 create mode 100644 src/libtracing/perfetto/ext/base/watchdog_posix.h
 create mode 100644 src/libtracing/perfetto/ext/base/weak_ptr.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/ipc/async_result.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/basic_types.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/client.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/client_info.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/codegen_helpers.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/deferred.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/host.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/service.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/service_descriptor.h
 create mode 100644 src/libtracing/perfetto/ext/ipc/service_proxy.h
 create mode 100644 src/libtracing/perfetto/ext/protozero/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/protozero/proto_ring_buffer.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/demangle.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/export_json.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph_processor.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_memory_graph_node.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_process_memory_node.h
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/rpc/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/trace_processor/rpc/query_result_serializer.h
 create mode 100644 src/libtracing/perfetto/ext/traced/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/traced/data_source_types.h
 create mode 100644 src/libtracing/perfetto/ext/traced/sys_stats_counters.h
 create mode 100644 src/libtracing/perfetto/ext/traced/traced.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/basic_types.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/client_identity.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/commit_data_request.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/consumer.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/null_consumer_endpoint_for_testing.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/observable_events.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/producer.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/shared_memory.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/shared_memory_abi.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/shared_memory_arbiter.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/slice.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/trace_packet.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/trace_stats.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/trace_writer.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/core/tracing_service.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/ipc/BUILD.gn
 create mode 100644 src/libtracing/perfetto/ext/tracing/ipc/consumer_ipc_client.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/ipc/producer_ipc_client.h
 create mode 100644 src/libtracing/perfetto/ext/tracing/ipc/service_ipc_host.h
 create mode 100644 src/libtracing/perfetto/protozero/contiguous_memory_range.h
 create mode 100644 src/libtracing/perfetto/protozero/copyable_ptr.h
 create mode 100644 src/libtracing/perfetto/protozero/cpp_message_obj.h
 create mode 100644 src/libtracing/perfetto/protozero/field.h
 create mode 100644 src/libtracing/perfetto/protozero/field_writer.h
 create mode 100644 src/libtracing/perfetto/protozero/gen_field_helpers.h
 create mode 100644 src/libtracing/perfetto/protozero/meson.build
 create mode 100644 src/libtracing/perfetto/protozero/message.h
 create mode 100644 src/libtracing/perfetto/protozero/message_arena.h
 create mode 100644 src/libtracing/perfetto/protozero/message_handle.h
 create mode 100644 src/libtracing/perfetto/protozero/packed_repeated_fields.h
 create mode 100644 src/libtracing/perfetto/protozero/proto_decoder.h
 create mode 100644 src/libtracing/perfetto/protozero/proto_utils.h
 create mode 100644 src/libtracing/perfetto/protozero/root_message.h
 create mode 100644 src/libtracing/perfetto/protozero/scattered_heap_buffer.h
 create mode 100644 src/libtracing/perfetto/protozero/scattered_stream_null_delegate.h
 create mode 100644 src/libtracing/perfetto/protozero/scattered_stream_writer.h
 create mode 100644 src/libtracing/perfetto/protozero/static_buffer.h
 create mode 100644 src/libtracing/perfetto/public/BUILD.gn
 create mode 100644 src/libtracing/perfetto/public/abi/BUILD.gn
 create mode 100644 src/libtracing/perfetto/public/abi/atomic.h
 create mode 100644 src/libtracing/perfetto/public/abi/backend_type.h
 create mode 100644 src/libtracing/perfetto/public/abi/data_source_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/export.h
 create mode 100644 src/libtracing/perfetto/public/abi/heap_buffer.h
 create mode 100644 src/libtracing/perfetto/public/abi/pb_decoder_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/producer_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/stream_writer_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/thread_utils_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/tracing_session_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/track_event_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/track_event_hl_abi.h
 create mode 100644 src/libtracing/perfetto/public/abi/track_event_ll_abi.h
 create mode 100644 src/libtracing/perfetto/public/compiler.h
 create mode 100644 src/libtracing/perfetto/public/data_source.h
 create mode 100644 src/libtracing/perfetto/public/fnv1a.h
 create mode 100644 src/libtracing/perfetto/public/pb_decoder.h
 create mode 100644 src/libtracing/perfetto/public/pb_macros.h
 create mode 100644 src/libtracing/perfetto/public/pb_msg.h
 create mode 100644 src/libtracing/perfetto/public/pb_packed.h
 create mode 100644 src/libtracing/perfetto/public/pb_utils.h
 create mode 100644 src/libtracing/perfetto/public/producer.h
 create mode 100644 src/libtracing/perfetto/public/protos/BUILD.gn
 create mode 100644 src/libtracing/perfetto/public/protos/common/builtin_clock.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/common/data_source_descriptor.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/config/data_source_config.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/config/trace_config.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/config/track_event/track_event_config.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/interned_data/interned_data.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/test_event.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/trace.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/trace_packet.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/track_event/counter_descriptor.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/track_event/debug_annotation.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/track_event/track_descriptor.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/track_event/track_event.pzc.h
 create mode 100644 src/libtracing/perfetto/public/protos/trace/trigger.pzc.h
 create mode 100644 src/libtracing/perfetto/public/stream_writer.h
 create mode 100644 src/libtracing/perfetto/public/te_category_macros.h
 create mode 100644 src/libtracing/perfetto/public/te_macros.h
 create mode 100644 src/libtracing/perfetto/public/thread_utils.h
 create mode 100644 src/libtracing/perfetto/public/tracing_session.h
 create mode 100644 src/libtracing/perfetto/public/track_event.h
 create mode 100644 src/libtracing/protos/README.md
 create mode 100644 src/libtracing/protos/perfetto/common/android_energy_consumer_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/common/android_log_constants.proto
 create mode 100644 src/libtracing/protos/perfetto/common/builtin_clock.proto
 create mode 100644 src/libtracing/protos/perfetto/common/commit_data_request.proto
 create mode 100644 src/libtracing/protos/perfetto/common/data_source_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/common/descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/common/ftrace_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/common/gpu_counter_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/common/interceptor_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/common/observable_events.proto
 create mode 100644 src/libtracing/protos/perfetto/common/perf_events.proto
 create mode 100644 src/libtracing/protos/perfetto/common/protolog_common.proto
 create mode 100644 src/libtracing/protos/perfetto/common/sys_stats_counters.proto
 create mode 100644 src/libtracing/protos/perfetto/common/trace_stats.proto
 create mode 100644 src/libtracing/protos/perfetto/common/tracing_service_capabilities.proto
 create mode 100644 src/libtracing/protos/perfetto/common/tracing_service_state.proto
 create mode 100644 src/libtracing/protos/perfetto/common/track_event_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/android_game_intervention_list_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/android_input_event_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/android_log_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/android_polled_state_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/android_system_property_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/network_trace_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/packages_list_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/protolog_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/surfaceflinger_layers_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/android/surfaceflinger_transactions_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/chrome/chrome_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/chrome/scenario_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/chrome/v8_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/data_source_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/etw/etw_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/ftrace/ftrace_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/gpu/gpu_counter_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/gpu/vulkan_memory_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/inode_file/inode_file_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/interceptor_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/interceptors/console_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/perfetto_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/power/android_power_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/process_stats/process_stats_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/profiling/heapprofd_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/profiling/java_hprof_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/profiling/perf_event_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/statsd/atom_ids.proto
 create mode 100644 src/libtracing/protos/perfetto/config/statsd/statsd_tracing_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/stress_test_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/sys_stats/sys_stats_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/system_info/system_info.proto
 create mode 100644 src/libtracing/protos/perfetto/config/test_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/trace_config.proto
 create mode 100644 src/libtracing/protos/perfetto/config/track_event/track_event_config.proto
 create mode 100644 src/libtracing/protos/perfetto/ipc/OWNERS
 create mode 100644 src/libtracing/protos/perfetto/ipc/consumer_port.proto
 create mode 100644 src/libtracing/protos/perfetto/ipc/producer_port.proto
 create mode 100644 src/libtracing/protos/perfetto/ipc/relay_port.proto
 create mode 100644 src/libtracing/protos/perfetto/ipc/wire_protocol.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/OWNERS
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/ad_services_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_blocking_call.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_unagg.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_boot.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_boot_unagg.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_frame_timeline_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/android_trusty_workqueues.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/anr_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/app_process_starts_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/batt_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/binder_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/camera_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/camera_unagg_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/codec_metrics.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/cpu_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/display_metrics.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/dma_heap_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/dvfs_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/fastrpc_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/g2d_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/gpu_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/hwcomposer.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/hwui_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/io_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/io_unagg_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/ion_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/irq_runtime_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/jank_cuj_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/java_heap_histogram.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/java_heap_stats.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/lmk_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/lmk_reason_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/mem_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/mem_unagg_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/monitor_contention_agg_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/monitor_contention_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/multiuser_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/network_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/other_traces.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/package_list.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/powrails_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/process_metadata.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/profiler_smaps.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/rt_runtime_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/simpleperf.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/startup_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/surfaceflinger.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/task_names.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/thread_time_in_state_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/trace_quality.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/android/unsymbolized_frames.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/all_chrome_metrics.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/args_class_names.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/dropped_frames.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/frame_times.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/histogram_hashes.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/long_latency.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/media_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/performance_mark_hashes.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/reported_by_page.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/scroll_jank.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/scroll_jank_v3.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/slice_names.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/test_chrome_metric.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/touch_jank.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/unsymbolized_args.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/chrome/user_event_hashes.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/custom_options.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/metrics.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/perfetto_merged_metrics.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/webview/all_webview_metrics.proto
 create mode 100644 src/libtracing/protos/perfetto/metrics/webview/webview_jank_approximation.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/android_game_intervention_list.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/android_input_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/android_log.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/android_system_property.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/camera_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/frame_timeline_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/gpu_mem_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/graphics_frame_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/initial_display_state.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/network_trace.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/packages_list.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/protolog.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/shell_transition.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/surfaceflinger_common.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/surfaceflinger_layers.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/surfaceflinger_transactions.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/android/winscope.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/chrome/chrome_benchmark_metadata.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/chrome/chrome_metadata.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/chrome/chrome_trace_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/chrome/chrome_trace_packet.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/chrome/chrome_trigger.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/chrome/v8.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/clock_snapshot.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/etw/all_protos.gni
 create mode 100644 src/libtracing/protos/perfetto/trace/etw/etw.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/etw/etw_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/etw/etw_event_bundle.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/extension_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/filesystem/inode_file_map.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/all_protos.gni
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/android_fs.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/binder.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/block.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/cgroup.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/clk.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/cma.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/compaction.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/cpuhp.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/cros_ec.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/dma_fence.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/dmabuf_heap.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/dpu.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/drm.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ext4.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/f2fs.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/fastrpc.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/fence.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/filemap.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ftrace.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ftrace_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ftrace_stats.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/g2d.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/generic.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/gpu_mem.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/gpu_scheduler.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/hyp.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/i2c.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ion.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ipi.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/irq.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/kfree.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/kmalloc.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/kmem.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/kvm.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/lowmemorykiller.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/lwis.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/mali.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/mdss.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/mm_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/net.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/oom.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/panel.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/perf_trace_counters.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/power.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/print.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/printk.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/raw_syscalls.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/regulator.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/rpm.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/samsung.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/sched.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/scm.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/sde.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/signal.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/skb.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/sock.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/sync.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/synthetic.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/systrace.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/task.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/tcp.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/test_bundle_wrapper.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/thermal.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/trusty.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/ufs.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/v4l2.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/virtio_gpu.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/virtio_video.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/vmscan.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ftrace/workqueue.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/gpu/gpu_counter_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/gpu/gpu_log.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/gpu/gpu_render_stage_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/gpu/vulkan_api_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/gpu/vulkan_memory_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/interned_data/interned_data.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/memory_graph.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/perfetto/perfetto_metatrace.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/perfetto/tracing_service_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/perfetto_trace.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/power/android_energy_estimation_breakdown.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/power/android_entity_state_residency.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/power/battery_counters.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/power/power_rails.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/profiling/deobfuscation.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/profiling/heap_graph.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/profiling/profile_common.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/profiling/profile_packet.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/profiling/smaps.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ps/process_stats.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ps/process_tree.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/remote_clock_sync.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/statsd/statsd_atom.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/sys_stats/sys_stats.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/system_info.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/system_info/cpu_info.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/test_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/test_extensions.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/trace.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/trace_packet.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/trace_packet_defaults.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/trace_uuid.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_active_processes.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_application_state_info.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_frame_reporter.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_histogram_sample.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_keyed_service.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_latency_info.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_legacy_ipc.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_message_pump.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_mojo_event_info.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_process_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_thread_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_user_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/counter_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/debug_annotation.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/log_message.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/pixel_modem.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/process_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/range_of_interest.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/screenshot.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/source_location.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/task_execution.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/thread_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/track_descriptor.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/track_event/track_event.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/translation/translation_table.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/trigger.proto
 create mode 100644 src/libtracing/protos/perfetto/trace/ui_state.proto
 create mode 100644 src/libtracing/protos/perfetto/trace_processor/metatrace_categories.proto
 create mode 100644 src/libtracing/protos/perfetto/trace_processor/metrics_impl.proto
 create mode 100644 src/libtracing/protos/perfetto/trace_processor/proto_files.gni
 create mode 100644 src/libtracing/protos/perfetto/trace_processor/serialization.proto
 create mode 100644 src/libtracing/protos/perfetto/trace_processor/stack.proto
 create mode 100644 src/libtracing/protos/perfetto/trace_processor/trace_processor.proto
 create mode 100644 src/libtracing/protos/third_party/CHROMIUM_OWNERS
 create mode 100644 src/libtracing/protos/third_party/OWNERS
 create mode 100644 src/libtracing/protos/third_party/chromium/chrome_track_event.proto
 create mode 100644 src/libtracing/protos/third_party/chromium/sources.gni
 create mode 100644 src/libtracing/protos/third_party/pprof/profile.proto
 create mode 100644 src/libtracing/protos/third_party/statsd/shell_config.proto
 create mode 100644 src/libtracing/protos/third_party/statsd/shell_data.proto
 create mode 100644 src/libtracing/protozero_src/copyable_ptr_unittest.cc
 create mode 100644 src/libtracing/protozero_src/field.cc
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_common.h
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_generator.cc
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_generator.h
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_generator_unittest.cc
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_parser.cc
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_parser.h
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_parser_fuzzer.cc
 create mode 100644 src/libtracing/protozero_src/filtering/filter_bytecode_parser_unittest.cc
 create mode 100644 src/libtracing/protozero_src/filtering/filter_util.cc
 create mode 100644 src/libtracing/protozero_src/filtering/filter_util.h
 create mode 100644 src/libtracing/protozero_src/filtering/filter_util_unittest.cc
 create mode 100644 src/libtracing/protozero_src/filtering/message_filter.cc
 create mode 100644 src/libtracing/protozero_src/filtering/message_filter.h
 create mode 100644 src/libtracing/protozero_src/filtering/message_filter_benchmark.cc
 create mode 100644 src/libtracing/protozero_src/filtering/message_filter_fuzzer.cc
 create mode 100644 src/libtracing/protozero_src/filtering/message_filter_unittest.cc
 create mode 100644 src/libtracing/protozero_src/filtering/message_tokenizer.h
 create mode 100644 src/libtracing/protozero_src/filtering/message_tokenizer_unittest.cc
 create mode 100644 src/libtracing/protozero_src/filtering/string_filter.cc
 create mode 100644 src/libtracing/protozero_src/filtering/string_filter.h
 create mode 100644 src/libtracing/protozero_src/filtering/string_filter_benchmark.cc
 create mode 100644 src/libtracing/protozero_src/filtering/string_filter_unittest.cc
 create mode 100644 src/libtracing/protozero_src/gen_field_helpers.cc
 create mode 100644 src/libtracing/protozero_src/message.cc
 create mode 100644 src/libtracing/protozero_src/message_arena.cc
 create mode 100644 src/libtracing/protozero_src/message_arena_unittest.cc
 create mode 100644 src/libtracing/protozero_src/message_handle_unittest.cc
 create mode 100644 src/libtracing/protozero_src/message_unittest.cc
 create mode 100644 src/libtracing/protozero_src/packed_repeated_fields.cc
 create mode 100644 src/libtracing/protozero_src/proto_decoder.cc
 create mode 100644 src/libtracing/protozero_src/proto_decoder_fuzzer.cc
 create mode 100644 src/libtracing/protozero_src/proto_decoder_unittest.cc
 create mode 100644 src/libtracing/protozero_src/proto_ring_buffer.cc
 create mode 100644 src/libtracing/protozero_src/proto_ring_buffer_unittest.cc
 create mode 100644 src/libtracing/protozero_src/proto_utils_unittest.cc
 create mode 100644 src/libtracing/protozero_src/protoc_plugin/cppgen_plugin.cc
 create mode 100644 src/libtracing/protozero_src/protoc_plugin/protozero_c_plugin.cc
 create mode 100644 src/libtracing/protozero_src/protoc_plugin/protozero_plugin.cc
 create mode 100644 src/libtracing/protozero_src/scattered_heap_buffer.cc
 create mode 100644 src/libtracing/protozero_src/scattered_stream_null_delegate.cc
 create mode 100644 src/libtracing/protozero_src/scattered_stream_writer.cc
 create mode 100644 src/libtracing/protozero_src/scattered_stream_writer_unittest.cc
 create mode 100644 src/libtracing/protozero_src/static_buffer.cc
 create mode 100644 src/libtracing/protozero_src/test/cppgen_conformance_unittest.cc
 create mode 100644 src/libtracing/protozero_src/test/example_proto/extensions.proto
 create mode 100644 src/libtracing/protozero_src/test/example_proto/library.proto
 create mode 100644 src/libtracing/protozero_src/test/example_proto/library_internals/galaxies.proto
 create mode 100644 src/libtracing/protozero_src/test/example_proto/other_package/test_messages.proto
 create mode 100644 src/libtracing/protozero_src/test/example_proto/subpackage/test_messages.proto
 create mode 100644 src/libtracing/protozero_src/test/example_proto/test_messages.proto
 create mode 100644 src/libtracing/protozero_src/test/example_proto/upper_import.proto
 create mode 100644 src/libtracing/protozero_src/test/fake_scattered_buffer.cc
 create mode 100644 src/libtracing/protozero_src/test/fake_scattered_buffer.h
 create mode 100644 src/libtracing/protozero_src/test/proto_ring_buffer_benchmark.cc
 create mode 100644 src/libtracing/protozero_src/test/protozero_benchmark.cc
 create mode 100644 src/libtracing/protozero_src/test/protozero_conformance_unittest.cc
 create mode 100644 src/libtracing/protozero_src/virtual_destructors.cc

diff --git a/src/libtracing/perfetto/base/BUILD.gn b/src/libtracing/perfetto/base/BUILD.gn
new file mode 100644
index 000000000..357f89a0c
--- /dev/null
+++ b/src/libtracing/perfetto/base/BUILD.gn
@@ -0,0 +1,33 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../gn/perfetto.gni")
+
+source_set("base") {
+  sources = [
+    "build_config.h",
+    "compiler.h",
+    "export.h",
+    "flat_set.h",
+    "logging.h",
+    "platform_handle.h",
+    "proc_utils.h",
+    "status.h",
+    "task_runner.h",
+    "template_util.h",
+    "thread_utils.h",
+    "time.h",
+  ]
+  public_deps = [ "../public:base" ]
+}
diff --git a/src/libtracing/perfetto/base/build_config.h b/src/libtracing/perfetto/base/build_config.h
new file mode 100644
index 000000000..5f7a7bd96
--- /dev/null
+++ b/src/libtracing/perfetto/base/build_config.h
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_BUILD_CONFIG_H_
+#define INCLUDE_PERFETTO_BASE_BUILD_CONFIG_H_
+
+// Allows to define build flags that give a compiler error if the header that
+// defined the flag is not included, instead of silently ignoring the #if block.
+#define PERFETTO_BUILDFLAG_CAT_INDIRECT(a, b) a##b
+#define PERFETTO_BUILDFLAG_CAT(a, b) PERFETTO_BUILDFLAG_CAT_INDIRECT(a, b)
+#define PERFETTO_BUILDFLAG(flag) \
+  (PERFETTO_BUILDFLAG_CAT(PERFETTO_BUILDFLAG_DEFINE_, flag)())
+
+#if defined(__ANDROID__)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0
+#elif defined(__APPLE__)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0
+// Include TARGET_OS_IPHONE when on __APPLE__ systems.
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 1
+#else
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+#endif
+#elif defined(__linux__)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0
+#elif defined(_WIN32)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0
+#elif defined(__EMSCRIPTEN__)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0
+#elif defined(__Fuchsia__)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0
+#elif defined(__native_client__)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 1
+#else
+#error OS not supported (see build_config.h)
+#endif
+
+#if defined(__clang__)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_CLANG() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_GCC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_MSVC() 0
+#elif defined(__GNUC__) // Careful: Clang also defines this!
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_CLANG() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_GCC() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_MSVC() 0
+#elif defined(_MSC_VER)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_CLANG() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_GCC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_MSVC() 1
+#else
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_CLANG() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_GCC() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPILER_MSVC() 0
+#endif
+
+#if defined(PERFETTO_BUILD_WITH_ANDROID_USERDEBUG)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ANDROID_USERDEBUG_BUILD() 1
+#else
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ANDROID_USERDEBUG_BUILD() 0
+#endif
+
+// Processor architecture detection.  For more info on what's defined, see:
+//   http://msdn.microsoft.com/en-us/library/b0084kay.aspx
+//   http://www.agner.org/optimize/calling_conventions.pdf
+//   or with gcc, run: "echo | gcc -E -dM -"
+#if defined(__aarch64__) || defined(_M_ARM64)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ARCH_CPU_ARM64() 1
+#else
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ARCH_CPU_ARM64() 0
+#endif
+
+#if defined(__x86_64__) || defined(_M_X64)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ARCH_CPU_X86_64() 1
+#else
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ARCH_CPU_X86_64() 0
+#endif
+
+// perfetto_build_flags.h contains the tweakable build flags defined via GN.
+// - In GN builds (e.g., standalone, chromium, v8) this file is generated at
+//   build time via the gen_rule //gn/gen_buildflags.
+// - In Android in-tree builds, this file is generated by tools/gen_android_bp
+//   and checked in into include/perfetto/base/build_configs/android_tree/. The
+//   default cflags add this path to the default include path.
+// - Similarly, in bazel builds, this file is generated by tools/gen_bazel and
+//   checked in into include/perfetto/base/build_configs/bazel/.
+// - In amalgamated builds, this file is generated by tools/gen_amalgamated and
+//   added to the amalgamated headers.
+#include "perfetto_build_flags.h"  // no-include-violation-check
+
+#endif  // INCLUDE_PERFETTO_BASE_BUILD_CONFIG_H_
diff --git a/src/libtracing/perfetto/base/build_configs/android_tree/perfetto_build_flags.h b/src/libtracing/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
new file mode 100644
index 000000000..c36d04b21
--- /dev/null
+++ b/src/libtracing/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Generated by write_buildflag_header.py
+
+// fix_include_guards: off
+#ifndef GEN_BUILD_CONFIG_PERFETTO_BUILD_FLAGS_H_
+#define GEN_BUILD_CONFIG_PERFETTO_BUILD_FLAGS_H_
+
+// clang-format off
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ANDROID_BUILD() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_CHROMIUM_BUILD() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_STANDALONE_BUILD() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_START_DAEMONS() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_IPC() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_WATCHDOG() (PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() || PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX())
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPONENT_BUILD() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DLOG_ON() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DLOG_OFF() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DCHECK_ON() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DCHECK_OFF() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_VERBOSE_LOGS() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_VERSION_GEN() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_PERCENTILE() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_LINENOISE() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_HTTPD() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_JSON() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_LOCAL_SYMBOLIZER() (PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() || PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() ||PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN())
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TRACED_PERF() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_HEAPPROFD() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_STDERR_CRASH_DUMP() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_X64_CPU_OPT() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_LLVM_DEMANGLE() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_SYSTEM_CONSUMER() (1)
+
+// clang-format on
+#endif  // GEN_BUILD_CONFIG_PERFETTO_BUILD_FLAGS_H_
diff --git a/src/libtracing/perfetto/base/build_configs/bazel/perfetto_build_flags.h b/src/libtracing/perfetto/base/build_configs/bazel/perfetto_build_flags.h
new file mode 100644
index 000000000..54fe273b6
--- /dev/null
+++ b/src/libtracing/perfetto/base/build_configs/bazel/perfetto_build_flags.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Generated by write_buildflag_header.py
+
+// fix_include_guards: off
+#ifndef GEN_BUILD_CONFIG_PERFETTO_BUILD_FLAGS_H_
+#define GEN_BUILD_CONFIG_PERFETTO_BUILD_FLAGS_H_
+
+// clang-format off
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ANDROID_BUILD() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_CHROMIUM_BUILD() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_STANDALONE_BUILD() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_START_DAEMONS() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_IPC() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_WATCHDOG() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_COMPONENT_BUILD() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DLOG_ON() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DLOG_OFF() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DCHECK_ON() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DCHECK_OFF() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_VERBOSE_LOGS() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_VERSION_GEN() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_PERCENTILE() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_LINENOISE() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_HTTPD() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_JSON() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_LOCAL_SYMBOLIZER() (PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() || PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() ||PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN())
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TRACED_PERF() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_HEAPPROFD() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_STDERR_CRASH_DUMP() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_X64_CPU_OPT() (0)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_LLVM_DEMANGLE() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_SYSTEM_CONSUMER() (1)
+
+// clang-format on
+#endif  // GEN_BUILD_CONFIG_PERFETTO_BUILD_FLAGS_H_
diff --git a/src/libtracing/perfetto/base/compiler.h b/src/libtracing/perfetto/base/compiler.h
new file mode 100644
index 000000000..e4b6b0cae
--- /dev/null
+++ b/src/libtracing/perfetto/base/compiler.h
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_COMPILER_H_
+#define INCLUDE_PERFETTO_BASE_COMPILER_H_
+
+#include <stddef.h>
+#include <type_traits>
+
+#include "perfetto/public/compiler.h"
+
+// __has_attribute is supported only by clang and recent versions of GCC.
+// Add a layer to wrap the __has_attribute macro.
+#if defined(__has_attribute)
+#define PERFETTO_HAS_ATTRIBUTE(x) __has_attribute(x)
+#else
+#define PERFETTO_HAS_ATTRIBUTE(x) 0
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#else
+#define PERFETTO_WARN_UNUSED_RESULT
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_UNUSED __attribute__((unused))
+#else
+#define PERFETTO_UNUSED
+#endif
+
+#if defined(__clang__)
+#define PERFETTO_ALWAYS_INLINE __attribute__((__always_inline__))
+#define PERFETTO_NO_INLINE __attribute__((__noinline__))
+#else
+// GCC is too pedantic and often fails with the error:
+// "always_inline function might not be inlinable"
+#define PERFETTO_ALWAYS_INLINE
+#define PERFETTO_NO_INLINE
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_NORETURN __attribute__((__noreturn__))
+#else
+#define PERFETTO_NORETURN __declspec(noreturn)
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_DEBUG_FUNCTION_IDENTIFIER() __PRETTY_FUNCTION__
+#elif defined(_MSC_VER)
+#define PERFETTO_DEBUG_FUNCTION_IDENTIFIER() __FUNCSIG__
+#else
+#define PERFETTO_DEBUG_FUNCTION_IDENTIFIER() \
+  static_assert(false, "Not implemented for this compiler")
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_PRINTF_FORMAT(x, y) \
+  __attribute__((__format__(__printf__, x, y)))
+#else
+#define PERFETTO_PRINTF_FORMAT(x, y)
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_POPCOUNT(x) __builtin_popcountll(x)
+#else
+#include <intrin.h>
+#define PERFETTO_POPCOUNT(x) __popcnt64(x)
+#endif
+
+#if defined(__clang__)
+#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
+extern "C" void __asan_poison_memory_region(void const volatile*, size_t);
+extern "C" void __asan_unpoison_memory_region(void const volatile*, size_t);
+#define PERFETTO_ASAN_POISON(a, s) __asan_poison_memory_region((a), (s))
+#define PERFETTO_ASAN_UNPOISON(a, s) __asan_unpoison_memory_region((a), (s))
+#else
+#define PERFETTO_ASAN_POISON(addr, size)
+#define PERFETTO_ASAN_UNPOISON(addr, size)
+#endif  // __has_feature(address_sanitizer)
+#else
+#define PERFETTO_ASAN_POISON(addr, size)
+#define PERFETTO_ASAN_UNPOISON(addr, size)
+#endif  // __clang__
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_IS_LITTLE_ENDIAN() __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#else
+// Assume all MSVC targets are little endian.
+#define PERFETTO_IS_LITTLE_ENDIAN() 1
+#endif
+
+// This is used for exporting xxxMain() symbols (e.g., PerfettoCmdMain,
+// ProbesMain) from libperfetto.so when the GN arg monolithic_binaries = false.
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_EXPORT_ENTRYPOINT __attribute__((visibility("default")))
+#else
+// TODO(primiano): on Windows this should be a pair of dllexport/dllimport. But
+// that requires a -DXXX_IMPLEMENTATION depending on whether we are on the
+// impl-site or call-site. Right now it's not worth the trouble as we
+// force-export the xxxMain() symbols only on Android, where we pack all the
+// code for N binaries into one .so to save binary size. On Windows we support
+// only monolithic binaries, as they are easier to deal with.
+#define PERFETTO_EXPORT_ENTRYPOINT
+#endif
+
+// Disables thread safety analysis for functions where the compiler can't
+// accurate figure out which locks are being held.
+#if defined(__clang__)
+#define PERFETTO_NO_THREAD_SAFETY_ANALYSIS \
+  __attribute__((no_thread_safety_analysis))
+#else
+#define PERFETTO_NO_THREAD_SAFETY_ANALYSIS
+#endif
+
+// Disables undefined behavior analysis for a function.
+#if defined(__clang__)
+#define PERFETTO_NO_SANITIZE_UNDEFINED __attribute__((no_sanitize("undefined")))
+#else
+#define PERFETTO_NO_SANITIZE_UNDEFINED
+#endif
+
+// Avoid calling the exit-time destructor on an object with static lifetime.
+#if PERFETTO_HAS_ATTRIBUTE(no_destroy)
+#define PERFETTO_HAS_NO_DESTROY() 1
+#define PERFETTO_NO_DESTROY __attribute__((no_destroy))
+#else
+#define PERFETTO_HAS_NO_DESTROY() 0
+#define PERFETTO_NO_DESTROY
+#endif
+
+// Macro for telling -Wimplicit-fallthrough that a fallthrough is intentional.
+#define PERFETTO_FALLTHROUGH [[fallthrough]]
+
+namespace perfetto {
+namespace base {
+
+template <typename... T>
+inline void ignore_result(const T&...) {}
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_COMPILER_H_
diff --git a/src/libtracing/perfetto/base/export.h b/src/libtracing/perfetto/base/export.h
new file mode 100644
index 000000000..14044b37c
--- /dev/null
+++ b/src/libtracing/perfetto/base/export.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_EXPORT_H_
+#define INCLUDE_PERFETTO_BASE_EXPORT_H_
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/public/abi/export.h"
+
+// PERFETTO_EXPORT_COMPONENT: Exports a symbol among C++ components when
+// building with is_component = true (mostly used by chromium build).
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPONENT_BUILD)
+
+#if defined(PERFETTO_IMPLEMENTATION)
+#define PERFETTO_EXPORT_COMPONENT PERFETTO_INTERNAL_DLL_EXPORT
+#else
+#define PERFETTO_EXPORT_COMPONENT PERFETTO_INTERNAL_DLL_IMPORT
+#endif
+
+#else  // !PERFETTO_BUILDFLAG(PERFETTO_COMPONENT_BUILD)
+
+#if !defined(PERFETTO_EXPORT_COMPONENT)
+#define PERFETTO_EXPORT_COMPONENT
+#endif  // !defined(PERFETTO_EXPORT_COMPONENT)
+
+#endif  // PERFETTO_BUILDFLAG(PERFETTO_COMPONENT_BUILD)
+
+#endif  // INCLUDE_PERFETTO_BASE_EXPORT_H_
diff --git a/src/libtracing/perfetto/base/flat_set.h b/src/libtracing/perfetto/base/flat_set.h
new file mode 100644
index 000000000..9390537b3
--- /dev/null
+++ b/src/libtracing/perfetto/base/flat_set.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_FLAT_SET_H_
+#define INCLUDE_PERFETTO_BASE_FLAT_SET_H_
+
+#include <algorithm>
+#include <vector>
+
+// A vector-based set::set-like container.
+// It's more cache friendly than std::*set and performs for cases where:
+// 1. A high number of dupes is expected (e.g. pid tracking in ftrace).
+// 2. The working set is small (hundreds of elements).
+
+// Performance characteristics (for uniformly random insertion order):
+// - For smaller insertions (up to ~500), it outperforms both std::set<int> and
+//   std::unordered_set<int> by ~3x.
+// - Up until 4k insertions, it is always faster than std::set<int>.
+// - unordered_set<int> is faster with more than 2k insertions.
+// - unordered_set, however, it's less memory efficient and has more caveats
+//   (see chromium's base/containers/README.md).
+//
+// See flat_set_benchmark.cc and the charts in go/perfetto-int-set-benchmark.
+
+namespace perfetto {
+namespace base {
+
+template <typename T>
+class FlatSet {
+ public:
+  using value_type = T;
+  using const_pointer = const T*;
+  using iterator = typename std::vector<T>::iterator;
+  using const_iterator = typename std::vector<T>::const_iterator;
+
+  FlatSet() = default;
+
+  // Mainly for tests. Deliberately not marked as "explicit".
+  FlatSet(std::initializer_list<T> initial) : entries_(initial) {
+    std::sort(entries_.begin(), entries_.end());
+    entries_.erase(std::unique(entries_.begin(), entries_.end()),
+                   entries_.end());
+  }
+
+  const_iterator find(T value) const {
+    auto entries_end = entries_.end();
+    auto it = std::lower_bound(entries_.begin(), entries_end, value);
+    return (it != entries_end && *it == value) ? it : entries_end;
+  }
+
+  size_t count(T value) const { return find(value) == entries_.end() ? 0 : 1; }
+
+  std::pair<iterator, bool> insert(T value) {
+    auto entries_end = entries_.end();
+    auto it = std::lower_bound(entries_.begin(), entries_end, value);
+    if (it != entries_end && *it == value)
+      return std::make_pair(it, false);
+    // If the value is not found |it| is either end() or the next item strictly
+    // greater than |value|. In both cases we want to insert just before that.
+    it = entries_.insert(it, std::move(value));
+    return std::make_pair(it, true);
+  }
+
+  size_t erase(T value) {
+    auto it = find(value);
+    if (it == entries_.end())
+      return 0;
+    entries_.erase(it);
+    return 1;
+  }
+
+  void clear() { entries_.clear(); }
+
+  bool empty() const { return entries_.empty(); }
+  void reserve(size_t n) { entries_.reserve(n); }
+  size_t size() const { return entries_.size(); }
+  const_iterator begin() const { return entries_.begin(); }
+  const_iterator end() const { return entries_.end(); }
+
+ private:
+  std::vector<T> entries_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_FLAT_SET_H_
diff --git a/src/libtracing/perfetto/base/logging.h b/src/libtracing/perfetto/base/logging.h
new file mode 100644
index 000000000..80420826f
--- /dev/null
+++ b/src/libtracing/perfetto/base/logging.h
@@ -0,0 +1,248 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_LOGGING_H_
+#define INCLUDE_PERFETTO_BASE_LOGGING_H_
+
+#include <errno.h>
+#include <string.h>  // For strerror.
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/export.h"
+
+#if defined(__GNUC__) || defined(__clang__)
+// Ignore GCC warning about a missing argument for a variadic macro parameter.
+#pragma GCC system_header
+#endif
+
+#if PERFETTO_BUILDFLAG(PERFETTO_FORCE_DCHECK_ON)
+#define PERFETTO_DCHECK_IS_ON() 1
+#elif PERFETTO_BUILDFLAG(PERFETTO_FORCE_DCHECK_OFF)
+#define PERFETTO_DCHECK_IS_ON() 0
+#elif defined(DCHECK_ALWAYS_ON) ||                                         \
+    (!defined(NDEBUG) && (PERFETTO_BUILDFLAG(PERFETTO_STANDALONE_BUILD) || \
+                          PERFETTO_BUILDFLAG(PERFETTO_CHROMIUM_BUILD) ||   \
+                          PERFETTO_BUILDFLAG(PERFETTO_ANDROID_BUILD)))
+#define PERFETTO_DCHECK_IS_ON() 1
+#else
+#define PERFETTO_DCHECK_IS_ON() 0
+#endif
+
+#if PERFETTO_BUILDFLAG(PERFETTO_FORCE_DLOG_ON)
+#define PERFETTO_DLOG_IS_ON() 1
+#elif PERFETTO_BUILDFLAG(PERFETTO_FORCE_DLOG_OFF)
+#define PERFETTO_DLOG_IS_ON() 0
+#else
+#define PERFETTO_DLOG_IS_ON() PERFETTO_DCHECK_IS_ON()
+#endif
+
+#if defined(PERFETTO_ANDROID_ASYNC_SAFE_LOG)
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+    !PERFETTO_BUILDFLAG(PERFETTO_ANDROID_BUILD)
+#error "Async-safe logging is limited to Android tree builds"
+#endif
+// For binaries which need a very lightweight logging implementation.
+// Note that this header is incompatible with android/log.h.
+#include <async_safe/log.h>
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+// Normal android logging.
+#include <android/log.h>
+#endif
+
+// Enable the "Print the most recent PERFETTO_LOG(s) before crashing" feature
+// on Android in-tree builds and on standalone builds (mainly for testing).
+// This is deliberately no PERFETTO_OS_ANDROID because we don't want this
+// feature when perfetto is embedded in other Android projects (e.g. SDK).
+// TODO(b/203795298): TFLite is using the client library in blaze builds and is
+// targeting API 19. For now disable the feature based on API level.
+#if defined(PERFETTO_ANDROID_ASYNC_SAFE_LOG)
+#define PERFETTO_ENABLE_LOG_RING_BUFFER() 0
+#elif PERFETTO_BUILDFLAG(PERFETTO_ANDROID_BUILD)
+#define PERFETTO_ENABLE_LOG_RING_BUFFER() 1
+#elif PERFETTO_BUILDFLAG(PERFETTO_STANDALONE_BUILD) && \
+    (!PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ||       \
+     (defined(__ANDROID_API__) && __ANDROID_API__ >= 21))
+#define PERFETTO_ENABLE_LOG_RING_BUFFER() 0
+#else
+#define PERFETTO_ENABLE_LOG_RING_BUFFER() 0
+#endif
+
+namespace perfetto {
+namespace base {
+
+// Constexpr functions to extract basename(__FILE__), e.g.: ../foo/f.c -> f.c .
+constexpr const char* StrEnd(const char* s) {
+  return *s ? StrEnd(s + 1) : s;
+}
+
+constexpr const char* BasenameRecursive(const char* s,
+                                        const char* begin,
+                                        const char* end) {
+  return (*s == '/' && s < end)
+             ? (s + 1)
+             : ((s > begin) ? BasenameRecursive(s - 1, begin, end) : s);
+}
+
+constexpr const char* Basename(const char* str) {
+  return BasenameRecursive(StrEnd(str), str, StrEnd(str));
+}
+
+enum LogLev { kLogDebug = 0, kLogInfo, kLogImportant, kLogError };
+
+struct LogMessageCallbackArgs {
+  LogLev level;
+  int line;
+  const char* filename;
+  const char* message;
+};
+
+using LogMessageCallback = void (*)(LogMessageCallbackArgs);
+
+// This is not thread safe and must be called before using tracing from other
+// threads.
+PERFETTO_EXPORT_COMPONENT void SetLogMessageCallback(
+    LogMessageCallback callback);
+
+PERFETTO_EXPORT_COMPONENT void LogMessage(LogLev,
+                                          const char* fname,
+                                          int line,
+                                          const char* fmt,
+                                          ...) PERFETTO_PRINTF_FORMAT(4, 5);
+
+// This is defined in debug_crash_stack_trace.cc, but that is only linked in
+// standalone && debug builds, see enable_perfetto_stderr_crash_dump in
+// perfetto.gni.
+PERFETTO_EXPORT_COMPONENT void EnableStacktraceOnCrashForDebug();
+
+#if PERFETTO_ENABLE_LOG_RING_BUFFER()
+// Gets a snapshot of the logs from the internal log ring buffer and:
+// - On Android in-tree builds: Passes that to android_set_abort_message().
+//   That will attach the logs to the crash report.
+// - On standalone builds (all otther OSes) prints that on stderr.
+// This function must called only once, right before inducing a crash (This is
+// because android_set_abort_message() can only be called once).
+PERFETTO_EXPORT_COMPONENT void MaybeSerializeLastLogsForCrashReporting();
+#else
+inline void MaybeSerializeLastLogsForCrashReporting() {}
+#endif
+
+#if defined(PERFETTO_ANDROID_ASYNC_SAFE_LOG)
+#define PERFETTO_XLOG(level, fmt, ...)                                        \
+  do {                                                                        \
+    async_safe_format_log((ANDROID_LOG_DEBUG + level), "perfetto",            \
+                          "%s:%d " fmt, ::perfetto::base::Basename(__FILE__), \
+                          __LINE__, ##__VA_ARGS__);                           \
+  } while (0)
+#elif defined(PERFETTO_DISABLE_LOG)
+#define PERFETTO_XLOG(level, fmt, ...) ::perfetto::base::ignore_result(level, \
+                                fmt, ##__VA_ARGS__)
+#else
+#define PERFETTO_XLOG(level, fmt, ...)                                      \
+  ::perfetto::base::LogMessage(level, ::perfetto::base::Basename(__FILE__), \
+                               __LINE__, fmt, ##__VA_ARGS__)
+#endif
+
+#if defined(_MSC_VER)
+#define PERFETTO_IMMEDIATE_CRASH()                               \
+  do {                                                           \
+    ::perfetto::base::MaybeSerializeLastLogsForCrashReporting(); \
+    __debugbreak();                                              \
+    __assume(0);                                                 \
+  } while (0)
+#else
+#define PERFETTO_IMMEDIATE_CRASH()                               \
+  do {                                                           \
+    ::perfetto::base::MaybeSerializeLastLogsForCrashReporting(); \
+    __builtin_trap();                                            \
+    __builtin_unreachable();                                     \
+  } while (0)
+#endif
+
+#if PERFETTO_BUILDFLAG(PERFETTO_VERBOSE_LOGS)
+#define PERFETTO_LOG(fmt, ...) \
+  PERFETTO_XLOG(::perfetto::base::kLogInfo, fmt, ##__VA_ARGS__)
+#else  // PERFETTO_BUILDFLAG(PERFETTO_VERBOSE_LOGS)
+#define PERFETTO_LOG(...) ::perfetto::base::ignore_result(__VA_ARGS__)
+#endif  // PERFETTO_BUILDFLAG(PERFETTO_VERBOSE_LOGS)
+
+#define PERFETTO_ILOG(fmt, ...) \
+  PERFETTO_XLOG(::perfetto::base::kLogImportant, fmt, ##__VA_ARGS__)
+#define PERFETTO_ELOG(fmt, ...) \
+  PERFETTO_XLOG(::perfetto::base::kLogError, fmt, ##__VA_ARGS__)
+#define PERFETTO_FATAL(fmt, ...)       \
+  do {                                 \
+    PERFETTO_PLOG(fmt, ##__VA_ARGS__); \
+    PERFETTO_IMMEDIATE_CRASH();        \
+  } while (0)
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_PLOG(x, ...) \
+  PERFETTO_ELOG(x " (errno: %d, %s)", ##__VA_ARGS__, errno, strerror(errno))
+#else
+// MSVC expands __VA_ARGS__ in a different order. Give up, not worth it.
+#define PERFETTO_PLOG PERFETTO_ELOG
+#endif
+
+#define PERFETTO_CHECK(x)                            \
+  do {                                               \
+    if (PERFETTO_UNLIKELY(!(x))) {                   \
+      PERFETTO_PLOG("%s", "PERFETTO_CHECK(" #x ")"); \
+      PERFETTO_IMMEDIATE_CRASH();                    \
+    }                                                \
+  } while (0)
+
+#if PERFETTO_DLOG_IS_ON()
+
+#define PERFETTO_DLOG(fmt, ...) \
+  PERFETTO_XLOG(::perfetto::base::kLogDebug, fmt, ##__VA_ARGS__)
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_DPLOG(x, ...) \
+  PERFETTO_DLOG(x " (errno: %d, %s)", ##__VA_ARGS__, errno, strerror(errno))
+#else
+// MSVC expands __VA_ARGS__ in a different order. Give up, not worth it.
+#define PERFETTO_DPLOG PERFETTO_DLOG
+#endif
+
+#else  // PERFETTO_DLOG_IS_ON()
+
+#define PERFETTO_DLOG(...) ::perfetto::base::ignore_result(__VA_ARGS__)
+#define PERFETTO_DPLOG(...) ::perfetto::base::ignore_result(__VA_ARGS__)
+
+#endif  // PERFETTO_DLOG_IS_ON()
+
+#if PERFETTO_DCHECK_IS_ON()
+
+#define PERFETTO_DCHECK(x) PERFETTO_CHECK(x)
+#define PERFETTO_DFATAL(...) PERFETTO_FATAL(__VA_ARGS__)
+#define PERFETTO_DFATAL_OR_ELOG(...) PERFETTO_DFATAL(__VA_ARGS__)
+
+#else  // PERFETTO_DCHECK_IS_ON()
+
+#define PERFETTO_DCHECK(x) \
+  do {                     \
+  } while (false && (x))
+
+#define PERFETTO_DFATAL(...) ::perfetto::base::ignore_result(__VA_ARGS__)
+#define PERFETTO_DFATAL_OR_ELOG(...) PERFETTO_ELOG(__VA_ARGS__)
+
+#endif  // PERFETTO_DCHECK_IS_ON()
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_LOGGING_H_
diff --git a/src/libtracing/perfetto/base/platform_handle.h b/src/libtracing/perfetto/base/platform_handle.h
new file mode 100644
index 000000000..88f6d5966
--- /dev/null
+++ b/src/libtracing/perfetto/base/platform_handle.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_PLATFORM_HANDLE_H_
+#define INCLUDE_PERFETTO_BASE_PLATFORM_HANDLE_H_
+
+#include <stdint.h>
+
+#include "perfetto/base/build_config.h"
+
+namespace perfetto {
+namespace base {
+
+// PlatformHandle should be used only for types that are HANDLE(s) in Windows.
+// It should NOT be used to blanket-replace "int fd" in the codebase.
+// Windows has two types of "handles", which, in UNIX-land, both map to int:
+// 1. File handles returned by the posix-compatibility API like _open().
+//    These are just int(s) and should stay such, because all the posix-like API
+//    in Windows.h take an int, not a HANDLE.
+// 2. Handles returned by old-school WINAPI like CreateFile, CreateEvent etc.
+//    These are proper HANDLE(s). PlatformHandle should be used here.
+//
+// On Windows, sockets have their own type (SOCKET) which is neither a HANDLE
+// nor an int. However Windows SOCKET(s) can have an event HANDLE attached
+// to them (which in Perfetto is a PlatformHandle), and that can be used in
+// WaitForMultipleObjects, hence in base::TaskRunner.AddFileDescriptorWatch().
+// On POSIX OSes, a SocketHandle is really just an int (a file descriptor).
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+// Windows.h typedefs HANDLE to void*, and SOCKET to uintptr_t. We use their
+// types to avoid leaking Windows.h through our headers.
+using PlatformHandle = void*;
+using SocketHandle = uintptr_t;
+
+// On Windows both nullptr and 0xffff... (INVALID_HANDLE_VALUE) are invalid.
+struct PlatformHandleChecker {
+  static inline bool IsValid(PlatformHandle h) {
+    return h && h != reinterpret_cast<PlatformHandle>(-1);
+  }
+};
+#else
+using PlatformHandle = int;
+using SocketHandle = int;
+struct PlatformHandleChecker {
+  static inline bool IsValid(PlatformHandle h) { return h >= 0; }
+};
+#endif
+
+// The definition of this lives in base/file_utils.cc (to avoid creating an
+// extra build edge for a one liner). This is really an alias for close() (UNIX)
+// CloseHandle() (Windows). THe indirection layer is just to avoid leaking
+// system headers like Windows.h through perfetto headers.
+// Thre return value is always UNIX-style: 0 on success, -1 on failure.
+int ClosePlatformHandle(PlatformHandle);
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_PLATFORM_HANDLE_H_
diff --git a/src/libtracing/perfetto/base/proc_utils.h b/src/libtracing/perfetto/base/proc_utils.h
new file mode 100644
index 000000000..cb8e13a58
--- /dev/null
+++ b/src/libtracing/perfetto/base/proc_utils.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_PROC_UTILS_H_
+#define INCLUDE_PERFETTO_BASE_PROC_UTILS_H_
+
+#include <stdint.h>
+
+#include "perfetto/base/build_config.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+extern "C" {
+// Prototype extracted from the Windows SDK to avoid including windows.h.
+__declspec(dllimport) unsigned long __stdcall GetCurrentProcessId();
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
+#include <zircon/process.h>
+#include <zircon/types.h>
+#else
+#include <unistd.h>
+#endif
+
+namespace perfetto {
+namespace base {
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
+using PlatformProcessId = zx_handle_t;
+inline PlatformProcessId GetProcessId() {
+  return zx_process_self();
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+using PlatformProcessId = uint64_t;
+inline PlatformProcessId GetProcessId() {
+  return static_cast<uint64_t>(GetCurrentProcessId());
+}
+#else
+using PlatformProcessId = pid_t;
+inline PlatformProcessId GetProcessId() {
+  return getpid();
+}
+#endif
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_PROC_UTILS_H_
diff --git a/src/libtracing/perfetto/base/status.h b/src/libtracing/perfetto/base/status.h
new file mode 100644
index 000000000..506bb6e61
--- /dev/null
+++ b/src/libtracing/perfetto/base/status.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_STATUS_H_
+#define INCLUDE_PERFETTO_BASE_STATUS_H_
+
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+
+namespace perfetto {
+namespace base {
+
+// Represents either the success or the failure message of a function.
+// This can used as the return type of functions which would usually return an
+// bool for success or int for errno but also wants to add some string context
+// (ususally for logging).
+//
+// Similar to absl::Status, an optional "payload" can also be included with more
+// context about the error. This allows passing additional metadata about the
+// error (e.g. location of errors, potential mitigations etc).
+class PERFETTO_EXPORT_COMPONENT Status {
+ public:
+  Status() : ok_(true) {}
+  explicit Status(std::string msg) : ok_(false), message_(std::move(msg)) {
+    PERFETTO_CHECK(!message_.empty());
+  }
+
+  // Copy operations.
+  Status(const Status&) = default;
+  Status& operator=(const Status&) = default;
+
+  // Move operations. The moved-from state is valid but unspecified.
+  Status(Status&&) noexcept = default;
+  Status& operator=(Status&&) = default;
+
+  bool ok() const { return ok_; }
+
+  // When ok() is false this returns the error message. Returns the empty string
+  // otherwise.
+  const std::string& message() const { return message_; }
+  const char* c_message() const { return message_.c_str(); }
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Payload Management APIs
+  //////////////////////////////////////////////////////////////////////////////
+
+  // Payloads can be attached to error statuses to provide additional context.
+  //
+  // Payloads are (key, value) pairs, where the key is a string acting as a
+  // unique "type URL" and the value is an opaque string. The "type URL" should
+  // be unique, follow the format of a URL and, ideally, documentation on how to
+  // interpret its associated data should be available.
+  //
+  // To attach a payload to a status object, call `Status::SetPayload()`.
+  // Similarly, to extract the payload from a status, call
+  // `Status::GetPayload()`.
+  //
+  // Note: the payload APIs are only meaningful to call when the status is an
+  // error. Otherwise, all methods are noops.
+
+  // Gets the payload for the given |type_url| if one exists.
+  //
+  // Will always return std::nullopt if |ok()|.
+  std::optional<std::string_view> GetPayload(std::string_view type_url) const;
+
+  // Sets the payload for the given key. The key should
+  //
+  // Will always do nothing if |ok()|.
+  void SetPayload(std::string_view type_url, std::string value);
+
+  // Erases the payload for the given string and returns true if the payload
+  // existed and was erased.
+  //
+  // Will always do nothing if |ok()|.
+  bool ErasePayload(std::string_view type_url);
+
+ private:
+  struct Payload {
+    std::string type_url;
+    std::string payload;
+  };
+
+  bool ok_ = false;
+  std::string message_;
+  std::vector<Payload> payloads_;
+};
+
+// Returns a status object which represents the Ok status.
+inline Status OkStatus() {
+  return Status();
+}
+
+PERFETTO_PRINTF_FORMAT(1, 2) Status ErrStatus(const char* format, ...);
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_STATUS_H_
diff --git a/src/libtracing/perfetto/base/task_runner.h b/src/libtracing/perfetto/base/task_runner.h
new file mode 100644
index 000000000..653b0e655
--- /dev/null
+++ b/src/libtracing/perfetto/base/task_runner.h
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
+#define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
+
+#include <stdint.h>
+
+#include <functional>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/platform_handle.h"
+
+namespace perfetto {
+namespace base {
+
+// A generic interface to allow the library clients to interleave the execution
+// of the tracing internals in their runtime environment.
+// The expectation is that all tasks, which are queued either via PostTask() or
+// AddFileDescriptorWatch(), are executed on the same sequence (either on the
+// same thread, or on a thread pool that gives sequencing guarantees).
+//
+// Tasks are never executed synchronously inside PostTask and there is a full
+// memory barrier between tasks.
+//
+// All methods of this interface can be called from any thread.
+class PERFETTO_EXPORT_COMPONENT TaskRunner {
+ public:
+  virtual ~TaskRunner();
+
+  // Schedule a task for immediate execution. Immediate tasks are always
+  // executed in the order they are posted. Can be called from any thread.
+  virtual void PostTask(std::function<void()>) = 0;
+
+  // Schedule a task for execution after |delay_ms|. Note that there is no
+  // strict ordering guarantee between immediate and delayed tasks. Can be
+  // called from any thread.
+  virtual void PostDelayedTask(std::function<void()>, uint32_t delay_ms) = 0;
+
+  // Schedule a task to run when the handle becomes readable. The same handle
+  // can only be monitored by one function. Note that this function only needs
+  // to be implemented on platforms where the built-in ipc framework is used.
+  // Can be called from any thread.
+  // TODO(skyostil): Refactor this out of the shared interface.
+  virtual void AddFileDescriptorWatch(PlatformHandle,
+                                      std::function<void()>) = 0;
+
+  // Remove a previously scheduled watch for the handle. If this is run on the
+  // target thread of this TaskRunner, guarantees that the task registered to
+  // this handle will not be executed after this function call.
+  // Can be called from any thread.
+  virtual void RemoveFileDescriptorWatch(PlatformHandle) = 0;
+
+  // Checks if the current thread is the same thread where the TaskRunner's task
+  // run. This allows single threaded task runners (like the ones used in
+  // perfetto) to inform the caller that anything posted will run on the same
+  // thread/sequence. This can allow some callers to skip PostTask and instead
+  // directly execute the code. Can be called from any thread.
+  virtual bool RunsTasksOnCurrentThread() const = 0;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
diff --git a/src/libtracing/perfetto/base/template_util.h b/src/libtracing/perfetto/base/template_util.h
new file mode 100644
index 000000000..4a5359c20
--- /dev/null
+++ b/src/libtracing/perfetto/base/template_util.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_TEMPLATE_UTIL_H_
+#define INCLUDE_PERFETTO_BASE_TEMPLATE_UTIL_H_
+
+#include <cstddef>
+#include <type_traits>
+
+namespace perfetto {
+namespace base {
+
+// Helper to express preferences in an overload set. If more than one overload
+// is available for a given set of parameters the overload with the higher
+// priority will be chosen.
+template <size_t I>
+struct priority_tag : priority_tag<I - 1> {};
+
+template <>
+struct priority_tag<0> {};
+
+// enable_if_t is an implementation of std::enable_if_t from C++14.
+//
+// Specification:
+// https://en.cppreference.com/w/cpp/types/enable_if
+template <bool B, class T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+// decay_t is an implementation of std::decay_t from C++14.
+//
+// Specification:
+// https://en.cppreference.com/w/cpp/types/decay
+template <class T>
+using decay_t = typename std::decay<T>::type;
+
+// remove_cvref is an implementation of std::remove_cvref from
+// C++20.
+//
+// Specification:
+// https://en.cppreference.com/w/cpp/types/remove_cvref
+
+template <class T>
+struct remove_cvref {
+  using type = typename std::remove_cv<typename std::remove_cv<
+      typename std::remove_reference<T>::type>::type>::type;
+};
+template <class T>
+using remove_cvref_t = typename remove_cvref<T>::type;
+
+// Check if a given type is a specialization of a given template:
+// is_specialization<T, std::vector>::value.
+
+template <typename Type, template <typename...> class Template>
+struct is_specialization : std::false_type {};
+
+template <template <typename...> class Ref, typename... Args>
+struct is_specialization<Ref<Args...>, Ref> : std::true_type {};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_TEMPLATE_UTIL_H_
diff --git a/src/libtracing/perfetto/base/thread_utils.h b/src/libtracing/perfetto/base/thread_utils.h
new file mode 100644
index 000000000..be8b4db3b
--- /dev/null
+++ b/src/libtracing/perfetto/base/thread_utils.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_THREAD_UTILS_H_
+#define INCLUDE_PERFETTO_BASE_THREAD_UTILS_H_
+
+#include <stdint.h>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/export.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+extern "C" {
+// Prototype extracted from the Windows SDK to avoid including windows.h.
+__declspec(dllimport) unsigned long __stdcall GetCurrentThreadId();
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
+#include <zircon/types.h>
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <unistd.h>
+#else
+#include <pthread.h>
+#endif
+
+namespace perfetto {
+namespace base {
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+using PlatformThreadId = pid_t;
+inline PlatformThreadId GetThreadId() {
+  return gettid();
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
+using PlatformThreadId = pid_t;
+inline PlatformThreadId GetThreadId() {
+  return static_cast<pid_t>(syscall(__NR_gettid));
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
+using PlatformThreadId = zx_koid_t;
+// Not inlined because the result is cached internally.
+PERFETTO_EXPORT_COMPONENT PlatformThreadId GetThreadId();
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
+using PlatformThreadId = uint64_t;
+inline PlatformThreadId GetThreadId() {
+  uint64_t tid;
+  pthread_threadid_np(nullptr, &tid);
+  return tid;
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+using PlatformThreadId = uint64_t;
+inline PlatformThreadId GetThreadId() {
+  return static_cast<uint64_t>(GetCurrentThreadId());
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_NACL)
+using PlatformThreadId = pid_t;
+inline PlatformThreadId GetThreadId() {
+  return reinterpret_cast<int32_t>(pthread_self());
+}
+#else  // Default to pthreads in case no OS is set.
+using PlatformThreadId = pthread_t;
+inline PlatformThreadId GetThreadId() {
+  return pthread_self();
+}
+#endif
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_THREAD_UTILS_H_
diff --git a/src/libtracing/perfetto/base/time.h b/src/libtracing/perfetto/base/time.h
new file mode 100644
index 000000000..13e575cbe
--- /dev/null
+++ b/src/libtracing/perfetto/base/time.h
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_BASE_TIME_H_
+#define INCLUDE_PERFETTO_BASE_TIME_H_
+
+#include <time.h>
+
+#include <chrono>
+#include <optional>
+#include <string>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/logging.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
+#include <mach/mach_init.h>
+#include <mach/mach_port.h>
+#include <mach/mach_time.h>
+#include <mach/thread_act.h>
+#endif
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WASM)
+#include <emscripten/emscripten.h>
+#endif
+
+#if PERFETTO_BUILDFLAG(PERFETTO_ARCH_CPU_X86_64)
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
+#include <intrin.h>
+#else
+#include <x86intrin.h>
+#endif
+#endif
+
+namespace perfetto {
+namespace base {
+
+using TimeSeconds = std::chrono::seconds;
+using TimeMillis = std::chrono::milliseconds;
+using TimeNanos = std::chrono::nanoseconds;
+
+inline TimeNanos FromPosixTimespec(const struct timespec& ts) {
+  return TimeNanos(ts.tv_sec * 1000000000LL + ts.tv_nsec);
+}
+
+void SleepMicroseconds(unsigned interval_us);
+void InitializeTime();
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
+TimeNanos GetWallTimeNs();
+TimeNanos GetThreadCPUTimeNs();
+inline TimeNanos GetWallTimeRawNs() {
+  return GetWallTimeNs();
+}
+
+// TODO: Clock that counts time during suspend is not implemented on Windows.
+inline TimeNanos GetBootTimeNs() {
+  return GetWallTimeNs();
+}
+
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
+
+inline TimeNanos GetWallTimeNs() {
+  auto init_timebase_info = []() -> mach_timebase_info_data_t {
+    mach_timebase_info_data_t timebase_info;
+    mach_timebase_info(&timebase_info);
+    return timebase_info;
+  };
+
+  static mach_timebase_info_data_t timebase_info = init_timebase_info();
+  uint64_t mach_time = mach_absolute_time();
+
+  // Take the fast path when the conversion is 1:1. The result will for sure fit
+  // into an int_64 because we're going from nanoseconds to microseconds.
+  if (timebase_info.numer == timebase_info.denom) {
+    return TimeNanos(mach_time);
+  }
+
+  // Nanoseconds is mach_time * timebase.numer // timebase.denom. Divide first
+  // to reduce the chance of overflow. Also stash the remainder right now,
+  // a likely byproduct of the division.
+  uint64_t nanoseconds = mach_time / timebase_info.denom;
+  const uint64_t mach_time_remainder = mach_time % timebase_info.denom;
+
+  // Now multiply, keeping an eye out for overflow.
+  PERFETTO_CHECK(!__builtin_umulll_overflow(nanoseconds, timebase_info.numer,
+                                            &nanoseconds));
+
+  // By dividing first we lose precision. Regain it by adding back the
+  // nanoseconds from the remainder, with an eye out for overflow.
+  uint64_t least_significant_nanoseconds =
+      (mach_time_remainder * timebase_info.numer) / timebase_info.denom;
+  PERFETTO_CHECK(!__builtin_uaddll_overflow(
+      nanoseconds, least_significant_nanoseconds, &nanoseconds));
+
+  return TimeNanos(nanoseconds);
+}
+
+inline TimeNanos GetWallTimeRawNs() {
+  return GetWallTimeNs();
+}
+
+// TODO: Clock that counts time during suspend is not implemented on Mac.
+inline TimeNanos GetBootTimeNs() {
+  return GetWallTimeNs();
+}
+
+// Before MacOS 10.12 clock_gettime() was not implemented.
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+inline TimeNanos GetThreadCPUTimeNs() {
+  mach_port_t this_thread = mach_thread_self();
+  mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
+  thread_basic_info_data_t info{};
+  kern_return_t kr =
+      thread_info(this_thread, THREAD_BASIC_INFO,
+                  reinterpret_cast<thread_info_t>(&info), &count);
+  mach_port_deallocate(mach_task_self(), this_thread);
+
+  if (kr != KERN_SUCCESS) {
+    PERFETTO_DFATAL("Failed to get CPU time.");
+    return TimeNanos(0);
+  }
+  return TimeNanos(info.user_time.seconds * 1000000000LL +
+                   info.user_time.microseconds * 1000LL +
+                   info.system_time.seconds * 1000000000LL +
+                   info.system_time.microseconds * 1000LL);
+}
+#else
+inline TimeNanos GetThreadCPUTimeNs() {
+  struct timespec ts = {};
+  PERFETTO_CHECK(clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts) == 0);
+  return FromPosixTimespec(ts);
+}
+#endif
+
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_WASM)
+
+inline TimeNanos GetWallTimeNs() {
+  return TimeNanos(static_cast<uint64_t>(emscripten_get_now()) * 1000000);
+}
+
+inline TimeNanos GetWallTimeRawNs() {
+  return GetWallTimeNs();
+}
+
+inline TimeNanos GetThreadCPUTimeNs() {
+  return TimeNanos(0);
+}
+
+// TODO: Clock that counts time during suspend is not implemented on WASM.
+inline TimeNanos GetBootTimeNs() {
+  return GetWallTimeNs();
+}
+
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_NACL)
+
+// Tracing time doesn't need to work on NaCl since its going away shortly. We
+// just need to compile on it. The only function NaCl could support is
+// GetWallTimeNs(), but to prevent false hope we leave it unimplemented.
+
+inline TimeNanos GetWallTimeNs() {
+  return TimeNanos(0);
+}
+
+inline TimeNanos GetWallTimeRawNs() {
+  return TimeNanos(0);
+}
+
+inline TimeNanos GetThreadCPUTimeNs() {
+  return TimeNanos(0);
+}
+
+inline TimeNanos GetBootTimeNs() {
+  return TimeNanos(0);
+}
+
+#else  // posix
+
+constexpr clockid_t kWallTimeClockSource = CLOCK_MONOTONIC;
+
+inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
+  struct timespec ts = {};
+  PERFETTO_CHECK(clock_gettime(clk_id, &ts) == 0);
+  return FromPosixTimespec(ts);
+}
+
+// Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
+// during suspend (when supported).
+inline TimeNanos GetBootTimeNs() {
+  // Determine if CLOCK_BOOTTIME is available on the first call.
+  static const clockid_t kBootTimeClockSource = [] {
+    struct timespec ts = {};
+    int res = clock_gettime(CLOCK_BOOTTIME, &ts);
+    return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
+  }();
+  return GetTimeInternalNs(kBootTimeClockSource);
+}
+
+inline TimeNanos GetWallTimeNs() {
+  return GetTimeInternalNs(kWallTimeClockSource);
+}
+
+inline TimeNanos GetWallTimeRawNs() {
+  return GetTimeInternalNs(CLOCK_MONOTONIC_RAW);
+}
+
+inline TimeNanos GetThreadCPUTimeNs() {
+  return GetTimeInternalNs(CLOCK_THREAD_CPUTIME_ID);
+}
+#endif
+
+inline TimeSeconds GetBootTimeS() {
+  return std::chrono::duration_cast<TimeSeconds>(GetBootTimeNs());
+}
+
+inline TimeMillis GetBootTimeMs() {
+  return std::chrono::duration_cast<TimeMillis>(GetBootTimeNs());
+}
+
+inline TimeMillis GetWallTimeMs() {
+  return std::chrono::duration_cast<TimeMillis>(GetWallTimeNs());
+}
+
+inline TimeSeconds GetWallTimeS() {
+  return std::chrono::duration_cast<TimeSeconds>(GetWallTimeNs());
+}
+
+inline struct timespec ToPosixTimespec(TimeMillis time) {
+  struct timespec ts {};
+  const long time_s = static_cast<long>(time.count() / 1000);
+  ts.tv_sec = time_s;
+  ts.tv_nsec = (static_cast<long>(time.count()) - time_s * 1000L) * 1000000L;
+  return ts;
+}
+
+std::string GetTimeFmt(const std::string& fmt);
+
+inline int64_t TimeGm(struct tm* tms) {
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  return static_cast<int64_t>(_mkgmtime(tms));
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_NACL)
+  // NaCL has no timegm.
+  if (tms)  // Kinda if (true), but avoids "mark as noreturn" errors.
+    PERFETTO_FATAL("timegm not supported");
+  return -1;
+#else
+  return static_cast<int64_t>(timegm(tms));
+#endif
+}
+
+// Creates a time_t-compatible timestamp (seconds since epoch) from a tuple of
+// y-m-d-h-m-s. It's a saner version of timegm(). Some remarks:
+// The year is just the actual year (it's Y-1900 in timegm()).
+// The month ranges 1-12 (it's 0-11 in timegm()).
+inline int64_t MkTime(int year, int month, int day, int h, int m, int s) {
+  PERFETTO_DCHECK(year >= 1900);
+  PERFETTO_DCHECK(month > 0 && month <= 12);
+  PERFETTO_DCHECK(day > 0 && day <= 31);
+  struct tm tms {};
+  tms.tm_year = year - 1900;
+  tms.tm_mon = month - 1;
+  tms.tm_mday = day;
+  tms.tm_hour = h;
+  tms.tm_min = m;
+  tms.tm_sec = s;
+  return TimeGm(&tms);
+}
+
+#if PERFETTO_BUILDFLAG(PERFETTO_ARCH_CPU_X86_64)
+inline uint64_t Rdtsc() {
+  return static_cast<uint64_t>(__rdtsc());
+}
+#endif
+
+std::optional<int32_t> GetTimezoneOffsetMins();
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_BASE_TIME_H_
diff --git a/src/libtracing/perfetto/ext/base/BUILD.gn b/src/libtracing/perfetto/ext/base/BUILD.gn
new file mode 100644
index 000000000..2418346ec
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/BUILD.gn
@@ -0,0 +1,73 @@
+# Copyright (C) 2019 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../../gn/perfetto.gni")
+
+source_set("base") {
+  sources = [
+    "android_utils.h",
+    "base64.h",
+    "circular_queue.h",
+    "container_annotations.h",
+    "crash_keys.h",
+    "ctrl_c_handler.h",
+    "endian.h",
+    "event_fd.h",
+    "file_utils.h",
+    "flat_hash_map.h",
+    "getopt.h",
+    "getopt_compat.h",
+    "hash.h",
+    "metatrace.h",
+    "metatrace_events.h",
+    "no_destructor.h",
+    "paged_memory.h",
+    "periodic_task.h",
+    "pipe.h",
+    "platform.h",
+    "scoped_file.h",
+    "scoped_mmap.h",
+    "small_set.h",
+    "small_vector.h",
+    "status_or.h",
+    "string_splitter.h",
+    "string_utils.h",
+    "string_view.h",
+    "string_writer.h",
+    "subprocess.h",
+    "sys_types.h",
+    "temp_file.h",
+    "thread_annotations.h",
+    "thread_checker.h",
+    "thread_task_runner.h",
+    "thread_utils.h",
+    "unix_task_runner.h",
+    "utils.h",
+    "uuid.h",
+    "waitable_event.h",
+    "watchdog.h",
+    "watchdog_noop.h",
+    "watchdog_posix.h",
+    "weak_ptr.h",
+  ]
+  if (enable_perfetto_ipc) {
+    sources += [ "unix_socket.h" ]
+  }
+  public_configs = [ "../../../../gn:asan_instrumentation" ]
+  public_deps = [ "../../base" ]
+}
+
+source_set("version") {
+  sources = [ "version.h" ]
+}
diff --git a/src/libtracing/perfetto/ext/base/android_utils.h b/src/libtracing/perfetto/ext/base/android_utils.h
new file mode 100644
index 000000000..c1f83ef39
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/android_utils.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_ANDROID_UTILS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_ANDROID_UTILS_H_
+
+#include <string>
+
+#include "perfetto/base/build_config.h"
+
+namespace perfetto {
+namespace base {
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+
+// Returns the value of the Android system property named `name`. If the
+// property does not exist, returns an empty string (a non-existing property is
+// the same as a property with an empty value for this API).
+std::string GetAndroidProp(const char* name);
+
+#endif  // PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_ANDROID_UTILS_H_
diff --git a/src/libtracing/perfetto/ext/base/base64.h b/src/libtracing/perfetto/ext/base/base64.h
new file mode 100644
index 000000000..5a01164f7
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/base64.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_BASE64_H_
+#define INCLUDE_PERFETTO_EXT_BASE_BASE64_H_
+
+#include <optional>
+#include <string>
+
+#include "perfetto/ext/base/string_view.h"
+#include "perfetto/ext/base/utils.h"  // For ssize_t.
+
+namespace perfetto {
+namespace base {
+
+// Returns the length of the destination string (included '=' padding).
+// Does NOT include the size of the string null terminator.
+inline size_t Base64EncSize(size_t src_size) {
+  return (src_size + 2) / 3 * 4;
+}
+
+// Returns the upper bound on the length of the destination buffer.
+// The actual decoded length might be <= the number returned here.
+inline size_t Base64DecSize(size_t src_size) {
+  return (src_size + 3) / 4 * 3;
+}
+
+// Does NOT null-terminate |dst|.
+ssize_t Base64Encode(const void* src,
+                     size_t src_size,
+                     char* dst,
+                     size_t dst_size);
+
+std::string Base64Encode(const void* src, size_t src_size);
+
+inline std::string Base64Encode(StringView sv) {
+  return Base64Encode(sv.data(), sv.size());
+}
+
+// Returns -1 in case of failure.
+ssize_t Base64Decode(const char* src,
+                     size_t src_size,
+                     uint8_t* dst,
+                     size_t dst_size);
+
+std::optional<std::string> Base64Decode(const char* src, size_t src_size);
+
+inline std::optional<std::string> Base64Decode(StringView sv) {
+  return Base64Decode(sv.data(), sv.size());
+}
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_BASE64_H_
diff --git a/src/libtracing/perfetto/ext/base/circular_queue.h b/src/libtracing/perfetto/ext/base/circular_queue.h
new file mode 100644
index 000000000..1f69ce5d9
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/circular_queue.h
@@ -0,0 +1,337 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_CIRCULAR_QUEUE_H_
+#define INCLUDE_PERFETTO_EXT_BASE_CIRCULAR_QUEUE_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <cstddef>
+#include <iterator>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/utils.h"
+
+namespace perfetto {
+namespace base {
+
+// CircularQueue is a push-back-only / pop-front-only queue with the following
+// characteristics:
+// - The storage is based on a flat circular buffer. Beginning and end wrap
+//   as necessary, to keep pushes and pops O(1) as long as capacity expansion is
+//   not required.
+// - Capacity is automatically expanded like in a std::vector. Expansion has a
+//   O(N) cost.
+// - It allows random access, allowing in-place std::sort.
+// - Iterators are not stable. Mutating the container invalidates all iterators.
+// - It doesn't bother with const-correctness.
+//
+// Implementation details:
+// Internally, |begin|, |end| and iterators use 64-bit monotonic indexes, which
+// are incremented as if the queue was backed by unlimited storage.
+// Even assuming that elements are inserted and removed every nanosecond, 64 bit
+// is enough for 584 years.
+// Wrapping happens only when addressing elements in the underlying circular
+// storage. This limits the complexity and avoiding dealing with modular
+// arithmetic all over the places.
+template <class T>
+class CircularQueue {
+ public:
+  class Iterator {
+   public:
+    using difference_type = ptrdiff_t;
+    using value_type = T;
+    using pointer = T*;
+    using reference = T&;
+    using iterator_category = std::random_access_iterator_tag;
+
+    Iterator(CircularQueue* queue, uint64_t pos, uint32_t generation)
+        : queue_(queue),
+          pos_(pos)
+#if PERFETTO_DCHECK_IS_ON()
+          ,
+          generation_(generation)
+#endif
+    {
+      ignore_result(generation);
+    }
+
+    Iterator(const Iterator&) noexcept = default;
+    Iterator& operator=(const Iterator&) noexcept = default;
+    Iterator(Iterator&&) noexcept = default;
+    Iterator& operator=(Iterator&&) noexcept = default;
+
+    T* operator->() const {
+#if PERFETTO_DCHECK_IS_ON()
+      PERFETTO_DCHECK(generation_ == queue_->generation());
+#endif
+      return queue_->Get(pos_);
+    }
+
+    T& operator*() const { return *(operator->()); }
+
+    value_type& operator[](difference_type i) { return *(*this + i); }
+
+    Iterator& operator++() {
+      Add(1);
+      return *this;
+    }
+
+    Iterator operator++(int) {
+      Iterator ret = *this;
+      Add(1);
+      return ret;
+    }
+
+    Iterator& operator--() {
+      Add(-1);
+      return *this;
+    }
+
+    Iterator operator--(int) {
+      Iterator ret = *this;
+      Add(-1);
+      return ret;
+    }
+
+    friend Iterator operator+(const Iterator& iter, difference_type offset) {
+      Iterator ret = iter;
+      ret.Add(offset);
+      return ret;
+    }
+
+    Iterator& operator+=(difference_type offset) {
+      Add(offset);
+      return *this;
+    }
+
+    friend Iterator operator-(const Iterator& iter, difference_type offset) {
+      Iterator ret = iter;
+      ret.Add(-offset);
+      return ret;
+    }
+
+    Iterator& operator-=(difference_type offset) {
+      Add(-offset);
+      return *this;
+    }
+
+    friend ptrdiff_t operator-(const Iterator& lhs, const Iterator& rhs) {
+      return static_cast<ptrdiff_t>(lhs.pos_) -
+             static_cast<ptrdiff_t>(rhs.pos_);
+    }
+
+    friend bool operator==(const Iterator& lhs, const Iterator& rhs) {
+      return lhs.pos_ == rhs.pos_;
+    }
+
+    friend bool operator!=(const Iterator& lhs, const Iterator& rhs) {
+      return lhs.pos_ != rhs.pos_;
+    }
+
+    friend bool operator<(const Iterator& lhs, const Iterator& rhs) {
+      return lhs.pos_ < rhs.pos_;
+    }
+
+    friend bool operator<=(const Iterator& lhs, const Iterator& rhs) {
+      return lhs.pos_ <= rhs.pos_;
+    }
+
+    friend bool operator>(const Iterator& lhs, const Iterator& rhs) {
+      return lhs.pos_ > rhs.pos_;
+    }
+
+    friend bool operator>=(const Iterator& lhs, const Iterator& rhs) {
+      return lhs.pos_ >= rhs.pos_;
+    }
+
+   private:
+    inline void Add(difference_type offset) {
+      pos_ = static_cast<uint64_t>(static_cast<difference_type>(pos_) + offset);
+      PERFETTO_DCHECK(pos_ <= queue_->end_);
+    }
+
+    CircularQueue* queue_;
+    uint64_t pos_;
+
+#if PERFETTO_DCHECK_IS_ON()
+    uint32_t generation_;
+#endif
+  };
+
+  explicit CircularQueue(size_t initial_capacity = 1024) {
+    Grow(initial_capacity);
+  }
+
+  CircularQueue(CircularQueue&& other) noexcept
+      : entries_(std::move(other.entries_)),
+        capacity_(other.capacity_),
+        begin_(other.begin_),
+        end_(other.end_) {
+    increment_generation();
+    new (&other) CircularQueue();  // Reset the old queue so it's still usable.
+  }
+
+  CircularQueue& operator=(CircularQueue&& other) noexcept {
+    this->~CircularQueue();                      // Destroy the current state.
+    new (this) CircularQueue(std::move(other));  // Use the move ctor above.
+    return *this;
+  }
+
+  explicit CircularQueue(const CircularQueue& other) noexcept {
+    Grow(other.capacity());
+    for (const auto& e : const_cast<CircularQueue&>(other))
+      emplace_back(e);
+    PERFETTO_DCHECK(size() == other.size());
+  }
+
+  CircularQueue& operator=(const CircularQueue& other) noexcept {
+    this->~CircularQueue();           // Destroy the current state.
+    new (this) CircularQueue(other);  // Use the copy ctor above.
+    return *this;
+  }
+
+  ~CircularQueue() {
+    if (!entries_) {
+      PERFETTO_DCHECK(empty());
+      return;
+    }
+    clear();  // Invoke destructors on all alive entries.
+    PERFETTO_DCHECK(empty());
+  }
+
+  template <typename... Args>
+  void emplace_back(Args&&... args) {
+    increment_generation();
+    if (PERFETTO_UNLIKELY(size() >= capacity_))
+      Grow();
+    T* slot = Get(end_++);
+    new (slot) T(std::forward<Args>(args)...);
+  }
+
+  void erase_front(size_t n) {
+    increment_generation();
+    for (; n && (begin_ < end_); --n) {
+      Get(begin_)->~T();
+      begin_++;  // This needs to be its own statement, Get() checks begin_.
+    }
+  }
+
+  void pop_front() { erase_front(1); }
+
+  void clear() { erase_front(size()); }
+
+  void shrink_to_fit() {
+    // We only bother shrinking if we can fit in quarter of the capacity we are
+    // currently using. Moreover, don't bother shrinking below 4096 elements as
+    // that will cause a lot of reallocations for little benefit.
+    if (size() > capacity() / 2 || capacity() <= 4096) {
+      return;
+    }
+    ChangeCapacity(capacity() / 2);
+  }
+
+  T& at(size_t idx) {
+    PERFETTO_DCHECK(idx < size());
+    return *Get(begin_ + idx);
+  }
+
+  Iterator begin() { return Iterator(this, begin_, generation()); }
+  Iterator end() { return Iterator(this, end_, generation()); }
+  T& front() { return *begin(); }
+  T& back() { return *(end() - 1); }
+
+  bool empty() const { return size() == 0; }
+
+  size_t size() const {
+    PERFETTO_DCHECK(end_ - begin_ <= capacity_);
+    return static_cast<size_t>(end_ - begin_);
+  }
+
+  size_t capacity() const { return capacity_; }
+
+#if PERFETTO_DCHECK_IS_ON()
+  uint32_t generation() const { return generation_; }
+  void increment_generation() { ++generation_; }
+#else
+  uint32_t generation() const { return 0; }
+  void increment_generation() {}
+#endif
+
+ private:
+  void Grow(size_t new_capacity = 0) {
+    // Capacity must be always a power of two. This allows Get() to use a simple
+    // bitwise-AND for handling the wrapping instead of a full division.
+    new_capacity = new_capacity ? new_capacity : capacity_ * 2;
+    PERFETTO_CHECK((new_capacity & (new_capacity - 1)) == 0);  // Must be pow2.
+
+    // On 32-bit systems this might hit the 4GB wall and overflow. We can't do
+    // anything other than crash in this case.
+    PERFETTO_CHECK(new_capacity > capacity_);
+
+    ChangeCapacity(new_capacity);
+  }
+
+  void ChangeCapacity(size_t new_capacity) {
+    // We should still have enough space to fit all the elements in the queue.
+    PERFETTO_CHECK(new_capacity >= size());
+
+    AlignedUniquePtr<T[]> new_vec = AlignedAllocTyped<T[]>(new_capacity);
+
+    // Move all elements in the expanded array.
+    size_t new_size = 0;
+    for (uint64_t i = begin_; i < end_; i++)
+      new (&new_vec[new_size++]) T(std::move(*Get(i)));  // Placement move ctor.
+
+    // Even if all the elements are std::move()-d and likely empty, we are still
+    // required to call the dtor for them.
+    for (uint64_t i = begin_; i < end_; i++)
+      Get(i)->~T();
+
+    begin_ = 0;
+    end_ = new_size;
+    capacity_ = new_capacity;
+    entries_ = std::move(new_vec);
+  }
+
+  inline T* Get(uint64_t pos) {
+    PERFETTO_DCHECK(pos >= begin_ && pos < end_);
+    PERFETTO_DCHECK((capacity_ & (capacity_ - 1)) == 0);  // Must be a pow2.
+    auto index = static_cast<size_t>(pos & (capacity_ - 1));
+    return &entries_[index];
+  }
+
+  // Underlying storage. It's raw malloc-ed rather than being a unique_ptr<T[]>
+  // to allow having uninitialized entries inside it.
+  AlignedUniquePtr<T[]> entries_;
+  size_t capacity_ = 0;  // Number of allocated slots (NOT bytes) in |entries_|.
+
+  // The |begin_| and |end_| indexes are monotonic and never wrap. Modular arith
+  // is used only when dereferencing entries in the vector.
+  uint64_t begin_ = 0;
+  uint64_t end_ = 0;
+
+// Generation is used in debug builds only for checking iterator validity.
+#if PERFETTO_DCHECK_IS_ON()
+  uint32_t generation_ = 0;
+#endif
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_CIRCULAR_QUEUE_H_
diff --git a/src/libtracing/perfetto/ext/base/container_annotations.h b/src/libtracing/perfetto/ext/base/container_annotations.h
new file mode 100644
index 000000000..5cc743a87
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/container_annotations.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_CONTAINER_ANNOTATIONS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_CONTAINER_ANNOTATIONS_H_
+
+#include "perfetto/base/build_config.h"
+
+// Windows ASAN doesn't currently support these annotations.
+#if defined(ADDRESS_SANITIZER) && !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
+    !defined(ADDRESS_SANITIZER_WITHOUT_INSTRUMENTATION)
+
+#include <sanitizer/common_interface_defs.h>
+
+#define ANNOTATE_NEW_BUFFER(buffer, capacity, new_size)                      \
+  if (buffer) {                                                              \
+    __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
+                                              (buffer) + (capacity),         \
+                                              (buffer) + (new_size));        \
+  }
+#define ANNOTATE_DELETE_BUFFER(buffer, capacity, old_size)                   \
+  if (buffer) {                                                              \
+    __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
+                                              (buffer) + (old_size),         \
+                                              (buffer) + (capacity));        \
+  }
+#define ANNOTATE_CHANGE_SIZE(buffer, capacity, old_size, new_size)           \
+  if (buffer) {                                                              \
+    __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
+                                              (buffer) + (old_size),         \
+                                              (buffer) + (new_size));        \
+  }
+#define ANNOTATE_CHANGE_CAPACITY(buffer, old_capacity, buffer_size, \
+                                 new_capacity)                      \
+  ANNOTATE_DELETE_BUFFER(buffer, old_capacity, buffer_size);        \
+  ANNOTATE_NEW_BUFFER(buffer, new_capacity, buffer_size);
+// Annotations require buffers to begin on an 8-byte boundary.
+#else  // defined(ADDRESS_SANITIZER)
+#define ANNOTATE_NEW_BUFFER(buffer, capacity, new_size)
+#define ANNOTATE_DELETE_BUFFER(buffer, capacity, old_size)
+#define ANNOTATE_CHANGE_SIZE(buffer, capacity, old_size, new_size)
+#define ANNOTATE_CHANGE_CAPACITY(buffer, old_capacity, buffer_size, \
+                                 new_capacity)
+#endif  // defined(ADDRESS_SANITIZER)
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_CONTAINER_ANNOTATIONS_H_
diff --git a/src/libtracing/perfetto/ext/base/crash_keys.h b/src/libtracing/perfetto/ext/base/crash_keys.h
new file mode 100644
index 000000000..36ef35874
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/crash_keys.h
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_CRASH_KEYS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_CRASH_KEYS_H_
+
+#include <algorithm>
+#include <atomic>
+
+#include <stdint.h>
+#include <string.h>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/ext/base/string_view.h"
+
+// Crash keys are very simple global variables with static-storage that
+// are reported on crash time for managed crashes (CHECK/FATAL/Watchdog).
+// - Translation units can define a CrashKey and register it at some point
+//   during initialization.
+// - CrashKey instances must be long-lived. They should really be just global
+//   static variable in the anonymous namespace.
+// Example:
+// subsystem_1.cc
+//   CrashKey g_client_id("ipc_client_id");
+//   ...
+//   OnIpcReceived(client_id) {
+//      g_client_id.Set(client_id);
+//      ... // Process the IPC
+//      g_client_id.Clear();
+//   }
+//   Or equivalently:
+//   OnIpcReceived(client_id) {
+//      auto scoped_key = g_client_id.SetScoped(client_id);
+//      ... // Process the IPC
+//   }
+//
+// If a crash happens while processing the IPC, the crash report will
+// have a line "ipc_client_id: 42".
+//
+// Thread safety considerations:
+// CrashKeys can be registered and set/cleared from any thread.
+// There is no compelling use-case to have full acquire/release consistency when
+// setting a key. This means that if a thread crashes immediately after a
+// crash key has been set on another thread, the value printed on the crash
+// report could be incomplete. The code guarantees defined behavior and does
+// not rely on null-terminated string (in the worst case 32 bytes of random
+// garbage will be printed out).
+
+// The tests live in logging_unittest.cc.
+
+namespace perfetto {
+namespace base {
+
+constexpr size_t kCrashKeyMaxStrSize = 32;
+
+// CrashKey instances must be long lived
+class CrashKey {
+ public:
+  class ScopedClear {
+   public:
+    explicit ScopedClear(CrashKey* k) : key_(k) {}
+    ~ScopedClear() {
+      if (key_)
+        key_->Clear();
+    }
+    ScopedClear(const ScopedClear&) = delete;
+    ScopedClear& operator=(const ScopedClear&) = delete;
+    ScopedClear& operator=(ScopedClear&&) = delete;
+    ScopedClear(ScopedClear&& other) noexcept : key_(other.key_) {
+      other.key_ = nullptr;
+    }
+
+   private:
+    CrashKey* key_;
+  };
+
+  // constexpr so it can be used in the anon namespace without requiring a
+  // global constructor.
+  // |name| must be a long-lived string.
+  constexpr explicit CrashKey(const char* name)
+      : registered_{}, type_(Type::kUnset), name_(name), str_value_{} {}
+  CrashKey(const CrashKey&) = delete;
+  CrashKey& operator=(const CrashKey&) = delete;
+  CrashKey(CrashKey&&) = delete;
+  CrashKey& operator=(CrashKey&&) = delete;
+
+  enum class Type : uint8_t { kUnset = 0, kInt, kStr };
+
+  void Clear() {
+    int_value_.store(0, std::memory_order_relaxed);
+    type_.store(Type::kUnset, std::memory_order_relaxed);
+  }
+
+  void Set(int64_t value) {
+    int_value_.store(value, std::memory_order_relaxed);
+    type_.store(Type::kInt, std::memory_order_relaxed);
+    if (PERFETTO_UNLIKELY(!registered_.load(std::memory_order_relaxed)))
+      Register();
+  }
+
+  void Set(StringView sv) {
+    size_t len = std::min(sv.size(), sizeof(str_value_) - 1);
+    for (size_t i = 0; i < len; ++i)
+      str_value_[i].store(sv.data()[i], std::memory_order_relaxed);
+    str_value_[len].store('\0', std::memory_order_relaxed);
+    type_.store(Type::kStr, std::memory_order_relaxed);
+    if (PERFETTO_UNLIKELY(!registered_.load(std::memory_order_relaxed)))
+      Register();
+  }
+
+  ScopedClear SetScoped(int64_t value) PERFETTO_WARN_UNUSED_RESULT {
+    Set(value);
+    return ScopedClear(this);
+  }
+
+  ScopedClear SetScoped(StringView sv) PERFETTO_WARN_UNUSED_RESULT {
+    Set(sv);
+    return ScopedClear(this);
+  }
+
+  void Register();
+
+  int64_t int_value() const {
+    return int_value_.load(std::memory_order_relaxed);
+  }
+  size_t ToString(char* dst, size_t len);
+
+ private:
+  std::atomic<bool> registered_;
+  std::atomic<Type> type_;
+  const char* const name_;
+  union {
+    std::atomic<char> str_value_[kCrashKeyMaxStrSize];
+    std::atomic<int64_t> int_value_;
+  };
+};
+
+// Fills |dst| with a string containing one line for each crash key
+// (excluding the unset ones).
+// Returns number of chars written, without counting the NUL terminator.
+// This is used in logging.cc when emitting the crash report abort message.
+size_t SerializeCrashKeys(char* dst, size_t len);
+
+void UnregisterAllCrashKeysForTesting();
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_CRASH_KEYS_H_
diff --git a/src/libtracing/perfetto/ext/base/ctrl_c_handler.h b/src/libtracing/perfetto/ext/base/ctrl_c_handler.h
new file mode 100644
index 000000000..d79387c62
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/ctrl_c_handler.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_CTRL_C_HANDLER_H_
+#define INCLUDE_PERFETTO_EXT_BASE_CTRL_C_HANDLER_H_
+
+namespace perfetto {
+namespace base {
+
+// On Linux/Android/Mac: installs SIGINT + SIGTERM signal handlers.
+// On Windows: installs a SetConsoleCtrlHandler() handler.
+// The passed handler must be async safe.
+using CtrlCHandlerFunction = void (*)();
+void InstallCtrlCHandler(CtrlCHandlerFunction);
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_CTRL_C_HANDLER_H_
diff --git a/src/libtracing/perfetto/ext/base/endian.h b/src/libtracing/perfetto/ext/base/endian.h
new file mode 100644
index 000000000..b18979fd8
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/endian.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_ENDIAN_H_
+#define INCLUDE_PERFETTO_EXT_BASE_ENDIAN_H_
+
+#include <stdint.h>
+#include <stdlib.h>  // For MSVC
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/compiler.h"
+
+#if !PERFETTO_IS_LITTLE_ENDIAN()
+#error "endian.h supports only little-endian archs"
+#endif
+
+namespace perfetto {
+namespace base {
+
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
+inline uint16_t HostToBE16(uint16_t x) {
+  return _byteswap_ushort(x);
+}
+inline uint32_t HostToBE32(uint32_t x) {
+  return _byteswap_ulong(x);
+}
+inline uint64_t HostToBE64(uint64_t x) {
+  return _byteswap_uint64(x);
+}
+#else
+inline uint16_t HostToBE16(uint16_t x) {
+  return __builtin_bswap16(x);
+}
+inline uint32_t HostToBE32(uint32_t x) {
+  return __builtin_bswap32(x);
+}
+inline uint64_t HostToBE64(uint64_t x) {
+  return __builtin_bswap64(x);
+}
+#endif
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_ENDIAN_H_
diff --git a/src/libtracing/perfetto/ext/base/event_fd.h b/src/libtracing/perfetto/ext/base/event_fd.h
new file mode 100644
index 000000000..e4bd6e915
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/event_fd.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_EVENT_FD_H_
+#define INCLUDE_PERFETTO_EXT_BASE_EVENT_FD_H_
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/platform_handle.h"
+#include "perfetto/ext/base/scoped_file.h"
+
+namespace perfetto {
+namespace base {
+
+// A waitable event that can be used with poll/select.
+// This is really a wrapper around eventfd_create with a pipe-based fallback
+// for other platforms where eventfd is not supported.
+class EventFd {
+ public:
+  EventFd();
+  ~EventFd();
+  EventFd(EventFd&&) noexcept = default;
+  EventFd& operator=(EventFd&&) = default;
+
+  // The non-blocking file descriptor that can be polled to wait for the event.
+  PlatformHandle fd() const { return event_handle_.get(); }
+
+  // Can be called from any thread.
+  void Notify();
+
+  // Can be called from any thread. If more Notify() are queued a Clear() call
+  // can clear all of them (up to 16 per call).
+  void Clear();
+
+ private:
+  // The eventfd, when eventfd is supported, otherwise this is the read end of
+  // the pipe for fallback mode.
+  ScopedPlatformHandle event_handle_;
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) &&   \
+    !PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && \
+    !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  // On Mac and other non-Linux UNIX platforms a pipe-based fallback is used.
+  // The write end of the wakeup pipe.
+  ScopedFile write_fd_;
+#endif
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_EVENT_FD_H_
diff --git a/src/libtracing/perfetto/ext/base/file_utils.h b/src/libtracing/perfetto/ext/base/file_utils.h
new file mode 100644
index 000000000..f87758273
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/file_utils.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_FILE_UTILS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_FILE_UTILS_H_
+
+#include <fcntl.h>  // For mode_t & O_RDONLY/RDWR. Exists also on Windows.
+#include <stddef.h>
+
+#include <optional>
+#include <string>
+#include <vector>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/export.h"
+#include "perfetto/base/status.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/utils.h"
+
+namespace perfetto {
+namespace base {
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+using FileOpenMode = int;
+inline constexpr char kDevNull[] = "NUL";
+#else
+using FileOpenMode = mode_t;
+inline constexpr char kDevNull[] = "/dev/null";
+#endif
+
+constexpr FileOpenMode kFileModeInvalid = static_cast<FileOpenMode>(-1);
+
+bool ReadPlatformHandle(PlatformHandle, std::string* out);
+bool ReadFileDescriptor(int fd, std::string* out);
+bool ReadFileStream(FILE* f, std::string* out);
+bool ReadFile(const std::string& path, std::string* out);
+
+// A wrapper around read(2). It deals with Linux vs Windows includes. It also
+// deals with handling EINTR. Has the same semantics of UNIX's read(2).
+ssize_t Read(int fd, void* dst, size_t dst_size);
+
+// Call write until all data is written or an error is detected.
+//
+// man 2 write:
+//   If a write() is interrupted by a signal handler before any bytes are
+//   written, then the call fails with the error EINTR; if it is
+//   interrupted after at least one byte has been written, the call
+//   succeeds, and returns the number of bytes written.
+ssize_t WriteAll(int fd, const void* buf, size_t count);
+
+ssize_t WriteAllHandle(PlatformHandle, const void* buf, size_t count);
+
+ScopedFile OpenFile(const std::string& path,
+                    int flags,
+                    FileOpenMode = kFileModeInvalid);
+ScopedFstream OpenFstream(const char* path, const char* mode);
+
+// This is an alias for close(). It's to avoid leaking Windows.h in headers.
+// Exported because ScopedFile is used in the /include/ext API by Chromium
+// component builds.
+int PERFETTO_EXPORT_COMPONENT CloseFile(int fd);
+
+bool FlushFile(int fd);
+
+// Returns true if mkdir succeeds, false if it fails (see errno in that case).
+bool Mkdir(const std::string& path);
+
+// Calls rmdir() on UNIX, _rmdir() on Windows.
+bool Rmdir(const std::string& path);
+
+// Wrapper around access(path, F_OK).
+bool FileExists(const std::string& path);
+
+// Gets the extension for a filename. If the file has two extensions, returns
+// only the last one (foo.pb.gz => .gz). Returns empty string if there is no
+// extension.
+std::string GetFileExtension(const std::string& filename);
+
+// Puts the path to all files under |dir_path| in |output|, recursively walking
+// subdirectories. File paths are relative to |dir_path|. Only files are
+// included, not directories. Path separator is always '/', even on windows (not
+// '\').
+base::Status ListFilesRecursive(const std::string& dir_path,
+                                std::vector<std::string>& output);
+
+// Sets |path|'s owner group to |group_name| and permission mode bits to
+// |mode_bits|.
+base::Status SetFilePermissions(const std::string& path,
+                                const std::string& group_name,
+                                const std::string& mode_bits);
+
+// Returns the size of the file located at |path|, or nullopt in case of error.
+std::optional<uint64_t> GetFileSize(const std::string& path);
+
+// Returns the size of the open file |fd|, or nullopt in case of error.
+std::optional<uint64_t> GetFileSize(PlatformHandle fd);
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_FILE_UTILS_H_
diff --git a/src/libtracing/perfetto/ext/base/flat_hash_map.h b/src/libtracing/perfetto/ext/base/flat_hash_map.h
new file mode 100644
index 000000000..0be192da8
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/flat_hash_map.h
@@ -0,0 +1,395 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_FLAT_HASH_MAP_H_
+#define INCLUDE_PERFETTO_EXT_BASE_FLAT_HASH_MAP_H_
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/hash.h"
+#include "perfetto/ext/base/utils.h"
+
+#include <algorithm>
+#include <functional>
+#include <limits>
+
+namespace perfetto {
+namespace base {
+
+// An open-addressing hashmap implementation.
+// Pointers are not stable, neither for keys nor values.
+// Has similar performances of a RobinHood hash (without the complications)
+// and 2x an unordered map.
+// Doc: http://go/perfetto-hashtables .
+//
+// When used to implement a string pool in TraceProcessor, the performance
+// characteristics obtained by replaying the set of strings seeen in a 4GB trace
+// (226M strings, 1M unique) are the following (see flat_hash_map_benchmark.cc):
+// This(Linear+AppendOnly)    879,383,676 ns    258.013M insertions/s
+// This(LinearProbe):         909,206,047 ns    249.546M insertions/s
+// This(QuadraticProbe):    1,083,844,388 ns    209.363M insertions/s
+// std::unordered_map:      6,203,351,870 ns    36.5811M insertions/s
+// tsl::robin_map:            931,403,397 ns    243.622M insertions/s
+// absl::flat_hash_map:       998,013,459 ns    227.379M insertions/s
+// FollyF14FastMap:         1,181,480,602 ns    192.074M insertions/s
+
+// The structs below define the probing algorithm used to probe slots upon a
+// collision. They are guaranteed to visit all slots as our table size is always
+// a power of two (see https://en.wikipedia.org/wiki/Quadratic_probing).
+
+// Linear probing can be faster if the hashing is well distributed and the load
+// is not high. For TraceProcessor's StringPool this is the fastest. It can
+// degenerate badly if the hashing doesn't spread (e.g., if using directly pids
+// as keys, with a no-op hashing function).
+struct LinearProbe {
+  static inline size_t Calc(size_t key_hash, size_t step, size_t capacity) {
+    return (key_hash + step) & (capacity - 1);  // Linear probe
+  }
+};
+
+// Generates the sequence: 0, 3, 10, 21, 36, 55, ...
+// Can be a bit (~5%) slower than LinearProbe because it's less cache hot, but
+// avoids degenerating badly if the hash function is bad and causes clusters.
+// A good default choice unless benchmarks prove otherwise.
+struct QuadraticProbe {
+  static inline size_t Calc(size_t key_hash, size_t step, size_t capacity) {
+    return (key_hash + 2 * step * step + step) & (capacity - 1);
+  }
+};
+
+// Tends to perform in the middle between linear and quadratic.
+// It's a bit more cache-effective than the QuadraticProbe but can create more
+// clustering if the hash function doesn't spread well.
+// Generates the sequence: 0, 1, 3, 6, 10, 15, 21, ...
+struct QuadraticHalfProbe {
+  static inline size_t Calc(size_t key_hash, size_t step, size_t capacity) {
+    return (key_hash + (step * step + step) / 2) & (capacity - 1);
+  }
+};
+
+template <typename Key,
+          typename Value,
+          typename Hasher = base::Hash<Key>,
+          typename Probe = QuadraticProbe,
+          bool AppendOnly = false>
+class FlatHashMap {
+ public:
+  class Iterator {
+   public:
+    explicit Iterator(const FlatHashMap* map) : map_(map) { FindNextNonFree(); }
+    ~Iterator() = default;
+    Iterator(const Iterator&) = default;
+    Iterator& operator=(const Iterator&) = default;
+    Iterator(Iterator&&) noexcept = default;
+    Iterator& operator=(Iterator&&) noexcept = default;
+
+    Key& key() { return map_->keys_[idx_]; }
+    Value& value() { return map_->values_[idx_]; }
+    const Key& key() const { return map_->keys_[idx_]; }
+    const Value& value() const { return map_->values_[idx_]; }
+
+    explicit operator bool() const { return idx_ != kEnd; }
+    Iterator& operator++() {
+      PERFETTO_DCHECK(idx_ < map_->capacity_);
+      ++idx_;
+      FindNextNonFree();
+      return *this;
+    }
+
+   private:
+    static constexpr size_t kEnd = std::numeric_limits<size_t>::max();
+
+    void FindNextNonFree() {
+      const auto& tags = map_->tags_;
+      for (; idx_ < map_->capacity_; idx_++) {
+        if (tags[idx_] != kFreeSlot && (AppendOnly || tags[idx_] != kTombstone))
+          return;
+      }
+      idx_ = kEnd;
+    }
+
+    const FlatHashMap* map_ = nullptr;
+    size_t idx_ = 0;
+  };  // Iterator
+
+  static constexpr int kDefaultLoadLimitPct = 75;
+  explicit FlatHashMap(size_t initial_capacity = 0,
+                       int load_limit_pct = kDefaultLoadLimitPct)
+      : load_limit_percent_(load_limit_pct) {
+    if (initial_capacity > 0)
+      Reset(initial_capacity);
+  }
+
+  // We are calling Clear() so that the destructors for the inserted entries are
+  // called (unless they are trivial, in which case it will be a no-op).
+  ~FlatHashMap() { Clear(); }
+
+  FlatHashMap(FlatHashMap&& other) noexcept {
+    tags_ = std::move(other.tags_);
+    keys_ = std::move(other.keys_);
+    values_ = std::move(other.values_);
+    capacity_ = other.capacity_;
+    size_ = other.size_;
+    max_probe_length_ = other.max_probe_length_;
+    load_limit_ = other.load_limit_;
+    load_limit_percent_ = other.load_limit_percent_;
+
+    new (&other) FlatHashMap();
+  }
+
+  FlatHashMap& operator=(FlatHashMap&& other) noexcept {
+    this->~FlatHashMap();
+    new (this) FlatHashMap(std::move(other));
+    return *this;
+  }
+
+  FlatHashMap(const FlatHashMap&) = delete;
+  FlatHashMap& operator=(const FlatHashMap&) = delete;
+
+  std::pair<Value*, bool> Insert(Key key, Value value) {
+    const size_t key_hash = Hasher{}(key);
+    const uint8_t tag = HashToTag(key_hash);
+    static constexpr size_t kSlotNotFound = std::numeric_limits<size_t>::max();
+
+    // This for loop does in reality at most two attempts:
+    // The first iteration either:
+    //  - Early-returns, because the key exists already,
+    //  - Finds an insertion slot and proceeds because the load is < limit.
+    // The second iteration is only hit in the unlikely case of this insertion
+    // bringing the table beyond the target |load_limit_| (or the edge case
+    // of the HT being full, if |load_limit_pct_| = 100).
+    // We cannot simply pre-grow the table before insertion, because we must
+    // guarantee that calling Insert() with a key that already exists doesn't
+    // invalidate iterators.
+    size_t insertion_slot;
+    size_t probe_len;
+    for (;;) {
+      PERFETTO_DCHECK((capacity_ & (capacity_ - 1)) == 0);  // Must be a pow2.
+      insertion_slot = kSlotNotFound;
+      // Start the iteration at the desired slot (key_hash % capacity_)
+      // searching either for a free slot or a tombstone. In the worst case we
+      // might end up scanning the whole array of slots. The Probe functions are
+      // guaranteed to visit all the slots within |capacity_| steps. If we find
+      // a free slot, we can stop the search immediately (a free slot acts as an
+      // "end of chain for entries having the same hash". If we find a
+      // tombstones (a deleted slot) we remember its position, but have to keep
+      // searching until a free slot to make sure we don't insert a duplicate
+      // key.
+      for (probe_len = 0; probe_len < capacity_;) {
+        const size_t idx = Probe::Calc(key_hash, probe_len, capacity_);
+        PERFETTO_DCHECK(idx < capacity_);
+        const uint8_t tag_idx = tags_[idx];
+        ++probe_len;
+        if (tag_idx == kFreeSlot) {
+          // Rationale for "insertion_slot == kSlotNotFound": if we encountered
+          // a tombstone while iterating we should reuse that rather than
+          // taking another slot.
+          if (AppendOnly || insertion_slot == kSlotNotFound)
+            insertion_slot = idx;
+          break;
+        }
+        // We should never encounter tombstones in AppendOnly mode.
+        PERFETTO_DCHECK(!(tag_idx == kTombstone && AppendOnly));
+        if (!AppendOnly && tag_idx == kTombstone) {
+          insertion_slot = idx;
+          continue;
+        }
+        if (tag_idx == tag && keys_[idx] == key) {
+          // The key is already in the map.
+          return std::make_pair(&values_[idx], false);
+        }
+      }  // for (idx)
+
+      // If we got to this point the key does not exist (otherwise we would have
+      // hit the return above) and we are going to insert a new entry.
+      // Before doing so, ensure we stay under the target load limit.
+      if (PERFETTO_UNLIKELY(size_ >= load_limit_)) {
+        MaybeGrowAndRehash(/*grow=*/true);
+        continue;
+      }
+      PERFETTO_DCHECK(insertion_slot != kSlotNotFound);
+      break;
+    }  // for (attempt)
+
+    PERFETTO_CHECK(insertion_slot < capacity_);
+
+    // We found a free slot (or a tombstone). Proceed with the insertion.
+    Value* value_idx = &values_[insertion_slot];
+    new (&keys_[insertion_slot]) Key(std::move(key));
+    new (value_idx) Value(std::move(value));
+    tags_[insertion_slot] = tag;
+    PERFETTO_DCHECK(probe_len > 0 && probe_len <= capacity_);
+    max_probe_length_ = std::max(max_probe_length_, probe_len);
+    size_++;
+
+    return std::make_pair(value_idx, true);
+  }
+
+  Value* Find(const Key& key) const {
+    const size_t idx = FindInternal(key);
+    if (idx == kNotFound)
+      return nullptr;
+    return &values_[idx];
+  }
+
+  bool Erase(const Key& key) {
+    if (AppendOnly)
+      PERFETTO_FATAL("Erase() not supported because AppendOnly=true");
+    size_t idx = FindInternal(key);
+    if (idx == kNotFound)
+      return false;
+    EraseInternal(idx);
+    return true;
+  }
+
+  void Clear() {
+    // Avoid trivial heap operations on zero-capacity std::move()-d objects.
+    if (PERFETTO_UNLIKELY(capacity_ == 0))
+      return;
+
+    for (size_t i = 0; i < capacity_; ++i) {
+      const uint8_t tag = tags_[i];
+      if (tag != kFreeSlot && tag != kTombstone)
+        EraseInternal(i);
+    }
+    // Clear all tombstones. We really need to do this for AppendOnly.
+    MaybeGrowAndRehash(/*grow=*/false);
+  }
+
+  Value& operator[](Key key) {
+    auto it_and_inserted = Insert(std::move(key), Value{});
+    return *it_and_inserted.first;
+  }
+
+  Iterator GetIterator() { return Iterator(this); }
+  const Iterator GetIterator() const { return Iterator(this); }
+
+  size_t size() const { return size_; }
+  size_t capacity() const { return capacity_; }
+
+  // "protected" here is only for the flat_hash_map_benchmark.cc. Everything
+  // below is by all means private.
+ protected:
+  enum ReservedTags : uint8_t { kFreeSlot = 0, kTombstone = 1 };
+  static constexpr size_t kNotFound = std::numeric_limits<size_t>::max();
+
+  size_t FindInternal(const Key& key) const {
+    const size_t key_hash = Hasher{}(key);
+    const uint8_t tag = HashToTag(key_hash);
+    PERFETTO_DCHECK((capacity_ & (capacity_ - 1)) == 0);  // Must be a pow2.
+    PERFETTO_DCHECK(max_probe_length_ <= capacity_);
+    for (size_t i = 0; i < max_probe_length_; ++i) {
+      const size_t idx = Probe::Calc(key_hash, i, capacity_);
+      const uint8_t tag_idx = tags_[idx];
+
+      if (tag_idx == kFreeSlot)
+        return kNotFound;
+      // HashToTag() never returns kTombstone, so the tag-check below cannot
+      // possibly match. Also we just want to skip tombstones.
+      if (tag_idx == tag && keys_[idx] == key) {
+        PERFETTO_DCHECK(tag_idx > kTombstone);
+        return idx;
+      }
+    }  // for (idx)
+    return kNotFound;
+  }
+
+  void EraseInternal(size_t idx) {
+    PERFETTO_DCHECK(tags_[idx] > kTombstone);
+    PERFETTO_DCHECK(size_ > 0);
+    tags_[idx] = kTombstone;
+    keys_[idx].~Key();
+    values_[idx].~Value();
+    size_--;
+  }
+
+  PERFETTO_NO_INLINE void MaybeGrowAndRehash(bool grow) {
+    PERFETTO_DCHECK(size_ <= capacity_);
+    const size_t old_capacity = capacity_;
+
+    // Grow quickly up to 1MB, then chill.
+    const size_t old_size_bytes = old_capacity * (sizeof(Key) + sizeof(Value));
+    const size_t grow_factor = old_size_bytes < (1024u * 1024u) ? 8 : 2;
+    const size_t new_capacity =
+        grow ? std::max(old_capacity * grow_factor, size_t(1024))
+             : old_capacity;
+
+    auto old_tags(std::move(tags_));
+    auto old_keys(std::move(keys_));
+    auto old_values(std::move(values_));
+    size_t old_size = size_;
+
+    // This must be a CHECK (i.e. not just a DCHECK) to prevent UAF attacks on
+    // 32-bit archs that try to double the size of the table until wrapping.
+    PERFETTO_CHECK(new_capacity >= old_capacity);
+    Reset(new_capacity);
+
+    size_t new_size = 0;  // Recompute the size.
+    for (size_t i = 0; i < old_capacity; ++i) {
+      const uint8_t old_tag = old_tags[i];
+      if (old_tag != kFreeSlot && old_tag != kTombstone) {
+        Insert(std::move(old_keys[i]), std::move(old_values[i]));
+        old_keys[i].~Key();  // Destroy the old objects.
+        old_values[i].~Value();
+        new_size++;
+      }
+    }
+    PERFETTO_DCHECK(new_size == old_size);
+    size_ = new_size;
+  }
+
+  // Doesn't call destructors. Use Clear() for that.
+  PERFETTO_NO_INLINE void Reset(size_t n) {
+    PERFETTO_DCHECK((n & (n - 1)) == 0);  // Must be a pow2.
+
+    capacity_ = n;
+    max_probe_length_ = 0;
+    size_ = 0;
+    load_limit_ = n * static_cast<size_t>(load_limit_percent_) / 100;
+    load_limit_ = std::min(load_limit_, n);
+
+    tags_.reset(new uint8_t[n]);
+    memset(&tags_[0], 0, n);                  // Clear all tags.
+    keys_ = AlignedAllocTyped<Key[]>(n);      // Deliberately not 0-initialized.
+    values_ = AlignedAllocTyped<Value[]>(n);  // Deliberately not 0-initialized.
+  }
+
+  static inline uint8_t HashToTag(size_t full_hash) {
+    uint8_t tag = full_hash >> (sizeof(full_hash) * 8 - 8);
+    // Ensure the hash is always >= 2. We use 0, 1 for kFreeSlot and kTombstone.
+    tag += (tag <= kTombstone) << 1;
+    PERFETTO_DCHECK(tag > kTombstone);
+    return tag;
+  }
+
+  size_t capacity_ = 0;
+  size_t size_ = 0;
+  size_t max_probe_length_ = 0;
+  size_t load_limit_ = 0;  // Updated every time |capacity_| changes.
+  int load_limit_percent_ =
+      kDefaultLoadLimitPct;  // Load factor limit in % of |capacity_|.
+
+  // These arrays have always the |capacity_| elements.
+  // Note: AlignedUniquePtr just allocates memory, doesn't invoke any ctor/dtor.
+  std::unique_ptr<uint8_t[]> tags_;
+  AlignedUniquePtr<Key[]> keys_;
+  AlignedUniquePtr<Value[]> values_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_FLAT_HASH_MAP_H_
diff --git a/src/libtracing/perfetto/ext/base/getopt.h b/src/libtracing/perfetto/ext/base/getopt.h
new file mode 100644
index 000000000..bf993fc1f
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/getopt.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_GETOPT_H_
+#define INCLUDE_PERFETTO_EXT_BASE_GETOPT_H_
+
+// This is the header that should be included in all places that need getopt.h.
+// This either routes on the sysroot getopt.h, for OSes that have one (all but
+// Windows) or routes on the home-brewed getopt_compat.h.
+
+#include "perfetto/base/build_config.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+#include "perfetto/ext/base/getopt_compat.h"
+
+// getopt_compat.h puts everything in a nested namespace, to allow
+// getopt_compat_unittest.cc to use both <getopt.h> and "getopt_compat.h"
+// without collisions.
+
+// Here we expose them into the root namespace, because we want offer a drop-in
+// replacement to the various main.cc, which can't know about the nested
+// namespace.
+using ::perfetto::base::getopt_compat::optarg;
+using ::perfetto::base::getopt_compat::opterr;
+using ::perfetto::base::getopt_compat::optind;
+using ::perfetto::base::getopt_compat::option;
+using ::perfetto::base::getopt_compat::optopt;
+constexpr auto getopt = ::perfetto::base::getopt_compat::getopt;
+constexpr auto getopt_long = ::perfetto::base::getopt_compat::getopt_long;
+constexpr auto no_argument = ::perfetto::base::getopt_compat::no_argument;
+constexpr auto required_argument =
+    ::perfetto::base::getopt_compat::required_argument;
+
+#else
+#include <getopt.h>
+#endif
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_GETOPT_H_
diff --git a/src/libtracing/perfetto/ext/base/getopt_compat.h b/src/libtracing/perfetto/ext/base/getopt_compat.h
new file mode 100644
index 000000000..d854ff022
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/getopt_compat.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_GETOPT_COMPAT_H_
+#define INCLUDE_PERFETTO_EXT_BASE_GETOPT_COMPAT_H_
+
+#include <cstddef>  // For std::nullptr_t
+
+// No translation units other than base/getopt.h and getopt_compat_unittest.cc
+// should directly include this file. Use base/getopt.h instead.
+
+namespace perfetto {
+namespace base {
+namespace getopt_compat {
+
+// A tiny getopt() replacement for Windows, which doesn't have <getopt.h>.
+// This implementation is based on the subset of features that we use in the
+// Perfetto codebase. It doesn't even try to deal with the full surface of GNU's
+// getopt().
+// Limitations:
+// - getopt_long_only() is not supported.
+// - optional_argument is not supported. That is extremely subtle and caused us
+//   problems in the past with GNU's getopt.
+// - It does not reorder non-option arguments. It behaves like MacOS getopt, or
+//   GNU's when POSIXLY_CORRECT=1.
+// - Doesn't expose optopt or opterr.
+// - option.flag and longindex are not supported and must be nullptr.
+
+enum {
+  no_argument = 0,
+  required_argument = 1,
+};
+
+struct option {
+  const char* name;
+  int has_arg;
+  std::nullptr_t flag;  // Only nullptr is supported.
+  int val;
+};
+
+extern char* optarg;
+extern int optind;
+extern int optopt;
+extern int opterr;
+
+int getopt_long(int argc,
+                char** argv,
+                const char* shortopts,
+                const option* longopts,
+                std::nullptr_t /*longindex is not supported*/);
+
+int getopt(int argc, char** argv, const char* shortopts);
+
+}  // namespace getopt_compat
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_GETOPT_COMPAT_H_
diff --git a/src/libtracing/perfetto/ext/base/hash.h b/src/libtracing/perfetto/ext/base/hash.h
new file mode 100644
index 000000000..548003efc
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/hash.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_HASH_H_
+#define INCLUDE_PERFETTO_EXT_BASE_HASH_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+namespace perfetto {
+namespace base {
+
+// A helper class which computes a 64-bit hash of the input data.
+// The algorithm used is FNV-1a as it is fast and easy to implement and has
+// relatively few collisions.
+// WARNING: This hash function should not be used for any cryptographic purpose.
+class Hasher {
+ public:
+  // Creates an empty hash object
+  Hasher() {}
+
+  // Hashes a numeric value.
+  template <
+      typename T,
+      typename std::enable_if<std::is_arithmetic<T>::value, bool>::type = true>
+  void Update(T data) {
+    Update(reinterpret_cast<const char*>(&data), sizeof(data));
+  }
+
+  // Using the loop instead of "Update(str, strlen(str))" to avoid looping twice
+  void Update(const char* str) {
+    for (const auto* p = str; *p; ++p)
+      Update(*p);
+  }
+
+  // Hashes a byte array.
+  void Update(const char* data, size_t size) {
+    for (size_t i = 0; i < size; i++) {
+      result_ ^= static_cast<uint8_t>(data[i]);
+      // Note: Arithmetic overflow of unsigned integers is well defined in C++
+      // standard unlike signed integers.
+      // https://stackoverflow.com/a/41280273
+      result_ *= kFnv1a64Prime;
+    }
+  }
+
+  // Allow hashing anything that has a |data| field, a |size| field,
+  // and has the kHashable trait (e.g., base::StringView).
+  template <typename T, typename = std::enable_if<T::kHashable>>
+  void Update(const T& t) {
+    Update(t.data(), t.size());
+  }
+
+  void Update(const std::string& s) { Update(s.data(), s.size()); }
+
+  uint64_t digest() const { return result_; }
+
+  // Usage:
+  // uint64_t hashed_value = Hash::Combine(33, false, "ABC", 458L, 3u, 'x');
+  template <typename... Ts>
+  static uint64_t Combine(Ts&&... args) {
+    Hasher hasher;
+    hasher.UpdateAll(std::forward<Ts>(args)...);
+    return hasher.digest();
+  }
+
+  // `hasher.UpdateAll(33, false, "ABC")` is shorthand for:
+  // `hasher.Update(33); hasher.Update(false); hasher.Update("ABC");`
+  void UpdateAll() {}
+
+  template <typename T, typename... Ts>
+  void UpdateAll(T&& arg, Ts&&... args) {
+    Update(arg);
+    UpdateAll(std::forward<Ts>(args)...);
+  }
+
+ private:
+  static constexpr uint64_t kFnv1a64OffsetBasis = 0xcbf29ce484222325;
+  static constexpr uint64_t kFnv1a64Prime = 0x100000001b3;
+
+  uint64_t result_ = kFnv1a64OffsetBasis;
+};
+
+// This is for using already-hashed key into std::unordered_map and avoid the
+// cost of re-hashing. Example:
+// unordered_map<uint64_t, Value, AlreadyHashed> my_map.
+template <typename T>
+struct AlreadyHashed {
+  size_t operator()(const T& x) const { return static_cast<size_t>(x); }
+};
+
+// base::Hash uses base::Hasher for integer values and falls base to std::hash
+// for other types. This is needed as std::hash for integers is just the
+// identity function and Perfetto uses open-addressing hash table, which are
+// very sensitive to hash quality and are known to degrade in performance
+// when using std::hash.
+template <typename T>
+struct Hash {
+  // Version for ints, using base::Hasher.
+  template <typename U = T>
+  auto operator()(const U& x) ->
+      typename std::enable_if<std::is_arithmetic<U>::value, size_t>::type
+      const {
+    Hasher hash;
+    hash.Update(x);
+    return static_cast<size_t>(hash.digest());
+  }
+
+  // Version for non-ints, falling back to std::hash.
+  template <typename U = T>
+  auto operator()(const U& x) ->
+      typename std::enable_if<!std::is_arithmetic<U>::value, size_t>::type
+      const {
+    return std::hash<U>()(x);
+  }
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_HASH_H_
diff --git a/src/libtracing/perfetto/ext/base/http/BUILD.gn b/src/libtracing/perfetto/ext/base/http/BUILD.gn
new file mode 100644
index 000000000..3e4260777
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/http/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("http") {
+  sources = [
+    "http_server.h",
+    "sha1.h",
+  ]
+  public_deps = [ "..:base" ]
+}
diff --git a/src/libtracing/perfetto/ext/base/http/http_server.h b/src/libtracing/perfetto/ext/base/http/http_server.h
new file mode 100644
index 000000000..2fe563bde
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/http/http_server.h
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_HTTP_HTTP_SERVER_H_
+#define INCLUDE_PERFETTO_EXT_BASE_HTTP_HTTP_SERVER_H_
+
+#include <array>
+#include <initializer_list>
+#include <list>
+#include <memory>
+#include <optional>
+#include <string>
+
+#include "perfetto/base/task_runner.h"
+#include "perfetto/ext/base/paged_memory.h"
+#include "perfetto/ext/base/string_view.h"
+#include "perfetto/ext/base/unix_socket.h"
+
+namespace perfetto {
+namespace base {
+
+class HttpServerConnection;
+
+struct HttpRequest {
+  explicit HttpRequest(HttpServerConnection* c) : conn(c) {}
+
+  std::optional<StringView> GetHeader(StringView name) const;
+
+  HttpServerConnection* conn;
+
+  // These StringViews point to memory in the rxbuf owned by |conn|. They are
+  // valid only within the OnHttpRequest() call.
+  StringView method;
+  StringView uri;
+  StringView origin;
+  StringView body;
+  bool is_websocket_handshake = false;
+
+ private:
+  friend class HttpServer;
+  struct Header {
+    StringView name;
+    StringView value;
+  };
+
+  static constexpr uint32_t kMaxHeaders = 32;
+  std::array<Header, kMaxHeaders> headers{};
+  size_t num_headers = 0;
+};
+
+struct WebsocketMessage {
+  explicit WebsocketMessage(HttpServerConnection* c) : conn(c) {}
+
+  HttpServerConnection* conn;
+
+  // Note: message boundaries are not respected in case of fragmentation.
+  // This websocket implementation preserves only the byte stream, but not the
+  // atomicity of inbound messages (like SOCK_STREAM, unlike SOCK_DGRAM).
+  // Holds onto the connection's |rxbuf|. This is valid only within the scope
+  // of the OnWebsocketMessage() callback.
+  StringView data;
+
+  // If false the payload contains binary data. If true it's supposed to contain
+  // text. Note that there is no guarantee this will be the case. This merely
+  // reflect the opcode that the client sets on each message.
+  bool is_text = false;
+};
+
+class HttpServerConnection {
+ public:
+  static constexpr size_t kOmitContentLength = static_cast<size_t>(-1);
+
+  explicit HttpServerConnection(std::unique_ptr<UnixSocket>);
+  ~HttpServerConnection();
+
+  void SendResponseHeaders(const char* http_code,
+                           std::initializer_list<const char*> headers = {},
+                           size_t content_length = 0);
+
+  // Works also for websockets.
+  void SendResponseBody(const void* content, size_t content_length);
+  void Close();
+
+  // All the above in one shot.
+  void SendResponse(const char* http_code,
+                    std::initializer_list<const char*> headers = {},
+                    StringView content = {},
+                    bool force_close = false);
+  void SendResponseAndClose(const char* http_code,
+                            std::initializer_list<const char*> headers = {},
+                            StringView content = {}) {
+    SendResponse(http_code, headers, content, true);
+  }
+
+  // The metods below are only valid for websocket connections.
+
+  // Upgrade an existing connection to a websocket. This can be called only in
+  // the context of OnHttpRequest(req) if req.is_websocket_handshake == true.
+  // If the origin is not in the |allowed_origins_|, the request will fail with
+  // a 403 error (this is because there is no browser-side CORS support for
+  // websockets).
+  void UpgradeToWebsocket(const HttpRequest&);
+  void SendWebsocketMessage(const void* data, size_t len);
+  void SendWebsocketMessage(StringView sv) {
+    SendWebsocketMessage(sv.data(), sv.size());
+  }
+  void SendWebsocketFrame(uint8_t opcode,
+                          const void* payload,
+                          size_t payload_len);
+
+  bool is_websocket() const { return is_websocket_; }
+
+ private:
+  friend class HttpServer;
+
+  size_t rxbuf_avail() { return rxbuf.size() - rxbuf_used; }
+
+  std::unique_ptr<UnixSocket> sock;
+  PagedMemory rxbuf;
+  size_t rxbuf_used = 0;
+  bool is_websocket_ = false;
+  bool headers_sent_ = false;
+  size_t content_len_headers_ = 0;
+  size_t content_len_actual_ = 0;
+
+  // If the origin is in the server's |allowed_origins_| this contains the
+  // origin itself. This is used to handle CORS headers.
+  std::string origin_allowed_;
+
+  // By default treat connections as keep-alive unless the client says
+  // explicitly 'Connection: close'. This improves TraceProcessor's python API.
+  // This is consistent with that nginx does.
+  bool keepalive_ = true;
+};
+
+class HttpRequestHandler {
+ public:
+  virtual ~HttpRequestHandler();
+  virtual void OnHttpRequest(const HttpRequest&) = 0;
+  virtual void OnWebsocketMessage(const WebsocketMessage&);
+  virtual void OnHttpConnectionClosed(HttpServerConnection*);
+};
+
+class HttpServer : public UnixSocket::EventListener {
+ public:
+  HttpServer(TaskRunner*, HttpRequestHandler*);
+  ~HttpServer() override;
+  void Start(int port);
+  void AddAllowedOrigin(const std::string&);
+
+ private:
+  size_t ParseOneHttpRequest(HttpServerConnection*);
+  size_t ParseOneWebsocketFrame(HttpServerConnection*);
+  void HandleCorsPreflightRequest(const HttpRequest&);
+  bool IsOriginAllowed(StringView);
+
+  // UnixSocket::EventListener implementation.
+  void OnNewIncomingConnection(UnixSocket*,
+                               std::unique_ptr<UnixSocket>) override;
+  void OnConnect(UnixSocket* self, bool connected) override;
+  void OnDisconnect(UnixSocket* self) override;
+  void OnDataAvailable(UnixSocket* self) override;
+
+  TaskRunner* const task_runner_;
+  HttpRequestHandler* req_handler_;
+  std::unique_ptr<UnixSocket> sock4_;
+  std::unique_ptr<UnixSocket> sock6_;
+  std::list<HttpServerConnection> clients_;
+  std::list<std::string> allowed_origins_;
+  bool origin_error_logged_ = false;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_HTTP_HTTP_SERVER_H_
diff --git a/src/libtracing/perfetto/ext/base/http/sha1.h b/src/libtracing/perfetto/ext/base/http/sha1.h
new file mode 100644
index 000000000..90b54e7a6
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/http/sha1.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_HTTP_SHA1_H_
+#define INCLUDE_PERFETTO_EXT_BASE_HTTP_SHA1_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <string>
+
+namespace perfetto {
+namespace base {
+
+constexpr size_t kSHA1Length = 20;
+using SHA1Digest = std::array<uint8_t, kSHA1Length>;
+
+SHA1Digest SHA1Hash(const std::string& str);
+SHA1Digest SHA1Hash(const void* data, size_t size);
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_HTTP_SHA1_H_
diff --git a/src/libtracing/perfetto/ext/base/metatrace.h b/src/libtracing/perfetto/ext/base/metatrace.h
new file mode 100644
index 000000000..59b8b3fe6
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/metatrace.h
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_METATRACE_H_
+#define INCLUDE_PERFETTO_EXT_BASE_METATRACE_H_
+
+#include <array>
+#include <atomic>
+#include <functional>
+#include <string>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/base/thread_utils.h"
+#include "perfetto/base/time.h"
+#include "perfetto/ext/base/metatrace_events.h"
+#include "perfetto/ext/base/utils.h"
+
+// A facility to trace execution of the perfetto codebase itself.
+// The meta-tracing framework is organized into three layers:
+//
+// 1. A static ring-buffer in base/ (this file) that supports concurrent writes
+//    and a single reader.
+//    The responsibility of this layer is to store events and counters as
+//    efficiently as possible without re-entering any tracing code.
+//    This is really a static-storage-based ring-buffer based on a POD array.
+//    This layer does NOT deal with serializing the meta-trace buffer.
+//    It posts a task when it's half full and expects something outside of
+//    base/ to drain the ring-buffer and serialize it, eventually writing it
+//    into the trace itself, before it gets 100% full.
+//
+// 2. A class in tracing/core which takes care of serializing the meta-trace
+//    buffer into the trace using a TraceWriter. See metatrace_writer.h .
+//
+// 3. A data source in traced_probes that, when be enabled via the trace config,
+//    injects metatrace events into the trace. See metatrace_data_source.h .
+//
+// The available events and tags are defined in metatrace_events.h .
+
+namespace perfetto {
+
+namespace base {
+class TaskRunner;
+}  // namespace base
+
+namespace metatrace {
+
+// Meta-tracing is organized in "tags" that can be selectively enabled. This is
+// to enable meta-tracing only of one sub-system. This word has one "enabled"
+// bit for each tag. 0 -> meta-tracing off.
+extern std::atomic<uint32_t> g_enabled_tags;
+
+// Time of the Enable() call. Used as a reference for keeping delta timestmaps
+// in Record.
+extern std::atomic<uint64_t> g_enabled_timestamp;
+
+// Enables meta-tracing for one or more tags. Once enabled it will discard any
+// further Enable() calls and return false until disabled,
+// |read_task| is a closure that will be called enqueued |task_runner| when the
+// meta-tracing ring buffer is half full. The task is expected to read the ring
+// buffer using RingBuffer::GetReadIterator() and serialize the contents onto a
+// file or into the trace itself.
+// Must be called on the |task_runner| passed.
+// |task_runner| must have static lifetime.
+bool Enable(std::function<void()> read_task, base::TaskRunner*, uint32_t tags);
+
+// Disables meta-tracing.
+// Must be called on the same |task_runner| as Enable().
+void Disable();
+
+inline uint64_t TraceTimeNowNs() {
+  return static_cast<uint64_t>(base::GetBootTimeNs().count());
+}
+
+// Returns a relaxed view of whether metatracing is enabled for the given tag.
+// Useful for skipping unnecessary argument computation if metatracing is off.
+inline bool IsEnabled(uint32_t tag) {
+  auto enabled_tags = g_enabled_tags.load(std::memory_order_relaxed);
+  return PERFETTO_UNLIKELY((enabled_tags & tag) != 0);
+}
+
+// Holds the data for a metatrace event or counter.
+struct Record {
+  static constexpr uint16_t kTypeMask = 0x8000;
+  static constexpr uint16_t kTypeCounter = 0x8000;
+  static constexpr uint16_t kTypeEvent = 0;
+
+  uint64_t timestamp_ns() const {
+    auto base_ns = g_enabled_timestamp.load(std::memory_order_relaxed);
+    PERFETTO_DCHECK(base_ns);
+    return base_ns + ((static_cast<uint64_t>(timestamp_ns_high) << 32) |
+                      timestamp_ns_low);
+  }
+
+  void set_timestamp(uint64_t ts) {
+    auto t_start = g_enabled_timestamp.load(std::memory_order_relaxed);
+    uint64_t diff = ts - t_start;
+    PERFETTO_DCHECK(diff < (1ull << 48));
+    timestamp_ns_low = static_cast<uint32_t>(diff);
+    timestamp_ns_high = static_cast<uint16_t>(diff >> 32);
+  }
+
+  // We can't just memset() this class because on MSVC std::atomic<> is not
+  // trivially constructible anymore. Also std::atomic<> has a deleted copy
+  // constructor so we cant just do "*this = Record()" either.
+  // See http://bit.ly/339Jlzd .
+  void clear() {
+    this->~Record();
+    new (this) Record();
+  }
+
+  // This field holds the type (counter vs event) in the MSB and event ID (as
+  // defined in metatrace_events.h) in the lowest 15 bits. It is also used also
+  // as a linearization point: this is always written after all the other
+  // fields with a release-store. This is so the reader can determine whether it
+  // can safely process the other event fields after a load-acquire.
+  std::atomic<uint16_t> type_and_id{};
+
+  // Timestamp is stored as a 48-bits value diffed against g_enabled_timestamp.
+  // This gives us 78 hours from Enabled().
+  uint16_t timestamp_ns_high = 0;
+  uint32_t timestamp_ns_low = 0;
+
+  uint32_t thread_id = 0;
+
+  union {
+    // Only one of the two elements can be zero initialized, clang complains
+    // about "initializing multiple members of union" otherwise.
+    uint32_t duration_ns = 0;  // If type == event.
+    int32_t counter_value;     // If type == counter.
+  };
+};
+
+// Hold the meta-tracing data into a statically allocated array.
+// This class uses static storage (as opposite to being a singleton) to:
+// - Have the guarantee of always valid storage, so that meta-tracing can be
+//   safely used in any part of the codebase, including base/ itself.
+// - Avoid barriers that thread-safe static locals would require.
+class RingBuffer {
+ public:
+  static constexpr size_t kCapacity = 4096;  // 4096 * 16 bytes = 64K.
+
+  // This iterator is not idempotent and will bump the read index in the buffer
+  // at the end of the reads. There can be only one reader at any time.
+  // Usage: for (auto it = RingBuffer::GetReadIterator(); it; ++it) { it->... }
+  class ReadIterator {
+   public:
+    ReadIterator(ReadIterator&& other) {
+      PERFETTO_DCHECK(other.valid_);
+      cur_ = other.cur_;
+      end_ = other.end_;
+      valid_ = other.valid_;
+      other.valid_ = false;
+    }
+
+    ~ReadIterator() {
+      if (!valid_)
+        return;
+      PERFETTO_DCHECK(cur_ >= RingBuffer::rd_index_);
+      PERFETTO_DCHECK(cur_ <= RingBuffer::wr_index_);
+      RingBuffer::rd_index_.store(cur_, std::memory_order_release);
+    }
+
+    explicit operator bool() const { return cur_ < end_; }
+    const Record* operator->() const { return RingBuffer::At(cur_); }
+    const Record& operator*() const { return *operator->(); }
+
+    // This is for ++it. it++ is deliberately not supported.
+    ReadIterator& operator++() {
+      PERFETTO_DCHECK(cur_ < end_);
+      // Once a record has been read, mark it as free clearing its type_and_id,
+      // so if we encounter it in another read iteration while being written
+      // we know it's not fully written yet.
+      // The memory_order_relaxed below is enough because:
+      // - The reader is single-threaded and doesn't re-read the same records.
+      // - Before starting a read batch, the reader has an acquire barrier on
+      //   |rd_index_|.
+      // - After terminating a read batch, the ~ReadIterator dtor updates the
+      //   |rd_index_| with a release-store.
+      // - Reader and writer are typically kCapacity/2 apart. So unless an
+      //   overrun happens a writer won't reuse a newly released record any time
+      //   soon. If an overrun happens, everything is busted regardless.
+      At(cur_)->type_and_id.store(0, std::memory_order_relaxed);
+      ++cur_;
+      return *this;
+    }
+
+   private:
+    friend class RingBuffer;
+    ReadIterator(uint64_t begin, uint64_t end)
+        : cur_(begin), end_(end), valid_(true) {}
+    ReadIterator& operator=(const ReadIterator&) = delete;
+    ReadIterator(const ReadIterator&) = delete;
+
+    uint64_t cur_;
+    uint64_t end_;
+    bool valid_;
+  };
+
+  static Record* At(uint64_t index) {
+    // Doesn't really have to be pow2, but if not the compiler will emit
+    // arithmetic operations to compute the modulo instead of a bitwise AND.
+    static_assert(!(kCapacity & (kCapacity - 1)), "kCapacity must be pow2");
+    PERFETTO_DCHECK(index >= rd_index_);
+    PERFETTO_DCHECK(index <= wr_index_);
+    return &records_[index % kCapacity];
+  }
+
+  // Must be called on the same task runner passed to Enable()
+  static ReadIterator GetReadIterator() {
+    PERFETTO_DCHECK(RingBuffer::IsOnValidTaskRunner());
+    return ReadIterator(rd_index_.load(std::memory_order_acquire),
+                        wr_index_.load(std::memory_order_acquire));
+  }
+
+  static Record* AppendNewRecord();
+  static void Reset();
+
+  static bool has_overruns() {
+    return has_overruns_.load(std::memory_order_acquire);
+  }
+
+  // Can temporarily return a value >= kCapacity but is eventually consistent.
+  // This would happen in case of overruns until threads hit the --wr_index_
+  // in AppendNewRecord().
+  static uint64_t GetSizeForTesting() {
+    auto wr_index = wr_index_.load(std::memory_order_relaxed);
+    auto rd_index = rd_index_.load(std::memory_order_relaxed);
+    PERFETTO_DCHECK(wr_index >= rd_index);
+    return wr_index - rd_index;
+  }
+
+ private:
+  friend class ReadIterator;
+
+  // Returns true if the caller is on the task runner passed to Enable().
+  // Used only for DCHECKs.
+  static bool IsOnValidTaskRunner();
+
+  static std::array<Record, kCapacity> records_;
+  static std::atomic<bool> read_task_queued_;
+  static std::atomic<uint64_t> wr_index_;
+  static std::atomic<uint64_t> rd_index_;
+  static std::atomic<bool> has_overruns_;
+  static Record bankruptcy_record_;  // Used in case of overruns.
+};
+
+inline void TraceCounter(uint32_t tag, uint16_t id, int32_t value) {
+  // memory_order_relaxed is okay because the storage has static lifetime.
+  // It is safe to accidentally log an event soon after disabling.
+  auto enabled_tags = g_enabled_tags.load(std::memory_order_relaxed);
+  if (PERFETTO_LIKELY((enabled_tags & tag) == 0))
+    return;
+  Record* record = RingBuffer::AppendNewRecord();
+  record->thread_id = static_cast<uint32_t>(base::GetThreadId());
+  record->set_timestamp(TraceTimeNowNs());
+  record->counter_value = value;
+  record->type_and_id.store(Record::kTypeCounter | id,
+                            std::memory_order_release);
+}
+
+class ScopedEvent {
+ public:
+  ScopedEvent(uint32_t tag, uint16_t event_id) {
+    auto enabled_tags = g_enabled_tags.load(std::memory_order_relaxed);
+    if (PERFETTO_LIKELY((enabled_tags & tag) == 0))
+      return;
+    event_id_ = event_id;
+    record_ = RingBuffer::AppendNewRecord();
+    record_->thread_id = static_cast<uint32_t>(base::GetThreadId());
+    record_->set_timestamp(TraceTimeNowNs());
+  }
+
+  ~ScopedEvent() {
+    if (PERFETTO_LIKELY(!record_))
+      return;
+    auto now = TraceTimeNowNs();
+    record_->duration_ns = static_cast<uint32_t>(now - record_->timestamp_ns());
+    record_->type_and_id.store(Record::kTypeEvent | event_id_,
+                               std::memory_order_release);
+  }
+
+ private:
+  Record* record_ = nullptr;
+  uint16_t event_id_ = 0;
+  ScopedEvent(const ScopedEvent&) = delete;
+  ScopedEvent& operator=(const ScopedEvent&) = delete;
+};
+
+// Boilerplate to derive a unique variable name for the event.
+#define PERFETTO_METATRACE_UID2(a, b) a##b
+#define PERFETTO_METATRACE_UID(x) PERFETTO_METATRACE_UID2(metatrace_, x)
+
+#define PERFETTO_METATRACE_SCOPED(TAG, ID)                                \
+  ::perfetto::metatrace::ScopedEvent PERFETTO_METATRACE_UID(__COUNTER__)( \
+      ::perfetto::metatrace::TAG, ::perfetto::metatrace::ID)
+
+#define PERFETTO_METATRACE_COUNTER(TAG, ID, VALUE)                \
+  ::perfetto::metatrace::TraceCounter(::perfetto::metatrace::TAG, \
+                                      ::perfetto::metatrace::ID,  \
+                                      static_cast<int32_t>(VALUE))
+
+}  // namespace metatrace
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_METATRACE_H_
diff --git a/src/libtracing/perfetto/ext/base/metatrace_events.h b/src/libtracing/perfetto/ext/base/metatrace_events.h
new file mode 100644
index 000000000..ff87aea0e
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/metatrace_events.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_METATRACE_EVENTS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_METATRACE_EVENTS_H_
+
+#include <stdint.h>
+
+namespace perfetto {
+namespace metatrace {
+
+enum Tags : uint32_t {
+  TAG_NONE = 0,
+  TAG_ANY = uint32_t(-1),
+  TAG_FTRACE = 1 << 0,
+  TAG_PROC_POLLERS = 1 << 1,
+  TAG_TRACE_WRITER = 1 << 2,
+  TAG_TRACE_SERVICE = 1 << 3,
+  TAG_PRODUCER = 1 << 4,
+};
+
+// The macros below generate matching enums and arrays of string literals.
+// This is to avoid maintaining string maps manually.
+
+// clang-format off
+
+// DO NOT remove or reshuffle items in this list, only append. The ID of these
+// events are an ABI, the trace processor relies on these to open old traces.
+#define PERFETTO_METATRACE_EVENTS(F) \
+  F(EVENT_ZERO_UNUSED), \
+  F(FTRACE_CPU_READER_READ), /*unused*/ \
+  F(FTRACE_DRAIN_CPUS), /*unused*/ \
+  F(FTRACE_UNBLOCK_READERS), /*unused*/ \
+  F(FTRACE_CPU_READ_NONBLOCK), /*unused*/ \
+  F(FTRACE_CPU_READ_BLOCK), /*unused*/ \
+  F(FTRACE_CPU_SPLICE_NONBLOCK), /*unused*/ \
+  F(FTRACE_CPU_SPLICE_BLOCK), /*unused*/ \
+  F(FTRACE_CPU_WAIT_CMD), /*unused*/ \
+  F(FTRACE_CPU_RUN_CYCLE), /*unused*/ \
+  F(FTRACE_CPU_FLUSH), \
+  F(FTRACE_CPU_BUFFER_WATERMARK), \
+  F(READ_SYS_STATS), \
+  F(PS_WRITE_ALL_PROCESSES), \
+  F(PS_ON_PIDS), \
+  F(PS_ON_RENAME_PIDS), \
+  F(PS_WRITE_ALL_PROCESS_STATS), \
+  F(TRACE_WRITER_COMMIT_STARTUP_WRITER_BATCH), \
+  F(FTRACE_READ_TICK), \
+  F(FTRACE_CPU_READ_CYCLE), \
+  F(FTRACE_CPU_READ_BATCH), \
+  F(KALLSYMS_PARSE), \
+  F(PROFILER_READ_TICK), \
+  F(PROFILER_READ_CPU), \
+  F(PROFILER_UNWIND_TICK), \
+  F(PROFILER_UNWIND_SAMPLE), \
+  F(PROFILER_UNWIND_INITIAL_ATTEMPT), \
+  F(PROFILER_UNWIND_ATTEMPT), \
+  F(PROFILER_MAPS_PARSE), \
+  F(PROFILER_MAPS_REPARSE), \
+  F(PROFILER_UNWIND_CACHE_CLEAR)
+
+// Append only, see above.
+//
+// Values that aren't used as counters:
+// * FTRACE_SERVICE_COMMIT_DATA is a bit-packed representation of an event, see
+//   tracing_service_impl.cc for the format.
+// * PROFILER_UNWIND_CURRENT_PID represents the PID that is being unwound.
+//
+#define PERFETTO_METATRACE_COUNTERS(F) \
+  F(COUNTER_ZERO_UNUSED),\
+  F(FTRACE_PAGES_DRAINED), \
+  F(PS_PIDS_SCANNED), \
+  F(TRACE_SERVICE_COMMIT_DATA), \
+  F(PROFILER_UNWIND_QUEUE_SZ), \
+  F(PROFILER_UNWIND_CURRENT_PID)
+
+// clang-format on
+
+#define PERFETTO_METATRACE_IDENTITY(name) name
+#define PERFETTO_METATRACE_TOSTRING(name) #name
+
+enum Events : uint16_t {
+  PERFETTO_METATRACE_EVENTS(PERFETTO_METATRACE_IDENTITY),
+  EVENTS_MAX
+};
+constexpr char const* kEventNames[] = {
+    PERFETTO_METATRACE_EVENTS(PERFETTO_METATRACE_TOSTRING)};
+
+enum Counters : uint16_t {
+  PERFETTO_METATRACE_COUNTERS(PERFETTO_METATRACE_IDENTITY),
+  COUNTERS_MAX
+};
+constexpr char const* kCounterNames[] = {
+    PERFETTO_METATRACE_COUNTERS(PERFETTO_METATRACE_TOSTRING)};
+
+inline void SuppressUnusedVarsInAmalgamatedBuild() {
+  (void)kCounterNames;
+  (void)kEventNames;
+}
+
+}  // namespace metatrace
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_METATRACE_EVENTS_H_
diff --git a/src/libtracing/perfetto/ext/base/no_destructor.h b/src/libtracing/perfetto/ext/base/no_destructor.h
new file mode 100644
index 000000000..b4e72f24c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/no_destructor.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_NO_DESTRUCTOR_H_
+#define INCLUDE_PERFETTO_EXT_BASE_NO_DESTRUCTOR_H_
+
+#include <new>
+#include <utility>
+
+namespace perfetto {
+namespace base {
+
+// Wrapper that can hold an object of type T, without invoking the contained
+// object's destructor when being destroyed. Useful for creating statics while
+// avoiding static destructors.
+//
+// Stores the object inline, and therefore doesn't incur memory allocation and
+// pointer indirection overheads.
+//
+// Example of use:
+//
+//   const std::string& GetStr() {
+//     static base::NoDestructor<std::string> s("hello");
+//     return s.ref();
+//   }
+//
+template <typename T>
+class NoDestructor {
+ public:
+  // Forward arguments to T's constructor. Note that this doesn't cover
+  // construction from initializer lists.
+  template <typename... Args>
+  explicit NoDestructor(Args&&... args) {
+    new (storage_) T(std::forward<Args>(args)...);
+  }
+
+  NoDestructor(const NoDestructor&) = delete;
+  NoDestructor& operator=(const NoDestructor&) = delete;
+  NoDestructor(NoDestructor&&) = delete;
+  NoDestructor& operator=(NoDestructor&&) = delete;
+
+  ~NoDestructor() = default;
+
+  /* To avoid type-punned pointer strict aliasing warnings on GCC6 and below
+   * these need to be split over two lines. If they are collapsed onto one line.
+   *   return reinterpret_cast<const T*>(storage_);
+   * The error fires.
+   */
+  const T& ref() const {
+    auto* const cast = reinterpret_cast<const T*>(storage_);
+    return *cast;
+  }
+  T& ref() {
+    auto* const cast = reinterpret_cast<T*>(storage_);
+    return *cast;
+  }
+
+ private:
+  alignas(T) char storage_[sizeof(T)];
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_NO_DESTRUCTOR_H_
diff --git a/src/libtracing/perfetto/ext/base/paged_memory.h b/src/libtracing/perfetto/ext/base/paged_memory.h
new file mode 100644
index 000000000..e90797610
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/paged_memory.h
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_PAGED_MEMORY_H_
+#define INCLUDE_PERFETTO_EXT_BASE_PAGED_MEMORY_H_
+
+#include <cstddef>
+#include <memory>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/ext/base/container_annotations.h"
+
+// We need to track the committed size on windows and when ASAN is enabled.
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) || defined(ADDRESS_SANITIZER)
+#define TRACK_COMMITTED_SIZE() 1
+#else
+#define TRACK_COMMITTED_SIZE() 0
+#endif
+
+namespace perfetto {
+namespace base {
+
+class PagedMemory {
+ public:
+  // Initializes an invalid PagedMemory pointing to nullptr.
+  PagedMemory();
+
+  ~PagedMemory();
+
+  PagedMemory(PagedMemory&& other) noexcept;
+  PagedMemory& operator=(PagedMemory&& other);
+
+  enum AllocationFlags {
+    // By default, Allocate() crashes if the underlying mmap fails (e.g., if out
+    // of virtual address space). When this flag is provided, an invalid
+    // PagedMemory pointing to nullptr is returned in this case instead.
+    kMayFail = 1 << 0,
+
+    // By default, Allocate() commits the allocated memory immediately. When
+    // this flag is provided, the memory virtual address space may only be
+    // reserved and the user should call EnsureCommitted() before writing to
+    // memory addresses.
+    kDontCommit = 1 << 1,
+  };
+
+  // Allocates |size| bytes using mmap(MAP_ANONYMOUS). The returned memory is
+  // guaranteed to be page-aligned and guaranteed to be zeroed.
+  // For |flags|, see the AllocationFlags enum above.
+  static PagedMemory Allocate(size_t size, int flags = 0);
+
+  // Hint to the OS that the memory range is not needed and can be discarded.
+  // The memory remains accessible and its contents may be retained, or they
+  // may be zeroed. This function may be a NOP on some platforms. Returns true
+  // if implemented.
+  bool AdviseDontNeed(void* p, size_t size);
+
+  // Ensures that at least the first |committed_size| bytes of the allocated
+  // memory region are committed. The implementation may commit memory in larger
+  // chunks above |committed_size|. Crashes if the memory couldn't be committed.
+#if TRACK_COMMITTED_SIZE()
+  void EnsureCommitted(size_t committed_size);
+#else   // TRACK_COMMITTED_SIZE()
+  void EnsureCommitted(size_t /*committed_size*/) {}
+#endif  // TRACK_COMMITTED_SIZE()
+
+  inline void* Get() const noexcept { return p_; }
+  inline bool IsValid() const noexcept { return !!p_; }
+  inline size_t size() const noexcept { return size_; }
+
+ private:
+  PagedMemory(char* p, size_t size);
+
+  PagedMemory(const PagedMemory&) = delete;
+  // Defaulted for implementation of move constructor + assignment.
+  PagedMemory& operator=(const PagedMemory&) = default;
+
+  char* p_ = nullptr;
+
+  // The size originally passed to Allocate(). The actual virtual memory
+  // reservation will be larger due to: (i) guard pages; (ii) rounding up to
+  // the system page size.
+  size_t size_ = 0;
+
+#if TRACK_COMMITTED_SIZE()
+  size_t committed_size_ = 0u;
+#endif  // TRACK_COMMITTED_SIZE()
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_PAGED_MEMORY_H_
diff --git a/src/libtracing/perfetto/ext/base/periodic_task.h b/src/libtracing/perfetto/ext/base/periodic_task.h
new file mode 100644
index 000000000..e58eb01ef
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/periodic_task.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_PERIODIC_TASK_H_
+#define INCLUDE_PERFETTO_EXT_BASE_PERIODIC_TASK_H_
+
+#include <functional>
+
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/thread_checker.h"
+#include "perfetto/ext/base/weak_ptr.h"
+
+namespace perfetto {
+namespace base {
+
+class TaskRunner;
+
+// A periodic task utility class. It wraps the logic necessary to do periodic
+// tasks using a TaskRunner, taking care of subtleties like ensuring that
+// outstanding tasks are cancelled after reset/dtor.
+// Tasks are aligned on wall time (unless they are |one_shot|). This is to
+// ensure that when using multiple periodic tasks, they happen at the same time,
+// minimizing context switches.
+// On Linux/Android it also supports suspend-aware mode (via timerfd). On other
+// operating systems it falls back to PostDelayedTask, which is not
+// suspend-aware.
+// TODO(primiano): this should probably become a periodic timer scheduler, so we
+// can use one FD for everything rather than one FD per task. For now we take
+// the hit of a FD-per-task to keep this low-risk.
+// TODO(primiano): consider renaming this class to TimerTask. When |one_shot|
+// is set, the "Periodic" part of the class name becomes a lie.
+class PeriodicTask {
+ public:
+  explicit PeriodicTask(base::TaskRunner*);
+  ~PeriodicTask();  // Calls Reset().
+
+  struct Args {
+    uint32_t period_ms = 0;
+    std::function<void()> task = nullptr;
+    bool start_first_task_immediately = false;
+    bool use_suspend_aware_timer = false;
+    bool one_shot = false;
+  };
+
+  void Start(Args);
+
+  // Safe to be called multiple times, even without calling Start():
+  void Reset();
+
+  // No copy or move. WeakPtr-wrapped pointers to |this| are posted on the
+  // task runner, this class is not easily movable.
+  PeriodicTask(const PeriodicTask&) = delete;
+  PeriodicTask& operator=(const PeriodicTask&) = delete;
+  PeriodicTask(PeriodicTask&&) = delete;
+  PeriodicTask& operator=(PeriodicTask&&) = delete;
+
+  base::PlatformHandle timer_fd_for_testing() { return *timer_fd_; }
+
+ private:
+  static void RunTaskAndPostNext(base::WeakPtr<PeriodicTask>,
+                                 uint32_t generation);
+  void PostNextTask();
+  void ResetTimerFd();
+
+  base::TaskRunner* const task_runner_;
+  Args args_;
+  uint32_t generation_ = 0;
+  base::ScopedPlatformHandle timer_fd_;
+
+  PERFETTO_THREAD_CHECKER(thread_checker_)
+  base::WeakPtrFactory<PeriodicTask> weak_ptr_factory_;  // Keep last.
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_PERIODIC_TASK_H_
diff --git a/src/libtracing/perfetto/ext/base/pipe.h b/src/libtracing/perfetto/ext/base/pipe.h
new file mode 100644
index 000000000..840296d60
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/pipe.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_PIPE_H_
+#define INCLUDE_PERFETTO_EXT_BASE_PIPE_H_
+
+#include "perfetto/base/platform_handle.h"
+#include "perfetto/ext/base/scoped_file.h"
+
+namespace perfetto {
+namespace base {
+
+class Pipe {
+ public:
+  enum Flags {
+    kBothBlock = 0,
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    kBothNonBlock,
+    kRdNonBlock,
+    kWrNonBlock,
+#endif
+  };
+
+  static Pipe Create(Flags = kBothBlock);
+
+  Pipe();
+  Pipe(Pipe&&) noexcept;
+  Pipe& operator=(Pipe&&);
+
+  ScopedPlatformHandle rd;
+  ScopedPlatformHandle wr;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_PIPE_H_
diff --git a/src/libtracing/perfetto/ext/base/platform.h b/src/libtracing/perfetto/ext/base/platform.h
new file mode 100644
index 000000000..352e84d3b
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/platform.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_PLATFORM_H_
+#define INCLUDE_PERFETTO_EXT_BASE_PLATFORM_H_
+
+namespace perfetto {
+namespace base {
+namespace platform {
+
+// Executed before entering a syscall (e.g. poll, read, write etc) which might
+// block.
+// This is overridden in Google internal builds for dealing with userspace
+// scheduling.
+void BeforeMaybeBlockingSyscall();
+
+// Executed after entering a syscall (e.g. poll, read, write etc) which might
+// block.
+// This is overridden in Google internal builds for dealing with userspace
+// scheduling.
+void AfterMaybeBlockingSyscall();
+
+}  // namespace platform
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_PLATFORM_H_
diff --git a/src/libtracing/perfetto/ext/base/scoped_file.h b/src/libtracing/perfetto/ext/base/scoped_file.h
new file mode 100644
index 000000000..f5133a745
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/scoped_file.h
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_SCOPED_FILE_H_
+#define INCLUDE_PERFETTO_EXT_BASE_SCOPED_FILE_H_
+
+#include "perfetto/base/build_config.h"
+
+#include <stdio.h>
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+#include <dirent.h>  // For DIR* / opendir().
+#endif
+
+#include <string>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/platform_handle.h"
+
+namespace perfetto {
+namespace base {
+
+namespace internal {
+// Used for the most common cases of ScopedResource where there is only one
+// invalid value.
+template <typename T, T InvalidValue>
+struct DefaultValidityChecker {
+  static bool IsValid(T t) { return t != InvalidValue; }
+};
+}  // namespace internal
+
+// RAII classes for auto-releasing fds and dirs.
+// if T is a pointer type, InvalidValue must be nullptr. Doing otherwise
+// causes weird unexpected behaviors (See https://godbolt.org/z/5nGMW4).
+template <typename T,
+          int (*CloseFunction)(T),
+          T InvalidValue,
+          bool CheckClose = true,
+          class Checker = internal::DefaultValidityChecker<T, InvalidValue>>
+class ScopedResource {
+ public:
+  using ValidityChecker = Checker;
+  static constexpr T kInvalid = InvalidValue;
+
+  explicit ScopedResource(T t = InvalidValue) : t_(t) {}
+  ScopedResource(ScopedResource&& other) noexcept {
+    t_ = other.t_;
+    other.t_ = InvalidValue;
+  }
+  ScopedResource& operator=(ScopedResource&& other) {
+    reset(other.t_);
+    other.t_ = InvalidValue;
+    return *this;
+  }
+  T get() const { return t_; }
+  T operator*() const { return t_; }
+  explicit operator bool() const { return Checker::IsValid(t_); }
+  void reset(T r = InvalidValue) {
+    if (Checker::IsValid(t_)) {
+      int res = CloseFunction(t_);
+      if (CheckClose)
+        PERFETTO_CHECK(res == 0);
+    }
+    t_ = r;
+  }
+  T release() {
+    T t = t_;
+    t_ = InvalidValue;
+    return t;
+  }
+  ~ScopedResource() { reset(InvalidValue); }
+
+ private:
+  ScopedResource(const ScopedResource&) = delete;
+  ScopedResource& operator=(const ScopedResource&) = delete;
+  T t_;
+};
+
+// Declared in file_utils.h. Forward declared to avoid #include cycles.
+int PERFETTO_EXPORT_COMPONENT CloseFile(int fd);
+
+// Use this for file resources obtained via open() and similar APIs.
+using ScopedFile = ScopedResource<int, CloseFile, -1>;
+using ScopedFstream = ScopedResource<FILE*, fclose, nullptr>;
+
+// Use this for resources that are HANDLE on Windows. See comments in
+// platform_handle.h
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+using ScopedPlatformHandle = ScopedResource<PlatformHandle,
+                                            ClosePlatformHandle,
+                                            /*InvalidValue=*/nullptr,
+                                            /*CheckClose=*/true,
+                                            PlatformHandleChecker>;
+#else
+// On non-windows systems we alias ScopedPlatformHandle to ScopedFile because
+// they are really the same. This is to allow assignments between the two in
+// Linux-specific code paths that predate ScopedPlatformHandle.
+static_assert(std::is_same<int, PlatformHandle>::value, "");
+using ScopedPlatformHandle = ScopedFile;
+
+// DIR* does not exist on Windows.
+using ScopedDir = ScopedResource<DIR*, closedir, nullptr>;
+#endif
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_SCOPED_FILE_H_
diff --git a/src/libtracing/perfetto/ext/base/scoped_mmap.h b/src/libtracing/perfetto/ext/base/scoped_mmap.h
new file mode 100644
index 000000000..f14afcb56
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/scoped_mmap.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_SCOPED_MMAP_H_
+#define INCLUDE_PERFETTO_EXT_BASE_SCOPED_MMAP_H_
+
+#include <cstddef>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/ext/base/scoped_file.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+#define PERFETTO_HAS_MMAP() 1
+#else
+#define PERFETTO_HAS_MMAP() 0
+#endif
+
+namespace perfetto::base {
+
+// RAII wrapper that holds ownership of an mmap()d area and of a file. Calls
+// unmap() and close() on destruction.
+class ScopedMmap {
+ public:
+  // Creates a memory mapping for the first `length` bytes of `file`.
+  static ScopedMmap FromHandle(base::ScopedPlatformHandle file, size_t length);
+
+  ScopedMmap() {}
+  ~ScopedMmap();
+  ScopedMmap(ScopedMmap&& other) noexcept;
+
+  ScopedMmap& operator=(ScopedMmap&& other) noexcept;
+
+  // Returns a pointer to the mapped memory area. Only valid if `IsValid()` is
+  // true.
+  void* data() const { return ptr_; }
+
+  // Returns true if this object contains a successfully mapped area.
+  bool IsValid() const { return ptr_ != nullptr; }
+
+  // Returns the length of the mapped area.
+  size_t length() const { return length_; }
+
+  // Unmaps the area and closes the file. Returns false if this held a mmap()d
+  // area and unmapping failed. In any case, after this method, `IsValid()` will
+  // return false.
+  bool reset() noexcept;
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
+  // Takes ownership of an mmap()d area that starts at `data`, `size` bytes
+  // long. `data` should not be MAP_FAILED.
+  static ScopedMmap InheritMmappedRange(void* data, size_t size);
+#endif
+
+ private:
+  ScopedMmap(const ScopedMmap&) = delete;
+  ScopedMmap& operator=(const ScopedMmap&) = delete;
+
+  size_t length_ = 0;
+  void* ptr_ = nullptr;
+  ScopedPlatformHandle file_;
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  ScopedPlatformHandle map_;
+#endif
+};
+
+// Tries to open `fname` and maps its first `length` bytes in memory.
+ScopedMmap ReadMmapFilePart(const char* fname, size_t length);
+
+// Tries to open `fname` and maps the whole file into memory.
+ScopedMmap ReadMmapWholeFile(const char* fname);
+
+}  // namespace perfetto::base
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_SCOPED_MMAP_H_
diff --git a/src/libtracing/perfetto/ext/base/small_set.h b/src/libtracing/perfetto/ext/base/small_set.h
new file mode 100644
index 000000000..db057a0e8
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/small_set.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_SMALL_SET_H_
+#define INCLUDE_PERFETTO_EXT_BASE_SMALL_SET_H_
+
+#include <array>
+
+namespace perfetto {
+
+// Set that can store up to Size items of DataType.
+// Lookup is O(Size), so it is only usable for very small sets.
+template <typename DataType, size_t Size>
+class SmallSet {
+  static_assert(Size < 16, "Do not use SmallSet for many items");
+
+ public:
+  // Name for consistency with STL.
+  using const_iterator = typename std::array<DataType, Size>::const_iterator;
+  bool Add(DataType n) {
+    if (Contains(n))
+      return true;
+    if (filled_ < Size) {
+      arr_[filled_++] = std::move(n);
+      return true;
+    }
+    return false;
+  }
+
+  bool Contains(const DataType& n) const {
+    for (size_t i = 0; i < filled_; ++i) {
+      if (arr_[i] == n)
+        return true;
+    }
+    return false;
+  }
+
+  const_iterator begin() const { return arr_.cbegin(); }
+  const_iterator end() const { return arr_.cbegin() + filled_; }
+  size_t size() const { return filled_; }
+
+ private:
+  std::array<DataType, Size> arr_;
+  size_t filled_ = 0;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_SMALL_SET_H_
diff --git a/src/libtracing/perfetto/ext/base/small_vector.h b/src/libtracing/perfetto/ext/base/small_vector.h
new file mode 100644
index 000000000..22f1232c3
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/small_vector.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_SMALL_VECTOR_H_
+#define INCLUDE_PERFETTO_EXT_BASE_SMALL_VECTOR_H_
+
+#include <algorithm>
+#include <type_traits>
+#include <utility>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/utils.h"
+
+namespace perfetto {
+namespace base {
+
+// Uses inline storage first, switches to dynamic storage when it overflows.
+template <typename T, size_t kSize>
+class SmallVector {
+ public:
+  static constexpr size_t kInlineSize = kSize;
+
+  explicit SmallVector() = default;
+
+  ~SmallVector() {
+    clear();
+    if (PERFETTO_UNLIKELY(is_using_heap()))
+      AlignedFree(begin_);
+    begin_ = end_ = end_of_storage_ = nullptr;
+  }
+
+  // Move operators.
+  SmallVector(SmallVector&& other) noexcept(
+      std::is_nothrow_move_constructible<T>::value) {
+    if (other.is_using_heap()) {
+      // Move the heap content, no need to move the individual objects as their
+      // location won't change.
+      begin_ = other.begin_;
+      end_ = other.end_;
+      end_of_storage_ = other.end_of_storage_;
+    } else {
+      const size_t other_size = other.size();
+      PERFETTO_DCHECK(other_size <= capacity());
+      for (size_t i = 0; i < other_size; i++) {
+        // Move the entries and destroy the ones in the moved-from object.
+        new (&begin_[i]) T(std::move(other.begin_[i]));
+        other.begin_[i].~T();
+      }
+      end_ = begin_ + other_size;
+    }
+    auto* const other_inline_storage = other.inline_storage_begin();
+    other.end_ = other.begin_ = other_inline_storage;
+    other.end_of_storage_ = other_inline_storage + kInlineSize;
+  }
+
+  SmallVector& operator=(SmallVector&& other) noexcept(
+      std::is_nothrow_move_constructible<T>::value) {
+    this->~SmallVector();
+    new (this) SmallVector<T, kSize>(std::move(other));
+    return *this;
+  }
+
+  // Copy operators.
+  SmallVector(const SmallVector& other) {
+    const size_t other_size = other.size();
+    if (other_size > capacity())
+      Grow(other_size);
+    // Copy-construct the elements.
+    for (size_t i = 0; i < other_size; ++i)
+      new (&begin_[i]) T(other.begin_[i]);
+    end_ = begin_ + other_size;
+  }
+
+  SmallVector& operator=(const SmallVector& other) {
+    if (PERFETTO_UNLIKELY(this == &other))
+      return *this;
+    this->~SmallVector();
+    new (this) SmallVector<T, kSize>(other);
+    return *this;
+  }
+
+  T* data() { return begin_; }
+  const T* data() const { return begin_; }
+
+  T* begin() { return begin_; }
+  const T* begin() const { return begin_; }
+
+  T* end() { return end_; }
+  const T* end() const { return end_; }
+
+  size_t size() const { return static_cast<size_t>(end_ - begin_); }
+
+  bool empty() const { return end_ == begin_; }
+
+  size_t capacity() const {
+    return static_cast<size_t>(end_of_storage_ - begin_);
+  }
+
+  T& front() {
+    PERFETTO_DCHECK(!empty());
+    return begin_[0];
+  }
+  const T& front() const {
+    PERFETTO_DCHECK(!empty());
+    return begin_[0];
+  }
+
+  T& back() {
+    PERFETTO_DCHECK(!empty());
+    return end_[-1];
+  }
+  const T& back() const {
+    PERFETTO_DCHECK(!empty());
+    return end_[-1];
+  }
+
+  T& operator[](size_t index) {
+    PERFETTO_DCHECK(index < size());
+    return begin_[index];
+  }
+
+  const T& operator[](size_t index) const {
+    PERFETTO_DCHECK(index < size());
+    return begin_[index];
+  }
+
+  template <typename... Args>
+  void emplace_back(Args&&... args) {
+    T* end = end_;
+    if (PERFETTO_UNLIKELY(end == end_of_storage_))
+      end = Grow();
+    new (end) T(std::forward<Args>(args)...);
+    end_ = end + 1;
+  }
+
+  void pop_back() {
+    PERFETTO_DCHECK(!empty());
+    back().~T();
+    --end_;
+  }
+
+  // Clear without reverting back to inline storage.
+  void clear() {
+    while (!empty())
+      pop_back();
+  }
+
+ private:
+  PERFETTO_NO_INLINE T* Grow(size_t desired_capacity = 0) {
+    size_t cur_size = size();
+    size_t new_capacity = desired_capacity;
+    if (desired_capacity <= cur_size)
+      new_capacity = std::max(capacity() * 2, size_t(128));
+    T* new_storage =
+        static_cast<T*>(AlignedAlloc(alignof(T), new_capacity * sizeof(T)));
+    for (size_t i = 0; i < cur_size; ++i) {
+      // Move the elements into the new heap buffer and destroy the old ones.
+      new (&new_storage[i]) T(std::move(begin_[i]));
+      begin_[i].~T();
+    }
+    if (is_using_heap())
+      AlignedFree(begin_);
+    begin_ = new_storage;
+    end_ = new_storage + cur_size;
+    end_of_storage_ = new_storage + new_capacity;
+    return end_;
+  }
+
+  T* inline_storage_begin() { return reinterpret_cast<T*>(&inline_storage_); }
+  bool is_using_heap() { return begin_ != inline_storage_begin(); }
+
+  T* begin_ = inline_storage_begin();
+  T* end_ = begin_;
+  T* end_of_storage_ = begin_ + kInlineSize;
+
+  typename std::aligned_storage<sizeof(T) * kInlineSize, alignof(T)>::type
+      inline_storage_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_SMALL_VECTOR_H_
diff --git a/src/libtracing/perfetto/ext/base/status_or.h b/src/libtracing/perfetto/ext/base/status_or.h
new file mode 100644
index 000000000..a6eda7e65
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/status_or.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_STATUS_OR_H_
+#define INCLUDE_PERFETTO_EXT_BASE_STATUS_OR_H_
+
+#include <optional>
+
+#include "perfetto/base/status.h"
+
+namespace perfetto {
+namespace base {
+
+// Union of a object of type |T| with a |base::Status|. Useful for cases where
+// a |T| indicates a successful result of an operation and |base::Status|
+// represents an error.
+//
+// This class is modelled closely on absl::Status and should essentially 1:1
+// match it's API.
+template <typename T>
+class StatusOr {
+ public:
+  // Matches naming of declarations in similar types e.g. std::optional,
+  // std::variant.
+  using value_type = T;
+
+  // Intentionally implicit to allow idomatic usage (e.g. returning value/status
+  // from base::StatusOr returning function).
+  StatusOr(base::Status status) : StatusOr(std::move(status), std::nullopt) {
+    if (status.ok()) {
+      // Matches what Abseil's approach towards OkStatus being passed to
+      // absl::StatusOr<T>.
+      PERFETTO_FATAL("base::OkStatus passed to StatusOr: this is not allowd");
+    }
+  }
+  StatusOr(T value) : StatusOr(base::OkStatus(), std::move(value)) {}
+
+  bool ok() const { return status_.ok(); }
+  const base::Status& status() const { return status_; }
+
+  T& value() {
+    PERFETTO_DCHECK(status_.ok());
+    return *value_;
+  }
+  const T& value() const { return *value_; }
+
+  T& operator*() { return value(); }
+  const T& operator*() const { return value(); }
+
+  T* operator->() { return &value(); }
+  const T* operator->() const { return &value(); }
+
+ private:
+  StatusOr(base::Status status, std::optional<T> value)
+      : status_(std::move(status)), value_(std::move(value)) {
+    PERFETTO_DCHECK(!status_.ok() || value_.has_value());
+  }
+
+  base::Status status_;
+  std::optional<T> value_;
+};
+
+// Deduction guide to make returning StatusOr less verbose.
+template <typename T>
+StatusOr(T) -> StatusOr<T>;
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_STATUS_OR_H_
diff --git a/src/libtracing/perfetto/ext/base/string_splitter.h b/src/libtracing/perfetto/ext/base/string_splitter.h
new file mode 100644
index 000000000..3b6d8a64f
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/string_splitter.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_STRING_SPLITTER_H_
+#define INCLUDE_PERFETTO_EXT_BASE_STRING_SPLITTER_H_
+
+#include <string>
+
+namespace perfetto {
+namespace base {
+
+// C++ version of strtok(). Splits a string without making copies or any heap
+// allocations. Destructs the original string passed in input.
+// Supports the special case of using \0 as a delimiter.
+// The token returned in output are valid as long as the input string is valid.
+class StringSplitter {
+ public:
+  // Whether an empty string (two delimiters side-to-side) is a valid token.
+  enum class EmptyTokenMode {
+    DISALLOW_EMPTY_TOKENS,
+    ALLOW_EMPTY_TOKENS,
+
+    DEFAULT = DISALLOW_EMPTY_TOKENS,
+  };
+
+  // Can take ownership of the string if passed via std::move(), e.g.:
+  // StringSplitter(std::move(str), '\n');
+  StringSplitter(std::string,
+                 char delimiter,
+                 EmptyTokenMode empty_token_mode = EmptyTokenMode::DEFAULT);
+
+  // Splits a C-string. The input string will be forcefully null-terminated (so
+  // str[size - 1] should be == '\0' or the last char will be truncated).
+  StringSplitter(char* str,
+                 size_t size,
+                 char delimiter,
+                 EmptyTokenMode empty_token_mode = EmptyTokenMode::DEFAULT);
+
+  // Splits the current token from an outer StringSplitter instance. This is to
+  // chain splitters as follows:
+  // for (base::StringSplitter lines(x, '\n'); ss.Next();)
+  //   for (base::StringSplitter words(&lines, ' '); words.Next();)
+  StringSplitter(StringSplitter*,
+                 char delimiter,
+                 EmptyTokenMode empty_token_mode = EmptyTokenMode::DEFAULT);
+
+  // Returns true if a token is found (in which case it will be stored in
+  // cur_token()), false if no more tokens are found.
+  bool Next();
+
+  // Returns the current token iff last call to Next() returned true. In this
+  // case it guarantees that the returned string is always null terminated.
+  // In all other cases (before the 1st call to Next() and after Next() returns
+  // false) returns nullptr.
+  char* cur_token() { return cur_; }
+
+  // Returns the length of the current token (excluding the null terminator).
+  size_t cur_token_size() const { return cur_size_; }
+
+ private:
+  StringSplitter(const StringSplitter&) = delete;
+  StringSplitter& operator=(const StringSplitter&) = delete;
+  void Initialize(char* str, size_t size);
+
+  std::string str_;
+  char* cur_;
+  size_t cur_size_;
+  char* next_;
+  char* end_;  // STL-style, points one past the last char.
+  const char delimiter_;
+  const EmptyTokenMode empty_token_mode_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_STRING_SPLITTER_H_
diff --git a/src/libtracing/perfetto/ext/base/string_utils.h b/src/libtracing/perfetto/ext/base/string_utils.h
new file mode 100644
index 000000000..c8264a2fb
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/string_utils.h
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_STRING_UTILS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_STRING_UTILS_H_
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cinttypes>
+#include <optional>
+#include <string>
+#include <vector>
+
+#include "perfetto/ext/base/string_view.h"
+
+namespace perfetto {
+namespace base {
+
+inline char Lowercase(char c) {
+  return ('A' <= c && c <= 'Z') ? static_cast<char>(c - ('A' - 'a')) : c;
+}
+
+inline char Uppercase(char c) {
+  return ('a' <= c && c <= 'z') ? static_cast<char>(c + ('A' - 'a')) : c;
+}
+
+inline std::optional<uint32_t> CStringToUInt32(const char* s, int base = 10) {
+  char* endptr = nullptr;
+  auto value = static_cast<uint32_t>(strtoul(s, &endptr, base));
+  return (*s && !*endptr) ? std::make_optional(value) : std::nullopt;
+}
+
+inline std::optional<int32_t> CStringToInt32(const char* s, int base = 10) {
+  char* endptr = nullptr;
+  auto value = static_cast<int32_t>(strtol(s, &endptr, base));
+  return (*s && !*endptr) ? std::make_optional(value) : std::nullopt;
+}
+
+// Note: it saturates to 7fffffffffffffff if parsing a hex number >= 0x8000...
+inline std::optional<int64_t> CStringToInt64(const char* s, int base = 10) {
+  char* endptr = nullptr;
+  auto value = static_cast<int64_t>(strtoll(s, &endptr, base));
+  return (*s && !*endptr) ? std::make_optional(value) : std::nullopt;
+}
+
+inline std::optional<uint64_t> CStringToUInt64(const char* s, int base = 10) {
+  char* endptr = nullptr;
+  auto value = static_cast<uint64_t>(strtoull(s, &endptr, base));
+  return (*s && !*endptr) ? std::make_optional(value) : std::nullopt;
+}
+
+double StrToD(const char* nptr, char** endptr);
+
+inline std::optional<double> CStringToDouble(const char* s) {
+  char* endptr = nullptr;
+  double value = StrToD(s, &endptr);
+  std::optional<double> result(std::nullopt);
+  if (*s != '\0' && *endptr == '\0')
+    result = value;
+  return result;
+}
+
+inline std::optional<uint32_t> StringToUInt32(const std::string& s,
+                                              int base = 10) {
+  return CStringToUInt32(s.c_str(), base);
+}
+
+inline std::optional<int32_t> StringToInt32(const std::string& s,
+                                            int base = 10) {
+  return CStringToInt32(s.c_str(), base);
+}
+
+inline std::optional<uint64_t> StringToUInt64(const std::string& s,
+                                              int base = 10) {
+  return CStringToUInt64(s.c_str(), base);
+}
+
+inline std::optional<int64_t> StringToInt64(const std::string& s,
+                                            int base = 10) {
+  return CStringToInt64(s.c_str(), base);
+}
+
+inline std::optional<double> StringToDouble(const std::string& s) {
+  return CStringToDouble(s.c_str());
+}
+
+bool StartsWith(const std::string& str, const std::string& prefix);
+bool EndsWith(const std::string& str, const std::string& suffix);
+bool StartsWithAny(const std::string& str,
+                   const std::vector<std::string>& prefixes);
+bool Contains(const std::string& haystack, const std::string& needle);
+bool Contains(const std::string& haystack, char needle);
+size_t Find(const StringView& needle, const StringView& haystack);
+bool CaseInsensitiveEqual(const std::string& first, const std::string& second);
+std::string Join(const std::vector<std::string>& parts,
+                 const std::string& delim);
+std::vector<std::string> SplitString(const std::string& text,
+                                     const std::string& delimiter);
+std::string StripPrefix(const std::string& str, const std::string& prefix);
+std::string StripSuffix(const std::string& str, const std::string& suffix);
+std::string TrimWhitespace(const std::string& str);
+std::string ToLower(const std::string& str);
+std::string ToUpper(const std::string& str);
+std::string StripChars(const std::string& str,
+                       const std::string& chars,
+                       char replacement);
+std::string ToHex(const char* data, size_t size);
+inline std::string ToHex(const std::string& s) {
+  return ToHex(s.c_str(), s.size());
+}
+std::string IntToHexString(uint32_t number);
+std::string Uint64ToHexString(uint64_t number);
+std::string Uint64ToHexStringNoPrefix(uint64_t number);
+std::string ReplaceAll(std::string str,
+                       const std::string& to_replace,
+                       const std::string& replacement);
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+bool WideToUTF8(const std::wstring& source, std::string& output);
+bool UTF8ToWide(const std::string& source, std::wstring& output);
+#endif // PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
+// A BSD-style strlcpy without the return value.
+// Copies at most |dst_size|-1 characters. Unlike strncpy, it always \0
+// terminates |dst|, as long as |dst_size| is not 0.
+// Unlike strncpy and like strlcpy it does not zero-pad the rest of |dst|.
+// Returns nothing. The BSD strlcpy returns the size of |src|, which might
+// be > |dst_size|. Anecdotal experience suggests people assume the return value
+// is the number of bytes written in |dst|. That assumption can lead to
+// dangerous bugs.
+// In order to avoid being subtly uncompliant with strlcpy AND avoid misuse,
+// the choice here is to return nothing.
+inline void StringCopy(char* dst, const char* src, size_t dst_size) {
+  for (size_t i = 0; i < dst_size; ++i) {
+    if ((dst[i] = src[i]) == '\0') {
+      return;  // We hit and copied the null terminator.
+    }
+  }
+
+  // We were left off at dst_size. We over copied 1 byte. Null terminate.
+  if (PERFETTO_LIKELY(dst_size > 0))
+    dst[dst_size - 1] = 0;
+}
+
+// Like snprintf() but returns the number of chars *actually* written (without
+// counting the null terminator) NOT "the number of chars which would have been
+// written to the final string if enough  space had been available".
+// This should be used in almost all cases when the caller uses the return value
+// of snprintf(). If the return value is not used, there is no benefit in using
+// this wrapper, as this just calls snprintf() and mangles the return value.
+// It always null-terminates |dst| (even in case of errors), unless
+// |dst_size| == 0.
+// Examples:
+//   SprintfTrunc(x, 4, "123whatever"): returns 3 and writes "123\0".
+//   SprintfTrunc(x, 4, "123"): returns 3 and writes "123\0".
+//   SprintfTrunc(x, 3, "123"): returns 2 and writes "12\0".
+//   SprintfTrunc(x, 2, "123"): returns 1 and writes "1\0".
+//   SprintfTrunc(x, 1, "123"): returns 0 and writes "\0".
+//   SprintfTrunc(x, 0, "123"): returns 0 and writes nothing.
+// NOTE: This means that the caller has no way to tell when truncation happens
+//   vs the edge case of *just* fitting in the buffer.
+size_t SprintfTrunc(char* dst, size_t dst_size, const char* fmt, ...)
+    PERFETTO_PRINTF_FORMAT(3, 4);
+
+// Line number starts from 1
+struct LineWithOffset {
+  base::StringView line;
+  uint32_t line_offset;
+  uint32_t line_num;
+};
+
+// For given string and offset Pfinds a line with character for
+// which offset points, what number is this line (starts from 1), and the offset
+// inside this line. returns std::nullopt if the offset points to
+// line break character or exceeds string length.
+std::optional<LineWithOffset> FindLineWithOffset(base::StringView str,
+                                                 uint32_t offset);
+
+// A helper class to facilitate construction and usage of write-once stack
+// strings.
+// Example usage:
+//   StackString<32> x("format %d %s", 42, string_arg);
+//   TakeString(x.c_str() | x.string_view() | x.ToStdString());
+// Rather than char x[32] + sprintf.
+// Advantages:
+// - Avoids useless zero-fills caused by people doing `char buf[32] {}` (mainly
+//   by fearing unknown snprintf failure modes).
+// - Makes the code more robust in case of snprintf truncations (len() and
+//  string_view() will return the truncated length, unlike snprintf).
+template <size_t N>
+class StackString {
+ public:
+  explicit PERFETTO_PRINTF_FORMAT(/* 1=this */ 2, 3)
+      StackString(const char* fmt, ...) {
+    buf_[0] = '\0';
+    va_list args;
+    va_start(args, fmt);
+    int res = vsnprintf(buf_, sizeof(buf_), fmt, args);
+    va_end(args);
+    buf_[sizeof(buf_) - 1] = '\0';
+    len_ = res < 0 ? 0 : std::min(static_cast<size_t>(res), sizeof(buf_) - 1);
+  }
+
+  StringView string_view() const { return StringView(buf_, len_); }
+  std::string ToStdString() const { return std::string(buf_, len_); }
+  const char* c_str() const { return buf_; }
+  size_t len() const { return len_; }
+  char* mutable_data() { return buf_; }
+
+ private:
+  char buf_[N];
+  size_t len_ = 0;  // Does not include the \0.
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_STRING_UTILS_H_
diff --git a/src/libtracing/perfetto/ext/base/string_view.h b/src/libtracing/perfetto/ext/base/string_view.h
new file mode 100644
index 000000000..1fe3696a8
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/string_view.h
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_STRING_VIEW_H_
+#define INCLUDE_PERFETTO_EXT_BASE_STRING_VIEW_H_
+
+#include <string.h>
+
+#include <algorithm>
+#include <string>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/hash.h"
+
+namespace perfetto {
+namespace base {
+
+// A string-like object that refers to a non-owned piece of memory.
+// Strings are internally NOT null terminated.
+class StringView {
+ public:
+  // Allow hashing with base::Hash.
+  static constexpr bool kHashable = true;
+  static constexpr size_t npos = static_cast<size_t>(-1);
+
+  StringView() : data_(nullptr), size_(0) {}
+  StringView(const StringView&) = default;
+  StringView& operator=(const StringView&) = default;
+  StringView(const char* data, size_t size) : data_(data), size_(size) {
+    PERFETTO_DCHECK(size == 0 || data != nullptr);
+  }
+
+  // Allow implicit conversion from any class that has a |data| and |size| field
+  // and has the kConvertibleToStringView trait (e.g., protozero::ConstChars).
+  template <typename T, typename = std::enable_if<T::kConvertibleToStringView>>
+  StringView(const T& x) : StringView(x.data, x.size) {
+    PERFETTO_DCHECK(x.size == 0 || x.data != nullptr);
+  }
+
+  // Creates a StringView from a null-terminated C string.
+  // Deliberately not "explicit".
+  StringView(const char* cstr) : data_(cstr), size_(strlen(cstr)) {
+    PERFETTO_DCHECK(cstr != nullptr);
+  }
+
+  // This instead has to be explicit, as creating a StringView out of a
+  // std::string can be subtle.
+  explicit StringView(const std::string& str)
+      : data_(str.data()), size_(str.size()) {}
+
+  bool empty() const { return size_ == 0; }
+  size_t size() const { return size_; }
+  const char* data() const { return data_; }
+  const char* begin() const { return data_; }
+  const char* end() const { return data_ + size_; }
+
+  char at(size_t pos) const {
+    PERFETTO_DCHECK(pos < size_);
+    return data_[pos];
+  }
+
+  size_t find(char c, size_t start_pos = 0) const {
+    for (size_t i = start_pos; i < size_; ++i) {
+      if (data_[i] == c)
+        return i;
+    }
+    return npos;
+  }
+
+  size_t find(const StringView& str, size_t start_pos = 0) const {
+    if (start_pos > size())
+      return npos;
+    auto it = std::search(begin() + start_pos, end(), str.begin(), str.end());
+    size_t pos = static_cast<size_t>(it - begin());
+    return pos + str.size() <= size() ? pos : npos;
+  }
+
+  size_t find(const char* str, size_t start_pos = 0) const {
+    return find(StringView(str), start_pos);
+  }
+
+  size_t rfind(char c) const {
+    for (size_t i = size_; i > 0; --i) {
+      if (data_[i - 1] == c)
+        return i - 1;
+    }
+    return npos;
+  }
+
+  StringView substr(size_t pos, size_t count = npos) const {
+    if (pos >= size_)
+      return StringView("", 0);
+    size_t rcount = std::min(count, size_ - pos);
+    return StringView(data_ + pos, rcount);
+  }
+
+  bool CaseInsensitiveEq(const StringView& other) const {
+    if (size() != other.size())
+      return false;
+    if (size() == 0)
+      return true;
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    return _strnicmp(data(), other.data(), size()) == 0;
+#else
+    return strncasecmp(data(), other.data(), size()) == 0;
+#endif
+  }
+
+  bool StartsWith(const StringView& other) const {
+    if (other.size() == 0)
+      return true;
+    if (size() == 0)
+      return false;
+    if (other.size() > size())
+      return false;
+    return memcmp(data(), other.data(), other.size()) == 0;
+  }
+
+  bool EndsWith(const StringView& other) const {
+    if (other.size() == 0)
+      return true;
+    if (size() == 0)
+      return false;
+    if (other.size() > size())
+      return false;
+    size_t off = size() - other.size();
+    return memcmp(data() + off, other.data(), other.size()) == 0;
+  }
+
+  std::string ToStdString() const {
+    return size_ == 0 ? "" : std::string(data_, size_);
+  }
+
+  uint64_t Hash() const {
+    base::Hasher hasher;
+    hasher.Update(data_, size_);
+    return hasher.digest();
+  }
+
+ private:
+  const char* data_ = nullptr;
+  size_t size_ = 0;
+};
+
+inline bool operator==(const StringView& x, const StringView& y) {
+  if (x.size() != y.size())
+    return false;
+  if (x.size() == 0)
+    return true;
+  return memcmp(x.data(), y.data(), x.size()) == 0;
+}
+
+inline bool operator!=(const StringView& x, const StringView& y) {
+  return !(x == y);
+}
+
+inline bool operator<(const StringView& x, const StringView& y) {
+  auto size = std::min(x.size(), y.size());
+  if (size == 0)
+    return x.size() < y.size();
+  int result = memcmp(x.data(), y.data(), size);
+  return result < 0 || (result == 0 && x.size() < y.size());
+}
+
+inline bool operator>=(const StringView& x, const StringView& y) {
+  return !(x < y);
+}
+
+inline bool operator>(const StringView& x, const StringView& y) {
+  return y < x;
+}
+
+inline bool operator<=(const StringView& x, const StringView& y) {
+  return !(y < x);
+}
+
+}  // namespace base
+}  // namespace perfetto
+
+template <>
+struct std::hash<::perfetto::base::StringView> {
+  size_t operator()(const ::perfetto::base::StringView& sv) const {
+    return static_cast<size_t>(sv.Hash());
+  }
+};
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_STRING_VIEW_H_
diff --git a/src/libtracing/perfetto/ext/base/string_writer.h b/src/libtracing/perfetto/ext/base/string_writer.h
new file mode 100644
index 000000000..587b2f932
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/string_writer.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_STRING_WRITER_H_
+#define INCLUDE_PERFETTO_EXT_BASE_STRING_WRITER_H_
+
+#include <string.h>
+
+#include <cinttypes>
+#include <cmath>
+#include <cstdlib>
+#include <limits>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/string_utils.h"
+#include "perfetto/ext/base/string_view.h"
+
+namespace perfetto {
+namespace base {
+
+// A helper class which writes formatted data to a string buffer.
+// This is used in the trace processor where we write O(GBs) of strings and
+// sprintf is too slow.
+class StringWriter {
+ public:
+  // Creates a string buffer from a char buffer and length.
+  StringWriter(char* buffer, size_t size) : buffer_(buffer), size_(size) {}
+
+  // Appends n instances of a char to the buffer.
+  void AppendChar(char in, size_t n = 1) {
+    PERFETTO_DCHECK(pos_ + n <= size_);
+    memset(&buffer_[pos_], in, n);
+    pos_ += n;
+  }
+
+  // Appends a length delimited string to the buffer.
+  void AppendString(const char* in, size_t n) {
+    PERFETTO_DCHECK(pos_ + n <= size_);
+    memcpy(&buffer_[pos_], in, n);
+    pos_ += n;
+  }
+
+  void AppendStringView(StringView sv) { AppendString(sv.data(), sv.size()); }
+
+  // Appends a null-terminated string literal to the buffer.
+  template <size_t N>
+  inline void AppendLiteral(const char (&in)[N]) {
+    AppendString(in, N - 1);
+  }
+
+  // Appends a StringView to the buffer.
+  void AppendString(StringView data) { AppendString(data.data(), data.size()); }
+
+  // Appends an integer to the buffer.
+  void AppendInt(int64_t value) { AppendPaddedInt<'0', 0>(value); }
+
+  // Appends an integer to the buffer, padding with |padchar| if the number of
+  // digits of the integer is less than |padding|.
+  template <char padchar, uint64_t padding>
+  void AppendPaddedInt(int64_t sign_value) {
+    const bool negate = std::signbit(static_cast<double>(sign_value));
+    uint64_t absolute_value;
+    if (sign_value == std::numeric_limits<int64_t>::min()) {
+      absolute_value =
+          static_cast<uint64_t>(std::numeric_limits<int64_t>::max()) + 1;
+    } else {
+      absolute_value = static_cast<uint64_t>(std::abs(sign_value));
+    }
+    AppendPaddedInt<padchar, padding>(absolute_value, negate);
+  }
+
+  void AppendUnsignedInt(uint64_t value) {
+    AppendPaddedUnsignedInt<'0', 0>(value);
+  }
+
+  // Appends an unsigned integer to the buffer, padding with |padchar| if the
+  // number of digits of the integer is less than |padding|.
+  template <char padchar, uint64_t padding>
+  void AppendPaddedUnsignedInt(uint64_t value) {
+    AppendPaddedInt<padchar, padding>(value, false);
+  }
+
+  // Appends a hex integer to the buffer.
+  template <typename IntType>
+  void AppendHexInt(IntType value) {
+    // TODO(lalitm): trying to optimize this is premature given we almost never
+    // print hex ints. Reevaluate this in the future if we do print them more.
+    size_t res =
+        base::SprintfTrunc(buffer_ + pos_, size_ - pos_, "%" PRIx64, value);
+    PERFETTO_DCHECK(pos_ + res <= size_);
+    pos_ += res;
+  }
+
+  // Appends a double to the buffer.
+  void AppendDouble(double value) {
+    // TODO(lalitm): trying to optimize this is premature given we almost never
+    // print doubles. Reevaluate this in the future if we do print them more.
+    size_t res = base::SprintfTrunc(buffer_ + pos_, size_ - pos_, "%lf", value);
+    PERFETTO_DCHECK(pos_ + res <= size_);
+    pos_ += res;
+  }
+
+  void AppendBool(bool value) {
+    if (value) {
+      AppendLiteral("true");
+      return;
+    }
+    AppendLiteral("false");
+  }
+
+  StringView GetStringView() {
+    PERFETTO_DCHECK(pos_ <= size_);
+    return StringView(buffer_, pos_);
+  }
+
+  char* CreateStringCopy() {
+    char* dup = reinterpret_cast<char*>(malloc(pos_ + 1));
+    if (dup) {
+      memcpy(dup, buffer_, pos_);
+      dup[pos_] = '\0';
+    }
+    return dup;
+  }
+
+  size_t pos() const { return pos_; }
+  size_t size() const { return size_; }
+  void reset() { pos_ = 0; }
+
+ private:
+  template <char padchar, uint64_t padding>
+  void AppendPaddedInt(uint64_t absolute_value, bool negate) {
+    // Need to add 2 to the number of digits to account for minus sign and
+    // rounding down of digits10.
+    constexpr auto kMaxDigits = std::numeric_limits<uint64_t>::digits10 + 2;
+    constexpr auto kSizeNeeded = kMaxDigits > padding ? kMaxDigits : padding;
+    PERFETTO_DCHECK(pos_ + kSizeNeeded <= size_);
+
+    char data[kSizeNeeded];
+
+    size_t idx;
+    for (idx = kSizeNeeded - 1; absolute_value >= 10;) {
+      char digit = absolute_value % 10;
+      absolute_value /= 10;
+      data[idx--] = digit + '0';
+    }
+    data[idx--] = static_cast<char>(absolute_value) + '0';
+
+    if (padding > 0) {
+      size_t num_digits = kSizeNeeded - 1 - idx;
+      // std::max() needed to work around GCC not being able to tell that
+      // padding > 0.
+      for (size_t i = num_digits; i < std::max(uint64_t{1u}, padding); i++) {
+        data[idx--] = padchar;
+      }
+    }
+
+    if (negate)
+      buffer_[pos_++] = '-';
+    AppendString(&data[idx + 1], kSizeNeeded - idx - 1);
+  }
+
+  char* buffer_ = nullptr;
+  size_t size_ = 0;
+  size_t pos_ = 0;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_STRING_WRITER_H_
diff --git a/src/libtracing/perfetto/ext/base/subprocess.h b/src/libtracing/perfetto/ext/base/subprocess.h
new file mode 100644
index 000000000..12121e028
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/subprocess.h
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_SUBPROCESS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_SUBPROCESS_H_
+
+#include <condition_variable>
+#include <functional>
+#include <initializer_list>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/platform_handle.h"
+#include "perfetto/base/proc_utils.h"
+#include "perfetto/ext/base/event_fd.h"
+#include "perfetto/ext/base/pipe.h"
+#include "perfetto/ext/base/scoped_file.h"
+
+namespace perfetto {
+namespace base {
+
+// Handles creation and lifecycle management of subprocesses, taking care of
+// all subtleties involved in handling processes on UNIX.
+// This class allows to deal with macro two use-cases:
+// 1) fork() + exec() equivalent: for spawning a brand new process image.
+//    This happens when |args.exec_cmd| is not empty.
+//    This is safe to use even in a multi-threaded environment.
+// 2) fork(): for spawning a process and running a function.
+//    This happens when |args.posix_entrypoint_for_testing| is not empty.
+//    This is intended only for tests as it is extremely subtle.
+//    This mode must be used with extreme care. Before the entrypoint is
+//    invoked all file descriptors other than stdin/out/err and the ones
+//    specified in |args.preserve_fds| will be closed, to avoid each process
+//    retaining a dupe of other subprocesses pipes. This however means that
+//    any non trivial calls (including logging) must be avoided as they might
+//    refer to FDs that are now closed. The entrypoint should really be used
+//    just to signal a pipe or similar for synchronizing sequencing in tests.
+
+//
+// This class allows to control stdin/out/err pipe redirection and takes care
+// of keeping all the pipes pumped (stdin) / drained (stdout/err), in a similar
+// fashion of python's subprocess.Communicate()
+// stdin: is always piped and closed once the |args.input| buffer is written.
+// stdout/err can be either:
+//   - dup()ed onto the parent process stdout/err.
+//   - redirected onto /dev/null.
+//   - piped onto a buffer (see output() method). There is only one output
+//     buffer in total. If both stdout and stderr are set to kBuffer mode, they
+//     will be merged onto the same. There doesn't seem any use case where they
+//     are needed distinctly.
+//
+// Some caveats worth mentioning:
+// - It always waitpid()s, to avoid leaving zombies around. If the process is
+//   not terminated by the time the destructor is reached, the dtor will
+//   send a SIGKILL and wait for the termination.
+// - After fork()-ing it will close all file descriptors, preserving only
+//   stdin/out/err and the fds listed in |args.preserve_fds|.
+// - On Linux/Android, the child process will be SIGKILL-ed if the calling
+//   thread exists, even if the Subprocess is std::move()-d onto another thread.
+//   This happens by virtue PR_SET_PDEATHSIG, which is used to avoid that
+//   child processes are leaked in the case of a crash of the parent (frequent
+//   in tests). However, the child process might still be leaked if execing
+//   a setuid/setgid binary (see man 2 prctl).
+//
+// Usage:
+// base::Subprocess p({"/bin/cat", "-"});
+// (or equivalently:
+//     base::Subprocess p;
+//     p.args.exec_cmd.push_back("/bin/cat");
+//     p.args.exec_cmd.push_back("-");
+//  )
+// p.args.stdout_mode = base::Subprocess::kBuffer;
+// p.args.stderr_mode = base::Subprocess::kInherit;
+// p.args.input = "stdin contents";
+// p.Call();
+// (or equivalently:
+//     p.Start();
+//     p.Wait();
+// )
+// EXPECT_EQ(p.status(), base::Subprocess::kTerminated);
+// EXPECT_EQ(p.returncode(), 0);
+class Subprocess {
+ public:
+  enum Status {
+    kNotStarted = 0,  // Before calling Start() or Call().
+    kRunning,         // After calling Start(), before Wait().
+    kTerminated,      // The subprocess terminated, either successfully or not.
+                      // This includes crashes or other signals on UNIX.
+  };
+
+  enum class OutputMode {
+    kInherit = 0,  // Inherit's the caller process stdout/stderr.
+    kDevNull,      // dup() onto /dev/null.
+    kBuffer,       // dup() onto a pipe and move it into the output() buffer.
+    kFd,           // dup() onto the passed args.fd.
+  };
+
+  enum class InputMode {
+    kBuffer = 0,  // dup() onto a pipe and write args.input on it.
+    kDevNull,     // dup() onto /dev/null.
+  };
+
+  // Input arguments for configuring the subprocess behavior.
+  struct Args {
+    Args(std::initializer_list<std::string> _cmd = {}) : exec_cmd(_cmd) {}
+    Args(Args&&) noexcept;
+    Args& operator=(Args&&);
+    // If non-empty this will cause an exec() when Start()/Call() are called.
+    std::vector<std::string> exec_cmd;
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    // If non-empty, it changes the argv[0] argument passed to exec. If
+    // unset, argv[0] == exec_cmd[0]. This is to handle cases like:
+    // exec_cmd = {"/proc/self/exec"}, argv0: "my_custom_test_override".
+    std::string posix_argv0_override_for_testing;
+
+    // If non-empty this will be invoked on the fork()-ed child process, after
+    // stdin/out/err has been redirected and all other file descriptor are
+    // closed. It is valid to specify both |exec_cmd| AND
+    // |posix_entrypoint_for_testing|. In this case the latter will be invoked
+    // just before the exec() call, but after having closed all fds % stdin/o/e.
+    // This is for synchronization barriers in tests.
+    std::function<void()> posix_entrypoint_for_testing;
+
+    // When set, will will move the process to the given process group. If set
+    // and zero, it will create a new process group. Effectively this calls
+    // setpgid(0 /*self_pid*/, posix_proc_group_id).
+    // This can be used to avoid that subprocesses receive CTRL-C from the
+    // terminal, while still living in the same session.
+    std::optional<pid_t> posix_proc_group_id{};
+#endif
+
+    // If non-empty, replaces the environment passed to exec().
+    std::vector<std::string> env;
+
+    // The file descriptors in this list will not be closed.
+    std::vector<int> preserve_fds;
+
+    // The data to push in the child process stdin, if input_mode ==
+    // InputMode::kBuffer.
+    std::string input;
+
+    InputMode stdin_mode = InputMode::kBuffer;
+    OutputMode stdout_mode = OutputMode::kInherit;
+    OutputMode stderr_mode = OutputMode::kInherit;
+
+    base::ScopedPlatformHandle out_fd;
+
+    // Returns " ".join(exec_cmd), quoting arguments.
+    std::string GetCmdString() const;
+  };
+
+  struct ResourceUsage {
+    uint32_t cpu_utime_ms = 0;
+    uint32_t cpu_stime_ms = 0;
+    uint32_t max_rss_kb = 0;
+    uint32_t min_page_faults = 0;
+    uint32_t maj_page_faults = 0;
+    uint32_t vol_ctx_switch = 0;
+    uint32_t invol_ctx_switch = 0;
+
+    uint32_t cpu_time_ms() const { return cpu_utime_ms + cpu_stime_ms; }
+  };
+
+  explicit Subprocess(std::initializer_list<std::string> exec_cmd = {});
+  Subprocess(Subprocess&&) noexcept;
+  Subprocess& operator=(Subprocess&&);
+  ~Subprocess();  // It will KillAndWaitForTermination() if still alive.
+
+  // Starts the subprocess but doesn't wait for its termination. The caller
+  // is expected to either call Wait() or Poll() after this call.
+  void Start();
+
+  // Wait for process termination. Can be called more than once.
+  // Args:
+  //   |timeout_ms| = 0: wait indefinitely.
+  //   |timeout_ms| > 0: wait for at most |timeout_ms|.
+  // Returns:
+  //  True: The process terminated. See status() and returncode().
+  //  False: Timeout reached, the process is still running. In this case the
+  //         process will be left in the kRunning state.
+  bool Wait(int timeout_ms = 0);
+
+  // Equivalent of Start() + Wait();
+  // Returns true if the process exited cleanly with return code 0. False in
+  // any othe case.
+  bool Call(int timeout_ms = 0);
+
+  Status Poll();
+
+  // Sends a signal (SIGKILL if not specified) and wait for process termination.
+  void KillAndWaitForTermination(int sig_num = 0);
+
+  PlatformProcessId pid() const { return s_->pid; }
+
+  // The accessors below are updated only after a call to Poll(), Wait() or
+  // KillAndWaitForTermination().
+  // In most cases you want to call Poll() rather than these accessors.
+
+  Status status() const { return s_->status; }
+  int returncode() const { return s_->returncode; }
+  bool timed_out() const { return s_->timed_out; }
+
+  // This contains both stdout and stderr (if the corresponding _mode ==
+  // OutputMode::kBuffer). It's non-const so the caller can std::move() it.
+  std::string& output() { return s_->output; }
+  const std::string& output() const { return s_->output; }
+
+  const ResourceUsage& posix_rusage() const { return *s_->rusage; }
+
+  Args args;
+
+ private:
+  // The signal/exit code used when killing the process in case of a timeout.
+  static const int kTimeoutSignal;
+
+  Subprocess(const Subprocess&) = delete;
+  Subprocess& operator=(const Subprocess&) = delete;
+
+  // This is to deal robustly with the move operators, without having to
+  // manually maintain member-wise move instructions.
+  struct MovableState {
+    base::Pipe stdin_pipe;
+    base::Pipe stdouterr_pipe;
+    PlatformProcessId pid;
+    Status status = kNotStarted;
+    int returncode = -1;
+    std::string output;  // Stdin+stderr. Only when OutputMode::kBuffer.
+    std::unique_ptr<ResourceUsage> rusage{new ResourceUsage()};
+    bool timed_out = false;
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    std::thread stdouterr_thread;
+    std::thread stdin_thread;
+    ScopedPlatformHandle win_proc_handle;
+    ScopedPlatformHandle win_thread_handle;
+
+    base::EventFd stdouterr_done_event;
+    std::mutex mutex;  // Protects locked_outerr_buf and the two pipes.
+    std::string locked_outerr_buf;
+#else
+    base::Pipe exit_status_pipe;
+    size_t input_written = 0;
+    std::thread waitpid_thread;
+#endif
+  };
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  static void StdinThread(MovableState*, std::string input);
+  static void StdoutErrThread(MovableState*);
+#else
+  void TryPushStdin();
+  void TryReadStdoutAndErr();
+  void TryReadExitStatus();
+  bool PollInternal(int poll_timeout_ms);
+#endif
+
+  std::unique_ptr<MovableState> s_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_SUBPROCESS_H_
diff --git a/src/libtracing/perfetto/ext/base/sys_types.h b/src/libtracing/perfetto/ext/base/sys_types.h
new file mode 100644
index 000000000..bcb6433a2
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/sys_types.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_SYS_TYPES_H_
+#define INCLUDE_PERFETTO_EXT_BASE_SYS_TYPES_H_
+
+// This headers deals with sys types commonly used in the codebase that are
+// missing on Windows.
+
+#include <sys/types.h>
+#include <cstdint>
+
+#include "perfetto/base/build_config.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_COMPILER_GCC)
+// MinGW has these. clang-cl and MSVC, which use just the Windows SDK, don't.
+using uid_t = int;
+using pid_t = int;
+#endif  // !GCC
+
+#if defined(_WIN64)
+using ssize_t = int64_t;
+#else
+using ssize_t = long;
+#endif  // _WIN64
+
+#endif  // OS_WIN
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && !defined(AID_SHELL)
+// From libcutils' android_filesystem_config.h .
+#define AID_SHELL 2000
+#endif
+
+namespace perfetto {
+namespace base {
+
+// The machine ID used in the tracing core.
+using MachineID = uint32_t;
+// The default value reserved for the host trace.
+constexpr MachineID kDefaultMachineID = 0;
+
+constexpr uid_t kInvalidUid = static_cast<uid_t>(-1);
+constexpr pid_t kInvalidPid = static_cast<pid_t>(-1);
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_SYS_TYPES_H_
diff --git a/src/libtracing/perfetto/ext/base/temp_file.h b/src/libtracing/perfetto/ext/base/temp_file.h
new file mode 100644
index 000000000..359886821
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/temp_file.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_TEMP_FILE_H_
+#define INCLUDE_PERFETTO_EXT_BASE_TEMP_FILE_H_
+
+#include <string>
+
+#include "perfetto/ext/base/scoped_file.h"
+
+namespace perfetto {
+namespace base {
+
+std::string GetSysTempDir();
+
+class TempFile {
+ public:
+  static TempFile CreateUnlinked();
+  static TempFile Create();
+
+  TempFile(TempFile&&) noexcept;
+  TempFile& operator=(TempFile&&);
+  ~TempFile();
+
+  const std::string& path() const { return path_; }
+  int fd() const { return *fd_; }
+  int operator*() const { return *fd_; }
+
+  // Unlinks the file from the filesystem but keeps the fd() open.
+  // It is safe to call this multiple times.
+  void Unlink();
+
+  // Releases the underlying file descriptor. Will unlink the file from the
+  // filesystem if it was created via CreateUnlinked().
+  ScopedFile ReleaseFD();
+
+ private:
+  TempFile();
+  TempFile(const TempFile&) = delete;
+  TempFile& operator=(const TempFile&) = delete;
+
+  ScopedFile fd_;
+  std::string path_;
+};
+
+class TempDir {
+ public:
+  static TempDir Create();
+
+  TempDir(TempDir&&) noexcept;
+  TempDir& operator=(TempDir&&);
+  ~TempDir();
+
+  const std::string& path() const { return path_; }
+
+ private:
+  TempDir();
+  TempDir(const TempDir&) = delete;
+  TempDir& operator=(const TempDir&) = delete;
+
+  std::string path_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_TEMP_FILE_H_
diff --git a/src/libtracing/perfetto/ext/base/thread_annotations.h b/src/libtracing/perfetto/ext/base/thread_annotations.h
new file mode 100644
index 000000000..6aee16ad9
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/thread_annotations.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREAD_ANNOTATIONS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREAD_ANNOTATIONS_H_
+
+#include "perfetto/base/build_config.h"
+
+// Windows TSAN doesn't currently support these annotations.
+#if defined(THREAD_SANITIZER) && !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+extern "C" {
+void AnnotateBenignRaceSized(const char* file,
+                             int line,
+                             const volatile void* address,
+                             size_t size,
+                             const char* description);
+}
+
+#define PERFETTO_ANNOTATE_BENIGN_RACE_SIZED(pointer, size, description) \
+  AnnotateBenignRaceSized(__FILE__, __LINE__, pointer, size, description);
+#else  // defined(ADDRESS_SANITIZER)
+#define PERFETTO_ANNOTATE_BENIGN_RACE_SIZED(pointer, size, description)
+#endif  // defined(ADDRESS_SANITIZER)
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREAD_ANNOTATIONS_H_
diff --git a/src/libtracing/perfetto/ext/base/thread_checker.h b/src/libtracing/perfetto/ext/base/thread_checker.h
new file mode 100644
index 000000000..5a283ac5d
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/thread_checker.h
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREAD_CHECKER_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREAD_CHECKER_H_
+
+#include "perfetto/base/build_config.h"
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+#include <pthread.h>
+#endif
+#include <atomic>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/utils.h"
+
+namespace perfetto {
+namespace base {
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+using ThreadID = unsigned long;
+#else
+using ThreadID = pthread_t;
+#endif
+
+class PERFETTO_EXPORT_COMPONENT ThreadChecker {
+ public:
+  ThreadChecker();
+  ~ThreadChecker();
+  ThreadChecker(const ThreadChecker&);
+  ThreadChecker& operator=(const ThreadChecker&);
+  bool CalledOnValidThread() const PERFETTO_WARN_UNUSED_RESULT;
+  void DetachFromThread();
+
+ private:
+  mutable std::atomic<ThreadID> thread_id_;
+};
+
+#if PERFETTO_DCHECK_IS_ON() && !PERFETTO_BUILDFLAG(PERFETTO_CHROMIUM_BUILD)
+// TODO(primiano) Use Chromium's thread checker in Chromium.
+#define PERFETTO_THREAD_CHECKER(name) base::ThreadChecker name;
+#define PERFETTO_DCHECK_THREAD(name) \
+  PERFETTO_DCHECK((name).CalledOnValidThread())
+#define PERFETTO_DETACH_FROM_THREAD(name) (name).DetachFromThread()
+#else
+#define PERFETTO_THREAD_CHECKER(name)
+#define PERFETTO_DCHECK_THREAD(name)
+#define PERFETTO_DETACH_FROM_THREAD(name)
+#endif  // PERFETTO_DCHECK_IS_ON()
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREAD_CHECKER_H_
diff --git a/src/libtracing/perfetto/ext/base/thread_task_runner.h b/src/libtracing/perfetto/ext/base/thread_task_runner.h
new file mode 100644
index 000000000..aebde7ba7
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/thread_task_runner.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREAD_TASK_RUNNER_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREAD_TASK_RUNNER_H_
+
+#include <functional>
+#include <thread>
+
+#include "perfetto/ext/base/unix_task_runner.h"
+
+namespace perfetto {
+namespace base {
+
+// A UnixTaskRunner backed by a dedicated task thread. Shuts down the runner and
+// joins the thread upon destruction. Can be moved to transfer ownership.
+//
+// Guarantees that:
+// * the UnixTaskRunner will be constructed and destructed on the task thread.
+// * the task thread will live for the lifetime of the UnixTaskRunner.
+//
+class PERFETTO_EXPORT_COMPONENT ThreadTaskRunner : public TaskRunner {
+ public:
+  static ThreadTaskRunner CreateAndStart(const std::string& name = "") {
+    return ThreadTaskRunner(name);
+  }
+
+  ThreadTaskRunner(const ThreadTaskRunner&) = delete;
+  ThreadTaskRunner& operator=(const ThreadTaskRunner&) = delete;
+
+  ThreadTaskRunner(ThreadTaskRunner&&) noexcept;
+  ThreadTaskRunner& operator=(ThreadTaskRunner&&);
+  ~ThreadTaskRunner() override;
+
+  // Executes the given function on the task runner thread and blocks the caller
+  // thread until the function has run.
+  void PostTaskAndWaitForTesting(std::function<void()>);
+
+  // Can be called from another thread to get the CPU time of the thread the
+  // task-runner is executing on.
+  uint64_t GetThreadCPUTimeNsForTesting();
+
+  // Returns a pointer to the UnixTaskRunner, which is valid for the lifetime of
+  // this ThreadTaskRunner object (unless this object is moved-from, in which
+  // case the pointer remains valid for the lifetime of the new owning
+  // ThreadTaskRunner).
+  //
+  // Warning: do not call Quit() on the returned runner pointer, the termination
+  // should be handled exclusively by this class' destructor.
+  UnixTaskRunner* get() const { return task_runner_; }
+
+  // TaskRunner implementation.
+  // These methods just proxy to the underlying task_runner_.
+  void PostTask(std::function<void()>) override;
+  void PostDelayedTask(std::function<void()>, uint32_t delay_ms) override;
+  void AddFileDescriptorWatch(PlatformHandle, std::function<void()>) override;
+  void RemoveFileDescriptorWatch(PlatformHandle) override;
+  bool RunsTasksOnCurrentThread() const override;
+
+ private:
+  explicit ThreadTaskRunner(const std::string& name);
+  void RunTaskThread(std::function<void(UnixTaskRunner*)> initializer);
+
+  std::thread thread_;
+  std::string name_;
+  UnixTaskRunner* task_runner_ = nullptr;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREAD_TASK_RUNNER_H_
diff --git a/src/libtracing/perfetto/ext/base/thread_utils.h b/src/libtracing/perfetto/ext/base/thread_utils.h
new file mode 100644
index 000000000..9281fa0c1
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/thread_utils.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREAD_UTILS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREAD_UTILS_H_
+
+#include <string>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/ext/base/string_utils.h"
+#include "perfetto/base/export.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
+#include <pthread.h>
+#include <string.h>
+#include <algorithm>
+#endif
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+#include <sys/prctl.h>
+#endif
+
+// Internal implementation utils that aren't as widely useful/supported as
+// base/thread_utils.h.
+
+namespace perfetto {
+namespace base {
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
+// Sets the "comm" of the calling thread to the first 15 chars of the given
+// string.
+inline bool MaybeSetThreadName(const std::string& name) {
+  char buf[16] = {};
+  StringCopy(buf, name.c_str(), sizeof(buf));
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
+  return pthread_setname_np(buf) == 0;
+#else
+  return pthread_setname_np(pthread_self(), buf) == 0;
+#endif
+}
+
+inline bool GetThreadName(std::string& out_result) {
+  char buf[16] = {};
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+  if (prctl(PR_GET_NAME, buf) != 0)
+    return false;
+#else
+  if (pthread_getname_np(pthread_self(), buf, sizeof(buf)) != 0)
+    return false;
+#endif
+  out_result = std::string(buf);
+  return true;
+}
+
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
+PERFETTO_EXPORT_COMPONENT bool MaybeSetThreadName(const std::string& name);
+PERFETTO_EXPORT_COMPONENT bool GetThreadName(std::string& out_result);
+
+#else
+inline bool MaybeSetThreadName(const std::string&) {
+  return false;
+}
+inline bool GetThreadName(std::string&) {
+  return false;
+}
+#endif
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREAD_UTILS_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/BUILD.gn b/src/libtracing/perfetto/ext/base/threading/BUILD.gn
new file mode 100644
index 000000000..d3a7b859c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright (C) 2023 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../../../gn/perfetto.gni")
+
+source_set("threading") {
+  sources = [
+    "channel.h",
+    "future.h",
+    "future_combinators.h",
+    "poll.h",
+    "spawn.h",
+    "stream.h",
+    "stream_combinators.h",
+    "thread_pool.h",
+    "util.h",
+  ]
+  deps = [
+    "..:base",
+    "../../../../../gn:default_deps",
+  ]
+}
diff --git a/src/libtracing/perfetto/ext/base/threading/channel.h b/src/libtracing/perfetto/ext/base/threading/channel.h
new file mode 100644
index 000000000..9bf42f52b
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/channel.h
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_CHANNEL_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_CHANNEL_H_
+
+#include <mutex>
+#include <optional>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/platform_handle.h"
+#include "perfetto/ext/base/circular_queue.h"
+#include "perfetto/ext/base/event_fd.h"
+
+namespace perfetto {
+namespace base {
+
+// Unidirectional conduit used to send values between threads with a fixed-sized
+// buffer in-between.
+//
+// When a channel is read from when empty or written to when full, the operation
+// will not succeed and the caller can choose to a) abandon the operation,
+// or b) use |read_fd| or |write_fd| (as appropriate) which will be become
+// "ready" (i.e. base::TaskRunner watches will fire) when the operation would
+// succeed.
+//
+// A channel is very similar to a Unix pipe except with the values being sent
+// a) not needing to be serializable b) data does not go through the kernel.
+template <typename T>
+class Channel {
+ public:
+  struct ReadResult {
+    ReadResult(std::optional<T> _item, bool _is_closed)
+        : item(std::move(_item)), is_closed(_is_closed) {}
+
+    bool operator==(const ReadResult& res) const {
+      return item == res.item && is_closed == res.is_closed;
+    }
+
+    // The item read from the channel or std::nullopt if the channel is empty.
+    // If so, callers can use |read_fd| to be notified when a read operation
+    // would succeed.
+    std::optional<T> item;
+
+    // Indicates the channel is closed. Readers can continue to read from the
+    // channel and any buffered elements will be correctly returned. Moreover,
+    // any future reads will also have |is_closed| == true and |read_fd| will be
+    // ready forever.
+    //
+    // Once a ReadResult is returned with |item| == std::nullopt and
+    // |is_closed| == true, no further values will ever be returned.
+    bool is_closed;
+  };
+  struct WriteResult {
+    WriteResult(bool _success, bool _is_closed)
+        : success(std::move(_success)), is_closed(_is_closed) {}
+
+    bool operator==(const WriteResult& res) const {
+      return success == res.success && is_closed == res.is_closed;
+    }
+
+    // Returns whether the write to the channel was successful. If this is
+    // false, callers can use |write_fd| to be notified when future writes
+    // would succeed. Note that callers should also check |is_closed| as another
+    // writer may have closed the channel.
+    bool success;
+
+    // Indicates that the channel is closed. If this value is true, |success|
+    // will be |false| Moreover, any further writes will continue to return
+    // |success| == false, |is_closed| == true and |write_fd| will be ready
+    // forever.
+    bool is_closed;
+  };
+
+  // Creates a channel with a capacity at least as large as |capacity_hint|. The
+  // capacity *must* be greater than zero.
+  //
+  // Note that it's possible that a capacity > |capacity_hint| will be chosen:
+  // it is implementation defined when this might happen.
+  explicit Channel(uint32_t capacity_hint) : elements_(capacity_hint) {
+    PERFETTO_DCHECK(capacity_hint > 0);
+
+    // It's very important that we make sure |write_fd| is ready to avoid
+    // deadlocks.
+    write_fd_.Notify();
+  }
+
+  // Attempts to read from the channel and returns the result of the attempt.
+  // See |ReadResult| for more information on the result.
+  PERFETTO_WARN_UNUSED_RESULT ReadResult ReadNonBlocking() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (elements_.empty()) {
+      return ReadResult(std::nullopt, is_closed_);
+    }
+    if (elements_.capacity() == elements_.size()) {
+      write_fd_.Notify();
+    }
+    T value = std::move(elements_.front());
+    elements_.pop_front();
+    if (!is_closed_ && elements_.empty()) {
+      read_fd_.Clear();
+    }
+    return ReadResult(std::move(value), is_closed_);
+  }
+
+  // Attempts to write to the channel and returns the result of the attempt.
+  // See |WriteResult| for more information on the result.
+  //
+  // IMPORTANT: if this function returns |success| == false, |element| *will
+  // not* be modified. This allows the caller to try again with the same value.
+  PERFETTO_WARN_UNUSED_RESULT WriteResult WriteNonBlocking(T&& element) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (is_closed_) {
+      return WriteResult{false, true};
+    }
+    if (elements_.size() == elements_.capacity()) {
+      return WriteResult{false, false};
+    }
+    if (elements_.empty()) {
+      read_fd_.Notify();
+    }
+    elements_.emplace_back(std::move(element));
+    if (elements_.size() == elements_.capacity()) {
+      write_fd_.Clear();
+    }
+    return WriteResult{true, false};
+  }
+
+  // Closes the channel for to any further writes.
+  //
+  // Note: this function will make both |read_fd| and |write_fd| ready to
+  // avoid deadlocks. Callers should correctly handle |is_closed| being
+  // false from |ReadNonBlocking| and |WriteNonBlocking| to stop watching the
+  // fds to avoid poll returning immediately.
+  //
+  // We prefer this behaviour as it's a lot more obvious something is wrong when
+  // it spins and takes 100% CPU rather than silently deadlocking.
+  void Close() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    is_closed_ = true;
+
+    // Make both fds ready to avoid deadlocks.
+    read_fd_.Notify();
+    write_fd_.Notify();
+  }
+
+  // Notification FD for when |ReadNonBlocking| would succeed. Can be useful to
+  // pass to AddFileDescriptorWatch to read data from the channel.
+  base::PlatformHandle read_fd() const { return read_fd_.fd(); }
+
+  // Notification FD for when |WriteNonBlocking| would succeed. Can be useful to
+  // pass to AddFileDescriptorWatch to send data through the channel.
+  base::PlatformHandle write_fd() const { return write_fd_.fd(); }
+
+ private:
+  std::mutex mutex_;
+  base::CircularQueue<T> elements_;
+  bool is_closed_ = false;
+
+  base::EventFd read_fd_;
+  base::EventFd write_fd_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_CHANNEL_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/future.h b/src/libtracing/perfetto/ext/base/threading/future.h
new file mode 100644
index 000000000..6ec6682e3
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/future.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_FUTURE_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_FUTURE_H_
+
+#include <memory>
+#include <type_traits>
+
+#include "perfetto/ext/base/status_or.h"
+#include "perfetto/ext/base/threading/future_combinators.h"
+#include "perfetto/ext/base/threading/poll.h"
+
+namespace perfetto {
+namespace base {
+
+// Creates a Future<T> from P, a subclass of FuturePollable<T>.
+//
+// T generally is a primitive (e.g. int, string, double) or structs of
+// primitives but any can also be any moveable type.
+//
+// This function follows the same pattern of std::make_unique, std::make_shared
+// etc.
+template <typename P, typename... Args, typename T = typename P::PollT>
+Future<T> MakeFuture(Args... args) {
+  return Future<T>(
+      std::unique_ptr<FuturePollable<T>>(new P(std::forward<Args>(args)...)));
+}
+
+// A value of type T which is computed asynchronously.
+//
+// The result of long running compute/IO operations may not be available
+// immediately. This class acts as a representation of the value which will be
+// produced at some point in the future. Callers can then be notified of the
+// result once it's available to be processed.
+//
+// This class takes heavy inspiration from the implementation of Futures in
+// Rust. Specifically, this implementation is:
+//  - pull-based/lazy: Futures do nothing until "polled" i.e. driven to
+//    completion by a base::TaskRunner. The implementation of this is provided
+//    by base::TaskRunnerPoller.
+//  - backpressured: because futures are "polled", the result is only
+//    requested when it can be processed on the base::TaskRunner thread.
+//  - cancellable: by just destroying the future the computation can be
+//    cancelled. Note, that the implementation of the source future still needs
+//    to propogate cancellation across thread/socket/pipe boundary.
+//
+// Note: Futures *must* be polled on the same thread on which they were created.
+// The |SpawnResultFuture| can be used to move the results of Futures between
+// threads in a safe manner.
+//
+// Implementation note:
+// An important point to note is that Future<T> is a final class. Implementation
+// of Future<T>::Poll happens through an indirection layer by implementing the
+// FuturePollable<T> interface. This allows for the
+// unique_ptr<FuturePollable<T>> to be hidden, making callsites nicer while
+// also allowing useful "helper" functions like |ContinueWith| to live on the
+// class rather than as free functions.
+template <typename T>
+class Future final {
+ public:
+  using PollT = T;
+
+  // Creates a Future from a |FuturePollable<T>|. Prefer using |MakeFuture|
+  // instead of this function.
+  explicit Future(std::unique_ptr<FuturePollable<T>> pollable)
+      : pollable_(std::move(pollable)) {}
+
+  // Intentionally implicit to allow for ergonomic definition of functions
+  // returning Future<T> for any T.
+  Future(T item) : pollable_(new ImmediateImpl<T>(std::move(item))) {}
+
+  // Intentionally implicit to allow for egonomic definition of functions
+  // returning Future<StatusOr<T>> by simply returning ErrStatus.
+  // The enable_if is necessary because this definition is the same as the above
+  // constructor in cases where T = base::Status.
+  template <typename U = T,
+            typename = std::enable_if_t<!std::is_same_v<Status, U>>>
+  Future(Status status) : Future(T(std::move(status))) {}
+
+  // Intentionally implicit to allow for egonomic definition of functions
+  // returning Future<StatusOr<T>> by simply returning T.
+  template <typename U = T, typename = typename U::value_type>
+  Future(typename U::value_type val) : Future(T(std::move(val))) {}
+
+  // Operator used to chain operations on Futures. The result T produced by
+  // |this| is passed to |fn| which itself returns a Future<U>. The return value
+  // of this function is a Future<U> which encapsulates both the operation done
+  // by |this| as well as by the Future<U> returned by |fn|.
+  //
+  // Usage:
+  // ```
+  // Future<int> MySpecialFutureFn();
+  // Future<std::string> IntToStringInBackground(int);
+  //
+  // MySpecialFutureFn().ContinueWith([](int x) -> Future<std::string> {
+  //   return IntToStringInBackground(x);
+  // });
+  // ```
+  template <typename Function /* Future<U>(T) */,
+            typename U = FutureReturn<Function, T>>
+  Future<U> ContinueWith(Function fn) && {
+    return MakeFuture<ContinueWithImpl<Function, T>>(std::move(*this),
+                                                     std::move(fn));
+  }
+
+  // Checks if the computation backing this Future<T> has finished.
+  //
+  // Returns a FuturePollResult<T> which is a essentially a
+  // variant<PendingPollResult, T>. If PendingPollResult is returned, |ctx| will
+  // be used to register interest in the various fds which are "blocking" this
+  // future from finishing. If T is returned, Poll *must not* be called again.
+  FuturePollResult<T> Poll(PollContext* ctx) { return pollable_->Poll(ctx); }
+
+ private:
+  // TOOD(lalitm): if performance becomes a problem, this can be changed to
+  // something more efficient e.g. either storage in a stack allocated buffer
+  // or with bump-pointer allocation. In the current usage this is not a
+  // performance bottleneck and so this is not important enough to invest time
+  // into fixing.
+  std::unique_ptr<FuturePollable<T>> pollable_;
+};
+
+// Alias to shorten type defintions for Future<Status> which is common in
+// the codebase.
+using StatusFuture = Future<Status>;
+
+// Alias to shorten type defintions for Future<StatusOr<T>> which is common
+// in the codebase.
+template <typename T>
+using StatusOrFuture = Future<StatusOr<T>>;
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_FUTURE_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/future_combinators.h b/src/libtracing/perfetto/ext/base/threading/future_combinators.h
new file mode 100644
index 000000000..d726c6692
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/future_combinators.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_FUTURE_COMBINATORS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_FUTURE_COMBINATORS_H_
+
+#include <optional>
+#include <utility>
+#include <vector>
+
+#include "perfetto/base/status.h"
+#include "perfetto/ext/base/threading/poll.h"
+
+namespace perfetto {
+namespace base {
+
+template <typename T>
+class Future;
+
+// For a Function which Future<U>, returns the U.
+template <typename Function, typename T>
+using FutureReturn = typename std::invoke_result<Function, T>::type::PollT;
+
+// Implementation of FuturePollable for creating a Future<T> from a T.
+template <typename T>
+class ImmediateImpl : public FuturePollable<T> {
+ public:
+  explicit ImmediateImpl(T value) : value_(std::move(value)) {}
+
+  FuturePollResult<T> Poll(PollContext*) override { return std::move(value_); }
+
+ private:
+  T value_;
+};
+
+// Implementation of FuturePollable backing Future::ContinueWith.
+template <typename Function, typename A, typename B = FutureReturn<Function, A>>
+class ContinueWithImpl : public FuturePollable<B> {
+ public:
+  ContinueWithImpl(Future<A> first, Function second_fn)
+      : first_(std::move(first)), second_fn_(std::move(second_fn)) {}
+
+  FuturePollResult<B> Poll(PollContext* context) override {
+    PERFETTO_CHECK((first_ && second_fn_) || second_);
+    if (first_) {
+      ASSIGN_OR_RETURN_IF_PENDING_FUTURE(res, first_->Poll(context));
+      first_ = std::nullopt;
+      second_ = (*second_fn_)(std::move(res));
+      second_fn_ = std::nullopt;
+    }
+    return second_->Poll(context);
+  }
+
+ private:
+  std::optional<Future<A>> first_;
+  std::optional<Function> second_fn_;
+  std::optional<Future<B>> second_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_FUTURE_COMBINATORS_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/poll.h b/src/libtracing/perfetto/ext/base/threading/poll.h
new file mode 100644
index 000000000..5a4b7e372
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/poll.h
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_POLL_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_POLL_H_
+
+#include <optional>
+
+#include <variant>
+#include "perfetto/base/flat_set.h"
+#include "perfetto/base/platform_handle.h"
+
+namespace perfetto {
+namespace base {
+
+// Forward declarations.
+class PollContext;
+
+// "Void" type for futures: this type can be used when a Future/Stream wants
+// to return no value. We cannot use void directly because it causes all sorts
+// of subtle issues with templates.
+struct FVoid {};
+
+// Indicates that the Future is not ready to produce data at the moment but
+// will do so at a later date.
+struct PendingPollResult {};
+
+// Return value of Future<T>::Poll.
+//
+// Essentially a wrapper around std::variant<T, PendingPollResult> but with
+// higher level API.
+template <typename T>
+class FuturePollResult {
+ public:
+  using PollT = T;
+
+  // Intentionally implicit to allow idiomatic returns.
+  FuturePollResult(const PendingPollResult&) : inner_(PendingPollResult()) {}
+  FuturePollResult(T item) noexcept : inner_(std::move(item)) {}
+
+  // Returns whether the Future is still pending.
+  bool IsPending() const {
+    return std::holds_alternative<PendingPollResult>(inner_);
+  }
+
+  // The real value inside this result: requires !IsPending().
+  T& item() {
+    PERFETTO_DCHECK(!IsPending());
+    return std::get<T>(inner_);
+  }
+  const T& item() const {
+    PERFETTO_DCHECK(!IsPending());
+    return std::get<T>(inner_);
+  }
+
+  // The real value inside this result: requires !IsPending().
+  T* operator->() { return &item(); }
+  const T* operator->() const { return &item(); }
+
+ private:
+  std::variant<PendingPollResult, T> inner_;
+};
+
+// Interface for implementing the Future<T>::Poll function.
+//
+// This is essentially a variant of the common PIMPL (pointer to impl) pattern
+// used in C++ to allow having different implementations for Future<T>::Poll.
+//
+// We are using this instead of having an abstract function in Future to avoid
+// having to wrap Future in unique_ptr everywhere it's used.
+//
+// We could have used std::function<Result(PollContext*)> but not all
+// implementations of FuturePollable are copyable. If we had C++23, we could use
+// std::move_only_function but we are some years from being able to do that.
+template <typename T>
+class FuturePollable {
+ public:
+  using PollT = T;
+
+  virtual ~FuturePollable() = default;
+
+  // Implementation of the Poll function of a Future: see Future documentation
+  // for how this should be implemented.
+  virtual FuturePollResult<T> Poll(PollContext*) = 0;
+};
+
+// Indicates that the Stream has been exhausted and no more values will be
+// returned.
+struct DonePollResult {};
+
+// Return value of Stream<T>::Poll.
+//
+// Essentially a wrapper around std::variant<T, PendingPollResult,
+// DonePollResult> but with higher level API.
+template <typename T>
+class StreamPollResult {
+ public:
+  using PollT = T;
+
+  // Intentionally implicit to allow idiomatic returns.
+  StreamPollResult(const PendingPollResult&) : inner_(PendingPollResult()) {}
+  StreamPollResult(const DonePollResult&) : inner_(DonePollResult()) {}
+  StreamPollResult(T item) : inner_(std::move(item)) {}
+
+  // Returns whether the Stream is still pending.
+  bool IsPending() const {
+    return std::holds_alternative<PendingPollResult>(inner_);
+  }
+
+  // Returns whether the Stream is done.
+  bool IsDone() const { return std::holds_alternative<DonePollResult>(inner_); }
+
+  // The real value inside this result: requires !IsPending() and !IsDone().
+  T& item() {
+    PERFETTO_DCHECK(!IsPending());
+    PERFETTO_DCHECK(!IsDone());
+    return std::get<T>(inner_);
+  }
+  const T& item() const {
+    PERFETTO_DCHECK(!IsPending());
+    PERFETTO_DCHECK(!IsDone());
+    return std::get<T>(inner_);
+  }
+
+  // The real value inside this result: requires !IsPending() and !IsDone().
+  T* operator->() { return &item(); }
+  const T* operator->() const { return &item(); }
+
+ private:
+  std::variant<PendingPollResult, DonePollResult, T> inner_;
+};
+
+// Interface for implementing the Stream<T>::Poll function.
+//
+// This is essentially analagous to FuturePollable<T> for streams: check the
+// documentation of that class for why this exists.
+template <typename T>
+class StreamPollable {
+ public:
+  using PollT = T;
+
+  virtual ~StreamPollable() = default;
+
+  // Implementation of the Poll function of a Stream: see Stream documentation
+  // for how this should be implemented.
+  virtual StreamPollResult<T> PollNext(PollContext*) = 0;
+};
+
+// Context class passed to Pollable classes.
+//
+// Implementations of Pollable which simply wrap another Pollable will use
+// this as an opaque parameter to pass on.
+//
+// "Source" pollables (i.e. Pollables dealing directly with FDs) should call
+// |RegisterInterested| when the FD returns EAGAIN/EWOULDBLOCK with the
+// PollContext passed in.
+class PollContext {
+ public:
+  explicit PollContext(FlatSet<PlatformHandle>* interested_handles,
+                       const FlatSet<PlatformHandle>* ready_handles)
+      : interested_handles_(interested_handles),
+        ready_handles_(ready_handles) {}
+
+  PollContext(PollContext&&) = default;
+  PollContext& operator=(PollContext&&) = default;
+
+  // Called by implementations of Future<T> to indicate that Poll should be
+  // called again when |handle(s)| are ready for reading (or have been closed).
+  void RegisterInterested(PlatformHandle handle) {
+    interested_handles_->insert(handle);
+  }
+  void RegisterAllInterested(const FlatSet<PlatformHandle>& handles) {
+    for (PlatformHandle handle : handles) {
+      RegisterInterested(handle);
+    }
+  }
+
+  // Returns a set of all the fds which were marked as "ready" by the operating
+  // system (i.e. POLLIN/POLLHUP on Linux).
+  const FlatSet<PlatformHandle>& ready_handles() const {
+    return *ready_handles_;
+  }
+
+ private:
+  PollContext(const PollContext&) = delete;
+  PollContext& operator=(const PollContext&) = delete;
+
+  FlatSet<PlatformHandle>* interested_handles_ = nullptr;
+  const FlatSet<PlatformHandle>* ready_handles_ = nullptr;
+};
+
+// Evaluates |expr|, which should return a FuturePollResult. If IsPending is
+// true, returns base::PendingPollResult().
+//
+// Example usage:
+//
+// Future<int> MyIntReturningFutureFn();
+//
+// FuturePollResult<std::string> Poll(PollContext* ctx) {
+//   // res will be of type "int"
+//   ASSIGN_OR_RETURN_IF_PENDING_FUTURE(res, MyIntReturningFutureFn());
+//   return std::to_string(*foo);
+// }
+#define ASSIGN_OR_RETURN_IF_PENDING_FUTURE(var, expr) \
+  auto assign_and_return_if_poll_##var = (expr);      \
+  if (assign_and_return_if_poll_##var.IsPending())    \
+    return base::PendingPollResult();                 \
+  auto var = std::move(assign_and_return_if_poll_##var.item())
+
+// Evaluates |expr|, which should return a PollResult. If IsPending is
+// true, returns base::PendingPollResult().
+//
+// Example usage:
+//
+// Strean<int> MyIntReturningStreamFn();
+//
+// StreamPollResult<std::string> Poll(PollContext* ctx) {
+//   ASSIGN_OR_RETURN_IF_PENDING_STREAM(res, MyIntReturningStreamFn());
+//   if (res.IsDone()) {
+//     return DonePollResult();
+//   }
+//   return std::to_string(*foo);
+// }
+#define ASSIGN_OR_RETURN_IF_PENDING_STREAM(var, expr) \
+  auto var = (expr);                                  \
+  if (var.IsPending())                                \
+  return base::PendingPollResult()
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_POLL_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/spawn.h b/src/libtracing/perfetto/ext/base/threading/spawn.h
new file mode 100644
index 000000000..4f650521d
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/spawn.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_SPAWN_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_SPAWN_H_
+
+#include <atomic>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <utility>
+#include <vector>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/flat_set.h"
+#include "perfetto/base/platform_handle.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/ext/base/event_fd.h"
+#include "perfetto/ext/base/flat_hash_map.h"
+#include "perfetto/ext/base/thread_checker.h"
+#include "perfetto/ext/base/threading/channel.h"
+#include "perfetto/ext/base/threading/future.h"
+#include "perfetto/ext/base/threading/poll.h"
+#include "perfetto/ext/base/threading/stream.h"
+#include "perfetto/ext/base/threading/stream_combinators.h"
+#include "perfetto/ext/base/threading/util.h"
+#include "perfetto/ext/base/uuid.h"
+#include "perfetto/ext/base/weak_ptr.h"
+
+namespace perfetto {
+namespace base {
+
+class PolledFuture;
+
+// A RAII object which tracks the polling of a Future.
+//
+// When this object is dropped, the backing Future will be cancelled as
+// soon as possible. In practice, the cancellation happens on the TaskRunner
+// thread so there can be some delay.
+class SpawnHandle {
+ public:
+  SpawnHandle(TaskRunner* task_runner, std::function<Future<FVoid>()> fn);
+
+  SpawnHandle(SpawnHandle&&) = default;
+  SpawnHandle& operator=(SpawnHandle&&) = default;
+
+  ~SpawnHandle();
+
+ private:
+  SpawnHandle(const SpawnHandle&) = delete;
+  SpawnHandle& operator=(const SpawnHandle&) = delete;
+
+  TaskRunner* task_runner_ = nullptr;
+  std::shared_ptr<std::unique_ptr<PolledFuture>> polled_future_;
+};
+
+// "Spawns" a Future<FVoid> on the given TaskRunner and returns an RAII
+// SpawnHandle which can be used to cancel the spawn.
+//
+// Spawning a Future means to poll it to completion. In Perfetto, this is done
+// by using a TaskRunner object to track FD readiness and polling the Future
+// when progress can be made.
+//
+// The returned SpawnHandle should be stashed as it is responsible for the
+// lifetime of the pollling. If the SpawnHandle is dropped, the Future is
+// cancelled and dropped ASAP (this happens on the TaskRunner thread so there
+// can be some delay).
+PERFETTO_WARN_UNUSED_RESULT inline SpawnHandle SpawnFuture(
+    TaskRunner* task_runner,
+    std::function<Future<FVoid>()> fn) {
+  return SpawnHandle(task_runner, std::move(fn));
+}
+
+// Variant of |SpawnFuture| for a Stream<T> allowing returning items of T.
+//
+// The Stream<T> returned by this function can be consumed on any thread, not
+// just the thread which ran this function.
+//
+// Dropping the returned stream does not affect the polling of the underlying
+// stream (i.e. the stream returned by |fn|); the polled values will simply be
+// dropped.
+//
+// Dropping the returned SpawnHandle causes the underlying stream to be
+// cancelled and dropped ASAP (this happens on the TaskRunner thread so there
+// can be some delay). The returned channel will return all the values that were
+// produced by the underlying stream before the cancellation.
+template <typename T>
+PERFETTO_WARN_UNUSED_RESULT std::pair<SpawnHandle, Stream<T>> SpawnResultStream(
+    TaskRunner* runner,
+    std::function<Stream<T>()> fn) {
+  class AllVoidCollector : public Collector<FVoid, FVoid> {
+   public:
+    std::optional<FVoid> OnNext(FVoid) override { return std::nullopt; }
+    FVoid OnDone() override { return FVoid(); }
+  };
+  auto channel = std::make_shared<Channel<T>>(4);
+  auto control = std::make_shared<Channel<FVoid>>(1);
+  SpawnHandle handle(runner, [channel, control, fn = std::move(fn)]() {
+    return fn()
+        .MapFuture([channel, control](T value) mutable {
+          if (control->ReadNonBlocking().is_closed) {
+            return base::Future<base::FVoid>(base::FVoid());
+          }
+          return WriteChannelFuture(channel.get(), std::move(value));
+        })
+        .Concat(OnDestroyStream<FVoid>([c = channel]() { c->Close(); }))
+        .template Collect<base::FVoid>(std::make_unique<AllVoidCollector>());
+  });
+  Stream<T> stream = ReadChannelStream(channel.get())
+                         .Concat(OnDestroyStream<T>([channel, control]() {
+                           // Close the control stream and drain an element from
+                           // the channel to unblock it in case it was blocked.
+                           // NOTE: the ordering here is important as we could
+                           // deadlock if it was the other way around!
+                           control->Close();
+                           base::ignore_result(channel->ReadNonBlocking());
+                         }));
+  return std::make_pair(std::move(handle), std::move(stream));
+}
+
+// Variant of |SpawnResultStream| but for Future<T>.
+template <typename T>
+PERFETTO_WARN_UNUSED_RESULT inline std::pair<SpawnHandle, Future<T>>
+SpawnResultFuture(TaskRunner* task_runner, std::function<Future<T>()> fn) {
+  auto [handle, stream] = SpawnResultStream<T>(
+      task_runner, [fn = std::move(fn)]() { return StreamFromFuture(fn()); });
+  return std::make_pair(std::move(handle), std::move(stream).Collect(
+                                               ToFutureCheckedCollector<T>()));
+}
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_SPAWN_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/stream.h b/src/libtracing/perfetto/ext/base/threading/stream.h
new file mode 100644
index 000000000..d12f0b9af
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/stream.h
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_STREAM_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_STREAM_H_
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "perfetto/base/status.h"
+#include "perfetto/ext/base/status_or.h"
+#include "perfetto/ext/base/threading/future.h"
+#include "perfetto/ext/base/threading/stream_combinators.h"
+
+namespace perfetto {
+namespace base {
+
+// Creates a Stream<T> from P, a subclass of StreamPollable<T>.
+//
+// This function follows the same pattern of std::make_unique, std::make_shared
+// etc.
+template <typename P, typename... Args>
+Stream<typename P::PollT> MakeStream(Args... args) {
+  return Stream<typename P::PollT>(
+      std::unique_ptr<StreamPollable<typename P::PollT>>(
+          new P(std::forward<Args>(args)...)));
+}
+
+// An asynchronous iterator for values of type T.
+//
+// If Future<T> is an asynchronous version of T, Stream<T> is an asynchronous
+// version of Iterator<T>. Long-running compute/IO operations which return
+// multiple values can be represented with a Stream<T>.
+//
+// Note: Streams *must* be polled on the same thread on which they were
+// created. The |SpawnResultStreams| can be used to move of the results of
+// Streams between threads in a safe manner.
+//
+// Refer to the class documentation for Future<T> as most of the features and
+// implementation of Future<T> also apply to Stream<T>.
+template <typename T>
+class Stream {
+ public:
+  using PollableItem = T;
+
+  // Creates a Stream from a |StreamPollable<T>|. Prefer using |MakeStream|
+  // instead of this function.
+  explicit Stream(std::unique_ptr<StreamPollable<T>> pollable)
+      : pollable_(std::move(pollable)) {}
+
+  // Converts a Stream<T> to Stream<U>. This works by applying |map_fn| to each
+  // element in T and then polling the returned Future<U> to completion.
+  template <typename Function /* = Future<U>(T) */>
+  Stream<FutureReturn<Function, T>> MapFuture(Function map_fn) && {
+    return MakeStream<MapFutureStreamImpl<Function, T>>(std::move(*this),
+                                                        std::move(map_fn));
+  }
+
+  // Creates a stream which fully polls |this| and then polls |concat| to
+  // completion.
+  Stream<T> Concat(Stream<T> concat) && {
+    return MakeStream<ConcatStreamImpl<T>>(std::move(*this), std::move(concat));
+  }
+
+  // Converts a Stream<T> to Future<U> by collecting elements using |collector|.
+  // See documentation on |Collector| for how to implement one.
+  template <typename U>
+  Future<U> Collect(std::unique_ptr<Collector<T, U>> collector) && {
+    return MakeFuture<CollectImpl<T, U>>(std::move(*this),
+                                         std::move(collector));
+  }
+
+  // Checks if the computation backing this Stream<T> has finished.
+  //
+  // Returns a StreamPollResult<T> which is a essentially a
+  // variant<PendingPollResult, DonePollResult T>. If PendingPollResult is
+  // returned, |ctx| will be used to register interest in the various fds which
+  // are "blocking" this future from finishing. If DonePollResult is returned,
+  // Poll *must not* be called again.
+  StreamPollResult<T> PollNext(PollContext* ctx) {
+    return pollable_->PollNext(ctx);
+  }
+
+ private:
+  std::unique_ptr<StreamPollable<T>> pollable_;
+};
+
+// Alias to shorten type defintions for Stream<Status> which is common in
+// the codebase.
+using StatusStream = Stream<Status>;
+
+// Alias to shorten type defintions for Stream<StatusOr<T>> which is common
+// in the codebase.
+template <typename T>
+using StatusOrStream = Stream<StatusOr<T>>;
+
+// Creates a Stream<T> which returns the next value inside |vector| every time
+// Stream<T>::Poll is called.
+template <typename T>
+Stream<T> StreamFrom(std::vector<T> vector) {
+  return MakeStream<ImmediateStreamImpl<T>>(std::move(vector));
+}
+
+// Creates a Stream<T> which immediately returns DonePollResult when polled.
+template <typename T>
+Stream<T> EmptyStream() {
+  return StreamFrom(std::vector<T>());
+}
+
+// Creates a Stream<T> which returns |first| and each of |rest| in sequence when
+// polled.
+template <typename T, typename... Ts>
+Stream<T> StreamOf(T first, Ts... rest) {
+  std::vector<T> values;
+  AddAllToVector(values, std::forward<T>(first), std::forward<Ts>(rest)...);
+  return StreamFrom(std::move(values));
+}
+
+// Creates a Stream<T> which returns the value of |future| before completing.
+template <typename T>
+Stream<T> StreamFromFuture(Future<T> future) {
+  return StreamOf(std::move(future)).MapFuture([](Future<T> value) {
+    return value;
+  });
+}
+
+// Creates a stream which returns no elements but calls |fn| in the destructor
+// of the returned stream.
+//
+// This function can be used to do resource management for a stream by making
+// the passed |fn| own the resources used by any "upstream" sources and then
+// Concat-ing this stream with the upstream.
+template <typename T, typename Function>
+Stream<T> OnDestroyStream(Function fn) {
+  return MakeStream<OnDestroyStreamImpl<T, Function>>(std::move(fn));
+}
+
+// Creates a Stream<T> returning values generated by each stream in |streams| as
+// soon as they are produced without preserving ordering.
+//
+// The returned Stream<T> keeps the amount of Poll calls to the inner |streams|,
+// to a minimum only calling Poll for the Streams which are marked are ready
+// in the PollContext.
+template <typename T>
+Stream<T> FlattenStreams(std::vector<Stream<T>> streams) {
+  return MakeStream<FlattenImpl<T>>(std::move(streams));
+}
+
+// Collector for Stream<Status>::Collect() which immediately resolves the
+// returned Future when an error status is detected. Resolves with
+// OkStatus once the entire stream finishes after returning all OkStatus().
+inline std::unique_ptr<Collector<Status, Status>> AllOkCollector() {
+  return std::make_unique<AllOkCollectorImpl>();
+}
+
+// Collector for Stream<T>::Collect() which ensures the stream returns *exactly*
+// one T before completing. Crashes if either a) no values are produced by
+// the Stream, b) more than one value is produced by the Stream.
+template <typename T>
+inline std::unique_ptr<Collector<T, T>> ToFutureCheckedCollector() {
+  return std::make_unique<FutureCheckedCollectorImpl<T>>();
+}
+
+// Collector for Stream<StatusOr<T>>::Collect() which returns a vector
+// containing all the successful results from the stream. If any element is an
+// error, short-circuits the stream with the error.
+template <typename T>
+inline std::unique_ptr<Collector<StatusOr<T>, StatusOr<std::vector<T>>>>
+StatusOrVectorCollector() {
+  return std::make_unique<StatusOrVectorCollectorImpl<T>>();
+}
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_STREAM_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/stream_combinators.h b/src/libtracing/perfetto/ext/base/threading/stream_combinators.h
new file mode 100644
index 000000000..2b7b69e81
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/stream_combinators.h
@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_STREAM_COMBINATORS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_STREAM_COMBINATORS_H_
+
+#include <memory>
+#include <optional>
+#include <utility>
+#include <vector>
+
+#include "perfetto/base/status.h"
+#include "perfetto/ext/base/status_or.h"
+#include "perfetto/ext/base/threading/future_combinators.h"
+#include "perfetto/ext/base/threading/poll.h"
+
+namespace perfetto {
+namespace base {
+
+template <typename T>
+class Stream;
+
+// Helper function for adding all the elements in parameter pack to a vector.
+template <typename T, typename... Elements>
+void AddAllToVector(std::vector<T>&) {}
+
+template <typename T, typename... Elements>
+void AddAllToVector(std::vector<T>& vec, T first, Elements... rest) {
+  vec.emplace_back(std::forward<T>(first));
+  AddAllToVector(vec, std::forward<Elements>(rest)...);
+}
+
+// For a Function which returns Stream<U>, returns the U.
+template <typename Function, typename T>
+using StreamReturn =
+    typename std::invoke_result<Function, T>::type::PollableItem;
+
+// Implementation of StreamPollable for creating a Stream<T> from a
+// std::vector<T>.
+template <typename T>
+class ImmediateStreamImpl : public StreamPollable<T> {
+ public:
+  explicit ImmediateStreamImpl(std::vector<T> values)
+      : values_(std::move(values)) {}
+
+  StreamPollResult<T> PollNext(PollContext*) override {
+    if (index_ >= values_.size()) {
+      return DonePollResult();
+    }
+    return StreamPollResult<T>(std::move(values_[index_++]));
+  }
+
+ private:
+  std::vector<T> values_;
+  uint32_t index_ = 0;
+};
+
+// Implementation of a StreamPollable for creating a Stream<U> from a Stream<T>
+// and a functor with prototype Future<U>(T).
+template <typename Function, typename T>
+class MapFutureStreamImpl : public StreamPollable<FutureReturn<Function, T>> {
+ public:
+  using U = FutureReturn<Function, T>;
+
+  MapFutureStreamImpl(Stream<T> stream, Function map_fn)
+      : stream_(std::move(stream)), map_fn_(std::move(map_fn)) {}
+
+  StreamPollResult<U> PollNext(PollContext* context) override {
+    if (!future_) {
+      ASSIGN_OR_RETURN_IF_PENDING_STREAM(res, stream_.PollNext(context));
+      if (res.IsDone()) {
+        return DonePollResult();
+      }
+      future_ = map_fn_(std::move(res.item()));
+    }
+    ASSIGN_OR_RETURN_IF_PENDING_FUTURE(res, future_->Poll(context));
+    future_ = std::nullopt;
+    return res;
+  }
+
+ private:
+  Stream<T> stream_;
+  Function map_fn_;
+  std::optional<Future<U>> future_;
+};
+
+// Implementation of a StreamPollable for creating a concatenating two streams
+// together.
+template <typename T>
+class ConcatStreamImpl : public StreamPollable<T> {
+ public:
+  explicit ConcatStreamImpl(Stream<T> first, Stream<T> second)
+      : first_(std::move(first)), second_(std::move(second)) {}
+
+  StreamPollResult<T> PollNext(PollContext* context) override {
+    if (first_) {
+      ASSIGN_OR_RETURN_IF_PENDING_STREAM(res, first_->PollNext(context));
+      if (!res.IsDone()) {
+        return res.item();
+      }
+      first_ = std::nullopt;
+    }
+    return second_.PollNext(context);
+  }
+
+ private:
+  std::optional<Stream<T>> first_;
+  Stream<T> second_;
+};
+
+// Implementation of a StreamPollable for creating a Stream<T> from a
+// std::vector<Stream<T>>. Values are returned from the inner streams as soon as
+// they are available.
+template <typename T>
+class FlattenImpl : public StreamPollable<T> {
+ public:
+  explicit FlattenImpl(std::vector<Stream<T>> streams)
+      : registered_handles_(static_cast<uint32_t>(streams.size())) {
+    for (auto& stream : streams) {
+      streams_.emplace_back(std::move(stream));
+    }
+  }
+
+  StreamPollResult<T> PollNext(PollContext* upstream) override {
+    for (uint32_t i = 0; i < streams_.size(); ++i) {
+      auto& stream = streams_[i];
+      if (!stream) {
+        continue;
+      }
+      std::optional<PollContext> ctx = PollContextForStream(upstream, i);
+      if (!ctx) {
+        continue;
+      }
+      StreamPollResult<T> res = stream->PollNext(&*ctx);
+      if (res.IsPending()) {
+        PERFETTO_CHECK(!registered_handles_[i].empty());
+        continue;
+      }
+      if (!res.IsDone()) {
+        return res;
+      }
+      // StreamPollable has returned EOF. Clear it and the registered handles
+      // out.
+      stream = std::nullopt;
+      ++eof_streams_;
+      registered_handles_[i].clear();
+    }
+
+    // Every child stream being EOF means we have reached EOF as well.
+    if (eof_streams_ == streams_.size()) {
+      return DonePollResult();
+    }
+    // Every remaining stream must be pending so we can make no further
+    // progress. Register all the child handles with the context and return.
+    for (const FlatSet<PlatformHandle>& handles : registered_handles_) {
+      upstream->RegisterAllInterested(handles);
+    }
+    return PendingPollResult();
+  }
+
+ private:
+  std::optional<PollContext> PollContextForStream(PollContext* upstream,
+                                                  uint32_t stream_idx) {
+    FlatSet<PlatformHandle>& state = registered_handles_[stream_idx];
+    if (state.empty()) {
+      return PollContext(&state, &upstream->ready_handles());
+    }
+    for (PlatformHandle handle : upstream->ready_handles()) {
+      if (state.count(handle)) {
+        state.clear();
+        return PollContext(&state, &upstream->ready_handles());
+      }
+    }
+    return std::nullopt;
+  }
+
+  std::vector<std::optional<Stream<T>>> streams_;
+  std::vector<FlatSet<PlatformHandle>> registered_handles_;
+  uint32_t eof_streams_ = 0;
+};
+
+// Implementation of a Stream<T> which immediately completes and calls a
+// function in the destructor.
+template <typename T, typename Function>
+class OnDestroyStreamImpl : public StreamPollable<T> {
+ public:
+  explicit OnDestroyStreamImpl(Function fn) : fn_(std::move(fn)) {}
+  ~OnDestroyStreamImpl() override { fn_(); }
+
+  StreamPollResult<T> PollNext(PollContext*) override {
+    return DonePollResult();
+  }
+
+ private:
+  Function fn_;
+};
+
+// Interface for converting a Stream<T> into a Future<U>.
+//
+// The goal of this interface is to allow a Stream to be converted to a Future,
+// allowing short-circuiting (i.e. allowing the Future to complete before
+// the stream finishes).
+//
+// The flexibility of this interface allows both supporting the traditional
+// notion of collecting i.e. converting a Stream<T> to a Future<vector<T>> but
+// also more advanced functionality like completing a Future<Status> early
+// when errors are detected, racing Future<T> against each other and returning
+// the first value produced etc.
+template <typename T, typename U>
+class Collector {
+ public:
+  virtual ~Collector() = default;
+
+  // Receives the next item from a Stream<T>. If the wrapping Future<U> can be
+  // completed, returns the a value U which completes that future. Otherwise,
+  // returns std::nullopt.
+  virtual std::optional<U> OnNext(T value) = 0;
+
+  // Called when the stream has completed and returns the |U| which will be
+  // used to complete the future. This method will only be called if OnNext
+  // returned std::nullopt for every element in the stream.
+  virtual U OnDone() = 0;
+};
+
+// Implementation of a StreamPollable which converts a Stream<T> to a Future<U>
+// using an implementation of Collector<T, U>.
+template <typename T, typename U>
+class CollectImpl : public FuturePollable<U> {
+ public:
+  explicit CollectImpl(Stream<T> stream,
+                       std::unique_ptr<Collector<T, U>> collector)
+      : stream_(std::move(stream)), collector_(std::move(collector)) {}
+
+  FuturePollResult<U> Poll(PollContext* context) override {
+    for (;;) {
+      ASSIGN_OR_RETURN_IF_PENDING_STREAM(res, stream_.PollNext(context));
+      if (res.IsDone()) {
+        return collector_->OnDone();
+      }
+      std::optional<U> collected = collector_->OnNext(std::move(res.item()));
+      if (collected.has_value()) {
+        return std::move(collected.value());
+      }
+    }
+  }
+
+ private:
+  Stream<T> stream_;
+  std::unique_ptr<Collector<T, U>> collector_;
+};
+
+// Implementation for |AllOkCollector|.
+class AllOkCollectorImpl : public Collector<Status, Status> {
+ public:
+  ~AllOkCollectorImpl() override;
+
+  std::optional<Status> OnNext(Status status) override {
+    return status.ok() ? std::nullopt : std::make_optional(std::move(status));
+  }
+  Status OnDone() override { return OkStatus(); }
+};
+
+// Implementation for |ToFutureCheckedCollector|.
+template <typename T>
+class FutureCheckedCollectorImpl : public Collector<T, T> {
+ public:
+  std::optional<T> OnNext(T value) override {
+    PERFETTO_CHECK(!prev_value_);
+    prev_value_ = value;
+    return std::nullopt;
+  }
+  T OnDone() override { return *prev_value_; }
+
+ private:
+  std::optional<T> prev_value_;
+};
+
+// Implementation for |StatusOrVectorCollector|.
+template <typename T>
+class StatusOrVectorCollectorImpl
+    : public Collector<base::StatusOr<T>, base::StatusOr<std::vector<T>>> {
+ public:
+  std::optional<base::StatusOr<std::vector<T>>> OnNext(
+      base::StatusOr<T> val_or) override {
+    if (!val_or.ok()) {
+      return std::make_optional(val_or.status());
+    }
+    values_.emplace_back(std::move(val_or.value()));
+    return std::nullopt;
+  }
+  base::StatusOr<std::vector<T>> OnDone() override {
+    return std::move(values_);
+  }
+
+ private:
+  std::vector<T> values_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_STREAM_COMBINATORS_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/thread_pool.h b/src/libtracing/perfetto/ext/base/threading/thread_pool.h
new file mode 100644
index 000000000..e08baaa2d
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/thread_pool.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_THREAD_POOL_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_THREAD_POOL_H_
+
+#include <condition_variable>
+#include <functional>
+#include <list>
+#include <mutex>
+#include <optional>
+#include <thread>
+#include <vector>
+
+#include "perfetto/base/task_runner.h"
+
+namespace perfetto {
+namespace base {
+
+// Bounded thread pool designed for CPU-bound tasks.
+//
+// This is a classic bounded thread pool designed for running jobs which fully
+// occupy the CPU without blocking. IO bound tasks which block for long periods
+// of times will cause starvation for any other tasks which are waiting.
+// IO-heavy tasks should use base::TaskRunner and async-IO instead of using this
+// class.
+//
+// Threads are created when the thread pool is created and persist for the
+// lifetime of the ThreadPool. No new threads are created after construction.
+// When the ThreadPool is destroyed, any active tasks are completed and every
+// thread joined before returning from the destructor.
+//
+// Tasks are executed in a FIFO order without any notion of priority. If a
+// thread in the pool is free, it will be used to execute the task immediately.
+// Otherwise, it will be queued for execution when any thread becomes available.
+class ThreadPool {
+ public:
+  // Initializes this thread_pool |thread_count| threads.
+  explicit ThreadPool(uint32_t thread_count);
+  ~ThreadPool();
+
+  // Submits a task for execution by any thread in this thread pool.
+  //
+  // This task should not block for IO as this can cause starvation.
+  void PostTask(std::function<void()>);
+
+ private:
+  void RunThreadLoop();
+
+  ThreadPool(ThreadPool&&) = delete;
+  ThreadPool& operator=(ThreadPool&&) = delete;
+
+  // Start of mutex protected members.
+  std::mutex mutex_;
+  std::list<std::function<void()>> pending_tasks_;
+  std::condition_variable thread_waiter_;
+  uint32_t thread_waiting_count_ = 0;
+  bool quit_ = false;
+  // End of mutex protected members.
+
+  std::vector<std::thread> threads_;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_THREAD_POOL_H_
diff --git a/src/libtracing/perfetto/ext/base/threading/util.h b/src/libtracing/perfetto/ext/base/threading/util.h
new file mode 100644
index 000000000..2a2b83eb8
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/threading/util.h
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_THREADING_UTIL_H_
+#define INCLUDE_PERFETTO_EXT_BASE_THREADING_UTIL_H_
+
+#include <functional>
+#include <memory>
+#include <optional>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "perfetto/base/status.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/ext/base/threading/channel.h"
+#include "perfetto/ext/base/threading/future.h"
+#include "perfetto/ext/base/threading/poll.h"
+#include "perfetto/ext/base/threading/stream.h"
+#include "perfetto/ext/base/threading/thread_pool.h"
+#include "perfetto/ext/base/unix_task_runner.h"
+
+namespace perfetto {
+namespace base {
+
+// Blocks the calling thread until |fd| is considered "readable". In Linux,
+// this corresponds to |POLLOUT| or |POLLHUP| being returned if |fd| is polled.
+// If |timeout_ms| is specified, waits that many ms before stopping.
+//
+// Returns true if the function returned because the fd was readable and false
+// otherwise.
+inline bool BlockUntilReadableFd(
+    base::PlatformHandle fd,
+    std::optional<uint32_t> timeout_ms = std::nullopt) {
+  bool is_readable = false;
+  base::UnixTaskRunner runner;
+  runner.AddFileDescriptorWatch(fd, [&runner, &is_readable]() {
+    is_readable = true;
+    runner.Quit();
+  });
+  if (timeout_ms) {
+    runner.PostDelayedTask([&runner]() { runner.Quit(); }, *timeout_ms);
+  }
+  runner.Run();
+  return is_readable;
+}
+
+// Creates a Stream<T> which returns all the data from |channel| and completes
+// when |channel| is closed.
+//
+// Note: the caller retains ownership of the passed channel and must ensure that
+// the channel outlives the lifetime of the returned stream.
+template <typename T>
+Stream<T> ReadChannelStream(Channel<T>* channel) {
+  class ReadImpl : public StreamPollable<T> {
+   public:
+    explicit ReadImpl(Channel<T>* reader) : reader_(reader) {}
+
+    StreamPollResult<T> PollNext(PollContext* ctx) override {
+      auto result = reader_->ReadNonBlocking();
+      if (!result.item.has_value()) {
+        if (result.is_closed) {
+          return DonePollResult();
+        }
+        ctx->RegisterInterested(reader_->read_fd());
+        return PendingPollResult();
+      }
+      return std::move(*result.item);
+    }
+
+   private:
+    Channel<T>* reader_ = nullptr;
+  };
+  return MakeStream<ReadImpl>(channel);
+}
+
+// Creates a Future<FVoid> which handles writing |item| into |channel|. The
+// Future is completed when the item is succesfully written.
+//
+// Note: the caller retains ownership of the passed channel and must ensure that
+// the channel outlives the lifetime of the returned future.
+template <typename T>
+Future<FVoid> WriteChannelFuture(Channel<T>* channel, T item) {
+  class WriteImpl : public FuturePollable<FVoid> {
+   public:
+    WriteImpl(Channel<T>* writer, T to_write)
+        : writer_(writer), to_write_(std::move(to_write)) {}
+
+    FuturePollResult<FVoid> Poll(PollContext* ctx) override {
+      auto res = writer_->WriteNonBlocking(std::move(to_write_));
+      PERFETTO_CHECK(!res.is_closed);
+      if (!res.success) {
+        ctx->RegisterInterested(writer_->write_fd());
+        return PendingPollResult();
+      }
+      return FVoid();
+    }
+
+   private:
+    Channel<T>* writer_ = nullptr;
+    T to_write_;
+  };
+  return MakeFuture<WriteImpl>(channel, std::move(item));
+}
+
+// Creates a Stream<T> which yields the result of executing |fn| on |pool|
+// repeatedly. The returned stream only completes when |fn| returns
+// std::nullopt.
+//
+// Callers can optionally specify a |on_destroy| function which is executed when
+// the returned stream is destroyed. This is useful for informing the work
+// spawned on the thread pool that the result is no longer necessary.
+//
+// The intended usage of this function is to schedule CPU intensive work on a
+// background thread pool and receive regular "updates" on the progress by:
+// a) breaking the work into chunks
+// b) returning some indication of progress/partial results through |T|.
+template <typename T>
+Stream<T> RunOnThreadPool(
+    ThreadPool* pool,
+    std::function<std::optional<T>()> fn,
+    std::function<void()> on_destroy = [] {}) {
+  class RunOnPoolImpl : public StreamPollable<T> {
+   public:
+    explicit RunOnPoolImpl(ThreadPool* pool,
+                           std::function<std::optional<T>()> fn,
+                           std::function<void()> on_destroy)
+        : pool_(pool),
+          fn_(std::make_shared<std::function<std::optional<T>()>>(
+              std::move(fn))),
+          on_destroy_(std::move(on_destroy)),
+          channel_(new Channel<T>(1)),
+          channel_stream_(ReadChannelStream(channel_.get())) {
+      RunFn();
+    }
+
+    ~RunOnPoolImpl() override { on_destroy_(); }
+
+    StreamPollResult<T> PollNext(PollContext* ctx) override {
+      ASSIGN_OR_RETURN_IF_PENDING_STREAM(res, channel_stream_.PollNext(ctx));
+      if (res.IsDone()) {
+        return DonePollResult();
+      }
+      RunFn();
+      return res;
+    }
+
+   private:
+    void RunFn() {
+      pool_->PostTask([channel = channel_, fn = fn_]() mutable {
+        auto opt_value = (*fn)();
+        if (!opt_value) {
+          // Clear out the function to ensure that any captured state is freed
+          // before we inform the caller.
+          fn.reset();
+          channel->Close();
+          return;
+        }
+        auto write_res =
+            channel->WriteNonBlocking(std::move(opt_value.value()));
+        PERFETTO_CHECK(write_res.success);
+        PERFETTO_CHECK(!write_res.is_closed);
+      });
+    }
+
+    ThreadPool* pool_ = nullptr;
+    std::shared_ptr<std::function<std::optional<T>()>> fn_;
+    std::function<void()> on_destroy_;
+    std::shared_ptr<Channel<T>> channel_;
+    base::Stream<T> channel_stream_;
+  };
+  return MakeStream<RunOnPoolImpl>(pool, std::move(fn), std::move(on_destroy));
+}
+
+// Creates a Future<T> which yields the result of executing |fn| on |pool|. The
+// returned completes with the return value of |fn|.
+//
+// The intended usage of this function is to schedule CPU intensive work on a
+// background thread pool and have the result returned when available.
+template <typename T>
+Future<T> RunOnceOnThreadPool(ThreadPool* pool, std::function<T()> fn) {
+  return RunOnThreadPool<T>(
+             pool,
+             [done = false, fn = std::move(fn)]() mutable -> std::optional<T> {
+               if (done) {
+                 return std::nullopt;
+               }
+               done = true;
+               return fn();
+             })
+      .Collect(base::ToFutureCheckedCollector<T>());
+}
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_THREADING_UTIL_H_
diff --git a/src/libtracing/perfetto/ext/base/unix_socket.h b/src/libtracing/perfetto/ext/base/unix_socket.h
new file mode 100644
index 000000000..f0e796130
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/unix_socket.h
@@ -0,0 +1,464 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_UNIX_SOCKET_H_
+#define INCLUDE_PERFETTO_EXT_BASE_UNIX_SOCKET_H_
+
+#include <stdint.h>
+#include <sys/types.h>
+
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/platform_handle.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/utils.h"
+#include "perfetto/ext/base/weak_ptr.h"
+
+struct msghdr;
+
+namespace perfetto {
+namespace base {
+
+// Define the ScopedSocketHandle type.
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+int CloseSocket(SocketHandle);   // A wrapper around ::closesocket().
+using ScopedSocketHandle =
+    ScopedResource<SocketHandle, CloseSocket, static_cast<SocketHandle>(-1)>;
+#else
+using ScopedSocketHandle = ScopedFile;
+#endif
+
+class TaskRunner;
+
+// Use arbitrarily high values to avoid that some code accidentally ends up
+// assuming that these enum values match the sysroot's SOCK_xxx defines rather
+// than using MkSockType() / MkSockFamily().
+enum class SockType { kStream = 100, kDgram, kSeqPacket };
+enum class SockFamily { kUnspec = 0, kUnix = 200, kInet, kInet6, kVsock };
+
+// Controls the getsockopt(SO_PEERCRED) behavior, which allows to obtain the
+// peer credentials.
+enum class SockPeerCredMode {
+  // Obtain the peer credentials immediately after connection and cache them.
+  kReadOnConnect = 0,
+
+  // Don't read peer credentials at all. Calls to peer_uid()/peer_pid() will
+  // hit a DCHECK and return kInvalidUid/Pid in release builds.
+  kIgnore = 1,
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
+  kDefault = kIgnore,
+#else
+  kDefault = kReadOnConnect,
+#endif
+};
+
+// Returns the socket family from the full addres that perfetto uses.
+// Addr can be:
+// - /path/to/socket : for linked AF_UNIX sockets.
+// - @abstract_name  : for abstract AF_UNIX sockets.
+// - 1.2.3.4:8080    : for Inet sockets.
+// - [::1]:8080      : for Inet6 sockets.
+// - vsock://-1:3000 : for VM sockets.
+SockFamily GetSockFamily(const char* addr);
+
+// Returns whether inter-process shared memory is supported for the socket.
+inline bool SockShmemSupported(SockFamily sock_family) {
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  return sock_family == SockFamily::kUnix;
+#else
+  base::ignore_result(sock_family);
+  // On Windows shm is negotiated by sharing an unguessable token
+  // over TCP sockets. In theory works on any socket type, in practice
+  // we need to tell the difference between a local and a remote
+  // connection. For now we assume everything is local.
+  // See comments on r.android.com/2951909 .
+  return true;
+#endif
+}
+inline bool SockShmemSupported(const char* addr) {
+  return SockShmemSupported(GetSockFamily(addr));
+}
+
+// UnixSocketRaw is a basic wrapper around sockets. It exposes wrapper
+// methods that take care of most common pitfalls (e.g., marking fd as
+// O_CLOEXEC, avoiding SIGPIPE, properly handling partial writes). It is used as
+// a building block for the more sophisticated UnixSocket class which depends
+// on base::TaskRunner.
+class UnixSocketRaw {
+ public:
+  // Creates a new unconnected unix socket.
+  static UnixSocketRaw CreateMayFail(SockFamily family, SockType type);
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  // Crates a pair of connected sockets.
+  static std::pair<UnixSocketRaw, UnixSocketRaw> CreatePairPosix(SockFamily,
+                                                                 SockType);
+#endif
+
+  // Creates an uninitialized unix socket.
+  UnixSocketRaw();
+
+  // Creates a unix socket adopting an existing file descriptor. This is
+  // typically used to inherit fds from init via environment variables.
+  UnixSocketRaw(ScopedSocketHandle, SockFamily, SockType);
+
+  ~UnixSocketRaw() = default;
+  UnixSocketRaw(UnixSocketRaw&&) noexcept = default;
+  UnixSocketRaw& operator=(UnixSocketRaw&&) = default;
+
+  bool Bind(const std::string& socket_name);
+  bool Listen();
+  bool Connect(const std::string& socket_name);
+  bool SetTxTimeout(uint32_t timeout_ms);
+  bool SetRxTimeout(uint32_t timeout_ms);
+  void Shutdown();
+  void SetBlocking(bool);
+  void DcheckIsBlocking(bool expected) const;  // No-op on release and Win.
+  void SetRetainOnExec(bool retain);
+  std::string GetSockAddr() const;
+  SockType type() const { return type_; }
+  SockFamily family() const { return family_; }
+  SocketHandle fd() const { return *fd_; }
+  explicit operator bool() const { return !!fd_; }
+
+  // This is the handle that passed to TaskRunner.AddFileDescriptorWatch().
+  // On UNIX this is just the socket FD. On Windows, we need to create a
+  // dedicated event object.
+  PlatformHandle watch_handle() const {
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    return *event_handle_;
+#else
+    return *fd_;
+#endif
+  }
+
+  ScopedSocketHandle ReleaseFd() { return std::move(fd_); }
+
+  // |send_fds| and |num_fds| are ignored on Windows.
+  ssize_t Send(const void* msg,
+               size_t len,
+               const int* send_fds = nullptr,
+               size_t num_fds = 0);
+
+  ssize_t SendStr(const std::string& str) {
+    return Send(str.data(), str.size());
+  }
+
+  // |fd_vec| and |max_files| are ignored on Windows.
+  ssize_t Receive(void* msg,
+                  size_t len,
+                  ScopedFile* fd_vec = nullptr,
+                  size_t max_files = 0);
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  // UNIX-specific helpers to deal with SCM_RIGHTS.
+
+  // Re-enter sendmsg until all the data has been sent or an error occurs.
+  // TODO(fmayer): Figure out how to do timeouts here for heapprofd.
+  ssize_t SendMsgAllPosix(struct msghdr* msg);
+
+  // Exposed for testing only.
+  // Update msghdr so subsequent sendmsg will send data that remains after n
+  // bytes have already been sent.
+  static void ShiftMsgHdrPosix(size_t n, struct msghdr* msg);
+#endif
+
+ private:
+  UnixSocketRaw(SockFamily, SockType);
+
+  UnixSocketRaw(const UnixSocketRaw&) = delete;
+  UnixSocketRaw& operator=(const UnixSocketRaw&) = delete;
+
+  ScopedSocketHandle fd_;
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  ScopedPlatformHandle event_handle_;
+#endif
+  SockFamily family_ = SockFamily::kUnix;
+  SockType type_ = SockType::kStream;
+  uint32_t tx_timeout_ms_ = 0;
+};
+
+// A non-blocking UNIX domain socket. Allows also to transfer file descriptors.
+// None of the methods in this class are blocking.
+// The main design goal is making strong guarantees on the EventListener
+// callbacks, in order to avoid ending in some undefined state.
+// In case of any error it will aggressively just shut down the socket and
+// notify the failure with OnConnect(false) or OnDisconnect() depending on the
+// state of the socket (see below).
+// EventListener callbacks stop happening as soon as the instance is destroyed.
+//
+// Lifecycle of a client socket:
+//
+//                           Connect()
+//                               |
+//            +------------------+------------------+
+//            | (success)                           | (failure or Shutdown())
+//            V                                     V
+//     OnConnect(true)                         OnConnect(false)
+//            |
+//            V
+//    OnDataAvailable()
+//            |
+//            V
+//     OnDisconnect()  (failure or shutdown)
+//
+//
+// Lifecycle of a server socket:
+//
+//                          Listen()  --> returns false in case of errors.
+//                             |
+//                             V
+//              OnNewIncomingConnection(new_socket)
+//
+//          (|new_socket| inherits the same EventListener)
+//                             |
+//                             V
+//                     OnDataAvailable()
+//                             | (failure or Shutdown())
+//                             V
+//                       OnDisconnect()
+class PERFETTO_EXPORT_COMPONENT UnixSocket {
+ public:
+  class EventListener {
+   public:
+    EventListener() = default;
+    virtual ~EventListener();
+
+    EventListener(const EventListener&) = delete;
+    EventListener& operator=(const EventListener&) = delete;
+
+    EventListener(EventListener&&) noexcept = default;
+    EventListener& operator=(EventListener&&) noexcept = default;
+
+    // After Listen().
+    // |self| may be null if the connection was not accepted via a listen
+    // socket.
+    virtual void OnNewIncomingConnection(
+        UnixSocket* self,
+        std::unique_ptr<UnixSocket> new_connection);
+
+    // After Connect(), whether successful or not.
+    virtual void OnConnect(UnixSocket* self, bool connected);
+
+    // After a successful Connect() or OnNewIncomingConnection(). Either the
+    // other endpoint did disconnect or some other error happened.
+    virtual void OnDisconnect(UnixSocket* self);
+
+    // Whenever there is data available to Receive(). Note that spurious FD
+    // watch events are possible, so it is possible that Receive() soon after
+    // OnDataAvailable() returns 0 (just ignore those).
+    virtual void OnDataAvailable(UnixSocket* self);
+  };
+
+  enum class State {
+    kDisconnected = 0,  // Failed connection, peer disconnection or Shutdown().
+    kConnecting,  // Soon after Connect(), before it either succeeds or fails.
+    kConnected,   // After a successful Connect().
+    kListening    // After Listen(), until Shutdown().
+  };
+
+  // Creates a socket and starts listening. If SockFamily::kUnix and
+  // |socket_name| starts with a '@', an abstract UNIX dmoain socket will be
+  // created instead of a filesystem-linked UNIX socket (Linux/Android only).
+  // If SockFamily::kInet, |socket_name| is host:port (e.g., "1.2.3.4:8000").
+  // If SockFamily::kInet6, |socket_name| is [host]:port (e.g., "[::1]:8000").
+  // Returns nullptr if the socket creation or bind fails. If listening fails,
+  // (e.g. if another socket with the same name is already listening) the
+  // returned socket will have is_listening() == false.
+  static std::unique_ptr<UnixSocket> Listen(const std::string& socket_name,
+                                            EventListener*,
+                                            TaskRunner*,
+                                            SockFamily,
+                                            SockType);
+
+  // Attaches to a pre-existing socket. The socket must have been created in
+  // SOCK_STREAM mode and the caller must have called bind() on it.
+  static std::unique_ptr<UnixSocket> Listen(ScopedSocketHandle,
+                                            EventListener*,
+                                            TaskRunner*,
+                                            SockFamily,
+                                            SockType);
+
+  // Creates a Unix domain socket and connects to the listening endpoint.
+  // Returns always an instance. EventListener::OnConnect(bool success) will
+  // be called always, whether the connection succeeded or not.
+  static std::unique_ptr<UnixSocket> Connect(
+      const std::string& socket_name,
+      EventListener*,
+      TaskRunner*,
+      SockFamily,
+      SockType,
+      SockPeerCredMode = SockPeerCredMode::kDefault);
+
+  // Constructs a UnixSocket using the given connected socket.
+  static std::unique_ptr<UnixSocket> AdoptConnected(
+      ScopedSocketHandle,
+      EventListener*,
+      TaskRunner*,
+      SockFamily,
+      SockType,
+      SockPeerCredMode = SockPeerCredMode::kDefault);
+
+  UnixSocket(const UnixSocket&) = delete;
+  UnixSocket& operator=(const UnixSocket&) = delete;
+  // Cannot be easily moved because of tasks from the FileDescriptorWatch.
+  UnixSocket(UnixSocket&&) = delete;
+  UnixSocket& operator=(UnixSocket&&) = delete;
+
+  // This class gives the hard guarantee that no callback is called on the
+  // passed EventListener immediately after the object has been destroyed.
+  // Any queued callback will be silently dropped.
+  ~UnixSocket();
+
+  // Shuts down the current connection, if any. If the socket was Listen()-ing,
+  // stops listening. The socket goes back to kNotInitialized state, so it can
+  // be reused with Listen() or Connect().
+  void Shutdown(bool notify);
+
+  void SetTxTimeout(uint32_t timeout_ms) {
+    PERFETTO_CHECK(sock_raw_.SetTxTimeout(timeout_ms));
+  }
+  void SetRxTimeout(uint32_t timeout_ms) {
+    PERFETTO_CHECK(sock_raw_.SetRxTimeout(timeout_ms));
+  }
+
+  std::string GetSockAddr() const { return sock_raw_.GetSockAddr(); }
+
+  // Returns true is the message was queued, false if there was no space in the
+  // output buffer, in which case the client should retry or give up.
+  // If any other error happens the socket will be shutdown and
+  // EventListener::OnDisconnect() will be called.
+  // If the socket is not connected, Send() will just return false.
+  // Does not append a null string terminator to msg in any case.
+  bool Send(const void* msg, size_t len, const int* send_fds, size_t num_fds);
+
+  inline bool Send(const void* msg, size_t len, int send_fd = -1) {
+    if (send_fd != -1)
+      return Send(msg, len, &send_fd, 1);
+    return Send(msg, len, nullptr, 0);
+  }
+
+  inline bool SendStr(const std::string& msg) {
+    return Send(msg.data(), msg.size(), -1);
+  }
+
+  // Returns the number of bytes (<= |len|) written in |msg| or 0 if there
+  // is no data in the buffer to read or an error occurs (in which case a
+  // EventListener::OnDisconnect() will follow).
+  // If the ScopedFile pointer is not null and a FD is received, it moves the
+  // received FD into that. If a FD is received but the ScopedFile pointer is
+  // null, the FD will be automatically closed.
+  size_t Receive(void* msg, size_t len, ScopedFile*, size_t max_files = 1);
+
+  inline size_t Receive(void* msg, size_t len) {
+    return Receive(msg, len, nullptr, 0);
+  }
+
+  // Only for tests. This is slower than Receive() as it requires a heap
+  // allocation and a copy for the std::string. Guarantees that the returned
+  // string is null terminated even if the underlying message sent by the peer
+  // is not.
+  std::string ReceiveString(size_t max_length = 1024);
+
+  bool is_connected() const { return state_ == State::kConnected; }
+  bool is_listening() const { return state_ == State::kListening; }
+  SocketHandle fd() const { return sock_raw_.fd(); }
+  SockFamily family() const { return sock_raw_.family(); }
+
+  // User ID of the peer, as returned by the kernel. If the client disconnects
+  // and the socket goes into the kDisconnected state, it retains the uid of
+  // the last peer.
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
+    !PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
+  uid_t peer_uid_posix(bool skip_check_for_testing = false) const {
+    PERFETTO_DCHECK((!is_listening() && peer_uid_ != kInvalidUid) ||
+                    skip_check_for_testing);
+
+    return peer_uid_;
+  }
+#endif
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+  // Process ID of the peer, as returned by the kernel. If the client
+  // disconnects and the socket goes into the kDisconnected state, it
+  // retains the pid of the last peer.
+  //
+  // This is only available on Linux / Android.
+  pid_t peer_pid_linux(bool skip_check_for_testing = false) const {
+    PERFETTO_DCHECK((!is_listening() && peer_pid_ != kInvalidPid) ||
+                    skip_check_for_testing);
+    return peer_pid_;
+  }
+#endif
+
+  // This makes the UnixSocket unusable.
+  UnixSocketRaw ReleaseSocket();
+
+ private:
+  UnixSocket(EventListener*,
+             TaskRunner*,
+             SockFamily,
+             SockType,
+             SockPeerCredMode);
+  UnixSocket(EventListener*,
+             TaskRunner*,
+             ScopedSocketHandle,
+             State,
+             SockFamily,
+             SockType,
+             SockPeerCredMode);
+
+  // Called once by the corresponding public static factory methods.
+  void DoConnect(const std::string& socket_name);
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  void ReadPeerCredentialsPosix();
+#endif
+
+  void OnEvent();
+  void NotifyConnectionState(bool success);
+
+  UnixSocketRaw sock_raw_;
+  State state_ = State::kDisconnected;
+  SockPeerCredMode peer_cred_mode_ = SockPeerCredMode::kDefault;
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
+    !PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
+  uid_t peer_uid_ = kInvalidUid;
+#endif
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+  pid_t peer_pid_ = kInvalidPid;
+#endif
+  EventListener* const event_listener_;
+  TaskRunner* const task_runner_;
+  WeakPtrFactory<UnixSocket> weak_ptr_factory_;  // Keep last.
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_UNIX_SOCKET_H_
diff --git a/src/libtracing/perfetto/ext/base/unix_task_runner.h b/src/libtracing/perfetto/ext/base/unix_task_runner.h
new file mode 100644
index 000000000..8d1ab6d89
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/unix_task_runner.h
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_UNIX_TASK_RUNNER_H_
+#define INCLUDE_PERFETTO_EXT_BASE_UNIX_TASK_RUNNER_H_
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/thread_utils.h"
+#include "perfetto/base/time.h"
+#include "perfetto/ext/base/event_fd.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/thread_checker.h"
+
+#include <chrono>
+#include <deque>
+#include <map>
+#include <mutex>
+#include <vector>
+
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+#include <poll.h>
+#endif
+
+namespace perfetto {
+namespace base {
+
+// Runs a task runner on the current thread.
+//
+// Implementation note: we currently assume (and enforce in debug builds) that
+// Run() is called from the thread that constructed the UnixTaskRunner. This is
+// not strictly necessary, and we could instead track the thread that invokes
+// Run(). However, a related property that *might* be important to enforce is
+// that the destructor runs on the task-running thread. Otherwise, if there are
+// still-pending tasks at the time of destruction, we would destroy those
+// outside of the task thread (which might be unexpected to the caller). On the
+// other hand, the std::function task interface discourages use of any
+// resource-owning tasks (as the callable needs to be copyable), so this might
+// not be important in practice.
+//
+// TODO(rsavitski): consider adding a thread-check in the destructor, after
+// auditing existing usages.
+// TODO(primiano): rename this to TaskRunnerImpl. The "Unix" part is misleading
+// now as it supports also Windows.
+class UnixTaskRunner : public TaskRunner {
+ public:
+  UnixTaskRunner();
+  ~UnixTaskRunner() override;
+
+  // Start executing tasks. Doesn't return until Quit() is called. Run() may be
+  // called multiple times on the same task runner.
+  void Run();
+  void Quit();
+
+  // Checks whether there are any pending immediate tasks to run. Note that
+  // delayed tasks don't count even if they are due to run.
+  bool IsIdleForTesting();
+
+  // TaskRunner implementation:
+  void PostTask(std::function<void()>) override;
+  void PostDelayedTask(std::function<void()>, uint32_t delay_ms) override;
+  void AddFileDescriptorWatch(PlatformHandle, std::function<void()>) override;
+  void RemoveFileDescriptorWatch(PlatformHandle) override;
+  bool RunsTasksOnCurrentThread() const override;
+
+  // Returns true if the task runner is quitting, or has quit and hasn't been
+  // restarted since. Exposed primarily for ThreadTaskRunner, not necessary for
+  // normal use of this class.
+  bool QuitCalled();
+
+ private:
+  void WakeUp();
+  void UpdateWatchTasksLocked();
+  int GetDelayMsToNextTaskLocked() const;
+  void RunImmediateAndDelayedTask();
+  void PostFileDescriptorWatches(uint64_t windows_wait_result);
+  void RunFileDescriptorWatch(PlatformHandle);
+
+  ThreadChecker thread_checker_;
+  PlatformThreadId created_thread_id_ = GetThreadId();
+
+  EventFd event_;
+
+// The array of fds/handles passed to poll(2) / WaitForMultipleObjects().
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  std::vector<PlatformHandle> poll_fds_;
+#else
+  std::vector<struct pollfd> poll_fds_;
+#endif
+
+  // --- Begin lock-protected members ---
+
+  std::mutex lock_;
+
+  std::deque<std::function<void()>> immediate_tasks_;
+  std::multimap<TimeMillis, std::function<void()>> delayed_tasks_;
+  bool quit_ = false;
+
+  struct WatchTask {
+    std::function<void()> callback;
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    // On UNIX systems we make the FD number negative in |poll_fds_| to avoid
+    // polling it again until the queued task runs. On Windows we can't do that.
+    // Instead we keep track of its state here.
+    bool pending = false;
+#else
+    size_t poll_fd_index;  // Index into |poll_fds_|.
+#endif
+  };
+
+  std::map<PlatformHandle, WatchTask> watch_tasks_;
+  bool watch_tasks_changed_ = false;
+
+  // --- End lock-protected members ---
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_UNIX_TASK_RUNNER_H_
diff --git a/src/libtracing/perfetto/ext/base/utils.h b/src/libtracing/perfetto/ext/base/utils.h
new file mode 100644
index 000000000..f3bfa1ce8
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/utils.h
@@ -0,0 +1,196 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_UTILS_H_
+#define INCLUDE_PERFETTO_EXT_BASE_UTILS_H_
+
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <string>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/compiler.h"
+#include "perfetto/ext/base/sys_types.h"
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+// Even if Windows has errno.h, the all syscall-restart behavior does not apply.
+// Trying to handle EINTR can cause more harm than good if errno is left stale.
+// Chromium does the same.
+#define PERFETTO_EINTR(x) (x)
+#else
+#define PERFETTO_EINTR(x)                                   \
+  ([&] {                                                    \
+    decltype(x) eintr_wrapper_result;                       \
+    do {                                                    \
+      eintr_wrapper_result = (x);                           \
+    } while (eintr_wrapper_result == -1 && errno == EINTR); \
+    return eintr_wrapper_result;                            \
+  }())
+#endif
+
+namespace perfetto {
+namespace base {
+
+namespace internal {
+extern std::atomic<uint32_t> g_cached_page_size;
+uint32_t GetSysPageSizeSlowpath();
+}  // namespace internal
+
+// Returns the system's page size. Use this when dealing with mmap, madvise and
+// similar mm-related syscalls.
+// This function might be called in hot paths. Avoid calling getpagesize() all
+// the times, in many implementations getpagesize() calls sysconf() which is
+// not cheap.
+inline uint32_t GetSysPageSize() {
+  const uint32_t page_size =
+      internal::g_cached_page_size.load(std::memory_order_relaxed);
+  return page_size != 0 ? page_size : internal::GetSysPageSizeSlowpath();
+}
+
+template <typename T, size_t TSize>
+constexpr size_t ArraySize(const T (&)[TSize]) {
+  return TSize;
+}
+
+// Function object which invokes 'free' on its parameter, which must be
+// a pointer. Can be used to store malloc-allocated pointers in std::unique_ptr:
+//
+// std::unique_ptr<int, base::FreeDeleter> foo_ptr(
+//     static_cast<int*>(malloc(sizeof(int))));
+struct FreeDeleter {
+  inline void operator()(void* ptr) const { free(ptr); }
+};
+
+template <typename T>
+constexpr T AssumeLittleEndian(T value) {
+#if !PERFETTO_IS_LITTLE_ENDIAN()
+  static_assert(false, "Unimplemented on big-endian archs");
+#endif
+  return value;
+}
+
+// Round up |size| to a multiple of |alignment| (must be a power of two).
+inline constexpr size_t AlignUp(size_t size, size_t alignment) {
+  return (size + alignment - 1) & ~(alignment - 1);
+}
+
+// TODO(primiano): clean this up and move all existing usages to the constexpr
+// version above.
+template <size_t alignment>
+constexpr size_t AlignUp(size_t size) {
+  static_assert((alignment & (alignment - 1)) == 0, "alignment must be a pow2");
+  return AlignUp(size, alignment);
+}
+
+inline bool IsAgain(int err) {
+  return err == EAGAIN || err == EWOULDBLOCK;
+}
+
+// setenv(2)-equivalent. Deals with Windows vs Posix discrepancies.
+void SetEnv(const std::string& key, const std::string& value);
+
+// unsetenv(2)-equivalent. Deals with Windows vs Posix discrepancies.
+void UnsetEnv(const std::string& key);
+
+// Calls mallopt(M_PURGE, 0) on Android. Does nothing on other platforms.
+// This forces the allocator to release freed memory. This is used to work
+// around various Scudo inefficiencies. See b/170217718.
+void MaybeReleaseAllocatorMemToOS();
+
+// geteuid() on POSIX OSes, returns 0 on Windows (See comment in utils.cc).
+uid_t GetCurrentUserId();
+
+// Forks the process.
+// Parent: prints the PID of the child, calls |parent_cb| and exits from the
+//         process with its return value.
+// Child: redirects stdio onto /dev/null, chdirs into / and returns.
+void Daemonize(std::function<int()> parent_cb);
+
+// Returns the path of the current executable, e.g. /foo/bar/exe.
+std::string GetCurExecutablePath();
+
+// Returns the directory where the current executable lives in, e.g. /foo/bar.
+// This is independent of cwd().
+std::string GetCurExecutableDir();
+
+// Memory returned by AlignedAlloc() must be freed via AlignedFree() not just
+// free. It makes a difference on Windows where _aligned_malloc() and
+// _aligned_free() must be paired.
+// Prefer using the AlignedAllocTyped() below which takes care of the pairing.
+void* AlignedAlloc(size_t alignment, size_t size);
+void AlignedFree(void*);
+
+// A RAII version of the above, which takes care of pairing Aligned{Alloc,Free}.
+template <typename T>
+struct AlignedDeleter {
+  inline void operator()(T* ptr) const { AlignedFree(ptr); }
+};
+
+// The remove_extent<T> here and below is to allow defining unique_ptr<T[]>.
+// As per https://en.cppreference.com/w/cpp/memory/unique_ptr the Deleter takes
+// always a T*, not a T[]*.
+template <typename T>
+using AlignedUniquePtr =
+    std::unique_ptr<T, AlignedDeleter<typename std::remove_extent<T>::type>>;
+
+template <typename T>
+AlignedUniquePtr<T> AlignedAllocTyped(size_t n_membs) {
+  using TU = typename std::remove_extent<T>::type;
+  return AlignedUniquePtr<T>(
+      static_cast<TU*>(AlignedAlloc(alignof(TU), sizeof(TU) * n_membs)));
+}
+
+// A RAII wrapper to invoke a function when leaving a function/scope.
+template <typename Func>
+class OnScopeExitWrapper {
+ public:
+  explicit OnScopeExitWrapper(Func f) : f_(std::move(f)), active_(true) {}
+  OnScopeExitWrapper(OnScopeExitWrapper&& other) noexcept
+      : f_(std::move(other.f_)), active_(other.active_) {
+    other.active_ = false;
+  }
+  ~OnScopeExitWrapper() {
+    if (active_)
+      f_();
+  }
+
+ private:
+  Func f_;
+  bool active_;
+};
+
+template <typename Func>
+PERFETTO_WARN_UNUSED_RESULT OnScopeExitWrapper<Func> OnScopeExit(Func f) {
+  return OnScopeExitWrapper<Func>(std::move(f));
+}
+
+// Returns a xxd-style hex dump (hex + ascii chars) of the input data.
+std::string HexDump(const void* data, size_t len, size_t bytes_per_line = 16);
+inline std::string HexDump(const std::string& data,
+                           size_t bytes_per_line = 16) {
+  return HexDump(data.data(), data.size(), bytes_per_line);
+}
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_UTILS_H_
diff --git a/src/libtracing/perfetto/ext/base/uuid.h b/src/libtracing/perfetto/ext/base/uuid.h
new file mode 100644
index 000000000..2bf5f5b07
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/uuid.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_UUID_H_
+#define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
+
+#include <string.h>
+#include <array>
+#include <cstdint>
+#include <optional>
+#include <string>
+
+namespace perfetto {
+namespace base {
+
+class Uuid {
+ public:
+  explicit Uuid(const std::string& s);
+  explicit Uuid(int64_t lsb, int64_t msb);
+  Uuid();
+
+  std::array<uint8_t, 16>* data() { return &data_; }
+  const std::array<uint8_t, 16>* data() const { return &data_; }
+
+  bool operator==(const Uuid& other) const { return data_ == other.data_; }
+
+  bool operator!=(const Uuid& other) const { return !(*this == other); }
+
+  explicit operator bool() const { return *this != Uuid(); }
+
+  int64_t msb() const {
+    int64_t result;
+    memcpy(&result, data_.data() + 8, 8);
+    return result;
+  }
+
+  int64_t lsb() const {
+    int64_t result;
+    memcpy(&result, data_.data(), 8);
+    return result;
+  }
+
+  void set_lsb_msb(int64_t lsb, int64_t msb) {
+    set_lsb(lsb);
+    set_msb(msb);
+  }
+  void set_msb(int64_t msb) { memcpy(data_.data() + 8, &msb, 8); }
+  void set_lsb(int64_t lsb) { memcpy(data_.data(), &lsb, 8); }
+
+  std::string ToString() const;
+  std::string ToPrettyString() const;
+
+ private:
+  std::array<uint8_t, 16> data_{};
+};
+
+Uuid Uuidv4();
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_UUID_H_
diff --git a/src/libtracing/perfetto/ext/base/version.h b/src/libtracing/perfetto/ext/base/version.h
new file mode 100644
index 000000000..ad783722c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/version.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_VERSION_H_
+#define INCLUDE_PERFETTO_EXT_BASE_VERSION_H_
+
+namespace perfetto {
+namespace base {
+
+// The returned pointer is a static string and safe to pass around.
+// Returns a human readable string currently of the approximate form:
+// Perfetto v42.1-deadbeef0 (deadbeef03c641e4b4ea9cf38e9b5696670175a9)
+// However you should not depend on the format of this string.
+// It maybe not be possible to determine the version. In which case the
+// string will be of the approximate form:
+// Perfetto v0.0 (unknown)
+const char* GetVersionString();
+
+// The returned pointer is a static string and safe to pass around.
+// Returns the short code used to identity the version:
+// v42.1-deadbeef0
+// It maybe not be possible to determine the version. In which case
+// this returns nullptr.
+// This can be compared with equality to other
+// version codes to detect matched builds (for example to see if
+// trace_processor_shell and the UI were built at the same revision)
+// but you should not attempt to parse it as the format may change
+// without warning.
+const char* GetVersionCode();
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_VERSION_H_
diff --git a/src/libtracing/perfetto/ext/base/waitable_event.h b/src/libtracing/perfetto/ext/base/waitable_event.h
new file mode 100644
index 000000000..0e786196f
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/waitable_event.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
+#define INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
+
+#include <condition_variable>
+#include <mutex>
+
+namespace perfetto {
+namespace base {
+
+// A waitable event for cross-thread synchronization.
+// All methods on this class can be called from any thread.
+class WaitableEvent {
+ public:
+  WaitableEvent();
+  ~WaitableEvent();
+  WaitableEvent(const WaitableEvent&) = delete;
+  WaitableEvent operator=(const WaitableEvent&) = delete;
+
+  // Synchronously block until the event is notified `notification` times.
+  void Wait(uint64_t notifications = 1);
+
+  // Signal the event, waking up blocked waiters.
+  void Notify();
+
+ private:
+  std::mutex mutex_;
+  std::condition_variable event_;
+  uint64_t notifications_ = 0;
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
diff --git a/src/libtracing/perfetto/ext/base/watchdog.h b/src/libtracing/perfetto/ext/base/watchdog.h
new file mode 100644
index 000000000..9bb422724
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/watchdog.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_H_
+#define INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_H_
+
+#include <functional>
+
+#include "perfetto/base/build_config.h"
+
+// The POSIX watchdog is only supported on Linux and Android in non-embedder
+// builds.
+#if PERFETTO_BUILDFLAG(PERFETTO_WATCHDOG)
+#include "perfetto/ext/base/watchdog_posix.h"
+#else
+#include "perfetto/ext/base/watchdog_noop.h"
+#endif
+
+namespace perfetto {
+namespace base {
+
+// Used only to add more details to crash reporting.
+enum class WatchdogCrashReason {
+  kUnspecified = 0,
+  kCpuGuardrail = 1,
+  kMemGuardrail = 2,
+  kTaskRunnerHung = 3,
+  kTraceDidntStop = 4,
+};
+
+// Make the limits more relaxed on desktop, where multi-GB traces are likely.
+// Multi-GB traces can take bursts of cpu time to write into disk at the end of
+// the trace.
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+constexpr uint32_t kWatchdogDefaultCpuLimit = 75;
+constexpr uint32_t kWatchdogDefaultCpuWindow = 5 * 60 * 1000;  // 5 minutes.
+#else
+constexpr uint32_t kWatchdogDefaultCpuLimit = 90;
+constexpr uint32_t kWatchdogDefaultCpuWindow = 10 * 60 * 1000;  // 10 minutes.
+#endif
+
+// The default memory margin we give to our processes. This is used as as a
+// constant to put on top of the trace buffers.
+constexpr uint64_t kWatchdogDefaultMemorySlack = 32 * 1024 * 1024;  // 32 MiB.
+constexpr uint32_t kWatchdogDefaultMemoryWindow = 30 * 1000;  // 30 seconds.
+
+inline void RunTaskWithWatchdogGuard(const std::function<void()>& task) {
+  // Maximum time a single task can take in a TaskRunner before the
+  // program suicides.
+  constexpr int64_t kWatchdogMillis = 30000;  // 30s
+
+  Watchdog::Timer handle = base::Watchdog::GetInstance()->CreateFatalTimer(
+      kWatchdogMillis, WatchdogCrashReason::kTaskRunnerHung);
+  task();
+
+  // Suppress unused variable warnings in the client library amalgamated build.
+  (void)kWatchdogDefaultCpuLimit;
+  (void)kWatchdogDefaultCpuWindow;
+  (void)kWatchdogDefaultMemorySlack;
+  (void)kWatchdogDefaultMemoryWindow;
+}
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_H_
diff --git a/src/libtracing/perfetto/ext/base/watchdog_noop.h b/src/libtracing/perfetto/ext/base/watchdog_noop.h
new file mode 100644
index 000000000..231705c64
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/watchdog_noop.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_NOOP_H_
+#define INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_NOOP_H_
+
+#include <stdint.h>
+
+namespace perfetto {
+namespace base {
+
+enum class WatchdogCrashReason;  // Defined in watchdog.h.
+
+class Watchdog {
+ public:
+  class Timer {
+   public:
+    // Define an empty dtor to avoid "unused variable" errors on the call site.
+    Timer() {}
+    Timer(const Timer&) {}
+    ~Timer() {}
+  };
+  static Watchdog* GetInstance() {
+    static Watchdog* watchdog = new Watchdog();
+    return watchdog;
+  }
+  Timer CreateFatalTimer(uint32_t /*ms*/, WatchdogCrashReason) {
+    return Timer();
+  }
+  void Start() {}
+  void SetMemoryLimit(uint64_t /*bytes*/, uint32_t /*window_ms*/) {}
+  void SetCpuLimit(uint32_t /*percentage*/, uint32_t /*window_ms*/) {}
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_NOOP_H_
diff --git a/src/libtracing/perfetto/ext/base/watchdog_posix.h b/src/libtracing/perfetto/ext/base/watchdog_posix.h
new file mode 100644
index 000000000..fef4074b6
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/watchdog_posix.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_POSIX_H_
+#define INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_POSIX_H_
+
+#include "perfetto/base/time.h"
+#include "perfetto/ext/base/scoped_file.h"
+
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <vector>
+
+namespace perfetto {
+namespace base {
+
+enum class WatchdogCrashReason;  // Defined in watchdog.h.
+
+struct ProcStat {
+  unsigned long int utime = 0l;
+  unsigned long int stime = 0l;
+  long int rss_pages = -1l;
+};
+
+bool ReadProcStat(int fd, ProcStat* out);
+
+// Ensures that the calling program does not exceed certain hard limits on
+// resource usage e.g. time, memory and CPU. If exceeded, the program is
+// crashed.
+class Watchdog {
+ public:
+  struct TimerData {
+    TimeMillis deadline{};  // Absolute deadline, CLOCK_MONOTONIC.
+    int thread_id = 0;      // The tid we'll send a SIGABRT to on expiry.
+    WatchdogCrashReason crash_reason{};  // Becomes a crash key.
+
+    TimerData() = default;
+    TimerData(TimeMillis d, int t) : deadline(d), thread_id(t) {}
+    bool operator<(const TimerData& x) const {
+      return std::tie(deadline, thread_id) < std::tie(x.deadline, x.thread_id);
+    }
+    bool operator==(const TimerData& x) const {
+      return std::tie(deadline, thread_id) == std::tie(x.deadline, x.thread_id);
+    }
+  };
+
+  // Handle to the timer set to crash the program. If the handle is dropped,
+  // the timer is removed so the program does not crash.
+  class Timer {
+   public:
+    ~Timer();
+    Timer(Timer&&) noexcept;
+
+   private:
+    friend class Watchdog;
+
+    explicit Timer(Watchdog*, uint32_t ms, WatchdogCrashReason);
+    Timer(const Timer&) = delete;
+    Timer& operator=(const Timer&) = delete;
+
+    // In production this is always Watchdog::GetInstance(), which is long
+    // lived. However unittests use a non-global instance.
+    Watchdog* watchdog_ = nullptr;
+    TimerData timer_data_;
+  };
+  virtual ~Watchdog();
+
+  static Watchdog* GetInstance();
+
+  // Sets a timer which will crash the program in |ms| milliseconds if the
+  // returned handle is not destroyed before this point.
+  // WatchdogCrashReason is used only to set a crash key in the case of a crash,
+  // to disambiguate different timer types.
+  Timer CreateFatalTimer(uint32_t ms, WatchdogCrashReason);
+
+  // Starts the watchdog thread which monitors the memory and CPU usage
+  // of the program.
+  void Start();
+
+  // Sets a limit on the memory (defined as the RSS) used by the program
+  // averaged over the last |window_ms| milliseconds. If |kb| is 0, any
+  // existing limit is removed.
+  // Note: |window_ms| has to be a multiple of |polling_interval_ms_|.
+  void SetMemoryLimit(uint64_t bytes, uint32_t window_ms);
+
+  // Sets a limit on the CPU usage used by the program averaged over the last
+  // |window_ms| milliseconds. If |percentage| is 0, any existing limit is
+  // removed.
+  // Note: |window_ms| has to be a multiple of |polling_interval_ms_|.
+  void SetCpuLimit(uint32_t percentage, uint32_t window_ms);
+
+ private:
+  // Represents a ring buffer in which integer values can be stored.
+  class WindowedInterval {
+   public:
+    // Pushes a new value into a ring buffer wrapping if necessary and returns
+    // whether the ring buffer is full.
+    bool Push(uint64_t sample);
+
+    // Returns the mean of the values in the buffer.
+    double Mean() const;
+
+    // Clears the ring buffer while keeping the existing size.
+    void Clear();
+
+    // Resets the size of the buffer as well as clearing it.
+    void Reset(size_t new_size);
+
+    // Gets the oldest value inserted in the buffer. The buffer must be full
+    // (i.e. Push returned true) before this method can be called.
+    uint64_t OldestWhenFull() const {
+      PERFETTO_CHECK(filled_);
+      return buffer_[position_];
+    }
+
+    // Gets the newest value inserted in the buffer. The buffer must be full
+    // (i.e. Push returned true) before this method can be called.
+    uint64_t NewestWhenFull() const {
+      PERFETTO_CHECK(filled_);
+      return buffer_[(position_ + size_ - 1) % size_];
+    }
+
+    // Returns the size of the ring buffer.
+    size_t size() const { return size_; }
+
+   private:
+    bool filled_ = false;
+    size_t position_ = 0;
+    size_t size_ = 0;
+    std::unique_ptr<uint64_t[]> buffer_;
+  };
+
+  Watchdog(const Watchdog&) = delete;
+  Watchdog& operator=(const Watchdog&) = delete;
+  Watchdog(Watchdog&&) = delete;
+  Watchdog& operator=(Watchdog&&) = delete;
+
+  // Main method for the watchdog thread.
+  void ThreadMain();
+
+  // Check each type of resource every |polling_interval_ms_| miillis.
+  // Returns true if the threshold is exceeded and the process should be killed.
+  bool CheckMemory_Locked(uint64_t rss_bytes);
+  bool CheckCpu_Locked(uint64_t cpu_time);
+
+  void AddFatalTimer(TimerData);
+  void RemoveFatalTimer(TimerData);
+  void RearmTimerFd_Locked();
+  void SerializeLogsAndKillThread(int tid, WatchdogCrashReason);
+
+  // Computes the time interval spanned by a given ring buffer with respect
+  // to |polling_interval_ms_|.
+  uint32_t WindowTimeForRingBuffer(const WindowedInterval& window);
+
+  const uint32_t polling_interval_ms_;
+  std::atomic<bool> enabled_{false};
+  std::thread thread_;
+  ScopedPlatformHandle timer_fd_;
+
+  // --- Begin lock-protected members ---
+
+  std::mutex mutex_;
+
+  uint64_t memory_limit_bytes_ = 0;
+  WindowedInterval memory_window_bytes_;
+
+  uint32_t cpu_limit_percentage_ = 0;
+  WindowedInterval cpu_window_time_ticks_;
+
+  // Outstanding timers created via CreateFatalTimer() and not yet destroyed.
+  // The vector is not sorted. In most cases there are only 1-2 timers, we can
+  // afford O(N) operations.
+  // All the timers in the list share the same |timer_fd_|, which is keeped
+  // armed on the min(timers_) through RearmTimerFd_Locked().
+  std::vector<TimerData> timers_;
+
+  // --- End lock-protected members ---
+
+ protected:
+  // Protected for testing.
+  explicit Watchdog(uint32_t polling_interval_ms);
+
+  bool disable_kill_failsafe_for_testing_ = false;
+};
+
+}  // namespace base
+}  // namespace perfetto
+#endif  // INCLUDE_PERFETTO_EXT_BASE_WATCHDOG_POSIX_H_
diff --git a/src/libtracing/perfetto/ext/base/weak_ptr.h b/src/libtracing/perfetto/ext/base/weak_ptr.h
new file mode 100644
index 000000000..805d32ebf
--- /dev/null
+++ b/src/libtracing/perfetto/ext/base/weak_ptr.h
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_BASE_WEAK_PTR_H_
+#define INCLUDE_PERFETTO_EXT_BASE_WEAK_PTR_H_
+
+#include "perfetto/ext/base/thread_checker.h"
+
+#include <memory>
+
+namespace perfetto {
+namespace base {
+
+// A simple WeakPtr for single-threaded cases.
+// Generally keep the WeakPtrFactory as last fields in classes: it makes the
+// WeakPtr(s) invalidate as first thing in the class dtor.
+// Usage:
+// class MyClass {
+//  MyClass() : weak_factory_(this) {}
+//  WeakPtr<MyClass> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
+//
+// private:
+//  WeakPtrFactory<MyClass> weak_factory_;
+// }
+//
+// int main() {
+//  std::unique_ptr<MyClass> foo(new MyClass);
+//  auto wptr = foo.GetWeakPtr();
+//  ASSERT_TRUE(wptr);
+//  ASSERT_EQ(foo.get(), wptr->get());
+//  foo.reset();
+//  ASSERT_FALSE(wptr);
+//  ASSERT_EQ(nullptr, wptr->get());
+// }
+
+template <typename T>
+class WeakPtrFactory;  // Forward declaration, defined below.
+
+template <typename T>
+class WeakPtr {
+ public:
+  WeakPtr() {}
+  WeakPtr(const WeakPtr&) = default;
+  WeakPtr& operator=(const WeakPtr&) = default;
+  WeakPtr(WeakPtr&&) = default;
+  WeakPtr& operator=(WeakPtr&&) = default;
+
+  T* get() const {
+    PERFETTO_DCHECK_THREAD(thread_checker);
+    return handle_ ? *handle_.get() : nullptr;
+  }
+  T* operator->() const { return get(); }
+  T& operator*() const { return *get(); }
+
+  explicit operator bool() const { return !!get(); }
+
+ private:
+  friend class WeakPtrFactory<T>;
+  explicit WeakPtr(const std::shared_ptr<T*>& handle) : handle_(handle) {}
+
+  std::shared_ptr<T*> handle_;
+  PERFETTO_THREAD_CHECKER(thread_checker)
+};
+
+template <typename T>
+class WeakPtrFactory {
+ public:
+  explicit WeakPtrFactory(T* owner) : weak_ptr_(std::make_shared<T*>(owner)) {
+    PERFETTO_DCHECK_THREAD(thread_checker);
+  }
+
+  ~WeakPtrFactory() {
+    PERFETTO_DCHECK_THREAD(thread_checker);
+    *(weak_ptr_.handle_.get()) = nullptr;
+  }
+
+  // Can be safely called on any thread, since it simply copies |weak_ptr_|.
+  // Note that any accesses to the returned pointer need to be made on the
+  // thread that created/reset the factory.
+  WeakPtr<T> GetWeakPtr() const { return weak_ptr_; }
+
+  // Reset the factory to a new owner & thread. May only be called before any
+  // weak pointers were passed out. Future weak pointers will be valid on the
+  // calling thread.
+  void Reset(T* owner) {
+    // Reset thread checker to current thread.
+    PERFETTO_DETACH_FROM_THREAD(thread_checker);
+    PERFETTO_DCHECK_THREAD(thread_checker);
+
+    // We should not have passed out any weak pointers yet at this point.
+    PERFETTO_DCHECK(weak_ptr_.handle_.use_count() == 1);
+
+    weak_ptr_ = WeakPtr<T>(std::make_shared<T*>(owner));
+  }
+
+ private:
+  WeakPtrFactory(const WeakPtrFactory&) = delete;
+  WeakPtrFactory& operator=(const WeakPtrFactory&) = delete;
+
+  WeakPtr<T> weak_ptr_;
+  PERFETTO_THREAD_CHECKER(thread_checker)
+};
+
+}  // namespace base
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_BASE_WEAK_PTR_H_
diff --git a/src/libtracing/perfetto/ext/ipc/BUILD.gn b/src/libtracing/perfetto/ext/ipc/BUILD.gn
new file mode 100644
index 000000000..0fe7b681b
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/BUILD.gn
@@ -0,0 +1,32 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("ipc") {
+  public_deps = [
+    "../../protozero",
+    "../base",
+  ]
+  sources = [
+    "async_result.h",
+    "basic_types.h",
+    "client.h",
+    "client_info.h",
+    "codegen_helpers.h",
+    "deferred.h",
+    "host.h",
+    "service.h",
+    "service_descriptor.h",
+    "service_proxy.h",
+  ]
+}
diff --git a/src/libtracing/perfetto/ext/ipc/async_result.h b/src/libtracing/perfetto/ext/ipc/async_result.h
new file mode 100644
index 000000000..5cb614092
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/async_result.h
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_ASYNC_RESULT_H_
+#define INCLUDE_PERFETTO_EXT_IPC_ASYNC_RESULT_H_
+
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+#include "perfetto/ext/ipc/basic_types.h"
+
+namespace perfetto {
+namespace ipc {
+
+// Wraps the result of an asynchronous invocation. This is the equivalent of a
+// std::pair<unique_ptr<T>, bool> with syntactic sugar. It is used as callback
+// argument by Deferred<T>. T is a ProtoMessage subclass (i.e. generated .pb.h).
+template <typename T>
+class AsyncResult {
+ public:
+  static AsyncResult Create() {
+    return AsyncResult(std::unique_ptr<T>(new T()));
+  }
+
+  AsyncResult(std::unique_ptr<T> msg = nullptr,
+              bool has_more = false,
+              int fd = -1)
+      : msg_(std::move(msg)), has_more_(has_more), fd_(fd) {
+    static_assert(std::is_base_of<ProtoMessage, T>::value, "T->ProtoMessage");
+  }
+  AsyncResult(AsyncResult&&) noexcept = default;
+  AsyncResult& operator=(AsyncResult&&) = default;
+
+  bool success() const { return !!msg_; }
+  explicit operator bool() const { return success(); }
+
+  bool has_more() const { return has_more_; }
+  void set_has_more(bool has_more) { has_more_ = has_more; }
+
+  void set_msg(std::unique_ptr<T> msg) { msg_ = std::move(msg); }
+  T* release_msg() { return msg_.release(); }
+  T* operator->() { return msg_.get(); }
+  T& operator*() { return *msg_; }
+
+  void set_fd(int fd) { fd_ = fd; }
+  int fd() const { return fd_; }
+
+ private:
+  std::unique_ptr<T> msg_;
+  bool has_more_ = false;
+
+  // Optional. Only for messages that convey a file descriptor, for sharing
+  // memory across processes.
+  int fd_ = -1;
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_ASYNC_RESULT_H_
diff --git a/src/libtracing/perfetto/ext/ipc/basic_types.h b/src/libtracing/perfetto/ext/ipc/basic_types.h
new file mode 100644
index 000000000..fd454b0f0
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/basic_types.h
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_BASIC_TYPES_H_
+#define INCLUDE_PERFETTO_EXT_IPC_BASIC_TYPES_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "perfetto/ext/base/utils.h"
+#include "perfetto/protozero/cpp_message_obj.h"
+
+namespace perfetto {
+namespace ipc {
+
+using ProtoMessage = ::protozero::CppMessageObj;
+using ServiceID = uint32_t;
+using MethodID = uint32_t;
+using ClientID = uint64_t;
+using RequestID = uint64_t;
+
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+// AF_UNIX on Windows is supported only on Windows 10 from build 17063.
+// Also it doesn't bring major advantages compared to a TCP socket.
+// See go/perfetto-win .
+constexpr bool kUseTCPSocket = true;
+#else
+// Android, Linux, Mac, Fuchsia use local sockets.
+constexpr bool kUseTCPSocket = false;
+#endif
+
+// This determines the maximum size allowed for an IPC message. Trying to send
+// or receive a larger message will hit DCHECK(s) and auto-disconnect.
+constexpr size_t kIPCBufferSize = 128 * 1024;
+
+constexpr uid_t kInvalidUid = static_cast<uid_t>(-1);
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_BASIC_TYPES_H_
diff --git a/src/libtracing/perfetto/ext/ipc/client.h b/src/libtracing/perfetto/ext/ipc/client.h
new file mode 100644
index 000000000..46e1e75f8
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/client.h
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_CLIENT_H_
+#define INCLUDE_PERFETTO_EXT_IPC_CLIENT_H_
+
+#include <functional>
+#include <memory>
+
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/unix_socket.h"
+#include "perfetto/ext/base/weak_ptr.h"
+#include "perfetto/ext/ipc/basic_types.h"
+
+namespace perfetto {
+
+namespace base {
+class TaskRunner;
+}  // namespace base
+
+namespace ipc {
+class ServiceProxy;
+
+// The client-side class that talks to the host over the socket and multiplexes
+// requests coming from the various autogenerated ServiceProxy stubs.
+// This is meant to be used by the user code as follows:
+// auto client = Client::CreateInstance("socket_name", task_runner);
+// std::unique_ptr<GreeterService> svc(new GreeterService());
+// client.BindService(svc);
+// svc.OnConnect([] () {
+//    svc.SayHello(..., ...);
+// });
+class Client {
+ public:
+  // struct ConnArgs is used for creating a client in 2 connection modes:
+  // 1. Connect using a socket name with the option to retry the connection on
+  //    connection failure.
+  // 2. Adopt a connected socket.
+  struct ConnArgs {
+    ConnArgs(const char* sock_name, bool sock_retry)
+        : socket_name(sock_name), retry(sock_retry) {}
+    explicit ConnArgs(base::ScopedSocketHandle sock_fd)
+        : socket_fd(std::move(sock_fd)) {}
+
+    // Disallow copy. Only supports move.
+    ConnArgs(const ConnArgs& other) = delete;
+    ConnArgs(ConnArgs&& other) = default;
+
+    base::ScopedSocketHandle socket_fd;
+    const char* socket_name = nullptr;
+    bool retry = false;  // Only for connecting with |socket_name|.
+    std::function<int(void)> receive_shmem_fd_cb_fuchsia;
+  };
+
+  static std::unique_ptr<Client> CreateInstance(ConnArgs, base::TaskRunner*);
+  virtual ~Client();
+
+  virtual void BindService(base::WeakPtr<ServiceProxy>) = 0;
+
+  // There is no need to call this method explicitly. Destroying the
+  // ServiceProxy instance is sufficient and will automatically unbind it. This
+  // method is exposed only for the ServiceProxy destructor.
+  virtual void UnbindService(ServiceID) = 0;
+
+  // Returns (with move semantics) the last file descriptor received on the IPC
+  // channel. No buffering is performed: if a service sends two file descriptors
+  // and the caller doesn't read them immediately, the first one will be
+  // automatically closed when the second is received (and will hit a DCHECK in
+  // debug builds).
+  virtual base::ScopedFile TakeReceivedFD() = 0;
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_CLIENT_H_
diff --git a/src/libtracing/perfetto/ext/ipc/client_info.h b/src/libtracing/perfetto/ext/ipc/client_info.h
new file mode 100644
index 000000000..132ab69cd
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/client_info.h
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_CLIENT_INFO_H_
+#define INCLUDE_PERFETTO_EXT_IPC_CLIENT_INFO_H_
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/sys_types.h"
+#include "perfetto/ext/base/utils.h"
+#include "perfetto/ext/ipc/basic_types.h"
+
+namespace perfetto {
+namespace ipc {
+
+// Passed to Service(s) to identify remote clients.
+class ClientInfo {
+ public:
+  ClientInfo() = default;
+  ClientInfo(ClientID client_id,
+             uid_t uid,
+             pid_t pid,
+             base::MachineID machine_id)
+      : client_id_(client_id), uid_(uid), pid_(pid), machine_id_(machine_id) {}
+
+  bool operator==(const ClientInfo& other) const {
+    return std::tie(client_id_, uid_, pid_, machine_id_) ==
+           std::tie(other.client_id_, other.uid_, other.pid_,
+                    other.machine_id_);
+  }
+  bool operator!=(const ClientInfo& other) const { return !(*this == other); }
+
+  // For map<> and other sorted containers.
+  bool operator<(const ClientInfo& other) const {
+    PERFETTO_DCHECK(client_id_ != other.client_id_ || *this == other);
+    return client_id_ < other.client_id_;
+  }
+
+  bool is_valid() const { return client_id_ != 0; }
+
+  // A monotonic counter.
+  ClientID client_id() const { return client_id_; }
+
+  // Posix User ID. Comes from the kernel, can be trusted.
+  uid_t uid() const { return uid_; }
+
+  // Posix process ID. Comes from the kernel and can be trusted.
+  int32_t pid() const { return pid_; }
+
+  // An integral ID that identifies the machine the client is on.
+  base::MachineID machine_id() const { return machine_id_; }
+
+ private:
+  ClientID client_id_ = 0;
+  // The following fields are emitted to trace packets and should be kept in
+  // sync with perfetto::ClientIdentity.
+  uid_t uid_ = kInvalidUid;
+  pid_t pid_ = base::kInvalidPid;
+  base::MachineID machine_id_ = base::kDefaultMachineID;
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_CLIENT_INFO_H_
diff --git a/src/libtracing/perfetto/ext/ipc/codegen_helpers.h b/src/libtracing/perfetto/ext/ipc/codegen_helpers.h
new file mode 100644
index 000000000..c0235a288
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/codegen_helpers.h
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This file is only meant to be included in autogenerated .cc files.
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_CODEGEN_HELPERS_H_
+#define INCLUDE_PERFETTO_EXT_IPC_CODEGEN_HELPERS_H_
+
+#include <memory>
+
+#include "perfetto/ext/ipc/basic_types.h"
+#include "perfetto/ext/ipc/deferred.h"
+#include "perfetto/ext/ipc/service.h"
+
+// A templated protobuf message decoder. Returns nullptr in case of failure.
+template <typename T>
+::std::unique_ptr<::perfetto::ipc::ProtoMessage> _IPC_Decoder(
+    const std::string& proto_data) {
+  ::std::unique_ptr<::perfetto::ipc::ProtoMessage> msg(new T());
+  if (msg->ParseFromString(proto_data))
+    return msg;
+  return nullptr;
+}
+
+// Templated method dispatcher. Used to obtain a function pointer to a given
+// IPC method (Method) of a given service (TSvc) that can be invoked by the
+// host-side machinery starting from a generic Service pointer and a generic
+// ProtoMessage request argument.
+template <typename TSvc,    // Type of the actual Service subclass.
+          typename TReq,    // Type of the request argument.
+          typename TReply,  // Type of the reply argument.
+          void (TSvc::*Method)(const TReq&, ::perfetto::ipc::Deferred<TReply>)>
+void _IPC_Invoker(::perfetto::ipc::Service* s,
+                  const ::perfetto::ipc::ProtoMessage& req,
+                  ::perfetto::ipc::DeferredBase reply) {
+  (*static_cast<TSvc*>(s).*Method)(
+      static_cast<const TReq&>(req),
+      ::perfetto::ipc::Deferred<TReply>(::std::move(reply)));
+}
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_CODEGEN_HELPERS_H_
diff --git a/src/libtracing/perfetto/ext/ipc/deferred.h b/src/libtracing/perfetto/ext/ipc/deferred.h
new file mode 100644
index 000000000..cb04820f4
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/deferred.h
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_DEFERRED_H_
+#define INCLUDE_PERFETTO_EXT_IPC_DEFERRED_H_
+
+#include <functional>
+#include <memory>
+#include <utility>
+
+#include "perfetto/ext/ipc/async_result.h"
+#include "perfetto/ext/ipc/basic_types.h"
+
+namespace perfetto {
+namespace ipc {
+
+// This class is a wrapper for a callback handling async results.
+// The problem this is solving is the following: For each result argument of the
+// methods generated from the .proto file:
+// - The client wants to see something on which it can Bind() a callback, which
+//   is invoked asynchronously once reply is received from the host.
+// - The host wants to expose something to user code that implements the IPC
+//   methods to allow them to provide an asynchronous reply back to the client.
+//   Eventually even more than once, for the case streaming replies.
+//
+// In both cases we want to make sure that callbacks don't get lost along the
+// way. To address this, this class will automatically reject the callbacks
+// if they are not resolved at destructor time (or the object is std::move()'d).
+//
+// The client is supposed to use this class as follows:
+//   class GreeterProxy {
+//      void SayHello(const HelloRequest&, Deferred<HelloReply> reply)
+//   }
+//  ...
+//  Deferred<HelloReply> reply;
+//  reply.Bind([] (AsyncResult<HelloReply> reply) {
+//    std::cout << reply.success() ? reply->message : "failure";
+//  });
+//  host_proxy_instance.SayHello(req, std::move(reply));
+//
+// The host instead is supposed to use this as follows:
+//   class GreeterImpl : public Greeter {
+//     void SayHello(const HelloRequest& req, Deferred<HelloReply> reply) {
+//        AsyncResult<HelloReply> reply = AsyncResult<HelloReply>::Create();
+//        reply->set_greeting("Hello " + req.name)
+//        reply.Resolve(std::move(reply));
+//     }
+//   }
+// Or for more complex cases, the deferred object can be std::move()'d outside
+// and the reply can continue asynchronously later.
+
+template <typename T>
+class Deferred;
+
+class DeferredBase {
+ public:
+  explicit DeferredBase(
+      std::function<void(AsyncResult<ProtoMessage>)> callback = nullptr);
+
+  ~DeferredBase();
+  DeferredBase(DeferredBase&&) noexcept;
+  DeferredBase& operator=(DeferredBase&&);
+  void Bind(std::function<void(AsyncResult<ProtoMessage>)> callback);
+  bool IsBound() const;
+  void Resolve(AsyncResult<ProtoMessage>);
+  void Reject();
+
+ protected:
+  template <typename T>
+  friend class Deferred;
+  void Move(DeferredBase&);
+
+  std::function<void(AsyncResult<ProtoMessage>)> callback_;
+};
+
+template <typename T>  // T : ProtoMessage subclass
+class Deferred : public DeferredBase {
+ public:
+  explicit Deferred(std::function<void(AsyncResult<T>)> callback = nullptr) {
+    Bind(std::move(callback));
+  }
+
+  // This move constructor (and the similar one in DeferredBase) is meant to be
+  // called only by the autogenerated code. The caller has to guarantee that the
+  // moved-from and moved-to types match. The behavior is otherwise undefined.
+  explicit Deferred(DeferredBase&& other) {
+    callback_ = std::move(other.callback_);
+    other.callback_ = nullptr;
+  }
+
+  void Bind(std::function<void(AsyncResult<T>)> callback) {
+    if (!callback)
+      return;
+
+    // Here we need a callback adapter to downcast the callback to a generic
+    // callback that takes an AsyncResult<ProtoMessage>, so that it can be
+    // stored in the base class |callback_|.
+    auto callback_adapter = [callback](
+                                AsyncResult<ProtoMessage> async_result_base) {
+      // Upcast the async_result from <ProtoMessage> -> <T : ProtoMessage>.
+      static_assert(std::is_base_of<ProtoMessage, T>::value, "T:ProtoMessage");
+      AsyncResult<T> async_result(
+          std::unique_ptr<T>(static_cast<T*>(async_result_base.release_msg())),
+          async_result_base.has_more(), async_result_base.fd());
+      callback(std::move(async_result));
+    };
+    DeferredBase::Bind(callback_adapter);
+  }
+
+  // If no more messages are expected, |callback_| is released.
+  void Resolve(AsyncResult<T> async_result) {
+    // Convert the |async_result| to the generic base one (T -> ProtoMessage).
+    AsyncResult<ProtoMessage> async_result_base(
+        std::unique_ptr<ProtoMessage>(async_result.release_msg()),
+        async_result.has_more(), async_result.fd());
+    DeferredBase::Resolve(std::move(async_result_base));
+  }
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_DEFERRED_H_
diff --git a/src/libtracing/perfetto/ext/ipc/host.h b/src/libtracing/perfetto/ext/ipc/host.h
new file mode 100644
index 000000000..e0f8af4d7
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/host.h
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_HOST_H_
+#define INCLUDE_PERFETTO_EXT_IPC_HOST_H_
+
+#include <memory>
+
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/unix_socket.h"
+#include "perfetto/ext/ipc/basic_types.h"
+
+namespace perfetto {
+
+namespace base {
+class TaskRunner;
+}  // namespace base
+
+namespace ipc {
+
+class Service;
+
+// The host-side of the IPC layer. This class acts as a registry and request
+// dispatcher. It listen on the UnixSocket |socket_name| for incoming requests
+// (coming Client instances) and dispatches their requests to the various
+// Services exposed.
+class Host {
+ public:
+  // Creates an instance and starts listening on the given |socket_name|.
+  // Returns nullptr if listening on the socket fails.
+  static std::unique_ptr<Host> CreateInstance(const char* socket_name,
+                                              base::TaskRunner*);
+
+  // Like the above but takes a file descriptor to a pre-bound unix socket.
+  // Returns nullptr if listening on the socket fails.
+  static std::unique_ptr<Host> CreateInstance(base::ScopedSocketHandle,
+                                              base::TaskRunner*);
+
+  // Creates a Host which is not backed by a POSIX listening socket.
+  // Instead, it accepts sockets passed in via AdoptConnectedSocket_Fuchsia().
+  // See go/fuchsetto for more details.
+  static std::unique_ptr<Host> CreateInstance_Fuchsia(base::TaskRunner*);
+
+  virtual ~Host();
+
+  // Registers a new service and makes it available to remote IPC peers.
+  // All the exposed Service instances will be destroyed when destroying the
+  // Host instance if ExposeService succeeds and returns true, or immediately
+  // after the call in case of failure.
+  // Returns true if the register has been successfully registered, false in
+  // case of errors (e.g., another service with the same name is already
+  // registered).
+  virtual bool ExposeService(std::unique_ptr<Service>) = 0;
+
+  // Accepts a pre-connected socket handle and a callback used to send a
+  // shared memory FD to the remote client.
+  // The callback returns false if the FD could not be sent.
+  // Should only be used in conjunction with CreateInstance_Fuchsia().
+  virtual void AdoptConnectedSocket_Fuchsia(
+      base::ScopedSocketHandle,
+      std::function<bool(int)> send_fd_cb) = 0;
+
+  // Overrides the default send timeout for the per-connection sockets.
+  virtual void SetSocketSendTimeoutMs(uint32_t timeout_ms) = 0;
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_HOST_H_
diff --git a/src/libtracing/perfetto/ext/ipc/service.h b/src/libtracing/perfetto/ext/ipc/service.h
new file mode 100644
index 000000000..08de20ca6
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/service.h
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_SERVICE_H_
+#define INCLUDE_PERFETTO_EXT_IPC_SERVICE_H_
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/ipc/client_info.h"
+
+namespace perfetto {
+namespace ipc {
+
+class ServiceDescriptor;
+
+// The base class for all the autogenerated host-side service interfaces.
+class Service {
+ public:
+  virtual ~Service();
+
+  // Overridden by the auto-generated class. Provides the list of methods and
+  // the protobuf (de)serialization functions for their arguments.
+  virtual const ServiceDescriptor& GetDescriptor() = 0;
+
+  // Invoked when a remote client disconnects. Use client_info() to obtain
+  // details about the client that disconnected.
+  virtual void OnClientDisconnected() {}
+
+  // Returns the ClientInfo for the current IPC request. Returns an invalid
+  // ClientInfo if called outside the scope of an IPC method.
+  const ClientInfo& client_info() {
+    PERFETTO_DCHECK(client_info_.is_valid());
+    return client_info_;
+  }
+
+  base::ScopedFile TakeReceivedFD() {
+    if (received_fd_)
+      return std::move(*received_fd_);
+    return base::ScopedFile();
+  }
+
+  bool use_shmem_emulation() { return use_shmem_emulation_; }
+
+ private:
+  friend class HostImpl;
+  ClientInfo client_info_;
+  // This is a pointer because the received fd needs to remain owned by the
+  // ClientConnection, as we will provide it to all method invocations
+  // for that client until one of them calls Service::TakeReceivedFD.
+  //
+  // Different clients might have sent different FDs so this cannot be owned
+  // here.
+  //
+  // Note that this means that there can always only be one outstanding
+  // invocation per client that supplies an FD and the client needs to
+  // wait for this one to return before calling another one.
+  base::ScopedFile* received_fd_;
+
+  // Whether the socket needs to emulate shared memory buffer. Set by HostImpl
+  // when the service is exposed.
+  bool use_shmem_emulation_ = false;
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_SERVICE_H_
diff --git a/src/libtracing/perfetto/ext/ipc/service_descriptor.h b/src/libtracing/perfetto/ext/ipc/service_descriptor.h
new file mode 100644
index 000000000..97eb9bfda
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/service_descriptor.h
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_SERVICE_DESCRIPTOR_H_
+#define INCLUDE_PERFETTO_EXT_IPC_SERVICE_DESCRIPTOR_H_
+
+#include <functional>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "perfetto/ext/ipc/basic_types.h"
+#include "perfetto/ext/ipc/deferred.h"
+
+namespace perfetto {
+namespace ipc {
+
+class Service;
+
+// This is a pure data structure which holds factory methods and strings for the
+// services and their methods that get generated in the .h/.cc files.
+// Each autogenerated class has a GetDescriptor() method that returns one
+// instance of these and allows both client and hosts to map service and method
+// names to IDs and provide function pointers to the protobuf decoder fuctions.
+class ServiceDescriptor {
+ public:
+  struct Method {
+    const char* name;
+
+    // DecoderFunc is pointer to a function that takes a string in input
+    // containing protobuf encoded data and returns a decoded protobuf message.
+    using DecoderFunc = std::unique_ptr<ProtoMessage> (*)(const std::string&);
+
+    // Function pointer to decode the request argument of the method.
+    DecoderFunc request_proto_decoder;
+
+    // Function pointer to decoded the reply argument of the method.
+    DecoderFunc reply_proto_decoder;
+
+    // Function pointer that dispatches the generic request to the corresponding
+    // method implementation.
+    using InvokerFunc = void (*)(Service*,
+                                 const ProtoMessage& /* request_args */,
+                                 DeferredBase /* deferred_reply */);
+    InvokerFunc invoker;
+  };
+
+  const char* service_name = nullptr;
+
+  // Note that methods order is not stable. Client and Host might have different
+  // method indexes, depending on their versions. The Client can't just rely
+  // on the indexes and has to keep a [string -> remote index] translation map.
+  std::vector<Method> methods;
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_SERVICE_DESCRIPTOR_H_
diff --git a/src/libtracing/perfetto/ext/ipc/service_proxy.h b/src/libtracing/perfetto/ext/ipc/service_proxy.h
new file mode 100644
index 000000000..aa9309d7a
--- /dev/null
+++ b/src/libtracing/perfetto/ext/ipc/service_proxy.h
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_IPC_SERVICE_PROXY_H_
+#define INCLUDE_PERFETTO_EXT_IPC_SERVICE_PROXY_H_
+
+#include "perfetto/ext/ipc/basic_types.h"
+
+#include <assert.h>
+
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/base/weak_ptr.h"
+#include "perfetto/ext/ipc/deferred.h"
+
+namespace perfetto {
+namespace ipc {
+
+class Client;
+class ServiceDescriptor;
+
+// The base class for the client-side autogenerated stubs that forward method
+// invocations to the host. All the methods of this class are meant to be called
+// only by the autogenerated code.
+class PERFETTO_EXPORT_COMPONENT ServiceProxy {
+ public:
+  class EventListener {
+   public:
+    virtual ~EventListener();
+
+    // Called once after Client::BindService() if the ServiceProxy has been
+    // successfully bound to the host. It is possible to start sending IPC
+    // requests soon after this.
+    virtual void OnConnect() {}
+
+    // Called if the connection fails to be established or drops after having
+    // been established.
+    virtual void OnDisconnect() {}
+  };
+
+  // Guarantees that no callback will happen after this object has been
+  // destroyed. The caller has to guarantee that the |event_listener| stays
+  // alive at least as long as the ServiceProxy instance.
+  explicit ServiceProxy(EventListener*);
+  virtual ~ServiceProxy();
+
+  void InitializeBinding(base::WeakPtr<Client>,
+                         ServiceID,
+                         std::map<std::string, MethodID>);
+
+  // Called by the IPC methods in the autogenerated classes.
+  void BeginInvoke(const std::string& method_name,
+                   const ProtoMessage& request,
+                   DeferredBase reply,
+                   int fd = -1);
+
+  // Called by ClientImpl.
+  // |reply_args| == nullptr means request failure.
+  void EndInvoke(RequestID,
+                 std::unique_ptr<ProtoMessage> reply_arg,
+                 bool has_more);
+
+  // Called by ClientImpl.
+  void OnConnect(bool success);
+  void OnDisconnect();
+  bool connected() const { return service_id_ != 0; }
+
+  base::WeakPtr<ServiceProxy> GetWeakPtr() const;
+
+  // Implemented by the autogenerated class.
+  virtual const ServiceDescriptor& GetDescriptor() = 0;
+
+ private:
+  base::WeakPtr<Client> client_;
+  ServiceID service_id_ = 0;
+  std::map<std::string, MethodID> remote_method_ids_;
+  std::map<RequestID, DeferredBase> pending_callbacks_;
+  EventListener* const event_listener_;
+  base::WeakPtrFactory<ServiceProxy> weak_ptr_factory_;  // Keep last.
+};
+
+}  // namespace ipc
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_IPC_SERVICE_PROXY_H_
diff --git a/src/libtracing/perfetto/ext/protozero/BUILD.gn b/src/libtracing/perfetto/ext/protozero/BUILD.gn
new file mode 100644
index 000000000..5354e2c8c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/protozero/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright (C) 2024 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../../gn/perfetto.gni")
+
+source_set("protozero") {
+  public_deps = [ "../base" ]
+  deps = [ "../../../../gn:default_deps" ]
+  sources = [ "proto_ring_buffer.h" ]
+}
diff --git a/src/libtracing/perfetto/ext/protozero/proto_ring_buffer.h b/src/libtracing/perfetto/ext/protozero/proto_ring_buffer.h
new file mode 100644
index 000000000..8db542cc2
--- /dev/null
+++ b/src/libtracing/perfetto/ext/protozero/proto_ring_buffer.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_PROTOZERO_PROTO_RING_BUFFER_H_
+#define INCLUDE_PERFETTO_EXT_PROTOZERO_PROTO_RING_BUFFER_H_
+
+#include <stdint.h>
+
+#include "perfetto/ext/base/paged_memory.h"
+
+namespace protozero {
+
+// This class buffers and tokenizes proto messages.
+//
+// From a logical level, it works with a sequence of protos like this.
+// [ header 1 ] [ payload 1   ]
+// [ header 2 ] [ payload 2  ]
+// [ header 3 ] [ payload 3     ]
+// Where [ header ] is a variable-length sequence of:
+// [ Field ID = 1, type = length-delimited] [ length (varint) ].
+//
+// The input to this class is byte-oriented, not message-oriented (like a TCP
+// stream or a pipe). The caller is not required to respect the boundaries of
+// each message; only guarantee that data is not lost or duplicated. The
+// following sequence of inbound events is possible:
+// 1. [ hdr 1 (incomplete) ... ]
+// 2. [ ... hdr 1 ] [ payload 1 ] [ hdr 2 ] [ payoad 2 ] [ hdr 3 ] [ pay... ]
+// 3. [ ...load 3 ]
+//
+// This class maintains inbound requests in a ring buffer.
+// The expected usage is:
+// ring_buf.Append(data, len);
+// for (;;) {
+//   auto msg = ring_buf.ReadMessage();
+//   if (!msg.valid())
+//     break;
+//   Decode(msg);
+// }
+//
+// After each call to Append, the caller is expected to call ReadMessage() until
+// it returns an invalid message (signalling no more messages could be decoded).
+// Note that a single Append can "unblock" > 1 messages, which is why the caller
+// needs to keep calling ReadMessage in a loop.
+//
+// Internal architecture
+// ---------------------
+// Internally this is similar to a ring-buffer, with the caveat that it never
+// wraps, it only expands. Expansions are rare. The deal is that in most cases
+// the read cursor follows very closely the write cursor. For instance, if the
+// underlying transport behaves as a dgram socket, after each Append, the read
+// cursor will chase completely the write cursor. Even if the underlying stream
+// is not always atomic, the expectation is that the read cursor will eventually
+// reach the write one within few messages.
+// A visual example, imagine we have four messages: 2it 4will 2be 4fine
+// Visually:
+//
+// Append("2it4wi"): A message and a bit:
+// [ 2it 4wi                     ]
+// ^R       ^W
+//
+// After the ReadMessage(), the 1st message will be read, but not the 2nd.
+// [ 2it 4wi                     ]
+//      ^R ^W
+//
+// Append("ll2be4f")
+// [ 2it 4will 2be 4f            ]
+//      ^R           ^W
+//
+// After the ReadMessage() loop:
+// [ 2it 4will 2be 4f            ]
+//                ^R ^W
+// Append("ine")
+// [ 2it 4will 2be 4fine         ]
+//                ^R    ^W
+//
+// In the next ReadMessage() the R cursor will chase the W cursor. When this
+// happens (very frequent) we can just reset both cursors to 0 and restart.
+// If we are unlucky and get to the end of the buffer, two things happen:
+// 1. We try first to recompact the buffer, moving everything left by R.
+// 2. If still there isn't enough space, we expand the buffer.
+// Given that each message is expected to be at most kMaxMsgSize (64 MB), the
+// expansion is bound at 2 * kMaxMsgSize.
+
+class RingBufferMessageReader {
+ public:
+  static constexpr size_t kMaxMsgSize = 64 * 1024 * 1024;
+  struct Message {
+    const uint8_t* start = nullptr;
+    uint32_t len = 0;
+    uint32_t field_id = 0;
+    bool fatal_framing_error = false;
+    const uint8_t* end() const { return start + len; }
+    inline bool valid() const { return !!start; }
+  };
+
+  RingBufferMessageReader();
+  virtual ~RingBufferMessageReader();
+  RingBufferMessageReader(const RingBufferMessageReader&) = delete;
+  RingBufferMessageReader& operator=(const RingBufferMessageReader&) = delete;
+
+  // Appends data into the ring buffer, recompacting or resizing it if needed.
+  // Will invaildate the pointers previously handed out.
+  void Append(const void* data, size_t len);
+
+  // If a message can be read, it returns the boundaries of the message
+  // (without including the preamble) and advances the read cursor.
+  // If no message is available, returns a null range.
+  // The returned pointer is only valid until the next call to Append(), as
+  // that can recompact or resize the underlying buffer.
+  Message ReadMessage();
+
+  // Exposed for testing.
+  size_t capacity() const { return buf_.size(); }
+  size_t avail() const { return buf_.size() - (wr_ - rd_); }
+
+ protected:
+  // Subclasses must implement the header parsing.
+  virtual Message TryReadMessage(const uint8_t* start, const uint8_t* end) = 0;
+
+ private:
+  perfetto::base::PagedMemory buf_;
+  Message fastpath_{};
+  bool failed_ = false;  // Set in case of an unrecoverable framing faiulre.
+  size_t rd_ = 0;        // Offset of the read cursor in |buf_|.
+  size_t wr_ = 0;        // Offset of the write cursor in |buf_|.
+};
+
+class ProtoRingBuffer final : public RingBufferMessageReader {
+ public:
+  ProtoRingBuffer();
+  ~ProtoRingBuffer() override final;
+
+ protected:
+  Message TryReadMessage(const uint8_t* start,
+                         const uint8_t* end) override final;
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_EXT_PROTOZERO_PROTO_RING_BUFFER_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/BUILD.gn b/src/libtracing/perfetto/ext/trace_processor/BUILD.gn
new file mode 100644
index 000000000..6df0cca76
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright (C) 2019 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../../gn/perfetto.gni")
+
+# Exposed for Chromium only. May be removed in the future.
+source_set("export_json") {
+  sources = []
+  if (enable_perfetto_trace_processor_json) {
+    sources += [ "export_json.h" ]
+  }
+}
+
+source_set("demangle") {
+  sources = [ "demangle.h" ]
+}
diff --git a/src/libtracing/perfetto/ext/trace_processor/demangle.h b/src/libtracing/perfetto/ext/trace_processor/demangle.h
new file mode 100644
index 000000000..f3c337ffd
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/demangle.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_DEMANGLE_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_DEMANGLE_H_
+
+#include "perfetto/ext/base/utils.h"
+
+namespace perfetto {
+namespace trace_processor {
+namespace demangle {
+
+// Returns a |malloc|-allocated C string with the demangled name.
+// Returns an empty pointer if demangling was unsuccessful.
+std::unique_ptr<char, base::FreeDeleter> Demangle(const char* mangled_name);
+
+}  // namespace demangle
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_DEMANGLE_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/export_json.h b/src/libtracing/perfetto/ext/trace_processor/export_json.h
new file mode 100644
index 000000000..23119bfad
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/export_json.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_EXPORT_JSON_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_EXPORT_JSON_H_
+
+#include <stdio.h>
+
+#include <functional>
+
+#include "perfetto/base/export.h"
+#include "perfetto/trace_processor/status.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+class TraceProcessorStorage;
+
+namespace json {
+
+using ArgumentNameFilterPredicate = std::function<bool(const char* arg_name)>;
+using ArgumentFilterPredicate =
+    std::function<bool(const char* category_group_name,
+                       const char* event_name,
+                       ArgumentNameFilterPredicate*)>;
+using MetadataFilterPredicate = std::function<bool(const char* metadata_name)>;
+using LabelFilterPredicate = std::function<bool(const char* label_name)>;
+
+class PERFETTO_EXPORT_COMPONENT OutputWriter {
+ public:
+  OutputWriter();
+  virtual ~OutputWriter();
+
+  virtual util::Status AppendString(const std::string&) = 0;
+};
+
+// Public for Chrome. Exports the trace loaded in TraceProcessorStorage to json,
+// applying argument, metadata and label filtering using the callbacks.
+util::Status PERFETTO_EXPORT_COMPONENT
+ExportJson(TraceProcessorStorage*,
+           OutputWriter*,
+           ArgumentFilterPredicate = nullptr,
+           MetadataFilterPredicate = nullptr,
+           LabelFilterPredicate = nullptr);
+
+}  // namespace json
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_EXPORT_JSON_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/BUILD.gn b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/BUILD.gn
new file mode 100644
index 000000000..7d093f454
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/BUILD.gn
@@ -0,0 +1,31 @@
+# Copyright (C) 2020 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../../../../gn/perfetto.gni")
+
+source_set("memory_tracker") {
+  deps = [ "../../../../../../gn:default_deps" ]
+  public_deps = [
+    "../../../../base",
+    "../../../base",
+  ]
+  sources = [
+    "graph.h",
+    "graph_processor.h",
+    "memory_allocator_node_id.h",
+    "memory_graph_edge.h",
+    "raw_memory_graph_node.h",
+    "raw_process_memory_node.h",
+  ]
+}
diff --git a/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph.h b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph.h
new file mode 100644
index 000000000..8ee5c74c7
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph.h
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_GRAPH_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_GRAPH_H_
+
+#include <sys/types.h>
+
+#include <forward_list>
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/proc_utils.h"
+#include "perfetto/ext/base/string_utils.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+const base::PlatformProcessId kNullProcessId = 0;
+
+// Contains processed node graphs for each process and in the global space.
+// This class is also the arena which owns the nodes of the graph.
+class PERFETTO_EXPORT_COMPONENT GlobalNodeGraph {
+ public:
+  class Node;
+  class Edge;
+  class PreOrderIterator;
+  class PostOrderIterator;
+
+  // Graph of nodes either associated with a process or with
+  // the shared space.
+  class PERFETTO_EXPORT_COMPONENT Process {
+   public:
+    Process(base::PlatformProcessId pid, GlobalNodeGraph* global_graph);
+    ~Process();
+
+    // Creates a node in the node graph which is associated with the
+    // given |id|, |path| and |weak|ness and returns it.
+    GlobalNodeGraph::Node* CreateNode(MemoryAllocatorNodeId id,
+                                      const std::string& path,
+                                      bool weak);
+
+    // Returns the node in the graph at the given |path| or nullptr
+    // if no such node exists in the provided |graph|.
+    GlobalNodeGraph::Node* FindNode(const std::string& path);
+
+    base::PlatformProcessId pid() const { return pid_; }
+    GlobalNodeGraph* global_graph() const { return global_graph_; }
+    GlobalNodeGraph::Node* root() const { return root_; }
+
+   private:
+    base::PlatformProcessId pid_;
+    GlobalNodeGraph* global_graph_;
+    GlobalNodeGraph::Node* root_;
+    Process(const Process&) = delete;
+    Process& operator=(const Process&) = delete;
+  };
+
+  // A single node in the graph of allocator nodes associated with a
+  // certain path and containing the entries for this path.
+  class PERFETTO_EXPORT_COMPONENT Node {
+   public:
+    // Auxilary data (a scalar number or a string) about this node each
+    // associated with a key.
+    struct PERFETTO_EXPORT_COMPONENT Entry {
+      enum Type {
+        kUInt64,
+        kString,
+      };
+
+      // The units of the entry if the entry is a scalar. The scalar
+      // refers to either a number of objects or a size in bytes.
+      enum ScalarUnits {
+        kObjects,
+        kBytes,
+      };
+
+      // Creates the entry with the appropriate type.
+      Entry(ScalarUnits units, uint64_t value);
+      explicit Entry(const std::string& value);
+
+      const Type type;
+      const ScalarUnits units;
+
+      // The value of the entry if this entry has a string type.
+      const std::string value_string;
+
+      // The value of the entry if this entry has a integer type.
+      const uint64_t value_uint64;
+    };
+
+    explicit Node(GlobalNodeGraph::Process* node_graph, Node* parent);
+    ~Node();
+
+    // Gets the direct child of a node for the given |subpath|.
+    Node* GetChild(const std::string& name) const;
+
+    // Inserts the given |node| as a child of the current node
+    // with the given |subpath| as the key.
+    void InsertChild(const std::string& name, Node* node);
+
+    // Creates a child for this node with the given |name| as the key.
+    Node* CreateChild(const std::string& name);
+
+    // Checks if the current node is a descendent (i.e. exists as a child,
+    // child of a child, etc.) of the given node |possible_parent|.
+    bool IsDescendentOf(const Node& possible_parent) const;
+
+    // Adds an entry for this node node with the given |name|, |units| and
+    // type.
+    void AddEntry(const std::string& name,
+                  Entry::ScalarUnits units,
+                  uint64_t value);
+    void AddEntry(const std::string& name, const std::string& value);
+
+    // Adds an edge which indicates that this node is owned by
+    // another node.
+    void AddOwnedByEdge(Edge* edge);
+
+    // Sets the edge indicates that this node owns another node.
+    void SetOwnsEdge(Edge* edge);
+
+    bool is_weak() const { return weak_; }
+    void set_weak(bool weak) { weak_ = weak; }
+    bool is_explicit() const { return explicit_; }
+    void set_explicit(bool explicit_node) { explicit_ = explicit_node; }
+    uint64_t not_owned_sub_size() const { return not_owned_sub_size_; }
+    void add_not_owned_sub_size(uint64_t addition) {
+      not_owned_sub_size_ += addition;
+    }
+    uint64_t not_owning_sub_size() const { return not_owning_sub_size_; }
+    void add_not_owning_sub_size(uint64_t addition) {
+      not_owning_sub_size_ += addition;
+    }
+    double owned_coefficient() const { return owned_coefficient_; }
+    void set_owned_coefficient(double owned_coefficient) {
+      owned_coefficient_ = owned_coefficient;
+    }
+    double owning_coefficient() const { return owning_coefficient_; }
+    void set_owning_coefficient(double owning_coefficient) {
+      owning_coefficient_ = owning_coefficient;
+    }
+    double cumulative_owned_coefficient() const {
+      return cumulative_owned_coefficient_;
+    }
+    void set_cumulative_owned_coefficient(double cumulative_owned_coefficient) {
+      cumulative_owned_coefficient_ = cumulative_owned_coefficient;
+    }
+    double cumulative_owning_coefficient() const {
+      return cumulative_owning_coefficient_;
+    }
+    void set_cumulative_owning_coefficient(
+        double cumulative_owning_coefficient) {
+      cumulative_owning_coefficient_ = cumulative_owning_coefficient;
+    }
+    MemoryAllocatorNodeId id() const { return id_; }
+    void set_id(MemoryAllocatorNodeId id) { id_ = id; }
+    GlobalNodeGraph::Edge* owns_edge() const { return owns_edge_; }
+    std::map<std::string, Node*>* children() { return &children_; }
+    const std::map<std::string, Node*>& const_children() const {
+      return children_;
+    }
+    std::vector<GlobalNodeGraph::Edge*>* owned_by_edges() {
+      return &owned_by_edges_;
+    }
+    const Node* parent() const { return parent_; }
+    const GlobalNodeGraph::Process* node_graph() const { return node_graph_; }
+    std::map<std::string, Entry>* entries() { return &entries_; }
+    const std::map<std::string, Entry>& const_entries() const {
+      return entries_;
+    }
+
+   private:
+    GlobalNodeGraph::Process* node_graph_;
+    Node* const parent_;
+    MemoryAllocatorNodeId id_;
+    std::map<std::string, Entry> entries_;
+    std::map<std::string, Node*> children_;
+    bool explicit_ = false;
+    bool weak_ = false;
+    uint64_t not_owning_sub_size_ = 0;
+    uint64_t not_owned_sub_size_ = 0;
+    double owned_coefficient_ = 1;
+    double owning_coefficient_ = 1;
+    double cumulative_owned_coefficient_ = 1;
+    double cumulative_owning_coefficient_ = 1;
+
+    GlobalNodeGraph::Edge* owns_edge_;
+    std::vector<GlobalNodeGraph::Edge*> owned_by_edges_;
+
+    Node(const Node&) = delete;
+    Node& operator=(const Node&) = delete;
+  };
+
+  // An edge in the node graph which indicates ownership between the
+  // source and target nodes.
+  class PERFETTO_EXPORT_COMPONENT Edge {
+   public:
+    Edge(GlobalNodeGraph::Node* source,
+         GlobalNodeGraph::Node* target,
+         int priority);
+
+    GlobalNodeGraph::Node* source() const { return source_; }
+    GlobalNodeGraph::Node* target() const { return target_; }
+    int priority() const { return priority_; }
+
+   private:
+    GlobalNodeGraph::Node* const source_;
+    GlobalNodeGraph::Node* const target_;
+    const int priority_;
+  };
+
+  // An iterator-esque class which yields nodes in a depth-first pre order.
+  class PERFETTO_EXPORT_COMPONENT PreOrderIterator {
+   public:
+    explicit PreOrderIterator(std::vector<Node*>&& root_nodes);
+    PreOrderIterator(PreOrderIterator&& other);
+    ~PreOrderIterator();
+
+    // Yields the next node in the DFS post-order traversal.
+    Node* next();
+
+   private:
+    std::vector<Node*> to_visit_;
+    std::set<const Node*> visited_;
+  };
+
+  // An iterator-esque class which yields nodes in a depth-first post order.
+  class PERFETTO_EXPORT_COMPONENT PostOrderIterator {
+   public:
+    explicit PostOrderIterator(std::vector<Node*>&& root_nodes);
+    PostOrderIterator(PostOrderIterator&& other);
+    ~PostOrderIterator();
+
+    // Yields the next node in the DFS post-order traversal.
+    Node* next();
+
+   private:
+    std::vector<Node*> to_visit_;
+    std::set<Node*> visited_;
+    std::vector<Node*> path_;
+  };
+
+  using ProcessNodeGraphMap =
+      std::map<base::PlatformProcessId,
+               std::unique_ptr<GlobalNodeGraph::Process>>;
+  using IdNodeMap = std::map<MemoryAllocatorNodeId, Node*>;
+
+  GlobalNodeGraph();
+  ~GlobalNodeGraph();
+
+  // Creates a container for all the node graphs for the process given
+  // by the given |process_id|.
+  GlobalNodeGraph::Process* CreateGraphForProcess(
+      base::PlatformProcessId process_id);
+
+  // Adds an edge in the node graph with the given source and target nodes
+  // and edge priority.
+  void AddNodeOwnershipEdge(Node* owner, Node* owned, int priority);
+
+  // Returns an iterator which yields nodes in the nodes in this graph in
+  // pre-order. That is, children and owners of nodes are returned after the
+  // node itself.
+  PreOrderIterator VisitInDepthFirstPreOrder();
+
+  // Returns an iterator which yields nodes in the nodes in this graph in
+  // post-order. That is, children and owners of nodes are returned before the
+  // node itself.
+  PostOrderIterator VisitInDepthFirstPostOrder();
+
+  const IdNodeMap& nodes_by_id() const { return nodes_by_id_; }
+  GlobalNodeGraph::Process* shared_memory_graph() const {
+    return shared_memory_graph_.get();
+  }
+  const ProcessNodeGraphMap& process_node_graphs() const {
+    return process_node_graphs_;
+  }
+  const std::forward_list<Edge>& edges() const { return all_edges_; }
+
+ private:
+  // Creates a node in the arena which is associated with the given
+  // |process_graph| and for the given |parent|.
+  Node* CreateNode(GlobalNodeGraph::Process* process_graph,
+                   GlobalNodeGraph::Node* parent);
+
+  std::forward_list<Node> all_nodes_;
+  std::forward_list<Edge> all_edges_;
+  IdNodeMap nodes_by_id_;
+  std::unique_ptr<GlobalNodeGraph::Process> shared_memory_graph_;
+  ProcessNodeGraphMap process_node_graphs_;
+  GlobalNodeGraph(const GlobalNodeGraph&) = delete;
+  GlobalNodeGraph& operator=(const GlobalNodeGraph&) = delete;
+};
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_GRAPH_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph_processor.h b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph_processor.h
new file mode 100644
index 000000000..2d702f788
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/graph_processor.h
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_GRAPH_PROCESSOR_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_GRAPH_PROCESSOR_H_
+
+#include <sys/types.h>
+
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+
+#include "perfetto/base/proc_utils.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/graph.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/raw_process_memory_node.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+class PERFETTO_EXPORT_COMPONENT GraphProcessor {
+ public:
+  // This map does not own the pointers inside.
+  using RawMemoryNodeMap =
+      std::map<base::PlatformProcessId, std::unique_ptr<RawProcessMemoryNode>>;
+
+  static std::unique_ptr<GlobalNodeGraph> CreateMemoryGraph(
+      const RawMemoryNodeMap& process_nodes);
+
+  static void RemoveWeakNodesFromGraph(GlobalNodeGraph* global_graph);
+
+  static void AddOverheadsAndPropagateEntries(GlobalNodeGraph* global_graph);
+
+  static void CalculateSizesForGraph(GlobalNodeGraph* global_graph);
+
+  static std::map<base::PlatformProcessId, uint64_t>
+  ComputeSharedFootprintFromGraph(const GlobalNodeGraph& global_graph);
+
+ private:
+  friend class GraphProcessorTest;
+
+  static void CollectAllocatorNodes(const RawProcessMemoryNode& source,
+                                    GlobalNodeGraph* global_graph,
+                                    GlobalNodeGraph::Process* process_graph);
+
+  static void AddEdges(const RawProcessMemoryNode& source,
+                       GlobalNodeGraph* global_graph);
+
+  static void MarkImplicitWeakParentsRecursively(GlobalNodeGraph::Node* node);
+
+  static void MarkWeakOwnersAndChildrenRecursively(
+      GlobalNodeGraph::Node* node,
+      std::set<const GlobalNodeGraph::Node*>* nodes);
+
+  static void RemoveWeakNodesRecursively(GlobalNodeGraph::Node* parent);
+
+  static void AssignTracingOverhead(const std::string& allocator,
+                                    GlobalNodeGraph* global_graph,
+                                    GlobalNodeGraph::Process* process);
+
+  static GlobalNodeGraph::Node::Entry AggregateNumericWithNameForNode(
+      GlobalNodeGraph::Node* node,
+      const std::string& name);
+
+  static void AggregateNumericsRecursively(GlobalNodeGraph::Node* node);
+
+  static void PropagateNumericsAndDiagnosticsRecursively(
+      GlobalNodeGraph::Node* node);
+
+  static std::optional<uint64_t> AggregateSizeForDescendantNode(
+      GlobalNodeGraph::Node* root,
+      GlobalNodeGraph::Node* descendant);
+
+  static void CalculateSizeForNode(GlobalNodeGraph::Node* node);
+
+  /**
+   * Calculate not-owned and not-owning sub-sizes of a memory allocator node
+   * from its children's (sub-)sizes.
+   *
+   * Not-owned sub-size refers to the aggregated memory of all children which
+   * is not owned by other MADs. Conversely, not-owning sub-size is the
+   * aggregated memory of all children which do not own another MAD. The
+   * diagram below illustrates these two concepts:
+   *
+   *     ROOT 1                         ROOT 2
+   *     size: 4                        size: 5
+   *     not-owned sub-size: 4          not-owned sub-size: 1 (!)
+   *     not-owning sub-size: 0 (!)     not-owning sub-size: 5
+   *
+   *      ^                              ^
+   *      |                              |
+   *
+   *     PARENT 1   ===== owns =====>   PARENT 2
+   *     size: 4                        size: 5
+   *     not-owned sub-size: 4          not-owned sub-size: 5
+   *     not-owning sub-size: 4         not-owning sub-size: 5
+   *
+   *      ^                              ^
+   *      |                              |
+   *
+   *     CHILD 1                        CHILD 2
+   *     size [given]: 4                size [given]: 5
+   *     not-owned sub-size: 4          not-owned sub-size: 5
+   *     not-owning sub-size: 4         not-owning sub-size: 5
+   *
+   * This method assumes that (1) the size of the node, its children, and its
+   * owners [see calculateSizes()] and (2) the not-owned and not-owning
+   * sub-sizes of both the children and owners of the node have already been
+   * calculated [depth-first post-order traversal].
+   */
+  static void CalculateNodeSubSizes(GlobalNodeGraph::Node* node);
+
+  /**
+   * Calculate owned and owning coefficients of a memory allocator node and
+   * its owners.
+   *
+   * The owning coefficient refers to the proportion of a node's not-owning
+   * sub-size which is attributed to the node (only relevant to owning MADs).
+   * Conversely, the owned coefficient is the proportion of a node's
+   * not-owned sub-size, which is attributed to it (only relevant to owned
+   * MADs).
+   *
+   * The not-owned size of the owned node is split among its owners in the
+   * order of the ownership importance as demonstrated by the following
+   * example:
+   *
+   *                                          memory allocator nodes
+   *                                   OWNED  OWNER1  OWNER2  OWNER3 OWNER4
+   *       not-owned sub-size [given]     10       -       -       - -
+   *      not-owning sub-size [given]      -       6       7       5 8
+   *               importance [given]      -       2       2       1 0
+   *    attributed not-owned sub-size      2       -       -       - -
+   *   attributed not-owning sub-size      -       3       4       0 1
+   *                owned coefficient   2/10       -       -       - -
+   *               owning coefficient      -     3/6     4/7     0/5 1/8
+   *
+   * Explanation: Firstly, 6 bytes are split equally among OWNER1 and OWNER2
+   * (highest importance). OWNER2 owns one more byte, so its attributed
+   * not-owning sub-size is 6/2 + 1 = 4 bytes. OWNER3 is attributed no size
+   * because it is smaller than the owners with higher priority. However,
+   * OWNER4 is larger, so it's attributed the difference 8 - 7 = 1 byte.
+   * Finally, 2 bytes remain unattributed and are hence kept in the OWNED
+   * node as attributed not-owned sub-size. The coefficients are then
+   * directly calculated as fractions of the sub-sizes and corresponding
+   * attributed sub-sizes.
+   *
+   * Note that we always assume that all ownerships of a node overlap (e.g.
+   * OWNER3 is subsumed by both OWNER1 and OWNER2). Hence, the table could
+   * be alternatively represented as follows:
+   *
+   *                                 owned memory range
+   *              0   1   2    3    4    5    6        7        8   9  10
+   *   Priority 2 |  OWNER1 + OWNER2 (split)  | OWNER2 |
+   *   Priority 1 | (already attributed) |
+   *   Priority 0 | - - -  (already attributed)  - - - | OWNER4 |
+   *    Remainder | - - - - - (already attributed) - - - - - -  | OWNED |
+   *
+   * This method assumes that (1) the size of the node [see calculateSizes()]
+   * and (2) the not-owned size of the node and not-owning sub-sizes of its
+   * owners [see the first step of calculateEffectiveSizes()] have already
+   * been calculated. Note that the method doesn't make any assumptions about
+   * the order in which nodes are visited.
+   */
+  static void CalculateNodeOwnershipCoefficient(GlobalNodeGraph::Node* node);
+
+  /**
+   * Calculate cumulative owned and owning coefficients of a memory allocator
+   * node from its (non-cumulative) owned and owning coefficients and the
+   * cumulative coefficients of its parent and/or owned node.
+   *
+   * The cumulative coefficients represent the total effect of all
+   * (non-strict) ancestor ownerships on a memory allocator node. The
+   * cumulative owned coefficient of a MAD can be calculated simply as:
+   *
+   *   cumulativeOwnedC(M) = ownedC(M) * cumulativeOwnedC(parent(M))
+   *
+   * This reflects the assumption that if a parent of a child MAD is
+   * (partially) owned, then the parent's owner also indirectly owns (a part
+   * of) the child MAD.
+   *
+   * The cumulative owning coefficient of a MAD depends on whether the MAD
+   * owns another node:
+   *
+   *                           [if M doesn't own another MAD]
+   *                         / cumulativeOwningC(parent(M))
+   *   cumulativeOwningC(M) =
+   *                         \ [if M owns another MAD]
+   *                           owningC(M) * cumulativeOwningC(owned(M))
+   *
+   * The reasoning behind the first case is similar to the one for cumulative
+   * owned coefficient above. The only difference is that we don't need to
+   * include the node's (non-cumulative) owning coefficient because it is
+   * implicitly 1.
+   *
+   * The formula for the second case is derived as follows: Since the MAD
+   * owns another node, its memory is not included in its parent's not-owning
+   * sub-size and hence shouldn't be affected by the parent's corresponding
+   * cumulative coefficient. Instead, the MAD indirectly owns everything
+   * owned by its owned node (and so it should be affected by the
+   * corresponding coefficient).
+   *
+   * Note that undefined coefficients (and coefficients of non-existent
+   * nodes) are implicitly assumed to be 1.
+   *
+   * This method assumes that (1) the size of the node [see calculateSizes()],
+   * (2) the (non-cumulative) owned and owning coefficients of the node [see
+   * the second step of calculateEffectiveSizes()], and (3) the cumulative
+   * coefficients of the node's parent and owned MADs (if present)
+   * [depth-first pre-order traversal] have already been calculated.
+   */
+  static void CalculateNodeCumulativeOwnershipCoefficient(
+      GlobalNodeGraph::Node* node);
+
+  /**
+   * Calculate the effective size of a memory allocator node.
+   *
+   * In order to simplify the (already complex) calculation, we use the fact
+   * that effective size is cumulative (unlike regular size), i.e. the
+   * effective size of a non-leaf node is equal to the sum of effective sizes
+   * of its children. The effective size of a leaf MAD is calculated as:
+   *
+   *   effectiveSize(M) = size(M) * cumulativeOwningC(M) * cumulativeOwnedC(M)
+   *
+   * This method assumes that (1) the size of the node and its children [see
+   * calculateSizes()] and (2) the cumulative owning and owned coefficients
+   * of the node (if it's a leaf node) [see the third step of
+   * calculateEffectiveSizes()] or the effective sizes of its children (if
+   * it's a non-leaf node) [depth-first post-order traversal] have already
+   * been calculated.
+   */
+  static void CalculateNodeEffectiveSize(GlobalNodeGraph::Node* node);
+};
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_GRAPH_PROCESSOR_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h
new file mode 100644
index 000000000..96319a50d
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_MEMORY_ALLOCATOR_NODE_ID_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_MEMORY_ALLOCATOR_NODE_ID_H_
+
+#include <stdint.h>
+
+#include <string>
+
+#include "perfetto/base/export.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+class PERFETTO_EXPORT_COMPONENT MemoryAllocatorNodeId {
+ public:
+  MemoryAllocatorNodeId();
+  explicit MemoryAllocatorNodeId(uint64_t id);
+
+  uint64_t ToUint64() const { return id_; }
+
+  // Returns a (hex-encoded) string representation of the id.
+  std::string ToString() const;
+
+  bool empty() const { return id_ == 0u; }
+
+  bool operator==(const MemoryAllocatorNodeId& other) const {
+    return id_ == other.id_;
+  }
+
+  bool operator!=(const MemoryAllocatorNodeId& other) const {
+    return !(*this == other);
+  }
+
+  bool operator<(const MemoryAllocatorNodeId& other) const {
+    return id_ < other.id_;
+  }
+
+ private:
+  uint64_t id_;
+
+  // Deliberately copy-able.
+};
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_MEMORY_ALLOCATOR_NODE_ID_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h
new file mode 100644
index 000000000..b8489451c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_MEMORY_GRAPH_EDGE_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_MEMORY_GRAPH_EDGE_H_
+
+#include <stdint.h>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+class PERFETTO_EXPORT_COMPONENT MemoryGraphEdge {
+ public:
+  MemoryGraphEdge(MemoryAllocatorNodeId s,
+                  MemoryAllocatorNodeId t,
+                  int i,
+                  bool o)
+      : source(s), target(t), importance(i), overridable(o) {}
+
+  MemoryGraphEdge& operator=(const MemoryGraphEdge& edge) {
+    source = edge.source;
+    target = edge.target;
+    importance = edge.importance;
+    overridable = edge.overridable;
+    return *this;
+  }
+
+  MemoryAllocatorNodeId source;
+  MemoryAllocatorNodeId target;
+  int importance;
+  bool overridable;
+
+  // Deliberately copy-able.
+};
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_MEMORY_GRAPH_EDGE_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_memory_graph_node.h b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_memory_graph_node.h
new file mode 100644
index 000000000..053a82bb7
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_memory_graph_node.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_RAW_MEMORY_GRAPH_NODE_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_RAW_MEMORY_GRAPH_NODE_H_
+
+#include <stdint.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+// Describes the level of detail of the memory graph.
+enum class LevelOfDetail : uint32_t {
+  kFirst,
+
+  // For background tracing mode. The node time is quick, and typically just the
+  // totals are expected. Suballocations need not be specified. Node name must
+  // contain only pre-defined strings and string arguments cannot be added.
+  kBackground = kFirst,
+
+  // For the levels below, MemoryNodeProvider instances must guarantee that the
+  // total size reported in the root node is consistent. Only the granularity of
+  // the child MemoryAllocatorNode(s) differs with the levels.
+
+  // Few entries, typically a fixed number, per node.
+  kLight,
+
+  // Unrestricted amount of entries per node.
+  kDetailed,
+
+  kLast = kDetailed
+};
+
+// Data model for user-land memory nodes.
+class PERFETTO_EXPORT_COMPONENT RawMemoryGraphNode {
+ public:
+  enum Flags {
+    kDefault = 0,
+
+    // A node marked weak will be discarded if there is no ownership edge exists
+    // from a non-weak node.
+    kWeak = 1 << 0,
+  };
+
+  // In the UI table each MemoryAllocatorNode becomes
+  // a row and each Entry generates a column (if it doesn't already
+  // exist).
+  struct PERFETTO_EXPORT_COMPONENT MemoryNodeEntry {
+    enum EntryType {
+      kUint64,
+      kString,
+    };
+
+    MemoryNodeEntry(const std::string& name,
+                    const std::string& units,
+                    uint64_t value);
+    MemoryNodeEntry(const std::string& name,
+                    const std::string& units,
+                    const std::string& value);
+
+    bool operator==(const MemoryNodeEntry& rhs) const;
+
+    std::string name;
+    std::string units;
+
+    EntryType entry_type;
+
+    uint64_t value_uint64;
+    std::string value_string;
+  };
+
+  RawMemoryGraphNode(const std::string& absolute_name,
+                     LevelOfDetail level,
+                     MemoryAllocatorNodeId id);
+
+  RawMemoryGraphNode(
+      const std::string& absolute_name,
+      LevelOfDetail level,
+      MemoryAllocatorNodeId id,
+      std::vector<RawMemoryGraphNode::MemoryNodeEntry>&& entries);
+
+  // Standard attribute |name|s for the AddScalar and AddString() methods.
+  static const char kNameSize[];         // To represent allocated space.
+  static const char kNameObjectCount[];  // To represent number of objects.
+
+  // Standard attribute |unit|s for the AddScalar and AddString() methods.
+  static const char kUnitsBytes[];    // Unit name to represent bytes.
+  static const char kUnitsObjects[];  // Unit name to represent #objects.
+
+  // Constants used only internally and by tests.
+  static const char kTypeScalar[];  // Type name for scalar attributes.
+  static const char kTypeString[];  // Type name for string attributes.
+
+  // |id| is an optional global node identifier, unique across all processes
+  // within the scope of a global node.
+  // Subsequent MemoryAllocatorNode(s) with the same |absolute_name| are
+  // expected to have the same id.
+  MemoryAllocatorNodeId id() const { return id_; }
+
+  // Absolute name, unique within the scope of an entire ProcessMemoryNode.
+  const std::string& absolute_name() const { return absolute_name_; }
+
+  const std::vector<MemoryNodeEntry>& entries() const { return entries_; }
+
+  LevelOfDetail level_of_detail() const { return level_of_detail_; }
+
+  // Use enum Flags to set values.
+  void set_flags(int flags) { flags_ |= flags; }
+  void clear_flags(int flags) { flags_ &= ~flags; }
+  int flags() const { return flags_; }
+
+ private:
+  std::string absolute_name_;
+  LevelOfDetail level_of_detail_;
+  std::vector<MemoryNodeEntry> entries_;
+  MemoryAllocatorNodeId id_;
+
+  // A node marked weak will be discarded by TraceViewer.
+  int flags_;  // See enum Flags.
+};
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_RAW_MEMORY_GRAPH_NODE_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_process_memory_node.h b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_process_memory_node.h
new file mode 100644
index 000000000..b8d294d2b
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/importers/memory_tracker/raw_process_memory_node.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_RAW_PROCESS_MEMORY_NODE_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_RAW_PROCESS_MEMORY_NODE_H_
+
+#include <stdint.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h"
+#include "perfetto/ext/trace_processor/importers/memory_tracker/raw_memory_graph_node.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+// ProcessMemoryNode is as a strongly typed container which holds the nodes
+// produced by the MemoryNodeProvider(s) for a specific process.
+class PERFETTO_EXPORT_COMPONENT RawProcessMemoryNode {
+ public:
+  // Maps allocator nodes absolute names (allocator_name/heap/subheap) to
+  // MemoryAllocatorNode instances.
+  using MemoryNodesMap =
+      std::map<std::string, std::unique_ptr<RawMemoryGraphNode>>;
+
+  // Stores allocator node edges indexed by source allocator node GUID.
+  using AllocatorNodeEdgesMap =
+      std::map<MemoryAllocatorNodeId, std::unique_ptr<MemoryGraphEdge>>;
+
+  explicit RawProcessMemoryNode(
+      LevelOfDetail level_of_detail,
+      AllocatorNodeEdgesMap&& edges_map = AllocatorNodeEdgesMap{},
+      MemoryNodesMap&& nodes_map = MemoryNodesMap{});
+  RawProcessMemoryNode(RawProcessMemoryNode&&);
+  ~RawProcessMemoryNode();
+  RawProcessMemoryNode& operator=(RawProcessMemoryNode&&);
+
+  // Looks up a MemoryAllocatorNode given its allocator and heap names, or
+  // nullptr if not found.
+  RawMemoryGraphNode* GetAllocatorNode(const std::string& absolute_name) const;
+
+  // Returns the map of the MemoryAllocatorNodes added to this node.
+  const MemoryNodesMap& allocator_nodes() const { return allocator_nodes_; }
+
+  const AllocatorNodeEdgesMap& allocator_nodes_edges() const {
+    return allocator_nodes_edges_;
+  }
+
+  const LevelOfDetail& level_of_detail() const { return level_of_detail_; }
+
+ private:
+  LevelOfDetail level_of_detail_;
+
+  // Keeps track of relationships between MemoryAllocatorNode(s).
+  AllocatorNodeEdgesMap allocator_nodes_edges_;
+
+  // Level of detail of the current node.
+  MemoryNodesMap allocator_nodes_;
+
+  // This class is uncopyable and unassignable.
+  RawProcessMemoryNode(const RawProcessMemoryNode&) = delete;
+  RawProcessMemoryNode& operator=(const RawProcessMemoryNode&) = delete;
+};
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_IMPORTERS_MEMORY_TRACKER_RAW_PROCESS_MEMORY_NODE_H_
diff --git a/src/libtracing/perfetto/ext/trace_processor/rpc/BUILD.gn b/src/libtracing/perfetto/ext/trace_processor/rpc/BUILD.gn
new file mode 100644
index 000000000..69adb4d6c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/rpc/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright (C) 2023 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../../../gn/perfetto.gni")
+
+source_set("query_result_serializer") {
+  sources = [ "query_result_serializer.h" ]
+}
diff --git a/src/libtracing/perfetto/ext/trace_processor/rpc/query_result_serializer.h b/src/libtracing/perfetto/ext/trace_processor/rpc/query_result_serializer.h
new file mode 100644
index 000000000..270f8144c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/trace_processor/rpc/query_result_serializer.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_RPC_QUERY_RESULT_SERIALIZER_H_
+#define INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_RPC_QUERY_RESULT_SERIALIZER_H_
+
+#include <memory>
+#include <vector>
+
+#include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
+
+namespace perfetto {
+
+namespace protos {
+namespace pbzero {
+class QueryResult;
+}  // namespace pbzero
+}  // namespace protos
+
+namespace trace_processor {
+
+class Iterator;
+class IteratorImpl;
+
+// This class serializes a TraceProcessor query result (i.e. an Iterator)
+// into batches of QueryResult (trace_processor.proto). This class
+// returns results in batches, allowing to deal with O(M) results without
+// full memory buffering. It works as follows:
+// - The iterator is passed in the constructor.
+// - The client is expected to call Serialize(out_buf) until EOF is reached.
+// - For each Serialize() call, this class will serialize a batch of cells,
+//   stopping when either when a number of cells (|cells_per_batch_|) is reached
+//   or when the batch size exceeds (batch_split_threshold_).
+//   A batch is guaranteed to contain a number of cells that is an integer
+//   multiple of the column count (i.e. a batch is not truncated in the middle
+//   of a row).
+// The intended use case is streaaming these batches onto through a
+// chunked-encoded HTTP response, or through a repetition of Wasm calls.
+class QueryResultSerializer {
+ public:
+  static constexpr uint32_t kDefaultBatchSplitThreshold = 128 * 1024;
+  explicit QueryResultSerializer(Iterator);
+  ~QueryResultSerializer();
+
+  // No copy or move.
+  QueryResultSerializer(const QueryResultSerializer&) = delete;
+  QueryResultSerializer& operator=(const QueryResultSerializer&) = delete;
+
+  // Appends the data to the passed protozero message. It returns true if more
+  // chunks are available (i.e. it returns NOT(|eof_reached_||)). The caller is
+  // supposed to keep calling this function until it returns false.
+  bool Serialize(protos::pbzero::QueryResult*);
+
+  // Like the above but stitches everything together in a vector. Incurs in
+  // extra copies.
+  bool Serialize(std::vector<uint8_t>*);
+
+  void set_batch_size_for_testing(uint32_t cells_per_batch, uint32_t thres) {
+    cells_per_batch_ = cells_per_batch;
+    batch_split_threshold_ = thres;
+  }
+
+ private:
+  void SerializeMetadata(protos::pbzero::QueryResult*);
+  void SerializeBatch(protos::pbzero::QueryResult*);
+  void MaybeSerializeError(protos::pbzero::QueryResult*);
+
+  std::unique_ptr<IteratorImpl> iter_;
+  const uint32_t num_cols_;
+  bool did_write_metadata_ = false;
+  bool eof_reached_ = false;
+  uint32_t col_ = UINT32_MAX;
+
+  // These params specify the thresholds for splitting the results in batches,
+  // in terms of: (1) max cells (row x cols); (2) serialized batch size in
+  // bytes, whichever is reached first. Note also that the byte limit is not
+  // 100% accurate and can occasionally yield to batches slighly larger than
+  // the limit (it splits on the next row *after* the limit is hit).
+  // Overridable for testing only.
+  uint32_t cells_per_batch_ = 50000;
+  uint32_t batch_split_threshold_ = kDefaultBatchSplitThreshold;
+};
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACE_PROCESSOR_RPC_QUERY_RESULT_SERIALIZER_H_
diff --git a/src/libtracing/perfetto/ext/traced/BUILD.gn b/src/libtracing/perfetto/ext/traced/BUILD.gn
new file mode 100644
index 000000000..631202c2e
--- /dev/null
+++ b/src/libtracing/perfetto/ext/traced/BUILD.gn
@@ -0,0 +1,29 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("traced") {
+  sources = [
+    "data_source_types.h",
+    "traced.h",
+  ]
+}
+
+source_set("sys_stats_counters") {
+  public_deps = [
+    "../../../../gn:default_deps",
+    "../../../../protos/perfetto/common:zero",
+    "../base",
+  ]
+  sources = [ "sys_stats_counters.h" ]
+}
diff --git a/src/libtracing/perfetto/ext/traced/data_source_types.h b/src/libtracing/perfetto/ext/traced/data_source_types.h
new file mode 100644
index 000000000..a91b490f9
--- /dev/null
+++ b/src/libtracing/perfetto/ext/traced/data_source_types.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACED_DATA_SOURCE_TYPES_H_
+#define INCLUDE_PERFETTO_EXT_TRACED_DATA_SOURCE_TYPES_H_
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <set>
+#include <string>
+
+namespace perfetto {
+
+// On ARM, st_ino is not ino_t but unsigned long long.
+using Inode = decltype(stat::st_ino);
+
+// On ARM, st_dev is not dev_t but unsigned long long.
+using BlockDeviceID = decltype(stat::st_dev);
+
+using InodeBlockPair = std::pair<Inode, BlockDeviceID>;
+
+// From inode_file_map.pbzero.h
+using InodeFileMap_Entry_Type = int32_t;
+
+class InodeMapValue {
+ public:
+  InodeMapValue(InodeFileMap_Entry_Type entry_type, std::set<std::string> paths)
+      : entry_type_(entry_type), paths_(std::move(paths)) {}
+
+  InodeMapValue() {}
+
+  InodeFileMap_Entry_Type type() const { return entry_type_; }
+  const std::set<std::string>& paths() const { return paths_; }
+  void SetType(InodeFileMap_Entry_Type entry_type) { entry_type_ = entry_type; }
+  void SetPaths(std::set<std::string> paths) { paths_ = std::move(paths); }
+  void AddPath(std::string path) { paths_.emplace(std::move(path)); }
+
+  bool operator==(const perfetto::InodeMapValue& rhs) const {
+    return type() == rhs.type() && paths() == rhs.paths();
+  }
+
+ private:
+  InodeFileMap_Entry_Type entry_type_;
+  std::set<std::string> paths_;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACED_DATA_SOURCE_TYPES_H_
diff --git a/src/libtracing/perfetto/ext/traced/sys_stats_counters.h b/src/libtracing/perfetto/ext/traced/sys_stats_counters.h
new file mode 100644
index 000000000..94117f00b
--- /dev/null
+++ b/src/libtracing/perfetto/ext/traced/sys_stats_counters.h
@@ -0,0 +1,384 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACED_SYS_STATS_COUNTERS_H_
+#define INCLUDE_PERFETTO_EXT_TRACED_SYS_STATS_COUNTERS_H_
+
+#include "perfetto/ext/base/utils.h"
+#include "protos/perfetto/common/sys_stats_counters.pbzero.h"
+
+#include <vector>
+
+namespace perfetto {
+
+struct KeyAndId {
+  const char* str;
+  int id;
+};
+
+constexpr KeyAndId kMeminfoKeys[] = {
+    {"MemUnspecified", protos::pbzero::MeminfoCounters::MEMINFO_UNSPECIFIED},
+    {"MemTotal", protos::pbzero::MeminfoCounters::MEMINFO_MEM_TOTAL},
+    {"MemFree", protos::pbzero::MeminfoCounters::MEMINFO_MEM_FREE},
+    {"MemAvailable", protos::pbzero::MeminfoCounters::MEMINFO_MEM_AVAILABLE},
+    {"Buffers", protos::pbzero::MeminfoCounters::MEMINFO_BUFFERS},
+    {"Cached", protos::pbzero::MeminfoCounters::MEMINFO_CACHED},
+    {"SwapCached", protos::pbzero::MeminfoCounters::MEMINFO_SWAP_CACHED},
+    {"Active", protos::pbzero::MeminfoCounters::MEMINFO_ACTIVE},
+    {"Inactive", protos::pbzero::MeminfoCounters::MEMINFO_INACTIVE},
+    {"Active(anon)", protos::pbzero::MeminfoCounters::MEMINFO_ACTIVE_ANON},
+    {"Inactive(anon)", protos::pbzero::MeminfoCounters::MEMINFO_INACTIVE_ANON},
+    {"Active(file)", protos::pbzero::MeminfoCounters::MEMINFO_ACTIVE_FILE},
+    {"Inactive(file)", protos::pbzero::MeminfoCounters::MEMINFO_INACTIVE_FILE},
+    {"Unevictable", protos::pbzero::MeminfoCounters::MEMINFO_UNEVICTABLE},
+    {"Mlocked", protos::pbzero::MeminfoCounters::MEMINFO_MLOCKED},
+    {"SwapTotal", protos::pbzero::MeminfoCounters::MEMINFO_SWAP_TOTAL},
+    {"SwapFree", protos::pbzero::MeminfoCounters::MEMINFO_SWAP_FREE},
+    {"Dirty", protos::pbzero::MeminfoCounters::MEMINFO_DIRTY},
+    {"Writeback", protos::pbzero::MeminfoCounters::MEMINFO_WRITEBACK},
+    {"AnonPages", protos::pbzero::MeminfoCounters::MEMINFO_ANON_PAGES},
+    {"Mapped", protos::pbzero::MeminfoCounters::MEMINFO_MAPPED},
+    {"Shmem", protos::pbzero::MeminfoCounters::MEMINFO_SHMEM},
+    {"Slab", protos::pbzero::MeminfoCounters::MEMINFO_SLAB},
+    {"SReclaimable", protos::pbzero::MeminfoCounters::MEMINFO_SLAB_RECLAIMABLE},
+    {"SUnreclaim", protos::pbzero::MeminfoCounters::MEMINFO_SLAB_UNRECLAIMABLE},
+    {"KernelStack", protos::pbzero::MeminfoCounters::MEMINFO_KERNEL_STACK},
+    {"PageTables", protos::pbzero::MeminfoCounters::MEMINFO_PAGE_TABLES},
+    {"CommitLimit", protos::pbzero::MeminfoCounters::MEMINFO_COMMIT_LIMIT},
+    {"Committed_AS", protos::pbzero::MeminfoCounters::MEMINFO_COMMITED_AS},
+    {"VmallocTotal", protos::pbzero::MeminfoCounters::MEMINFO_VMALLOC_TOTAL},
+    {"VmallocUsed", protos::pbzero::MeminfoCounters::MEMINFO_VMALLOC_USED},
+    {"VmallocChunk", protos::pbzero::MeminfoCounters::MEMINFO_VMALLOC_CHUNK},
+    {"CmaTotal", protos::pbzero::MeminfoCounters::MEMINFO_CMA_TOTAL},
+    {"CmaFree", protos::pbzero::MeminfoCounters::MEMINFO_CMA_FREE},
+};
+
+const KeyAndId kVmstatKeys[] = {
+    {"VmstatUnspecified", protos::pbzero::VmstatCounters::VMSTAT_UNSPECIFIED},
+    {"nr_free_pages", protos::pbzero::VmstatCounters::VMSTAT_NR_FREE_PAGES},
+    {"nr_alloc_batch", protos::pbzero::VmstatCounters::VMSTAT_NR_ALLOC_BATCH},
+    {"nr_inactive_anon",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_INACTIVE_ANON},
+    {"nr_active_anon", protos::pbzero::VmstatCounters::VMSTAT_NR_ACTIVE_ANON},
+    {"nr_inactive_file",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_INACTIVE_FILE},
+    {"nr_active_file", protos::pbzero::VmstatCounters::VMSTAT_NR_ACTIVE_FILE},
+    {"nr_unevictable", protos::pbzero::VmstatCounters::VMSTAT_NR_UNEVICTABLE},
+    {"nr_mlock", protos::pbzero::VmstatCounters::VMSTAT_NR_MLOCK},
+    {"nr_anon_pages", protos::pbzero::VmstatCounters::VMSTAT_NR_ANON_PAGES},
+    {"nr_mapped", protos::pbzero::VmstatCounters::VMSTAT_NR_MAPPED},
+    {"nr_file_pages", protos::pbzero::VmstatCounters::VMSTAT_NR_FILE_PAGES},
+    {"nr_dirty", protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTY},
+    {"nr_writeback", protos::pbzero::VmstatCounters::VMSTAT_NR_WRITEBACK},
+    {"nr_slab_reclaimable",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_SLAB_RECLAIMABLE},
+    {"nr_slab_unreclaimable",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_SLAB_UNRECLAIMABLE},
+    {"nr_page_table_pages",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_PAGE_TABLE_PAGES},
+    {"nr_kernel_stack", protos::pbzero::VmstatCounters::VMSTAT_NR_KERNEL_STACK},
+    {"nr_overhead", protos::pbzero::VmstatCounters::VMSTAT_NR_OVERHEAD},
+    {"nr_unstable", protos::pbzero::VmstatCounters::VMSTAT_NR_UNSTABLE},
+    {"nr_bounce", protos::pbzero::VmstatCounters::VMSTAT_NR_BOUNCE},
+    {"nr_vmscan_write", protos::pbzero::VmstatCounters::VMSTAT_NR_VMSCAN_WRITE},
+    {"nr_vmscan_immediate_reclaim",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_VMSCAN_IMMEDIATE_RECLAIM},
+    {"nr_writeback_temp",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_WRITEBACK_TEMP},
+    {"nr_isolated_anon",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ISOLATED_ANON},
+    {"nr_isolated_file",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ISOLATED_FILE},
+    {"nr_shmem", protos::pbzero::VmstatCounters::VMSTAT_NR_SHMEM},
+    {"nr_dirtied", protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTIED},
+    {"nr_written", protos::pbzero::VmstatCounters::VMSTAT_NR_WRITTEN},
+    {"nr_pages_scanned",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_PAGES_SCANNED},
+    {"workingset_refault",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_REFAULT},
+    {"workingset_activate",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_ACTIVATE},
+    {"workingset_nodereclaim",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_NODERECLAIM},
+    {"nr_anon_transparent_hugepages",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ANON_TRANSPARENT_HUGEPAGES},
+    {"nr_free_cma", protos::pbzero::VmstatCounters::VMSTAT_NR_FREE_CMA},
+    {"nr_swapcache", protos::pbzero::VmstatCounters::VMSTAT_NR_SWAPCACHE},
+    {"nr_dirty_threshold",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTY_THRESHOLD},
+    {"nr_dirty_background_threshold",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTY_BACKGROUND_THRESHOLD},
+    {"pgpgin", protos::pbzero::VmstatCounters::VMSTAT_PGPGIN},
+    {"pgpgout", protos::pbzero::VmstatCounters::VMSTAT_PGPGOUT},
+    {"pgpgoutclean", protos::pbzero::VmstatCounters::VMSTAT_PGPGOUTCLEAN},
+    {"pswpin", protos::pbzero::VmstatCounters::VMSTAT_PSWPIN},
+    {"pswpout", protos::pbzero::VmstatCounters::VMSTAT_PSWPOUT},
+    {"pgalloc_dma", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_DMA},
+    {"pgalloc_normal", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_NORMAL},
+    {"pgalloc_movable", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_MOVABLE},
+    {"pgfree", protos::pbzero::VmstatCounters::VMSTAT_PGFREE},
+    {"pgactivate", protos::pbzero::VmstatCounters::VMSTAT_PGACTIVATE},
+    {"pgdeactivate", protos::pbzero::VmstatCounters::VMSTAT_PGDEACTIVATE},
+    {"pgfault", protos::pbzero::VmstatCounters::VMSTAT_PGFAULT},
+    {"pgmajfault", protos::pbzero::VmstatCounters::VMSTAT_PGMAJFAULT},
+    {"pgrefill_dma", protos::pbzero::VmstatCounters::VMSTAT_PGREFILL_DMA},
+    {"pgrefill_normal", protos::pbzero::VmstatCounters::VMSTAT_PGREFILL_NORMAL},
+    {"pgrefill_movable",
+     protos::pbzero::VmstatCounters::VMSTAT_PGREFILL_MOVABLE},
+    {"pgsteal_kswapd_dma",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_DMA},
+    {"pgsteal_kswapd_normal",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_NORMAL},
+    {"pgsteal_kswapd_movable",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_MOVABLE},
+    {"pgsteal_direct_dma",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_DMA},
+    {"pgsteal_direct_normal",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_NORMAL},
+    {"pgsteal_direct_movable",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_MOVABLE},
+    {"pgscan_kswapd_dma",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_DMA},
+    {"pgscan_kswapd_normal",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_NORMAL},
+    {"pgscan_kswapd_movable",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_MOVABLE},
+    {"pgscan_direct_dma",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_DMA},
+    {"pgscan_direct_normal",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_NORMAL},
+    {"pgscan_direct_movable",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_MOVABLE},
+    {"pgscan_direct_throttle",
+     protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_THROTTLE},
+    {"pginodesteal", protos::pbzero::VmstatCounters::VMSTAT_PGINODESTEAL},
+    {"slabs_scanned", protos::pbzero::VmstatCounters::VMSTAT_SLABS_SCANNED},
+    {"kswapd_inodesteal",
+     protos::pbzero::VmstatCounters::VMSTAT_KSWAPD_INODESTEAL},
+    {"kswapd_low_wmark_hit_quickly",
+     protos::pbzero::VmstatCounters::VMSTAT_KSWAPD_LOW_WMARK_HIT_QUICKLY},
+    {"kswapd_high_wmark_hit_quickly",
+     protos::pbzero::VmstatCounters::VMSTAT_KSWAPD_HIGH_WMARK_HIT_QUICKLY},
+    {"pageoutrun", protos::pbzero::VmstatCounters::VMSTAT_PAGEOUTRUN},
+    {"allocstall", protos::pbzero::VmstatCounters::VMSTAT_ALLOCSTALL},
+    {"pgrotated", protos::pbzero::VmstatCounters::VMSTAT_PGROTATED},
+    {"drop_pagecache", protos::pbzero::VmstatCounters::VMSTAT_DROP_PAGECACHE},
+    {"drop_slab", protos::pbzero::VmstatCounters::VMSTAT_DROP_SLAB},
+    {"pgmigrate_success",
+     protos::pbzero::VmstatCounters::VMSTAT_PGMIGRATE_SUCCESS},
+    {"pgmigrate_fail", protos::pbzero::VmstatCounters::VMSTAT_PGMIGRATE_FAIL},
+    {"compact_migrate_scanned",
+     protos::pbzero::VmstatCounters::VMSTAT_COMPACT_MIGRATE_SCANNED},
+    {"compact_free_scanned",
+     protos::pbzero::VmstatCounters::VMSTAT_COMPACT_FREE_SCANNED},
+    {"compact_isolated",
+     protos::pbzero::VmstatCounters::VMSTAT_COMPACT_ISOLATED},
+    {"compact_stall", protos::pbzero::VmstatCounters::VMSTAT_COMPACT_STALL},
+    {"compact_fail", protos::pbzero::VmstatCounters::VMSTAT_COMPACT_FAIL},
+    {"compact_success", protos::pbzero::VmstatCounters::VMSTAT_COMPACT_SUCCESS},
+    {"compact_daemon_wake",
+     protos::pbzero::VmstatCounters::VMSTAT_COMPACT_DAEMON_WAKE},
+    {"unevictable_pgs_culled",
+     protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_CULLED},
+    {"unevictable_pgs_scanned",
+     protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_SCANNED},
+    {"unevictable_pgs_rescued",
+     protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_RESCUED},
+    {"unevictable_pgs_mlocked",
+     protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_MLOCKED},
+    {"unevictable_pgs_munlocked",
+     protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_MUNLOCKED},
+    {"unevictable_pgs_cleared",
+     protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_CLEARED},
+    {"unevictable_pgs_stranded",
+     protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_STRANDED},
+    {"nr_zspages", protos::pbzero::VmstatCounters::VMSTAT_NR_ZSPAGES},
+    {"nr_ion_heap", protos::pbzero::VmstatCounters::VMSTAT_NR_ION_HEAP},
+    {"nr_gpu_heap", protos::pbzero::VmstatCounters::VMSTAT_NR_GPU_HEAP},
+    {"allocstall_dma", protos::pbzero::VmstatCounters::VMSTAT_ALLOCSTALL_DMA},
+    {"allocstall_movable",
+     protos::pbzero::VmstatCounters::VMSTAT_ALLOCSTALL_MOVABLE},
+    {"allocstall_normal",
+     protos::pbzero::VmstatCounters::VMSTAT_ALLOCSTALL_NORMAL},
+    {"compact_daemon_free_scanned",
+     protos::pbzero::VmstatCounters::VMSTAT_COMPACT_DAEMON_FREE_SCANNED},
+    {"compact_daemon_migrate_scanned",
+     protos::pbzero::VmstatCounters::VMSTAT_COMPACT_DAEMON_MIGRATE_SCANNED},
+    {"nr_fastrpc", protos::pbzero::VmstatCounters::VMSTAT_NR_FASTRPC},
+    {"nr_indirectly_reclaimable",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_INDIRECTLY_RECLAIMABLE},
+    {"nr_ion_heap_pool",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ION_HEAP_POOL},
+    {"nr_kernel_misc_reclaimable",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_KERNEL_MISC_RECLAIMABLE},
+    {"nr_shadow_call_stack_bytes",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_SHADOW_CALL_STACK_BYTES},
+    {"nr_shmem_hugepages",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_SHMEM_HUGEPAGES},
+    {"nr_shmem_pmdmapped",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_SHMEM_PMDMAPPED},
+    {"nr_unreclaimable_pages",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_UNRECLAIMABLE_PAGES},
+    {"nr_zone_active_anon",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ZONE_ACTIVE_ANON},
+    {"nr_zone_active_file",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ZONE_ACTIVE_FILE},
+    {"nr_zone_inactive_anon",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ZONE_INACTIVE_ANON},
+    {"nr_zone_inactive_file",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ZONE_INACTIVE_FILE},
+    {"nr_zone_unevictable",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ZONE_UNEVICTABLE},
+    {"nr_zone_write_pending",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_ZONE_WRITE_PENDING},
+    {"oom_kill", protos::pbzero::VmstatCounters::VMSTAT_OOM_KILL},
+    {"pglazyfree", protos::pbzero::VmstatCounters::VMSTAT_PGLAZYFREE},
+    {"pglazyfreed", protos::pbzero::VmstatCounters::VMSTAT_PGLAZYFREED},
+    {"pgrefill", protos::pbzero::VmstatCounters::VMSTAT_PGREFILL},
+    {"pgscan_direct", protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT},
+    {"pgscan_kswapd", protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_KSWAPD},
+    {"pgskip_dma", protos::pbzero::VmstatCounters::VMSTAT_PGSKIP_DMA},
+    {"pgskip_movable", protos::pbzero::VmstatCounters::VMSTAT_PGSKIP_MOVABLE},
+    {"pgskip_normal", protos::pbzero::VmstatCounters::VMSTAT_PGSKIP_NORMAL},
+    {"pgsteal_direct", protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_DIRECT},
+    {"pgsteal_kswapd", protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD},
+    {"swap_ra_hit", protos::pbzero::VmstatCounters::VMSTAT_SWAP_RA_HIT},
+    {"swap_ra", protos::pbzero::VmstatCounters::VMSTAT_SWAP_RA},
+    {"workingset_restore",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_RESTORE},
+    {"allocstall_device",
+     protos::pbzero::VmstatCounters::VMSTAT_ALLOCSTALL_DEVICE},
+    {"allocstall_dma32",
+     protos::pbzero::VmstatCounters::VMSTAT_ALLOCSTALL_DMA32},
+    {"balloon_deflate", protos::pbzero::VmstatCounters::VMSTAT_BALLOON_DEFLATE},
+    {"balloon_inflate", protos::pbzero::VmstatCounters::VMSTAT_BALLOON_INFLATE},
+    {"balloon_migrate", protos::pbzero::VmstatCounters::VMSTAT_BALLOON_MIGRATE},
+    {"cma_alloc_fail", protos::pbzero::VmstatCounters::VMSTAT_CMA_ALLOC_FAIL},
+    {"cma_alloc_success",
+     protos::pbzero::VmstatCounters::VMSTAT_CMA_ALLOC_SUCCESS},
+    {"nr_file_hugepages",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_FILE_HUGEPAGES},
+    {"nr_file_pmdmapped",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_FILE_PMDMAPPED},
+    {"nr_foll_pin_acquired",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_FOLL_PIN_ACQUIRED},
+    {"nr_foll_pin_released",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_FOLL_PIN_RELEASED},
+    {"nr_sec_page_table_pages",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_SEC_PAGE_TABLE_PAGES},
+    {"nr_shadow_call_stack",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_SHADOW_CALL_STACK},
+    {"nr_swapcached", protos::pbzero::VmstatCounters::VMSTAT_NR_SWAPCACHED},
+    {"nr_throttled_written",
+     protos::pbzero::VmstatCounters::VMSTAT_NR_THROTTLED_WRITTEN},
+    {"pgalloc_device", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_DEVICE},
+    {"pgalloc_dma32", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_DMA32},
+    {"pgdemote_direct", protos::pbzero::VmstatCounters::VMSTAT_PGDEMOTE_DIRECT},
+    {"pgdemote_kswapd", protos::pbzero::VmstatCounters::VMSTAT_PGDEMOTE_KSWAPD},
+    {"pgreuse", protos::pbzero::VmstatCounters::VMSTAT_PGREUSE},
+    {"pgscan_anon", protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_ANON},
+    {"pgscan_file", protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_FILE},
+    {"pgskip_device", protos::pbzero::VmstatCounters::VMSTAT_PGSKIP_DEVICE},
+    {"pgskip_dma32", protos::pbzero::VmstatCounters::VMSTAT_PGSKIP_DMA32},
+    {"pgsteal_anon", protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_ANON},
+    {"pgsteal_file", protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_FILE},
+    {"thp_collapse_alloc",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_COLLAPSE_ALLOC},
+    {"thp_collapse_alloc_failed",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_COLLAPSE_ALLOC_FAILED},
+    {"thp_deferred_split_page",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_DEFERRED_SPLIT_PAGE},
+    {"thp_fault_alloc", protos::pbzero::VmstatCounters::VMSTAT_THP_FAULT_ALLOC},
+    {"thp_fault_fallback",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_FAULT_FALLBACK},
+    {"thp_fault_fallback_charge",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_FAULT_FALLBACK_CHARGE},
+    {"thp_file_alloc", protos::pbzero::VmstatCounters::VMSTAT_THP_FILE_ALLOC},
+    {"thp_file_fallback",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_FILE_FALLBACK},
+    {"thp_file_fallback_charge",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_FILE_FALLBACK_CHARGE},
+    {"thp_file_mapped", protos::pbzero::VmstatCounters::VMSTAT_THP_FILE_MAPPED},
+    {"thp_migration_fail",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_MIGRATION_FAIL},
+    {"thp_migration_split",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_MIGRATION_SPLIT},
+    {"thp_migration_success",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_MIGRATION_SUCCESS},
+    {"thp_scan_exceed_none_pte",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_SCAN_EXCEED_NONE_PTE},
+    {"thp_scan_exceed_share_pte",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_SCAN_EXCEED_SHARE_PTE},
+    {"thp_scan_exceed_swap_pte",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_SCAN_EXCEED_SWAP_PTE},
+    {"thp_split_page", protos::pbzero::VmstatCounters::VMSTAT_THP_SPLIT_PAGE},
+    {"thp_split_page_failed",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_SPLIT_PAGE_FAILED},
+    {"thp_split_pmd", protos::pbzero::VmstatCounters::VMSTAT_THP_SPLIT_PMD},
+    {"thp_swpout", protos::pbzero::VmstatCounters::VMSTAT_THP_SWPOUT},
+    {"thp_swpout_fallback",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_SWPOUT_FALLBACK},
+    {"thp_zero_page_alloc",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_ZERO_PAGE_ALLOC},
+    {"thp_zero_page_alloc_failed",
+     protos::pbzero::VmstatCounters::VMSTAT_THP_ZERO_PAGE_ALLOC_FAILED},
+    {"vma_lock_abort", protos::pbzero::VmstatCounters::VMSTAT_VMA_LOCK_ABORT},
+    {"vma_lock_miss", protos::pbzero::VmstatCounters::VMSTAT_VMA_LOCK_MISS},
+    {"vma_lock_retry", protos::pbzero::VmstatCounters::VMSTAT_VMA_LOCK_RETRY},
+    {"vma_lock_success",
+     protos::pbzero::VmstatCounters::VMSTAT_VMA_LOCK_SUCCESS},
+    {"workingset_activate_anon",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_ACTIVATE_ANON},
+    {"workingset_activate_file",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_ACTIVATE_FILE},
+    {"workingset_nodes",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_NODES},
+    {"workingset_refault_anon",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_REFAULT_ANON},
+    {"workingset_refault_file",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_REFAULT_FILE},
+    {"workingset_restore_anon",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_RESTORE_ANON},
+    {"workingset_restore_file",
+     protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_RESTORE_FILE},
+};
+
+// Returns a lookup table of meminfo counter names addressable by counter id.
+inline std::vector<const char*> BuildMeminfoCounterNames() {
+  int max_id = 0;
+  for (size_t i = 0; i < base::ArraySize(kMeminfoKeys); i++)
+    max_id = std::max(max_id, kMeminfoKeys[i].id);
+  std::vector<const char*> v;
+  v.resize(static_cast<size_t>(max_id) + 1);
+  for (size_t i = 0; i < base::ArraySize(kMeminfoKeys); i++)
+    v[static_cast<size_t>(kMeminfoKeys[i].id)] = kMeminfoKeys[i].str;
+  return v;
+}
+
+inline std::vector<const char*> BuildVmstatCounterNames() {
+  int max_id = 0;
+  for (size_t i = 0; i < base::ArraySize(kVmstatKeys); i++)
+    max_id = std::max(max_id, kVmstatKeys[i].id);
+  std::vector<const char*> v;
+  v.resize(static_cast<size_t>(max_id) + 1);
+  for (size_t i = 0; i < base::ArraySize(kVmstatKeys); i++)
+    v[static_cast<size_t>(kVmstatKeys[i].id)] = kVmstatKeys[i].str;
+  return v;
+}
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACED_SYS_STATS_COUNTERS_H_
diff --git a/src/libtracing/perfetto/ext/traced/traced.h b/src/libtracing/perfetto/ext/traced/traced.h
new file mode 100644
index 000000000..042f9ec3e
--- /dev/null
+++ b/src/libtracing/perfetto/ext/traced/traced.h
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACED_TRACED_H_
+#define INCLUDE_PERFETTO_EXT_TRACED_TRACED_H_
+
+namespace perfetto {
+
+int ServiceMain(int argc, char** argv);
+int ProbesMain(int argc, char** argv);
+int PerfettoCmdMain(int argc, char** argv);
+int TriggerPerfettoMain(int argc, char** argv);
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACED_TRACED_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/BUILD.gn b/src/libtracing/perfetto/ext/tracing/core/BUILD.gn
new file mode 100644
index 000000000..601e0ceb7
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/BUILD.gn
@@ -0,0 +1,41 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("core") {
+  public_deps = [
+    "../../../../../protos/perfetto/common:cpp",
+    "../../../tracing/core",
+    "../../base",
+  ]
+  sources = [
+    "basic_types.h",
+    "client_identity.h",
+    "commit_data_request.h",
+    "consumer.h",
+    "observable_events.h",
+    "producer.h",
+    "shared_memory.h",
+    "shared_memory_abi.h",
+    "shared_memory_arbiter.h",
+    "slice.h",
+    "trace_packet.h",
+    "trace_stats.h",
+    "trace_writer.h",
+    "tracing_service.h",
+  ]
+}
+
+source_set("test_support") {
+  sources = [ "null_consumer_endpoint_for_testing.h" ]
+}
diff --git a/src/libtracing/perfetto/ext/tracing/core/basic_types.h b/src/libtracing/perfetto/ext/tracing/core/basic_types.h
new file mode 100644
index 000000000..c3484ac62
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/basic_types.h
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_BASIC_TYPES_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_BASIC_TYPES_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "perfetto/ext/base/sys_types.h"
+
+namespace perfetto {
+
+// Unique within the scope of the tracing service.
+using TracingSessionID = uint64_t;
+
+// Unique within the scope of the tracing service.
+using ProducerID = uint16_t;
+
+// Unique within the scope of the tracing service.
+using DataSourceInstanceID = uint64_t;
+
+// Unique within the scope of a Producer.
+using WriterID = uint16_t;
+
+// Unique within the scope of the tracing service.
+using FlushRequestID = uint64_t;
+
+// Combines Producer and Writer ID in one word which can be used as key for
+// hashtables and other data structures.
+using ProducerAndWriterID = uint32_t;
+
+inline ProducerAndWriterID MkProducerAndWriterID(ProducerID p, WriterID w) {
+  static_assert(
+      sizeof(ProducerID) + sizeof(WriterID) == sizeof(ProducerAndWriterID),
+      "MkProducerAndWriterID() and GetProducerAndWriterID() need updating");
+  return (static_cast<ProducerAndWriterID>(p) << (sizeof(WriterID) * 8)) | w;
+}
+
+inline void GetProducerAndWriterID(ProducerAndWriterID x,
+                                   ProducerID* p,
+                                   WriterID* w) {
+  static constexpr auto mask = (1ull << (sizeof(WriterID) * 8)) - 1;
+  *w = static_cast<WriterID>(x & mask);
+  *p = static_cast<ProducerID>(x >> (sizeof(WriterID) * 8));
+}
+
+// We need one FD per producer and we are not going to be able to keep > 64k FDs
+// open in the service.
+static constexpr ProducerID kMaxProducerID = static_cast<ProducerID>(-1);
+
+// 1024 Writers per producer seems a resonable bound. This reduces the ability
+// to memory-DoS the service by having to keep track of too many writer IDs.
+static constexpr WriterID kMaxWriterID = static_cast<WriterID>((1 << 10) - 1);
+
+// Unique within the scope of a {ProducerID, WriterID} tuple.
+using ChunkID = uint32_t;
+static constexpr ChunkID kMaxChunkID = static_cast<ChunkID>(-1);
+
+// Unique within the scope of the tracing service.
+using BufferID = uint16_t;
+
+// Target buffer ID for SharedMemoryArbiter. Values up to max uint16_t are
+// equivalent to a bound BufferID. Values above max uint16_t are reservation IDs
+// for the target buffer of a startup trace writer. Reservation IDs will be
+// translated to actual BufferIDs after they are bound by
+// SharedMemoryArbiter::BindStartupTargetBuffer().
+// TODO(mohitms): Delete this type and use `struct {uint16 ; uint16;}` instead.
+using MaybeUnboundBufferID = uint32_t;
+
+// Keep this in sync with SharedMemoryABI::PageHeader::target_buffer.
+static constexpr BufferID kMaxTraceBufferID = static_cast<BufferID>(-1);
+
+// Unique within the scope of a tracing session.
+using PacketSequenceID = uint32_t;
+// Used for extra packets emitted by the service, such as statistics.
+static constexpr PacketSequenceID kServicePacketSequenceID = 1;
+static constexpr PacketSequenceID kMaxPacketSequenceID =
+    static_cast<PacketSequenceID>(-1);
+
+constexpr uint32_t kDefaultFlushTimeoutMs = 5000;
+
+// The special id 0xffff..ffff represents the tracing session with the highest
+// bugreport score. This is used for CloneSession(kBugreportSessionId).
+constexpr TracingSessionID kBugreportSessionId =
+    static_cast<TracingSessionID>(-1);
+
+// The ID of a machine in a multi-machine tracing session.
+using MachineID = base::MachineID;
+constexpr MachineID kDefaultMachineID = base::kDefaultMachineID;
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_BASIC_TYPES_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/client_identity.h b/src/libtracing/perfetto/ext/tracing/core/client_identity.h
new file mode 100644
index 000000000..3a1884624
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/client_identity.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_CLIENT_IDENTITY_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_CLIENT_IDENTITY_H_
+
+#include "perfetto/ext/base/sys_types.h"
+#include "perfetto/ext/tracing/core/basic_types.h"
+
+namespace perfetto {
+
+// This class groups data fields of a connected client that can get passed in
+// the tracing core to be emitted to trace packets.
+class ClientIdentity {
+ public:
+  ClientIdentity() = default;
+  ClientIdentity(uid_t uid, pid_t pid, MachineID machine_id = kDefaultMachineID)
+      : uid_(uid), pid_(pid), machine_id_(machine_id) {}
+
+  bool has_uid() const { return uid_ != base::kInvalidUid; }
+  uid_t uid() const { return uid_; }
+
+  bool has_pid() const { return pid_ != base::kInvalidPid; }
+  pid_t pid() const { return pid_; }
+
+  bool has_non_default_machine_id() const {
+    return machine_id_ != kDefaultMachineID;
+  }
+  base::MachineID machine_id() const { return machine_id_; }
+
+ private:
+  uid_t uid_ = base::kInvalidUid;
+  pid_t pid_ = base::kInvalidPid;
+  MachineID machine_id_ = kDefaultMachineID;
+};
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_CLIENT_IDENTITY_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/commit_data_request.h b/src/libtracing/perfetto/ext/tracing/core/commit_data_request.h
new file mode 100644
index 000000000..f87b0d41a
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/commit_data_request.h
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_COMMIT_DATA_REQUEST_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_COMMIT_DATA_REQUEST_H_
+
+// Creates the aliases in the ::perfetto namespace, doing things like:
+// using ::perfetto::Foo = ::perfetto::protos::gen::Foo.
+// See comments in forward_decls.h for the historical reasons of this
+// indirection layer.
+#include "perfetto/tracing/core/forward_decls.h"
+
+#include "protos/perfetto/common/commit_data_request.gen.h"
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_COMMIT_DATA_REQUEST_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/consumer.h b/src/libtracing/perfetto/ext/tracing/core/consumer.h
new file mode 100644
index 000000000..f55b810df
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/consumer.h
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_CONSUMER_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_CONSUMER_H_
+
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/base/uuid.h"
+#include "perfetto/ext/tracing/core/basic_types.h"
+#include "perfetto/ext/tracing/core/observable_events.h"
+#include "perfetto/tracing/core/forward_decls.h"
+namespace perfetto {
+
+class TracePacket;
+
+class PERFETTO_EXPORT_COMPONENT Consumer {
+ public:
+  virtual ~Consumer();
+
+  // Called by Service (or more typically by the transport layer, on behalf of
+  // the remote Service), once the Consumer <> Service connection has been
+  // established.
+  virtual void OnConnect() = 0;
+
+  // Called by the Service or by the transport layer if the connection with the
+  // service drops, either voluntarily (e.g., by destroying the ConsumerEndpoint
+  // obtained through Service::ConnectConsumer()) or involuntarily (e.g., if the
+  // Service process crashes).
+  virtual void OnDisconnect() = 0;
+
+  // Called by the Service after the tracing session has ended. This can happen
+  // for a variety of reasons:
+  // - The consumer explicitly called DisableTracing()
+  // - The TraceConfig's |duration_ms| has been reached.
+  // - The TraceConfig's |max_file_size_bytes| has been reached.
+  // - An error occurred while trying to enable tracing. In this case |error|
+  //   is non-empty.
+  virtual void OnTracingDisabled(const std::string& error) = 0;
+
+  // Called back by the Service (or transport layer) after invoking
+  // TracingService::ConsumerEndpoint::ReadBuffers(). This function can be
+  // called more than once. Each invocation can carry one or more
+  // TracePacket(s). Upon the last call, |has_more| is set to true (i.e.
+  // |has_more| is a !EOF).
+  virtual void OnTraceData(std::vector<TracePacket>, bool has_more) = 0;
+
+  // Called back by the Service (or transport layer) after invoking
+  // TracingService::ConsumerEndpoint::Detach().
+  // The consumer can disconnect at this point and the trace session will keep
+  // on going. A new consumer can later re-attach passing back the same |key|
+  // passed to Detach(), but only if the two requests come from the same uid.
+  virtual void OnDetach(bool success) = 0;
+
+  // Called back by the Service (or transport layer) after invoking
+  // TracingService::ConsumerEndpoint::Attach().
+  virtual void OnAttach(bool success, const TraceConfig&) = 0;
+
+  // Called back by the Service (or transport layer) after invoking
+  // TracingService::ConsumerEndpoint::GetTraceStats().
+  virtual void OnTraceStats(bool success, const TraceStats&) = 0;
+
+  // Called back by the Service (or transport layer) after invoking
+  // TracingService::ConsumerEndpoint::ObserveEvents() whenever one or more
+  // ObservableEvents of enabled event types occur.
+  virtual void OnObservableEvents(const ObservableEvents&) = 0;
+
+  // Called back by the Service (or transport layer) after invoking
+  // TracingService::ConsumerEndpoint::CloneSession().
+  // TODO(primiano): make pure virtual after various 3way patches.
+  struct OnSessionClonedArgs {
+    bool success;
+    std::string error;
+    base::Uuid uuid;  // UUID of the cloned session.
+  };
+  virtual void OnSessionCloned(const OnSessionClonedArgs&);
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_CONSUMER_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/null_consumer_endpoint_for_testing.h b/src/libtracing/perfetto/ext/tracing/core/null_consumer_endpoint_for_testing.h
new file mode 100644
index 000000000..2e85c9225
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/null_consumer_endpoint_for_testing.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_NULL_CONSUMER_ENDPOINT_FOR_TESTING_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_NULL_CONSUMER_ENDPOINT_FOR_TESTING_H_
+
+#include "perfetto/ext/tracing/core/tracing_service.h"
+
+namespace perfetto {
+
+// An empty implemetation of ConsumerEndpoint. This is used only to handle
+// code in other repos like arctraceservice/PerfettoClient_test.cpp which
+// ended up depending on internal perfetto interfaces against our plans.
+// This allows to make changes to the ConsumerEndpoint without requiring 3way
+// patches when touching methods that are not overridden by other projects.
+class NullConsumerEndpointForTesting : public ConsumerEndpoint {
+ public:
+  ~NullConsumerEndpointForTesting() override {}
+
+  void EnableTracing(const TraceConfig&, base::ScopedFile) override {}
+  void ChangeTraceConfig(const perfetto::TraceConfig&) override {}
+  void StartTracing() override {}
+  void DisableTracing() override {}
+  void CloneSession(TracingSessionID, CloneSessionArgs) override {}
+  void Flush(uint32_t, FlushCallback, FlushFlags) override {}
+  void ReadBuffers() override {}
+  void FreeBuffers() override {}
+  void Detach(const std::string&) override {}
+  void Attach(const std::string&) override {}
+  void GetTraceStats() override {}
+  void ObserveEvents(uint32_t) override {}
+  void QueryServiceState(ConsumerEndpoint::QueryServiceStateArgs,
+                         ConsumerEndpoint::QueryServiceStateCallback) override {
+  }
+  void QueryCapabilities(ConsumerEndpoint::QueryCapabilitiesCallback) override {
+  }
+  void SaveTraceForBugreport(
+      ConsumerEndpoint::SaveTraceForBugreportCallback) override {}
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_NULL_CONSUMER_ENDPOINT_FOR_TESTING_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/observable_events.h b/src/libtracing/perfetto/ext/tracing/core/observable_events.h
new file mode 100644
index 000000000..945955889
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/observable_events.h
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_OBSERVABLE_EVENTS_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_OBSERVABLE_EVENTS_H_
+
+// Creates the aliases in the ::perfetto namespace, doing things like:
+// using ::perfetto::Foo = ::perfetto::protos::gen::Foo.
+// See comments in forward_decls.h for the historical reasons of this
+// indirection layer.
+#include "perfetto/tracing/core/forward_decls.h"
+
+#include "protos/perfetto/common/observable_events.gen.h"
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_OBSERVABLE_EVENTS_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/producer.h b/src/libtracing/perfetto/ext/tracing/core/producer.h
new file mode 100644
index 000000000..234c40651
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/producer.h
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_PRODUCER_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_PRODUCER_H_
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/tracing/core/basic_types.h"
+#include "perfetto/tracing/core/flush_flags.h"
+#include "perfetto/tracing/core/forward_decls.h"
+
+namespace perfetto {
+
+class SharedMemory;
+
+// A Producer is an entity that connects to the write-only port of the Service
+// and exposes the ability to produce performance data on-demand. The lifecycle
+// of a Producer is as follows:
+// 1. The producer connects to the service and advertises its data sources
+//    (e.g., the ability to get kernel ftraces, to list process stats).
+// 2. The service acknowledges the connection and sends over the SharedMemory
+//    region that will be used to exchange data (together with the signalling
+//    API TracingService::ProducerEndpoint::OnPageAcquired()/OnPageReleased()).
+// 3. At some point later on, the Service asks the Producer to turn on some of
+//    the previously registered data sources, together with some configuration
+//    parameters. This happens via the StartDataSource() callback.
+// 4. In response to that the Producer will spawn an instance of the given data
+//    source and inject its data into the shared memory buffer (obtained during
+//    OnConnect).
+// This interface is subclassed by:
+//  1. The actual producer code in the clients e.g., the ftrace reader process.
+//  2. The transport layer when interposing RPC between service and producers.
+class PERFETTO_EXPORT_COMPONENT Producer {
+ public:
+  virtual ~Producer();
+
+  // Called by Service (or more typically by the transport layer, on behalf of
+  // the remote Service), once the Producer <> Service connection has been
+  // established.
+  virtual void OnConnect() = 0;
+
+  // Called by the Service or by the transport layer if the connection with the
+  // service drops, either voluntarily (e.g., by destroying the ProducerEndpoint
+  // obtained through Service::ConnectProducer()) or involuntarily (e.g., if the
+  // Service process crashes).
+  // The Producer is expected to tear down all its data sources if this happens.
+  // Once this call returns it is possible to safely destroy the Producer
+  // instance.
+  virtual void OnDisconnect() = 0;
+
+  // Called by the Service after OnConnect but before the first DataSource is
+  // created. Can be used for any setup required before tracing begins.
+  virtual void OnTracingSetup() = 0;
+
+  // Called by muxer once StartupTracing is started. It will be called before
+  // SetupStartupTracingBlocking is returned.
+  virtual void OnStartupTracingSetup() {}
+
+  // The lifecycle methods below are always called in the following sequence:
+  // SetupDataSource  -> StartDataSource -> StopDataSource.
+  // Or, in the edge case where a trace is aborted immediately:
+  // SetupDataSource  -> StopDataSource.
+  // The Setup+Start call sequence is always guaranateed, regardless of the
+  // TraceConfig.deferred_start flags.
+  // Called by the Service to configure one of the data sources previously
+  // registered through TracingService::ProducerEndpoint::RegisterDataSource().
+  // This method is always called before StartDataSource. There is always a
+  // SetupDataSource() call before each StartDataSource() call.
+  // Args:
+  // - DataSourceInstanceID is an identifier chosen by the Service that should
+  //   be assigned to the newly created data source instance. It is used to
+  //   match the StopDataSource() request below.
+  // - DataSourceConfig is the configuration for the new data source (e.g.,
+  //   tells which trace categories to enable).
+  virtual void SetupDataSource(DataSourceInstanceID,
+                               const DataSourceConfig&) = 0;
+
+  // Called by the Service to turn on one of the data sources previously
+  // registered through TracingService::ProducerEndpoint::RegisterDataSource()
+  // and initialized through SetupDataSource().
+  // Both arguments are guaranteed to be identical to the ones passed to the
+  // prior SetupDataSource() call.
+  virtual void StartDataSource(DataSourceInstanceID,
+                               const DataSourceConfig&) = 0;
+
+  // Called by the Service to shut down an existing data source instance.
+  virtual void StopDataSource(DataSourceInstanceID) = 0;
+
+  // Called by the service to request the Producer to commit the data of the
+  // given data sources and return their chunks into the shared memory buffer.
+  // The Producer is expected to invoke NotifyFlushComplete(FlushRequestID) on
+  // the Service after the data has been committed. The producer has to either
+  // reply to the flush requests in order, or can just reply to the latest one
+  // Upon seeing a NotifyFlushComplete(N), the service will assume that all
+  // flushes < N have also been committed.
+  virtual void Flush(FlushRequestID,
+                     const DataSourceInstanceID* data_source_ids,
+                     size_t num_data_sources,
+                     FlushFlags) = 0;
+
+  // Called by the service to instruct the given data sources to stop referring
+  // to any trace contents emitted so far. The intent is that after processing
+  // this call, the rest of the trace should be parsable even if all of the
+  // packets emitted so far have been lost (for example due to ring buffer
+  // overwrites).
+  //
+  // Called only for Producers with active data sources that have opted in by
+  // setting |handles_incremental_state_clear| in their DataSourceDescriptor.
+  //
+  // The way this call is handled is up to the individual Producer
+  // implementation. Some might wish to emit invalidation markers in the trace
+  // (see TracePacket.incremental_state_cleared for an existing field), and
+  // handle them when parsing the trace.
+  virtual void ClearIncrementalState(
+      const DataSourceInstanceID* data_source_ids,
+      size_t num_data_sources) = 0;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_PRODUCER_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/shared_memory.h b/src/libtracing/perfetto/ext/tracing/core/shared_memory.h
new file mode 100644
index 000000000..f2e527448
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/shared_memory.h
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_H_
+
+#include <stddef.h>
+
+#include <memory>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/platform_handle.h"
+
+namespace perfetto {
+
+// An abstract interface that models the shared memory region shared between
+// Service and Producer. The concrete implementation of this is up to the
+// transport layer. This can be as simple as a malloc()-ed buffer, if both
+// Producer and Service are hosted in the same process, or some posix shared
+// memory for the out-of-process case (see src/unix_rpc).
+// Both this class and the Factory are subclassed by the transport layer, which
+// will attach platform specific fields to it (e.g., a unix file descriptor).
+class PERFETTO_EXPORT_COMPONENT SharedMemory {
+ public:
+  class PERFETTO_EXPORT_COMPONENT Factory {
+   public:
+    virtual ~Factory();
+    virtual std::unique_ptr<SharedMemory> CreateSharedMemory(size_t) = 0;
+  };
+
+  // The transport layer is expected to tear down the resource associated to
+  // this object region when destroyed.
+  virtual ~SharedMemory();
+
+  virtual void* start() const = 0;
+  virtual size_t size() const = 0;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/shared_memory_abi.h b/src/libtracing/perfetto/ext/tracing/core/shared_memory_abi.h
new file mode 100644
index 000000000..dd146eabe
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/shared_memory_abi.h
@@ -0,0 +1,627 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_ABI_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_ABI_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <array>
+#include <atomic>
+#include <bitset>
+#include <thread>
+#include <type_traits>
+#include <utility>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/proto_utils.h"
+
+namespace perfetto {
+
+// This file defines the binary interface of the memory buffers shared between
+// Producer and Service. This is a long-term stable ABI and has to be backwards
+// compatible to deal with mismatching Producer and Service versions.
+//
+// Overview
+// --------
+// SMB := "Shared Memory Buffer".
+// In the most typical case of a multi-process architecture (i.e. Producer and
+// Service are hosted by different processes), a Producer means almost always
+// a "client process producing data" (almost: in some cases a process might host
+// > 1 Producer, if it links two libraries, independent of each other, that both
+// use Perfetto tracing).
+// The Service has one SMB for each Producer.
+// A producer has one or (typically) more data sources. They all share the same
+// SMB.
+// The SMB is a staging area to decouple data sources living in the Producer
+// and allow them to do non-blocking async writes.
+// The SMB is *not* the ultimate logging buffer seen by the Consumer. That one
+// is larger (~MBs) and not shared with Producers.
+// Each SMB is small, typically few KB. Its size is configurable by the producer
+// within a max limit of ~MB (see kMaxShmSize in tracing_service_impl.cc).
+// The SMB is partitioned into fixed-size Page(s). The size of the Pages are
+// determined by each Producer at connection time and cannot be changed.
+// Hence, different producers can have SMB(s) that have a different Page size
+// from each other, but the page size will be constant throughout all the
+// lifetime of the SMB.
+// Page(s) are partitioned by the Producer into variable size Chunk(s):
+//
+// +------------+      +--------------------------+
+// | Producer 1 |  <-> |      SMB 1 [~32K - 1MB]  |
+// +------------+      +--------+--------+--------+
+//                     |  Page  |  Page  |  Page  |
+//                     +--------+--------+--------+
+//                     | Chunk  |        | Chunk  |
+//                     +--------+  Chunk +--------+ <----+
+//                     | Chunk  |        | Chunk  |      |
+//                     +--------+--------+--------+      +---------------------+
+//                                                       |       Service       |
+// +------------+      +--------------------------+      +---------------------+
+// | Producer 2 |  <-> |      SMB 2 [~32K - 1MB]  |     /| large ring buffers  |
+// +------------+      +--------+--------+--------+ <--+ | (100K - several MB) |
+//                     |  Page  |  Page  |  Page  |      +---------------------+
+//                     +--------+--------+--------+
+//                     | Chunk  |        | Chunk  |
+//                     +--------+  Chunk +--------+
+//                     | Chunk  |        | Chunk  |
+//                     +--------+--------+--------+
+//
+// * Sizes of both SMB and ring buffers are purely indicative and decided at
+// configuration time by the Producer (for SMB sizes) and the Consumer (for the
+// final ring buffer size).
+
+// Page
+// ----
+// A page is a portion of the shared memory buffer and defines the granularity
+// of the interaction between the Producer and tracing Service. When scanning
+// the shared memory buffer to determine if something should be moved to the
+// central logging buffers, the Service most of the times looks at and moves
+// whole pages. Similarly, the Producer sends an IPC to invite the Service to
+// drain the shared memory buffer only when a whole page is filled.
+// Having fixed the total SMB size (hence the total memory overhead), the page
+// size is a triangular tradeoff between:
+// 1) IPC traffic: smaller pages -> more IPCs.
+// 2) Producer lock freedom: larger pages -> larger chunks -> data sources can
+//    write more data without needing to swap chunks and synchronize.
+// 3) Risk of write-starving the SMB: larger pages -> higher chance that the
+//    Service won't manage to drain them and the SMB remains full.
+// The page size, on the other side, has no implications on wasted memory due to
+// fragmentations (see Chunk below).
+// The size of the page is chosen by the Service at connection time and stays
+// fixed throughout all the lifetime of the Producer. Different producers (i.e.
+// ~ different client processes) can use different page sizes.
+// The page size must be an integer multiple of 4k (this is to allow VM page
+// stealing optimizations) and obviously has to be an integer divisor of the
+// total SMB size.
+
+// Chunk
+// -----
+// A chunk is a portion of a Page which is written and handled by a Producer.
+// A chunk contains a linear sequence of TracePacket(s) (the root proto).
+// A chunk cannot be written concurrently by two data sources. Protobufs must be
+// encoded as contiguous byte streams and cannot be interleaved. Therefore, on
+// the Producer side, a chunk is almost always owned exclusively by one thread
+// (% extremely peculiar slow-path cases).
+// Chunks are essentially single-writer single-thread lock-free arenas. Locking
+// happens only when a Chunk is full and a new one needs to be acquired.
+// Locking happens only within the scope of a Producer process. There is no
+// inter-process locking. The Producer cannot lock the Service and viceversa.
+// In the worst case, any of the two can starve the SMB, by marking all chunks
+// as either being read or written. But that has the only side effect of
+// losing the trace data.
+// The Producer can decide to partition each page into a number of limited
+// configurations (e.g., 1 page == 1 chunk, 1 page == 2 chunks and so on).
+
+// TracePacket
+// -----------
+// Is the atom of tracing. Putting aside pages and chunks a trace is merely a
+// sequence of TracePacket(s). TracePacket is the root protobuf message.
+// A TracePacket can span across several chunks (hence even across several
+// pages). A TracePacket can therefore be >> chunk size, >> page size and even
+// >> SMB size. The Chunk header carries metadata to deal with the TracePacket
+// splitting case.
+
+// Use only explicitly-sized types below. DO NOT use size_t or any architecture
+// dependent size (e.g. size_t) in the struct fields. This buffer will be read
+// and written by processes that have a different bitness in the same OS.
+// Instead it's fine to assume little-endianess. Big-endian is a dream we are
+// not currently pursuing.
+
+class SharedMemoryABI {
+ public:
+  static constexpr size_t kMinPageSize = 4 * 1024;
+
+  // This is due to Chunk::size being 16 bits.
+  static constexpr size_t kMaxPageSize = 64 * 1024;
+
+  // "14" is the max number that can be encoded in a 32 bit atomic word using
+  // 2 state bits per Chunk and leaving 4 bits for the page layout.
+  // See PageLayout below.
+  static constexpr size_t kMaxChunksPerPage = 14;
+
+  // Each TracePacket fragment in the Chunk is prefixed by a VarInt stating its
+  // size that is up to 4 bytes long. Since the size is often known after the
+  // fragment has been filled, the VarInt is often redundantly encoded (see
+  // proto_utils.h) to be exactly 4 bytes.
+  static constexpr size_t kPacketHeaderSize = 4;
+
+  // TraceWriter specifies this invalid packet/fragment size to signal to the
+  // service that a packet should be discarded, because the TraceWriter couldn't
+  // write its remaining fragments (e.g. because the SMB was exhausted).
+  static constexpr size_t kPacketSizeDropPacket =
+      protozero::proto_utils::kMaxMessageLength;
+
+  // Chunk states and transitions:
+  //    kChunkFree  <----------------+
+  //         |  (Producer)           |
+  //         V                       |
+  //  kChunkBeingWritten             |
+  //         |  (Producer)           |
+  //         V                       |
+  //  kChunkComplete                 |
+  //         |  (Service)            |
+  //         V                       |
+  //  kChunkBeingRead                |
+  //        |   (Service)            |
+  //        +------------------------+
+  //
+  // The ABI has an "emulation mode" for transports where shared memory isn't
+  // supported. In this mode, kChunkBeingRead is skipped. A chunk in the
+  // kChunkComplete state is released as free after the producer serializes
+  // chunk content to the protobuf message.
+  enum ChunkState : uint32_t {
+    // The Chunk is free. The Service shall never touch it, the Producer can
+    // acquire it and transition it into kChunkBeingWritten.
+    kChunkFree = 0,
+
+    // The Chunk is being used by the Producer and is not complete yet.
+    // The Service shall never touch kChunkBeingWritten pages.
+    kChunkBeingWritten = 1,
+
+    // The Service is moving the page into its non-shared ring buffer. The
+    // Producer shall never touch kChunkBeingRead pages.
+    kChunkBeingRead = 2,
+
+    // The Producer is done writing the page and won't touch it again. The
+    // Service can now move it to its non-shared ring buffer.
+    // kAllChunksComplete relies on this being == 3.
+    kChunkComplete = 3,
+  };
+  static constexpr const char* kChunkStateStr[] = {"Free", "BeingWritten",
+                                                   "BeingRead", "Complete"};
+
+  enum PageLayout : uint32_t {
+    // The page is fully free and has not been partitioned yet.
+    kPageNotPartitioned = 0,
+
+    // TODO(primiano): Aligning a chunk @ 16 bytes could allow to use faster
+    // intrinsics based on quad-word moves. Do the math and check what is the
+    // fragmentation loss.
+
+    // align4(X) := the largest integer N s.t. (N % 4) == 0 && N <= X.
+    // 8 == sizeof(PageHeader).
+    kPageDiv1 = 1,   // Only one chunk of size: PAGE_SIZE - 8.
+    kPageDiv2 = 2,   // Two chunks of size: align4((PAGE_SIZE - 8) / 2).
+    kPageDiv4 = 3,   // Four chunks of size: align4((PAGE_SIZE - 8) / 4).
+    kPageDiv7 = 4,   // Seven chunks of size: align4((PAGE_SIZE - 8) / 7).
+    kPageDiv14 = 5,  // Fourteen chunks of size: align4((PAGE_SIZE - 8) / 14).
+
+    // The rationale for 7 and 14 above is to maximize the page usage for the
+    // likely case of |page_size| == 4096:
+    // (((4096 - 8) / 14) % 4) == 0, while (((4096 - 8) / 16 % 4)) == 3. So
+    // Div16 would waste 3 * 16 = 48 bytes per page for chunk alignment gaps.
+
+    kPageDivReserved1 = 6,
+    kPageDivReserved2 = 7,
+    kNumPageLayouts = 8,
+  };
+
+  // Keep this consistent with the PageLayout enum above.
+  static constexpr uint32_t kNumChunksForLayout[] = {0, 1, 2, 4, 7, 14, 0, 0};
+
+  enum class ShmemMode {
+    // The default mode, where the shared buffer is visible to both the producer
+    // and the service.
+    kDefault,
+
+    // The emulation mode, used for producer ports without shared memory. The
+    // state transitions are all done in the producer process.
+    kShmemEmulation,
+  };
+
+  // Layout of a Page.
+  // +===================================================+
+  // | Page header [8 bytes]                             |
+  // | Tells how many chunks there are, how big they are |
+  // | and their state (free, read, write, complete).    |
+  // +===================================================+
+  // +***************************************************+
+  // | Chunk #0 header [8 bytes]                         |
+  // | Tells how many packets there are and whether the  |
+  // | whether the 1st and last ones are fragmented.     |
+  // | Also has a chunk id to reassemble fragments.    |
+  // +***************************************************+
+  // +---------------------------------------------------+
+  // | Packet #0 size [varint, up to 4 bytes]            |
+  // + - - - - - - - - - - - - - - - - - - - - - - - - - +
+  // | Packet #0 payload                                 |
+  // | A TracePacket protobuf message                    |
+  // +---------------------------------------------------+
+  //                         ...
+  // + . . . . . . . . . . . . . . . . . . . . . . . . . +
+  // |      Optional padding to maintain aligment        |
+  // + . . . . . . . . . . . . . . . . . . . . . . . . . +
+  // +---------------------------------------------------+
+  // | Packet #N size [varint, up to 4 bytes]            |
+  // + - - - - - - - - - - - - - - - - - - - - - - - - - +
+  // | Packet #N payload                                 |
+  // | A TracePacket protobuf message                    |
+  // +---------------------------------------------------+
+  //                         ...
+  // +***************************************************+
+  // | Chunk #M header [8 bytes]                         |
+  //                         ...
+
+  // Alignment applies to start offset only. The Chunk size is *not* aligned.
+  static constexpr uint32_t kChunkAlignment = 4;
+  static constexpr uint32_t kChunkShift = 2;
+  static constexpr uint32_t kChunkMask = 0x3;
+  static constexpr uint32_t kLayoutMask = 0x70000000;
+  static constexpr uint32_t kLayoutShift = 28;
+  static constexpr uint32_t kAllChunksMask = 0x0FFFFFFF;
+
+  // This assumes that kChunkComplete == 3.
+  static constexpr uint32_t kAllChunksComplete = 0x0FFFFFFF;
+  static constexpr uint32_t kAllChunksFree = 0;
+  static constexpr size_t kInvalidPageIdx = static_cast<size_t>(-1);
+
+  // There is one page header per page, at the beginning of the page.
+  struct PageHeader {
+    // |layout| bits:
+    // [31] [30:28] [27:26] ... [1:0]
+    //  |      |       |     |    |
+    //  |      |       |     |    +---------- ChunkState[0]
+    //  |      |       |     +--------------- ChunkState[12..1]
+    //  |      |       +--------------------- ChunkState[13]
+    //  |      +----------------------------- PageLayout (0 == page fully free)
+    //  +------------------------------------ Reserved for future use
+    std::atomic<uint32_t> layout;
+
+    // If we'll ever going to use this in the future it might come handy
+    // reviving the kPageBeingPartitioned logic (look in git log, it was there
+    // at some point in the past).
+    uint32_t reserved;
+  };
+
+  // There is one Chunk header per chunk (hence PageLayout per page) at the
+  // beginning of each chunk.
+  struct ChunkHeader {
+    enum Flags : uint8_t {
+      // If set, the first TracePacket in the chunk is partial and continues
+      // from |chunk_id| - 1 (within the same |writer_id|).
+      kFirstPacketContinuesFromPrevChunk = 1 << 0,
+
+      // If set, the last TracePacket in the chunk is partial and continues on
+      // |chunk_id| + 1 (within the same |writer_id|).
+      kLastPacketContinuesOnNextChunk = 1 << 1,
+
+      // If set, the last (fragmented) TracePacket in the chunk has holes (even
+      // if the chunk is marked as kChunkComplete) that need to be patched
+      // out-of-band before the chunk can be read.
+      kChunkNeedsPatching = 1 << 2,
+    };
+
+    struct Packets {
+      // Number of valid TracePacket protobuf messages contained in the chunk.
+      // Each TracePacket is prefixed by its own size. This field is
+      // monotonically updated by the Producer with release store semantic when
+      // the packet at position |count| is started. This last packet may not be
+      // considered complete until |count| is incremented for the subsequent
+      // packet or the chunk is completed.
+      uint16_t count : 10;
+      static constexpr size_t kMaxCount = (1 << 10) - 1;
+
+      // See Flags above.
+      uint16_t flags : 6;
+    };
+
+    // A monotonic counter of the chunk within the scoped of a |writer_id|.
+    // The tuple (ProducerID, WriterID, ChunkID) allows to figure out if two
+    // chunks are contiguous (and hence a trace packets spanning across them can
+    // be glued) or we had some holes due to the ring buffer wrapping.
+    // This is set only when transitioning from kChunkFree to kChunkBeingWritten
+    // and remains unchanged throughout the remaining lifetime of the chunk.
+    std::atomic<uint32_t> chunk_id;
+
+    // ID of the writer, unique within the producer.
+    // Like |chunk_id|, this is set only when transitioning from kChunkFree to
+    // kChunkBeingWritten.
+    std::atomic<uint16_t> writer_id;
+
+    // There is no ProducerID here. The service figures that out from the IPC
+    // channel, which is unspoofable.
+
+    // Updated with release-store semantics.
+    std::atomic<Packets> packets;
+  };
+
+  class Chunk {
+   public:
+    Chunk();  // Constructs an invalid chunk.
+
+    // Chunk is move-only, to document the scope of the Acquire/Release
+    // TryLock operations below.
+    Chunk(const Chunk&) = delete;
+    Chunk operator=(const Chunk&) = delete;
+    Chunk(Chunk&&) noexcept;
+    Chunk& operator=(Chunk&&);
+
+    uint8_t* begin() const { return begin_; }
+    uint8_t* end() const { return begin_ + size_; }
+
+    // Size, including Chunk header.
+    size_t size() const { return size_; }
+
+    // Begin of the first packet (or packet fragment).
+    uint8_t* payload_begin() const { return begin_ + sizeof(ChunkHeader); }
+    size_t payload_size() const {
+      PERFETTO_DCHECK(size_ >= sizeof(ChunkHeader));
+      return size_ - sizeof(ChunkHeader);
+    }
+
+    bool is_valid() const { return begin_ && size_; }
+
+    // Index of the chunk within the page [0..13] (13 comes from kPageDiv14).
+    uint8_t chunk_idx() const { return chunk_idx_; }
+
+    ChunkHeader* header() { return reinterpret_cast<ChunkHeader*>(begin_); }
+
+    uint16_t writer_id() {
+      return header()->writer_id.load(std::memory_order_relaxed);
+    }
+
+    // Returns the count of packets and the flags with acquire-load semantics.
+    std::pair<uint16_t, uint8_t> GetPacketCountAndFlags() {
+      auto packets = header()->packets.load(std::memory_order_acquire);
+      const uint16_t packets_count = packets.count;
+      const uint8_t packets_flags = packets.flags;
+      return std::make_pair(packets_count, packets_flags);
+    }
+
+    // Increases |packets.count| with release semantics (note, however, that the
+    // packet count is incremented *before* starting writing a packet). Returns
+    // the new packet count. The increment is atomic but NOT race-free (i.e. no
+    // CAS). Only the Producer is supposed to perform this increment, and it's
+    // supposed to do that in a thread-safe way (holding a lock). A Chunk cannot
+    // be shared by multiple Producer threads without locking. The packet count
+    // is cleared by TryAcquireChunk(), when passing the new header for the
+    // chunk.
+    uint16_t IncrementPacketCount() {
+      ChunkHeader* chunk_header = header();
+      auto packets = chunk_header->packets.load(std::memory_order_relaxed);
+      packets.count++;
+      chunk_header->packets.store(packets, std::memory_order_release);
+      return packets.count;
+    }
+
+    // Flags are cleared by TryAcquireChunk(), by passing the new header for
+    // the chunk, or through ClearNeedsPatchingFlag.
+    void SetFlag(ChunkHeader::Flags flag) {
+      ChunkHeader* chunk_header = header();
+      auto packets = chunk_header->packets.load(std::memory_order_relaxed);
+      packets.flags |= flag;
+      chunk_header->packets.store(packets, std::memory_order_release);
+    }
+
+    // This flag can only be cleared by the producer while it is still holding
+    // on to the chunk - i.e. while the chunk is still in state
+    // ChunkState::kChunkBeingWritten and hasn't been transitioned to
+    // ChunkState::kChunkComplete. This is ok, because the service is oblivious
+    // to the needs patching flag before the chunk is released as complete.
+    void ClearNeedsPatchingFlag() {
+      ChunkHeader* chunk_header = header();
+      auto packets = chunk_header->packets.load(std::memory_order_relaxed);
+      packets.flags &= ~ChunkHeader::kChunkNeedsPatching;
+      chunk_header->packets.store(packets, std::memory_order_release);
+    }
+
+   private:
+    friend class SharedMemoryABI;
+    Chunk(uint8_t* begin, uint16_t size, uint8_t chunk_idx);
+
+    // Don't add extra fields, keep the move operator fast.
+    uint8_t* begin_ = nullptr;
+    uint16_t size_ = 0;
+    uint8_t chunk_idx_ = 0;
+
+   public:
+    static constexpr size_t kMaxSize = 1ULL << sizeof(size_) * 8;
+  };
+
+  // Construct an instance from an existing shared memory buffer.
+  SharedMemoryABI(uint8_t* start,
+                  size_t size,
+                  size_t page_size,
+                  ShmemMode mode);
+  SharedMemoryABI();
+
+  void Initialize(uint8_t* start,
+                  size_t size,
+                  size_t page_size,
+                  ShmemMode mode);
+
+  uint8_t* start() const { return start_; }
+  uint8_t* end() const { return start_ + size_; }
+  size_t size() const { return size_; }
+  size_t page_size() const { return page_size_; }
+  size_t num_pages() const { return num_pages_; }
+  bool is_valid() { return num_pages() > 0; }
+
+  uint8_t* page_start(size_t page_idx) {
+    PERFETTO_DCHECK(page_idx < num_pages_);
+    return start_ + page_size_ * page_idx;
+  }
+
+  PageHeader* page_header(size_t page_idx) {
+    return reinterpret_cast<PageHeader*>(page_start(page_idx));
+  }
+
+  // Returns true if the page is fully clear and has not been partitioned yet.
+  // The state of the page can change at any point after this returns (or even
+  // before). The Producer should use this only as a hint to decide out whether
+  // it should TryPartitionPage() or acquire an individual chunk.
+  bool is_page_free(size_t page_idx) {
+    return page_header(page_idx)->layout.load(std::memory_order_relaxed) == 0;
+  }
+
+  // Returns true if all chunks in the page are kChunkComplete. As above, this
+  // is advisory only. The Service is supposed to use this only to decide
+  // whether to TryAcquireAllChunksForReading() or not.
+  bool is_page_complete(size_t page_idx) {
+    auto layout = page_header(page_idx)->layout.load(std::memory_order_relaxed);
+    const uint32_t num_chunks = GetNumChunksForLayout(layout);
+    if (num_chunks == 0)
+      return false;  // Non partitioned pages cannot be complete.
+    return (layout & kAllChunksMask) ==
+           (kAllChunksComplete & ((1 << (num_chunks * kChunkShift)) - 1));
+  }
+
+  // For testing / debugging only.
+  std::string page_header_dbg(size_t page_idx) {
+    uint32_t x = page_header(page_idx)->layout.load(std::memory_order_relaxed);
+    return std::bitset<32>(x).to_string();
+  }
+
+  // Returns the page layout, which is a bitmap that specifies the chunking
+  // layout of the page and each chunk's current state. Reads with an
+  // acquire-load semantic to ensure a producer's writes corresponding to an
+  // update of the layout (e.g. clearing a chunk's header) are observed
+  // consistently.
+  uint32_t GetPageLayout(size_t page_idx) {
+    return page_header(page_idx)->layout.load(std::memory_order_acquire);
+  }
+
+  // Returns a bitmap in which each bit is set if the corresponding Chunk exists
+  // in the page (according to the page layout) and is free. If the page is not
+  // partitioned it returns 0 (as if the page had no free chunks).
+  uint32_t GetFreeChunks(size_t page_idx);
+
+  // Tries to atomically partition a page with the given |layout|. Returns true
+  // if the page was free and has been partitioned with the given |layout|,
+  // false if the page wasn't free anymore by the time we got there.
+  // If succeeds all the chunks are atomically set in the kChunkFree state.
+  bool TryPartitionPage(size_t page_idx, PageLayout layout);
+
+  // Tries to atomically mark a single chunk within the page as
+  // kChunkBeingWritten. Returns an invalid chunk if the page is not partitioned
+  // or the chunk is not in the kChunkFree state. If succeeds sets the chunk
+  // header to |header|.
+  Chunk TryAcquireChunkForWriting(size_t page_idx,
+                                  size_t chunk_idx,
+                                  const ChunkHeader* header) {
+    return TryAcquireChunk(page_idx, chunk_idx, kChunkBeingWritten, header);
+  }
+
+  // Similar to TryAcquireChunkForWriting. Fails if the chunk isn't in the
+  // kChunkComplete state.
+  Chunk TryAcquireChunkForReading(size_t page_idx, size_t chunk_idx) {
+    return TryAcquireChunk(page_idx, chunk_idx, kChunkBeingRead, nullptr);
+  }
+
+  // The caller must have successfully TryAcquireAllChunksForReading() or it
+  // needs to guarantee that the chunk is already in the kChunkBeingWritten
+  // state.
+  Chunk GetChunkUnchecked(size_t page_idx,
+                          uint32_t page_layout,
+                          size_t chunk_idx);
+
+  // Creates a Chunk by adopting the given buffer (|data| and |size|) and chunk
+  // index. This is used for chunk data passed over the wire (e.g. tcp or
+  // vsock). The chunk should *not* be freed to the shared memory.
+  static Chunk MakeChunkFromSerializedData(uint8_t* data,
+                                           uint16_t size,
+                                           uint8_t chunk_idx) {
+    return Chunk(data, size, chunk_idx);
+  }
+
+  // Puts a chunk into the kChunkComplete state. Returns the page index.
+  size_t ReleaseChunkAsComplete(Chunk chunk) {
+    return ReleaseChunk(std::move(chunk), kChunkComplete);
+  }
+
+  // Puts a chunk into the kChunkFree state. Returns the page index.
+  size_t ReleaseChunkAsFree(Chunk chunk) {
+    return ReleaseChunk(std::move(chunk), kChunkFree);
+  }
+
+  ChunkState GetChunkState(size_t page_idx, size_t chunk_idx) {
+    PageHeader* phdr = page_header(page_idx);
+    uint32_t layout = phdr->layout.load(std::memory_order_relaxed);
+    return GetChunkStateFromLayout(layout, chunk_idx);
+  }
+
+  std::pair<size_t, size_t> GetPageAndChunkIndex(const Chunk& chunk);
+
+  uint16_t GetChunkSizeForLayout(uint32_t page_layout) const {
+    return chunk_sizes_[(page_layout & kLayoutMask) >> kLayoutShift];
+  }
+
+  static ChunkState GetChunkStateFromLayout(uint32_t page_layout,
+                                            size_t chunk_idx) {
+    return static_cast<ChunkState>((page_layout >> (chunk_idx * kChunkShift)) &
+                                   kChunkMask);
+  }
+
+  static constexpr uint32_t GetNumChunksForLayout(uint32_t page_layout) {
+    return kNumChunksForLayout[(page_layout & kLayoutMask) >> kLayoutShift];
+  }
+
+  // Returns a bitmap in which each bit is set if the corresponding Chunk exists
+  // in the page (according to the page layout) and is not free. If the page is
+  // not partitioned it returns 0 (as if the page had no used chunks). Bit N
+  // corresponds to Chunk N.
+  static uint32_t GetUsedChunks(uint32_t page_layout) {
+    const uint32_t num_chunks = GetNumChunksForLayout(page_layout);
+    uint32_t res = 0;
+    for (uint32_t i = 0; i < num_chunks; i++) {
+      res |= ((page_layout & kChunkMask) != kChunkFree) ? (1 << i) : 0;
+      page_layout >>= kChunkShift;
+    }
+    return res;
+  }
+
+ private:
+  SharedMemoryABI(const SharedMemoryABI&) = delete;
+  SharedMemoryABI& operator=(const SharedMemoryABI&) = delete;
+
+  Chunk TryAcquireChunk(size_t page_idx,
+                        size_t chunk_idx,
+                        ChunkState,
+                        const ChunkHeader*);
+  size_t ReleaseChunk(Chunk chunk, ChunkState);
+
+  uint8_t* start_ = nullptr;
+  size_t size_ = 0;
+  size_t page_size_ = 0;
+  bool use_shmem_emulation_ = false;
+  size_t num_pages_ = 0;
+  std::array<uint16_t, kNumPageLayouts> chunk_sizes_;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_ABI_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/shared_memory_arbiter.h b/src/libtracing/perfetto/ext/tracing/core/shared_memory_arbiter.h
new file mode 100644
index 000000000..850d7bb7d
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/shared_memory_arbiter.h
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_ARBITER_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_ARBITER_H_
+
+#include <stddef.h>
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/tracing/core/basic_types.h"
+#include "perfetto/ext/tracing/core/shared_memory_abi.h"
+#include "perfetto/ext/tracing/core/tracing_service.h"
+#include "perfetto/tracing/buffer_exhausted_policy.h"
+
+namespace perfetto {
+
+namespace base {
+class TaskRunner;
+}
+
+class SharedMemory;
+class TraceWriter;
+
+// Used by the Producer-side of the transport layer to vend TraceWriters
+// from the SharedMemory it receives from the Service-side.
+class PERFETTO_EXPORT_COMPONENT SharedMemoryArbiter {
+ public:
+  using ShmemMode = SharedMemoryABI::ShmemMode;
+
+  virtual ~SharedMemoryArbiter();
+
+  // Creates a new TraceWriter and assigns it a new WriterID. The WriterID is
+  // written in each chunk header owned by a given TraceWriter and is used by
+  // the Service to reconstruct TracePackets written by the same TraceWriter.
+  // Returns null impl of TraceWriter if all WriterID slots are exhausted. The
+  // writer will commit to the provided |target_buffer|. If the arbiter was
+  // created via CreateUnbound() or CreateStartupTraceWriter() is later used,
+  // only BufferExhaustedPolicy::kDrop is supported.
+  virtual std::unique_ptr<TraceWriter> CreateTraceWriter(
+      BufferID target_buffer,
+      BufferExhaustedPolicy buffer_exhausted_policy =
+          BufferExhaustedPolicy::kDefault) = 0;
+
+  // Creates a TraceWriter that will commit to the target buffer with the given
+  // reservation ID (creating a new reservation for this ID if none exists yet).
+  // The buffer reservation should be bound to an actual BufferID via
+  // BindStartupTargetBuffer() once the actual BufferID is known. Calling this
+  // method may transition the arbiter into unbound state (see state diagram in
+  // SharedMemoryArbiterImpl's class comment) and requires that all (past and
+  // future) TraceWriters are created with BufferExhaustedPolicy::kDrop.
+  //
+  // While any unbound buffer reservation exists, all commits will be buffered
+  // until all reservations were bound. Thus, until all reservations are bound,
+  // the data written to the SMB will not be consumed by the service - the SMB
+  // size should be chosen with this in mind. Startup writers always use
+  // BufferExhaustedPolicy::kDrop, as we cannot feasibly stall while not
+  // flushing to the service.
+  //
+  // The |target_buffer_reservation_id| should be greater than 0 but can
+  // otherwise be freely chosen by the producer and is only used to translate
+  // packets into the actual buffer id once
+  // BindStartupTargetBuffer(reservation_id) is called. For example, Chrome uses
+  // startup tracing not only for the first, but also subsequent tracing
+  // sessions (to enable tracing in the browser process before it instructs the
+  // tracing service to start tracing asynchronously, minimizing trace data loss
+  // in the meantime), and increments the reservation ID between sessions.
+  // Similarly, if more than a single target buffer per session is required
+  // (e.g. for two different data sources), different reservation IDs should be
+  // chosen for different target buffers.
+  virtual std::unique_ptr<TraceWriter> CreateStartupTraceWriter(
+      uint16_t target_buffer_reservation_id) = 0;
+
+  // Should only be called on unbound SharedMemoryArbiters. Binds the arbiter to
+  // the provided ProducerEndpoint and TaskRunner. Should be called only once
+  // and on the provided |TaskRunner|. Usually called by the producer (i.e., no
+  // specific data source) once it connects to the service. Both the endpoint
+  // and task runner should remain valid for the remainder of the arbiter's
+  // lifetime.
+  virtual void BindToProducerEndpoint(TracingService::ProducerEndpoint*,
+                                      base::TaskRunner*) = 0;
+
+  // Binds commits from TraceWriters created via CreateStartupTraceWriter() with
+  // the given |target_buffer_reservation_id| to |target_buffer_id|. May only be
+  // called once per |target_buffer_reservation_id|. Should be called on the
+  // arbiter's TaskRunner, and after BindToProducerEndpoint() was called.
+  // Usually, it is called by a specific data source, after it received its
+  // configuration (including the target buffer ID) from the service.
+  virtual void BindStartupTargetBuffer(uint16_t target_buffer_reservation_id,
+                                       BufferID target_buffer_id) = 0;
+
+  // Treat the reservation as resolved to an invalid buffer. Commits for this
+  // reservation will be flushed to the service ASAP. The service will free
+  // committed chunks but otherwise ignore them. The producer can call this
+  // method, for example, if connection to the tracing service failed or the
+  // session was stopped concurrently before the connection was established.
+  virtual void AbortStartupTracingForReservation(
+      uint16_t target_buffer_reservation_id) = 0;
+
+  // Notifies the service that all data for the given FlushRequestID has been
+  // committed in the shared memory buffer. Should only be called while bound.
+  virtual void NotifyFlushComplete(FlushRequestID) = 0;
+
+  // Sets the duration during which commits are batched. Args:
+  // |batch_commits_duration_ms|: The length of the period, during which commits
+  // by all trace writers are accumulated, before being sent to the service.
+  // When the period ends, all accumulated commits are flushed. On the first
+  // commit after the last flush, another delayed flush is scheduled to run in
+  // |batch_commits_duration_ms|. If an immediate flush occurs (via
+  // FlushPendingCommitDataRequests()) during a batching period, any
+  // accumulated commits up to that point will be sent to the service
+  // immediately. And when the batching period ends, the commits that occurred
+  // after the immediate flush will also be sent to the service.
+  //
+  // If the duration has already been set to a non-zero value before this method
+  // is called, and there is already a scheduled flush with the previously-set
+  // duration, the new duration will take effect after the scheduled flush
+  // occurs.
+  //
+  // If |batch_commits_duration_ms| is non-zero, batched data that hasn't been
+  // sent could be lost at the end of a tracing session. To avoid this,
+  // producers should make sure that FlushPendingCommitDataRequests is called
+  // after the last TraceWriter write and before the service has stopped
+  // listening for commits from the tracing session's data sources (i.e.
+  // data sources should stop asynchronously, see
+  // DataSourceDescriptor.will_notify_on_stop=true).
+  virtual void SetBatchCommitsDuration(uint32_t batch_commits_duration_ms) = 0;
+
+  // Called to enable direct producer-side patching of chunks that have not yet
+  // been committed to the service. The return value indicates whether direct
+  // patching was successfully enabled. It will be true if
+  // SharedMemoryArbiter::SetDirectSMBPatchingSupportedByService has been called
+  // and false otherwise.
+  virtual bool EnableDirectSMBPatching() = 0;
+
+  // When the producer and service live in separate processes, this method
+  // should be called if the producer receives an
+  // InitializeConnectionResponse.direct_smb_patching_supported set to true by
+  // the service (see producer_port.proto) .
+  //
+  // In the in-process case, the service will always support direct SMB patching
+  // and this method should always be called.
+  virtual void SetDirectSMBPatchingSupportedByService() = 0;
+
+  // Forces an immediate commit of the completed packets, without waiting for
+  // the next task or for a batching period to end. Should only be called while
+  // bound.
+  virtual void FlushPendingCommitDataRequests(
+      std::function<void()> callback = {}) = 0;
+
+  // Attempts to shut down this arbiter. This function prevents new trace
+  // writers from being created for this this arbiter, but if there are any
+  // existing trace writers, the shutdown cannot proceed and this funtion
+  // returns false. The caller should not delete the arbiter before all of its
+  // associated trace writers have been destroyed and this function returns
+  // true.
+  virtual bool TryShutdown() = 0;
+
+  // Create a bound arbiter instance. Args:
+  // |SharedMemory|: the shared memory buffer to use.
+  // |page_size|: a multiple of 4KB that defines the granularity of tracing
+  // pages. See tradeoff considerations in shared_memory_abi.h.
+  // |ProducerEndpoint|: The service's producer endpoint used e.g. to commit
+  // chunks and register trace writers.
+  // |TaskRunner|: Task runner for perfetto's main thread, which executes the
+  // OnPagesCompleteCallback and IPC calls to the |ProducerEndpoint|.
+  //
+  // Implemented in src/core/shared_memory_arbiter_impl.cc.
+  static std::unique_ptr<SharedMemoryArbiter> CreateInstance(
+      SharedMemory*,
+      size_t page_size,
+      ShmemMode,
+      TracingService::ProducerEndpoint*,
+      base::TaskRunner*);
+
+  // Create an unbound arbiter instance, which should later be bound to a
+  // ProducerEndpoint and TaskRunner by calling BindToProducerEndpoint(). The
+  // returned arbiter will ONLY support trace writers with
+  // BufferExhaustedPolicy::kDrop.
+  //
+  // An unbound SharedMemoryArbiter can be used to write to a producer-created
+  // SharedMemory buffer before the producer connects to the tracing service.
+  // The producer can then pass this SMB to the service when it connects (see
+  // TracingService::ConnectProducer).
+  //
+  // To trace into the SMB before the service starts the tracing session, trace
+  // writers can be obtained via CreateStartupTraceWriter() and later associated
+  // with a target buffer via BindStartupTargetBuffer(), once the target buffer
+  // is known.
+  //
+  // Implemented in src/core/shared_memory_arbiter_impl.cc. See CreateInstance()
+  // for comments about the arguments.
+  static std::unique_ptr<SharedMemoryArbiter>
+  CreateUnboundInstance(SharedMemory*, size_t page_size, ShmemMode mode);
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_SHARED_MEMORY_ARBITER_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/slice.h b/src/libtracing/perfetto/ext/tracing/core/slice.h
new file mode 100644
index 000000000..063043bdc
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/slice.h
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_SLICE_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_SLICE_H_
+
+#include <stddef.h>
+#include <string.h>
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "perfetto/base/logging.h"
+
+namespace perfetto {
+
+// A simple wrapper around a virtually contiguous memory range that contains a
+// TracePacket, or just a portion of it.
+struct Slice {
+  Slice() : start(nullptr), size(0) {}
+  Slice(const void* st, size_t sz) : start(st), size(sz) {}
+  Slice(Slice&& other) noexcept = default;
+
+  // Create a Slice which owns |size| bytes of memory.
+  static Slice Allocate(size_t size) {
+    Slice slice;
+    slice.own_data_.reset(new uint8_t[size]);
+    slice.start = &slice.own_data_[0];
+    slice.size = size;
+    return slice;
+  }
+
+  static Slice TakeOwnership(std::unique_ptr<uint8_t[]> buf, size_t size) {
+    Slice slice;
+    slice.own_data_ = std::move(buf);
+    slice.start = &slice.own_data_[0];
+    slice.size = size;
+    return slice;
+  }
+
+  uint8_t* own_data() {
+    PERFETTO_DCHECK(own_data_);
+    return own_data_.get();
+  }
+
+  const void* start;
+  size_t size;
+
+ private:
+  Slice(const Slice&) = delete;
+  void operator=(const Slice&) = delete;
+
+  std::unique_ptr<uint8_t[]> own_data_;
+};
+
+// TODO(primiano): most TracePacket(s) fit in a slice or two. We need something
+// a bit more clever here that has inline capacity for 2 slices and then uses a
+// std::forward_list or a std::vector for the less likely cases.
+using Slices = std::vector<Slice>;
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_SLICE_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/trace_packet.h b/src/libtracing/perfetto/ext/tracing/core/trace_packet.h
new file mode 100644
index 000000000..abb25c4b4
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/trace_packet.h
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_PACKET_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_PACKET_H_
+
+#include <stddef.h>
+#include <memory>
+#include <optional>
+#include <tuple>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/tracing/core/slice.h"
+
+namespace perfetto {
+
+// A wrapper around a byte buffer that contains a protobuf-encoded TracePacket
+// (see trace_packet.proto). The TracePacket is decoded only if the Consumer
+// requests that. This is to allow Consumer(s) to just stream the packet over
+// the network or save it to a file without wasting time decoding it and without
+// needing to depend on libprotobuf or the trace_packet.pb.h header.
+// If the packets are saved / streamed and not just consumed locally, consumers
+// should ensure to preserve the unknown fields in the proto. A consumer, in
+// fact, might have an older version .proto which is newer on the producer.
+class PERFETTO_EXPORT_COMPONENT TracePacket {
+ public:
+  using const_iterator = Slices::const_iterator;
+
+  // The field id of protos::Trace::packet, static_assert()-ed in the unittest.
+  static constexpr uint32_t kPacketFieldNumber = 1;
+
+  // Maximum size of the preamble returned by GetProtoPreamble().
+  static constexpr size_t kMaxPreambleBytes = 8;
+
+  TracePacket();
+  ~TracePacket();
+  TracePacket(TracePacket&&) noexcept;
+  TracePacket& operator=(TracePacket&&);
+
+  // Accesses all the raw slices in the packet, for saving them to file/network.
+  const Slices& slices() const { return slices_; }
+
+  // Mutator, used only by the service and tests.
+  void AddSlice(Slice);
+
+  // Does not copy / take ownership of the memory of the slice. The TracePacket
+  // will be valid only as long as the original buffer is valid.
+  void AddSlice(const void* start, size_t size);
+
+  // Total size of all slices.
+  size_t size() const { return size_; }
+
+  // Generates a protobuf preamble suitable to represent this packet as a
+  // repeated field within a root trace.proto message.
+  // Returns a pointer to a buffer, owned by this class, containing the preamble
+  // and its size.
+  std::tuple<char*, size_t> GetProtoPreamble();
+
+  // Returns the raw protobuf bytes of the slices, all stitched together into
+  // a string. Only for testing.
+  std::string GetRawBytesForTesting();
+
+  // Remembers the buffer index where this packet was taken from. This is
+  // usually populated for packets from a TraceBuffer, not synthetic ones.
+  std::optional<uint32_t> buffer_index_for_stats() const {
+    if (buffer_index_for_stats_ == 0)
+      return std::nullopt;
+    return buffer_index_for_stats_ - 1;
+  }
+  void set_buffer_index_for_stats(uint32_t v) {
+    buffer_index_for_stats_ = v + 1;
+  }
+
+ private:
+  TracePacket(const TracePacket&) = delete;
+  TracePacket& operator=(const TracePacket&) = delete;
+
+  Slices slices_;     // Not owned.
+  size_t size_ = 0;   // SUM(slice.size for slice in slices_).
+
+  // Internally we store index+1, and use 0 for the "not set" case.
+  uint32_t buffer_index_for_stats_ = 0;
+  char preamble_[kMaxPreambleBytes];  // Deliberately not initialized.
+
+  // Remember to update the move operators and their unittest if adding new
+  // fields. ConsumerIPCClientImpl::OnReadBuffersResponse() relies on
+  // std::move(TracePacket) to clear up the moved-from instance.
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_PACKET_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/trace_stats.h b/src/libtracing/perfetto/ext/tracing/core/trace_stats.h
new file mode 100644
index 000000000..b85cb430f
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/trace_stats.h
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_STATS_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_STATS_H_
+
+// Creates the aliases in the ::perfetto namespace, doing things like:
+// using ::perfetto::Foo = ::perfetto::protos::gen::Foo.
+// See comments in forward_decls.h for the historical reasons of this
+// indirection layer.
+#include "perfetto/tracing/core/forward_decls.h"
+
+#include "protos/perfetto/common/trace_stats.gen.h"
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_STATS_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/trace_writer.h b/src/libtracing/perfetto/ext/tracing/core/trace_writer.h
new file mode 100644
index 000000000..76b4fa6bc
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/trace_writer.h
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_WRITER_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_WRITER_H_
+
+#include <functional>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/tracing/core/basic_types.h"
+#include "perfetto/protozero/message_handle.h"
+#include "perfetto/tracing/trace_writer_base.h"
+
+namespace perfetto {
+
+namespace protos {
+namespace pbzero {
+class TracePacket;
+}  // namespace pbzero
+}  // namespace protos
+
+// See comments in include/perfetto/tracing/trace_writer_base.h
+class PERFETTO_EXPORT_COMPONENT TraceWriter : public TraceWriterBase {
+ public:
+  using TracePacketHandle =
+      protozero::MessageHandle<protos::pbzero::TracePacket>;
+
+  TraceWriter();
+  ~TraceWriter() override;
+
+  virtual WriterID writer_id() const = 0;
+
+ private:
+  TraceWriter(const TraceWriter&) = delete;
+  TraceWriter& operator=(const TraceWriter&) = delete;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACE_WRITER_H_
diff --git a/src/libtracing/perfetto/ext/tracing/core/tracing_service.h b/src/libtracing/perfetto/ext/tracing/core/tracing_service.h
new file mode 100644
index 000000000..2b33fee9c
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/core/tracing_service.h
@@ -0,0 +1,442 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACING_SERVICE_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACING_SERVICE_H_
+
+#include <stdint.h>
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/sys_types.h"
+#include "perfetto/ext/tracing/core/basic_types.h"
+#include "perfetto/ext/tracing/core/shared_memory.h"
+#include "perfetto/ext/tracing/core/trace_packet.h"
+#include "perfetto/tracing/buffer_exhausted_policy.h"
+#include "perfetto/tracing/core/clock_snapshots.h"
+#include "perfetto/tracing/core/flush_flags.h"
+#include "perfetto/tracing/core/forward_decls.h"
+
+namespace perfetto {
+
+namespace base {
+class TaskRunner;
+}  // namespace base
+
+class Consumer;
+class Producer;
+class SharedMemoryArbiter;
+class TraceWriter;
+class ClientIdentity;
+
+// TODO: for the moment this assumes that all the calls happen on the same
+// thread/sequence. Not sure this will be the case long term in Chrome.
+
+// The API for the Producer port of the Service.
+// Subclassed by:
+// 1. The tracing_service_impl.cc business logic when returning it in response
+//    to the ConnectProducer() method.
+// 2. The transport layer (e.g., src/ipc) when the producer and
+//    the service don't talk locally but via some IPC mechanism.
+class PERFETTO_EXPORT_COMPONENT ProducerEndpoint {
+ public:
+  virtual ~ProducerEndpoint();
+
+  // Disconnects the endpoint from the service, while keeping the shared memory
+  // valid. After calling this, the endpoint will no longer call any methods
+  // on the Producer.
+  virtual void Disconnect() = 0;
+
+  // Called by the Producer to (un)register data sources. Data sources are
+  // identified by their name (i.e. DataSourceDescriptor.name)
+  virtual void RegisterDataSource(const DataSourceDescriptor&) = 0;
+  virtual void UpdateDataSource(const DataSourceDescriptor&) = 0;
+  virtual void UnregisterDataSource(const std::string& name) = 0;
+
+  // Associate the trace writer with the given |writer_id| with
+  // |target_buffer|. The service may use this information to retrieve and
+  // copy uncommitted chunks written by the trace writer into its associated
+  // buffer, e.g. when a producer process crashes or when a flush is
+  // necessary.
+  virtual void RegisterTraceWriter(uint32_t writer_id,
+                                   uint32_t target_buffer) = 0;
+
+  // Remove the association of the trace writer previously created via
+  // RegisterTraceWriter.
+  virtual void UnregisterTraceWriter(uint32_t writer_id) = 0;
+
+  // Called by the Producer to signal that some pages in the shared memory
+  // buffer (shared between Service and Producer) have changed.
+  // When the Producer and the Service are hosted in the same process and
+  // hence potentially live on the same task runner, This method must call
+  // TracingServiceImpl's CommitData synchronously, without any PostTask()s,
+  // if on the same thread. This is to avoid a deadlock where the Producer
+  // exhausts its SMB and stalls waiting for the service to catch up with
+  // reads, but the Service never gets to that because it lives on the same
+  // thread.
+  using CommitDataCallback = std::function<void()>;
+  virtual void CommitData(const CommitDataRequest&,
+                          CommitDataCallback callback = {}) = 0;
+
+  virtual SharedMemory* shared_memory() const = 0;
+
+  // Size of shared memory buffer pages. It's always a multiple of 4K.
+  // See shared_memory_abi.h
+  virtual size_t shared_buffer_page_size_kb() const = 0;
+
+  // Creates a trace writer, which allows to create events, handling the
+  // underying shared memory buffer and signalling to the Service. This method
+  // is thread-safe but the returned object is not. A TraceWriter should be
+  // used only from a single thread, or the caller has to handle sequencing
+  // via a mutex or equivalent. This method can only be called if
+  // TracingService::ConnectProducer was called with |in_process=true|.
+  // Args:
+  // |target_buffer| is the target buffer ID where the data produced by the
+  // writer should be stored by the tracing service. This value is passed
+  // upon creation of the data source (StartDataSource()) in the
+  // DataSourceConfig.target_buffer().
+  virtual std::unique_ptr<TraceWriter> CreateTraceWriter(
+      BufferID target_buffer,
+      BufferExhaustedPolicy buffer_exhausted_policy =
+          BufferExhaustedPolicy::kDefault) = 0;
+
+  // TODO(eseckler): Also expose CreateStartupTraceWriter() ?
+
+  // In some cases you can access the producer's SharedMemoryArbiter (for
+  // example if TracingService::ConnectProducer is called with
+  // |in_process=true|). The SharedMemoryArbiter can be used to create
+  // TraceWriters which is able to directly commit chunks. For the
+  // |in_process=true| case this can be done without going through an IPC layer.
+  virtual SharedMemoryArbiter* MaybeSharedMemoryArbiter() = 0;
+
+  // Whether the service accepted a shared memory buffer provided by the
+  // producer.
+  virtual bool IsShmemProvidedByProducer() const = 0;
+
+  // Called in response to a Producer::Flush(request_id) call after all data
+  // for the flush request has been committed.
+  virtual void NotifyFlushComplete(FlushRequestID) = 0;
+
+  // Called in response to one or more Producer::StartDataSource(),
+  // if the data source registered setting the flag
+  // DataSourceDescriptor.will_notify_on_start.
+  virtual void NotifyDataSourceStarted(DataSourceInstanceID) = 0;
+
+  // Called in response to one or more Producer::StopDataSource(),
+  // if the data source registered setting the flag
+  // DataSourceDescriptor.will_notify_on_stop.
+  virtual void NotifyDataSourceStopped(DataSourceInstanceID) = 0;
+
+  // This informs the service to activate any of these triggers if any tracing
+  // session was waiting for them.
+  virtual void ActivateTriggers(const std::vector<std::string>&) = 0;
+
+  // Emits a synchronization barrier to linearize with the service. When
+  // |callback| is invoked, the caller has the guarantee that the service has
+  // seen and processed all the requests sent by this producer prior to the
+  // Sync() call. Used mainly in tests.
+  virtual void Sync(std::function<void()> callback) = 0;
+};  // class ProducerEndpoint.
+
+// The API for the Consumer port of the Service.
+// Subclassed by:
+// 1. The tracing_service_impl.cc business logic when returning it in response
+// to
+//    the ConnectConsumer() method.
+// 2. The transport layer (e.g., src/ipc) when the consumer and
+//    the service don't talk locally but via some IPC mechanism.
+class PERFETTO_EXPORT_COMPONENT ConsumerEndpoint {
+ public:
+  virtual ~ConsumerEndpoint();
+
+  // Enables tracing with the given TraceConfig. The ScopedFile argument is
+  // used only when TraceConfig.write_into_file == true.
+  // If TraceConfig.deferred_start == true data sources are configured via
+  // SetupDataSource() but are not started until StartTracing() is called.
+  // This is to support pre-initialization and fast triggering of traces.
+  // The ScopedFile argument is used only when TraceConfig.write_into_file
+  // == true.
+  virtual void EnableTracing(const TraceConfig&,
+                             base::ScopedFile = base::ScopedFile()) = 0;
+
+  // Update the trace config of an existing tracing session; only a subset
+  // of options can be changed mid-session. Currently the only
+  // supported functionality is expanding the list of producer_name_filters()
+  // (or removing the filter entirely) for existing data sources.
+  virtual void ChangeTraceConfig(const TraceConfig&) = 0;
+
+  // Starts all data sources configured in the trace config. This is used only
+  // after calling EnableTracing() with TraceConfig.deferred_start=true.
+  // It's a no-op if called after a regular EnableTracing(), without setting
+  // deferred_start.
+  virtual void StartTracing() = 0;
+
+  virtual void DisableTracing() = 0;
+
+  // Clones an existing tracing session and attaches to it. The session is
+  // cloned in read-only mode and can only be used to read a snapshot of an
+  // existing tracing session. Will invoke Consumer::OnSessionCloned().
+  // If TracingSessionID == kBugreportSessionId (0xff...ff) the session with the
+  // highest bugreport score is cloned (if any exists).
+  struct CloneSessionArgs {
+    // If set, the trace filter will not have effect on the cloned session.
+    // Used for bugreports.
+    bool skip_trace_filter = false;
+
+    // If set, affects the generation of the FlushFlags::CloneTarget to be set
+    // to kBugreport when requesting the flush to the producers.
+    bool for_bugreport = false;
+  };
+  virtual void CloneSession(TracingSessionID, CloneSessionArgs) = 0;
+
+  // Requests all data sources to flush their data immediately and invokes the
+  // passed callback once all of them have acked the flush (in which case
+  // the callback argument |success| will be true) or |timeout_ms| are elapsed
+  // (in which case |success| will be false).
+  // If |timeout_ms| is 0 the TraceConfig's flush_timeout_ms is used, or,
+  // if that one is not set (or is set to 0), kDefaultFlushTimeoutMs (5s) is
+  // used.
+  using FlushCallback = std::function<void(bool /*success*/)>;
+  virtual void Flush(uint32_t timeout_ms,
+                     FlushCallback callback,
+                     FlushFlags) = 0;
+
+  // This is required for legacy out-of-repo clients like arctraceservice which
+  // use the 2-version parameter.
+  inline void Flush(uint32_t timeout_ms, FlushCallback callback) {
+    Flush(timeout_ms, std::move(callback), FlushFlags());
+  }
+
+  // Tracing data will be delivered invoking Consumer::OnTraceData().
+  virtual void ReadBuffers() = 0;
+
+  virtual void FreeBuffers() = 0;
+
+  // Will call OnDetach().
+  virtual void Detach(const std::string& key) = 0;
+
+  // Will call OnAttach().
+  virtual void Attach(const std::string& key) = 0;
+
+  // Will call OnTraceStats().
+  virtual void GetTraceStats() = 0;
+
+  // Start or stop observing events of selected types. |events_mask| specifies
+  // the types of events to observe in a bitmask of ObservableEvents::Type.
+  // To disable observing, pass 0.
+  // Will call OnObservableEvents() repeatedly whenever an event of an enabled
+  // ObservableEventType occurs.
+  // TODO(eseckler): Extend this to support producers & data sources.
+  virtual void ObserveEvents(uint32_t events_mask) = 0;
+
+  // Used to obtain the list of connected data sources and other info about
+  // the tracing service.
+  struct QueryServiceStateArgs {
+    // If set, only the TracingServiceState.tracing_sessions is filled.
+    bool sessions_only = false;
+  };
+  using QueryServiceStateCallback =
+      std::function<void(bool success, const TracingServiceState&)>;
+  virtual void QueryServiceState(QueryServiceStateArgs,
+                                 QueryServiceStateCallback) = 0;
+
+  // Used for feature detection. Makes sense only when the consumer and the
+  // service talk over IPC and can be from different versions.
+  using QueryCapabilitiesCallback =
+      std::function<void(const TracingServiceCapabilities&)>;
+  virtual void QueryCapabilities(QueryCapabilitiesCallback) = 0;
+
+  // If any tracing session with TraceConfig.bugreport_score > 0 is running,
+  // this will pick the highest-score one, stop it and save it into a fixed
+  // path (See kBugreportTracePath).
+  // The callback is invoked when the file has been saved, in case of success,
+  // or whenever an error occurs.
+  // Args:
+  // - success: if true, an eligible trace was found and saved into file.
+  //            If false, either there was no eligible trace running or
+  //            something else failed (See |msg|).
+  // - msg: human readable diagnostic messages to debug failures.
+  using SaveTraceForBugreportCallback =
+      std::function<void(bool /*success*/, const std::string& /*msg*/)>;
+  virtual void SaveTraceForBugreport(SaveTraceForBugreportCallback) = 0;
+};  // class ConsumerEndpoint.
+
+struct PERFETTO_EXPORT_COMPONENT TracingServiceInitOpts {
+  // Function used by tracing service to compress packets. Takes a pointer to
+  // a vector of TracePackets and replaces the packets in the vector with
+  // compressed ones.
+  using CompressorFn = void (*)(std::vector<TracePacket>*);
+  CompressorFn compressor_fn = nullptr;
+
+  // Whether the relay endpoint is enabled on producer transport(s).
+  bool enable_relay_endpoint = false;
+};
+
+// The API for the Relay port of the Service. Subclassed by the
+// tracing_service_impl.cc business logic when returning it in response to the
+// ConnectRelayClient() method.
+class PERFETTO_EXPORT_COMPONENT RelayEndpoint {
+ public:
+  virtual ~RelayEndpoint();
+
+  // A snapshot of client and host clocks.
+  struct SyncClockSnapshot {
+    ClockSnapshotVector client_clock_snapshots;
+    ClockSnapshotVector host_clock_snapshots;
+  };
+
+  enum class SyncMode : uint32_t { PING = 1, UPDATE = 2 };
+  virtual void SyncClocks(SyncMode sync_mode,
+                          ClockSnapshotVector client_clocks,
+                          ClockSnapshotVector host_clocks) = 0;
+  virtual void Disconnect() = 0;
+};
+
+// The public API of the tracing Service business logic.
+//
+// Exposed to:
+// 1. The transport layer (e.g., src/unix_rpc/unix_service_host.cc),
+//    which forwards commands received from a remote producer or consumer to
+//    the actual service implementation.
+// 2. Tests.
+//
+// Subclassed by:
+//   The service business logic in src/core/tracing_service_impl.cc.
+class PERFETTO_EXPORT_COMPONENT TracingService {
+ public:
+  using ProducerEndpoint = perfetto::ProducerEndpoint;
+  using ConsumerEndpoint = perfetto::ConsumerEndpoint;
+  using RelayEndpoint = perfetto::RelayEndpoint;
+  using InitOpts = TracingServiceInitOpts;
+
+  // Default sizes used by the service implementation and client library.
+  static constexpr size_t kDefaultShmPageSize = 4096ul;
+  static constexpr size_t kDefaultShmSize = 256 * 1024ul;
+
+  enum class ProducerSMBScrapingMode {
+    // Use service's default setting for SMB scraping. Currently, the default
+    // mode is to disable SMB scraping, but this may change in the future.
+    kDefault,
+
+    // Enable scraping of uncommitted chunks in producers' shared memory
+    // buffers.
+    kEnabled,
+
+    // Disable scraping of uncommitted chunks in producers' shared memory
+    // buffers.
+    kDisabled
+  };
+
+  // Implemented in src/core/tracing_service_impl.cc . CompressorFn can be
+  // nullptr, in which case TracingService will not support compression.
+  static std::unique_ptr<TracingService> CreateInstance(
+      std::unique_ptr<SharedMemory::Factory>,
+      base::TaskRunner*,
+      InitOpts init_opts = {});
+
+  virtual ~TracingService();
+
+  // Connects a Producer instance and obtains a ProducerEndpoint, which is
+  // essentially a 1:1 channel between one Producer and the Service.
+  //
+  // The caller has to guarantee that the passed Producer will be alive as long
+  // as the returned ProducerEndpoint is alive. Both the passed Producer and the
+  // returned ProducerEndpoint must live on the same task runner of the service,
+  // specifically:
+  // 1) The Service will call Producer::* methods on the Service's task runner.
+  // 2) The Producer should call ProducerEndpoint::* methods only on the
+  //    service's task runner, except for ProducerEndpoint::CreateTraceWriter(),
+  //    which can be called on any thread. To disconnect just destroy the
+  //    returned ProducerEndpoint object. It is safe to destroy the Producer
+  //    once the Producer::OnDisconnect() has been invoked.
+  //
+  // |uid| is the trusted user id of the producer process, used by the consumers
+  // for validating the origin of trace data. |shared_memory_size_hint_bytes|
+  // and |shared_memory_page_size_hint_bytes| are optional hints on the size of
+  // the shared memory buffer and its pages. The service can ignore the hints
+  // (e.g., if the hints are unreasonably large or other sizes were configured
+  // in a tracing session's config). |in_process| enables the ProducerEndpoint
+  // to manage its own shared memory and enables use of
+  // |ProducerEndpoint::CreateTraceWriter|.
+  //
+  // The producer can optionally provide a non-null |shm|, which the service
+  // will adopt for the connection to the producer, provided it is correctly
+  // sized. In this case, |shared_memory_page_size_hint_bytes| indicates the
+  // page size used in this SMB. The producer can use this mechanism to record
+  // tracing data to an SMB even before the tracing session is started by the
+  // service. This is used in Chrome to implement startup tracing. If the buffer
+  // is incorrectly sized, the service will discard the SMB and allocate a new
+  // one, provided to the producer via ProducerEndpoint::shared_memory() after
+  // OnTracingSetup(). To verify that the service accepted the SMB, the producer
+  // may check via ProducerEndpoint::IsShmemProvidedByProducer(). If the service
+  // accepted the SMB, the producer can then commit any data that is already in
+  // the SMB after the tracing session was started by the service via
+  // Producer::StartDataSource(). The |shm| will also be rejected when
+  // connecting to a service that is too old (pre Android-11).
+  //
+  // Can return null in the unlikely event that service has too many producers
+  // connected.
+  virtual std::unique_ptr<ProducerEndpoint> ConnectProducer(
+      Producer*,
+      const ClientIdentity& client_identity,
+      const std::string& name,
+      size_t shared_memory_size_hint_bytes = 0,
+      bool in_process = false,
+      ProducerSMBScrapingMode smb_scraping_mode =
+          ProducerSMBScrapingMode::kDefault,
+      size_t shared_memory_page_size_hint_bytes = 0,
+      std::unique_ptr<SharedMemory> shm = nullptr,
+      const std::string& sdk_version = {}) = 0;
+
+  // Connects a Consumer instance and obtains a ConsumerEndpoint, which is
+  // essentially a 1:1 channel between one Consumer and the Service.
+  // The caller has to guarantee that the passed Consumer will be alive as long
+  // as the returned ConsumerEndpoint is alive.
+  // To disconnect just destroy the returned ConsumerEndpoint object. It is safe
+  // to destroy the Consumer once the Consumer::OnDisconnect() has been invoked.
+  virtual std::unique_ptr<ConsumerEndpoint> ConnectConsumer(Consumer*,
+                                                            uid_t) = 0;
+
+  // Enable/disable scraping of chunks in the shared memory buffer. If enabled,
+  // the service will copy uncommitted but non-empty chunks from the SMB when
+  // flushing (e.g. to handle unresponsive producers or producers unable to
+  // flush their active chunks), on producer disconnect (e.g. to recover data
+  // from crashed producers), and after disabling a tracing session (e.g. to
+  // gather data from producers that didn't stop their data sources in time).
+  //
+  // This feature is currently used by Chrome.
+  virtual void SetSMBScrapingEnabled(bool enabled) = 0;
+
+  using RelayClientID = std::pair<base::MachineID, /*client ID*/ uint64_t>;
+  // Connects a remote RelayClient instance and obtains a RelayEndpoint, which
+  // is a 1:1 channel between one RelayClient and the Service. To disconnect
+  // just call Disconnect() of the RelayEndpoint instance. The relay client is
+  // connected using an identifier of MachineID and client ID. The service
+  // doesn't hold an object that represents the client because the relay port
+  // only has a client-to-host SyncClock() method.
+  //
+  // TODO(chinglinyu): connect the relay client using a RelayClient* object when
+  // we need host-to-client RPC method.
+  virtual std::unique_ptr<RelayEndpoint> ConnectRelayClient(RelayClientID) = 0;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_CORE_TRACING_SERVICE_H_
diff --git a/src/libtracing/perfetto/ext/tracing/ipc/BUILD.gn b/src/libtracing/perfetto/ext/tracing/ipc/BUILD.gn
new file mode 100644
index 000000000..1f42bff33
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/ipc/BUILD.gn
@@ -0,0 +1,25 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("ipc") {
+  public_deps = [
+    "../../base",
+    "../core",
+  ]
+  sources = [
+    "consumer_ipc_client.h",
+    "producer_ipc_client.h",
+    "service_ipc_host.h",
+  ]
+}
diff --git a/src/libtracing/perfetto/ext/tracing/ipc/consumer_ipc_client.h b/src/libtracing/perfetto/ext/tracing/ipc/consumer_ipc_client.h
new file mode 100644
index 000000000..961c2bcd4
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/ipc/consumer_ipc_client.h
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_IPC_CONSUMER_IPC_CLIENT_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_IPC_CONSUMER_IPC_CLIENT_H_
+
+#include <memory>
+#include <string>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/tracing/core/tracing_service.h"
+
+namespace perfetto {
+
+class Consumer;
+
+// Allows to connect to a remote Service through a UNIX domain socket.
+// Exposed to:
+//   Consumer(s) of the tracing library.
+// Implemented in:
+//   src/tracing/ipc/consumer/consumer_ipc_client_impl.cc
+class PERFETTO_EXPORT_COMPONENT ConsumerIPCClient {
+ public:
+  // Connects to the producer port of the Service listening on the given
+  // |service_sock_name|. If the connection is successful, the OnConnect()
+  // method will be invoked asynchronously on the passed Consumer interface.
+  // If the connection fails, OnDisconnect() will be invoked instead.
+  // The returned ConsumerEndpoint serves also to delimit the scope of the
+  // callbacks invoked on the Consumer interface: no more Consumer callbacks are
+  // invoked immediately after its destruction and any pending callback will be
+  // dropped.
+  static std::unique_ptr<TracingService::ConsumerEndpoint>
+  Connect(const char* service_sock_name, Consumer*, base::TaskRunner*);
+
+ protected:
+  ConsumerIPCClient() = delete;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_IPC_CONSUMER_IPC_CLIENT_H_
diff --git a/src/libtracing/perfetto/ext/tracing/ipc/producer_ipc_client.h b/src/libtracing/perfetto/ext/tracing/ipc/producer_ipc_client.h
new file mode 100644
index 000000000..e486f165b
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/ipc/producer_ipc_client.h
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_IPC_PRODUCER_IPC_CLIENT_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_IPC_PRODUCER_IPC_CLIENT_H_
+
+#include <memory>
+#include <string>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/ipc/client.h"
+#include "perfetto/ext/tracing/core/shared_memory.h"
+#include "perfetto/ext/tracing/core/shared_memory_arbiter.h"
+#include "perfetto/ext/tracing/core/tracing_service.h"
+#include "perfetto/tracing/tracing_backend.h"
+
+namespace perfetto {
+
+class Producer;
+
+// Allows to connect to a remote Service through a UNIX domain socket.
+// Exposed to:
+//   Producer(s) of the tracing library.
+// Implemented in:
+//   src/tracing/ipc/producer/producer_ipc_client_impl.cc
+class PERFETTO_EXPORT_COMPONENT ProducerIPCClient {
+ public:
+  enum class ConnectionFlags {
+    // Fails immediately with OnConnect(false) if the service connection cannot
+    // be established.
+    kDefault = 0,
+
+    // Keeps retrying with exponential backoff indefinitely. The caller will
+    // never see an OnConnect(false).
+    kRetryIfUnreachable = 1,
+  };
+
+  // Connects to the producer port of the Service listening on the given
+  // |service_sock_name|. If the connection is successful, the OnConnect()
+  // method will be invoked asynchronously on the passed Producer interface. If
+  // the connection fails, OnDisconnect() will be invoked instead. The returned
+  // ProducerEndpoint serves also to delimit the scope of the callbacks invoked
+  // on the Producer interface: no more Producer callbacks are invoked
+  // immediately after its destruction and any pending callback will be dropped.
+  // To provide a producer-allocated shared memory buffer, both |shm| and
+  // |shm_arbiter| should be set. |shm_arbiter| should be an unbound
+  // SharedMemoryArbiter instance. When |shm| and |shm_arbiter| are provided,
+  // the service will attempt to adopt the provided SMB. If this fails, the
+  // ProducerEndpoint will disconnect, but the SMB and arbiter will remain valid
+  // until the client is destroyed.
+  //
+  // TODO(eseckler): Support adoption failure more gracefully.
+  // TODO(primiano): move all the existing use cases to the Connect(ConnArgs)
+  // below. Also move the functionality of ConnectionFlags into ConnArgs.
+  static std::unique_ptr<TracingService::ProducerEndpoint> Connect(
+      const char* service_sock_name,
+      Producer*,
+      const std::string& producer_name,
+      base::TaskRunner*,
+      TracingService::ProducerSMBScrapingMode smb_scraping_mode =
+          TracingService::ProducerSMBScrapingMode::kDefault,
+      size_t shared_memory_size_hint_bytes = 0,
+      size_t shared_memory_page_size_hint_bytes = 0,
+      std::unique_ptr<SharedMemory> shm = nullptr,
+      std::unique_ptr<SharedMemoryArbiter> shm_arbiter = nullptr,
+      ConnectionFlags = ConnectionFlags::kDefault);
+
+  // Overload of Connect() to support adopting a connected socket using
+  // ipc::Client::ConnArgs.
+  static std::unique_ptr<TracingService::ProducerEndpoint> Connect(
+      ipc::Client::ConnArgs,
+      Producer*,
+      const std::string& producer_name,
+      base::TaskRunner*,
+      TracingService::ProducerSMBScrapingMode smb_scraping_mode =
+          TracingService::ProducerSMBScrapingMode::kDefault,
+      size_t shared_memory_size_hint_bytes = 0,
+      size_t shared_memory_page_size_hint_bytes = 0,
+      std::unique_ptr<SharedMemory> shm = nullptr,
+      std::unique_ptr<SharedMemoryArbiter> shm_arbiter = nullptr,
+      CreateSocketAsync create_socket_async = nullptr);
+
+ protected:
+  ProducerIPCClient() = delete;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_IPC_PRODUCER_IPC_CLIENT_H_
diff --git a/src/libtracing/perfetto/ext/tracing/ipc/service_ipc_host.h b/src/libtracing/perfetto/ext/tracing/ipc/service_ipc_host.h
new file mode 100644
index 000000000..3814d0b15
--- /dev/null
+++ b/src/libtracing/perfetto/ext/tracing/ipc/service_ipc_host.h
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_EXT_TRACING_IPC_SERVICE_IPC_HOST_H_
+#define INCLUDE_PERFETTO_EXT_TRACING_IPC_SERVICE_IPC_HOST_H_
+
+#include <memory>
+
+#include "perfetto/base/export.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/unix_socket.h"
+#include "perfetto/ext/tracing/core/basic_types.h"
+#include "perfetto/ext/tracing/core/tracing_service.h"
+#include "perfetto/tracing/default_socket.h"
+
+namespace perfetto {
+namespace base {
+class TaskRunner;
+}  // namespace base.
+
+namespace ipc {
+class Host;
+}  // namespace ipc
+
+// Creates an instance of the service (business logic + UNIX socket transport).
+// Exposed to:
+//   The code in the tracing client that will host the service e.g., traced.
+// Implemented in:
+//   src/tracing/ipc/service/service_ipc_host_impl.cc
+class PERFETTO_EXPORT_COMPONENT ServiceIPCHost {
+ public:
+  static std::unique_ptr<ServiceIPCHost> CreateInstance(
+      base::TaskRunner*,
+      TracingService::InitOpts = {});
+  virtual ~ServiceIPCHost();
+
+  // The overload to wrap the multi-value producer socket name in the
+  // single-value variant for compatibility in tests.
+  bool Start(const char* producer_socket_name,
+             const char* consumer_socket_name) {
+    return Start(TokenizeProducerSockets(producer_socket_name),
+                 consumer_socket_name);
+  }
+  // Start listening on the Producer & Consumer ports. Returns false in case of
+  // failure (e.g., something else is listening on |socket_name|).
+  virtual bool Start(const std::vector<std::string>& producer_socket_names,
+                     const char* consumer_socket_name) = 0;
+
+  // Like the above, but takes two file descriptors to already bound sockets.
+  // This is used when building as part of the Android tree, where init opens
+  // and binds the socket beore exec()-ing us.
+  virtual bool Start(base::ScopedSocketHandle producer_socket_fd,
+                     base::ScopedSocketHandle consumer_socket_fd) = 0;
+
+  // Allows callers to supply preconstructed Hosts.
+  virtual bool Start(std::unique_ptr<ipc::Host> producer_host,
+                     std::unique_ptr<ipc::Host> consumer_host) = 0;
+
+  virtual TracingService* service() const = 0;
+
+ protected:
+  ServiceIPCHost();
+
+ private:
+  ServiceIPCHost(const ServiceIPCHost&) = delete;
+  ServiceIPCHost& operator=(const ServiceIPCHost&) = delete;
+};
+
+}  // namespace perfetto
+
+#endif  // INCLUDE_PERFETTO_EXT_TRACING_IPC_SERVICE_IPC_HOST_H_
diff --git a/src/libtracing/perfetto/protozero/contiguous_memory_range.h b/src/libtracing/perfetto/protozero/contiguous_memory_range.h
new file mode 100644
index 000000000..d00715bf5
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/contiguous_memory_range.h
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+namespace protozero {
+
+// Keep this struct trivially constructible (no ctors, no default initializers).
+struct ContiguousMemoryRange {
+  uint8_t* begin;
+  uint8_t* end;  // STL style: one byte past the end of the buffer.
+
+  inline bool is_valid() const { return begin != nullptr; }
+  inline void reset() { begin = nullptr; }
+  inline size_t size() const { return static_cast<size_t>(end - begin); }
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
diff --git a/src/libtracing/perfetto/protozero/copyable_ptr.h b/src/libtracing/perfetto/protozero/copyable_ptr.h
new file mode 100644
index 000000000..2fe5ff671
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/copyable_ptr.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_COPYABLE_PTR_H_
+#define INCLUDE_PERFETTO_PROTOZERO_COPYABLE_PTR_H_
+
+#include <memory>
+
+namespace protozero {
+
+// This class is essentially a std::vector<T> of fixed size = 1.
+// It's a pointer wrapper with deep copying and deep equality comparison.
+// At all effects this wrapper behaves like the underlying T, with the exception
+// of the heap indirection.
+// Conversely to a std::unique_ptr, the pointer will be always valid, never
+// null. The problem it solves is the following: when generating C++ classes
+// from proto files, we want to keep each header hermetic (i.e. not #include
+// headers of dependent types). As such we can't directly instantiate T
+// field members but we can instead rely on pointers, so only the .cc file needs
+// to see the actual definition of T. If the generated classes were move-only we
+// could just use a unique_ptr there. But they aren't, hence this wrapper.
+// Converesely to unique_ptr, this wrapper:
+// - Default constructs the T instance in its constructor.
+// - Implements deep comparison in operator== instead of pointer comparison.
+template <typename T>
+class CopyablePtr {
+ public:
+  CopyablePtr() : ptr_(new T()) {}
+  ~CopyablePtr() = default;
+
+  // Copy operators.
+  CopyablePtr(const CopyablePtr& other) : ptr_(new T(*other.ptr_)) {}
+  CopyablePtr& operator=(const CopyablePtr& other) {
+    *ptr_ = *other.ptr_;
+    return *this;
+  }
+
+  // Move operators.
+  CopyablePtr(CopyablePtr&& other) noexcept : ptr_(std::move(other.ptr_)) {
+    other.ptr_.reset(new T());
+  }
+
+  CopyablePtr& operator=(CopyablePtr&& other) {
+    ptr_ = std::move(other.ptr_);
+    other.ptr_.reset(new T());
+    return *this;
+  }
+
+  T* get() { return ptr_.get(); }
+  const T* get() const { return ptr_.get(); }
+
+  T* operator->() { return ptr_.get(); }
+  const T* operator->() const { return ptr_.get(); }
+
+  T& operator*() { return *ptr_; }
+  const T& operator*() const { return *ptr_; }
+
+  friend bool operator==(const CopyablePtr& lhs, const CopyablePtr& rhs) {
+    return *lhs == *rhs;
+  }
+
+  friend bool operator!=(const CopyablePtr& lhs, const CopyablePtr& rhs) {
+    // In theory the underlying type might have a special operator!=
+    // implementation which is not just !(x == y). Respect that.
+    return *lhs != *rhs;
+  }
+
+ private:
+  std::unique_ptr<T> ptr_;
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_COPYABLE_PTR_H_
diff --git a/src/libtracing/perfetto/protozero/cpp_message_obj.h b/src/libtracing/perfetto/protozero/cpp_message_obj.h
new file mode 100644
index 000000000..997a1258e
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/cpp_message_obj.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_CPP_MESSAGE_OBJ_H_
+#define INCLUDE_PERFETTO_PROTOZERO_CPP_MESSAGE_OBJ_H_
+
+#include <stdint.h>
+
+#include <string>
+#include <vector>
+
+#include "perfetto/base/export.h"
+
+namespace protozero {
+
+// Base class for generated .gen.h classes, which are full C++ objects that
+// support both ser and deserialization (but are not zero-copy).
+// This is only used by the "cpp" targets not the "pbzero" ones.
+class PERFETTO_EXPORT_COMPONENT CppMessageObj {
+ public:
+  virtual ~CppMessageObj();
+  virtual std::string SerializeAsString() const = 0;
+  virtual std::vector<uint8_t> SerializeAsArray() const = 0;
+  virtual bool ParseFromArray(const void*, size_t) = 0;
+
+  bool ParseFromString(const std::string& str) {
+    return ParseFromArray(str.data(), str.size());
+  }
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_CPP_MESSAGE_OBJ_H_
diff --git a/src/libtracing/perfetto/protozero/field.h b/src/libtracing/perfetto/protozero/field.h
new file mode 100644
index 000000000..e601e0697
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/field.h
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_FIELD_H_
+#define INCLUDE_PERFETTO_PROTOZERO_FIELD_H_
+
+#include <stdint.h>
+
+#include <string>
+#include <vector>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/contiguous_memory_range.h"
+#include "perfetto/protozero/proto_utils.h"
+
+namespace protozero {
+
+struct ConstBytes {
+  std::string ToStdString() const {
+    return std::string(reinterpret_cast<const char*>(data), size);
+  }
+
+  const uint8_t* data;
+  size_t size;
+};
+
+struct ConstChars {
+  // Allow implicit conversion to perfetto's base::StringView without depending
+  // on perfetto/base or viceversa.
+  static constexpr bool kConvertibleToStringView = true;
+  std::string ToStdString() const { return std::string(data, size); }
+
+  const char* data;
+  size_t size;
+};
+
+// A protobuf field decoded by the protozero proto decoders. It exposes
+// convenience accessors with minimal debug checks.
+// This class is used both by the iterator-based ProtoDecoder and by the
+// one-shot TypedProtoDecoder.
+// If the field is not valid the accessors consistently return zero-integers or
+// null strings.
+class Field {
+ public:
+  bool valid() const { return id_ != 0; }
+  uint32_t id() const { return id_; }
+  explicit operator bool() const { return valid(); }
+
+  proto_utils::ProtoWireType type() const {
+    auto res = static_cast<proto_utils::ProtoWireType>(type_);
+    PERFETTO_DCHECK(res == proto_utils::ProtoWireType::kVarInt ||
+                    res == proto_utils::ProtoWireType::kLengthDelimited ||
+                    res == proto_utils::ProtoWireType::kFixed32 ||
+                    res == proto_utils::ProtoWireType::kFixed64);
+    return res;
+  }
+
+  bool as_bool() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kVarInt);
+    return static_cast<bool>(int_value_);
+  }
+
+  uint32_t as_uint32() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kVarInt ||
+                    type() == proto_utils::ProtoWireType::kFixed32);
+    return static_cast<uint32_t>(int_value_);
+  }
+
+  int32_t as_int32() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kVarInt ||
+                    type() == proto_utils::ProtoWireType::kFixed32);
+    return static_cast<int32_t>(int_value_);
+  }
+
+  int32_t as_sint32() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kVarInt);
+    return proto_utils::ZigZagDecode(static_cast<uint32_t>(int_value_));
+  }
+
+  uint64_t as_uint64() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kVarInt ||
+                    type() == proto_utils::ProtoWireType::kFixed32 ||
+                    type() == proto_utils::ProtoWireType::kFixed64);
+    return int_value_;
+  }
+
+  int64_t as_int64() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kVarInt ||
+                    type() == proto_utils::ProtoWireType::kFixed32 ||
+                    type() == proto_utils::ProtoWireType::kFixed64);
+    return static_cast<int64_t>(int_value_);
+  }
+
+  int64_t as_sint64() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kVarInt);
+    return proto_utils::ZigZagDecode(static_cast<uint64_t>(int_value_));
+  }
+
+  float as_float() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kFixed32);
+    float res;
+    uint32_t value32 = static_cast<uint32_t>(int_value_);
+    memcpy(&res, &value32, sizeof(res));
+    return res;
+  }
+
+  double as_double() const {
+    PERFETTO_DCHECK(!valid() || type() == proto_utils::ProtoWireType::kFixed64);
+    double res;
+    memcpy(&res, &int_value_, sizeof(res));
+    return res;
+  }
+
+  ConstChars as_string() const {
+    PERFETTO_DCHECK(!valid() ||
+                    type() == proto_utils::ProtoWireType::kLengthDelimited);
+    return ConstChars{reinterpret_cast<const char*>(data()), size_};
+  }
+
+  std::string as_std_string() const { return as_string().ToStdString(); }
+
+  ConstBytes as_bytes() const {
+    PERFETTO_DCHECK(!valid() ||
+                    type() == proto_utils::ProtoWireType::kLengthDelimited);
+    return ConstBytes{data(), size_};
+  }
+
+  const uint8_t* data() const {
+    PERFETTO_DCHECK(!valid() ||
+                    type() == proto_utils::ProtoWireType::kLengthDelimited);
+    return reinterpret_cast<const uint8_t*>(int_value_);
+  }
+
+  size_t size() const {
+    PERFETTO_DCHECK(!valid() ||
+                    type() == proto_utils::ProtoWireType::kLengthDelimited);
+    return size_;
+  }
+
+  uint64_t raw_int_value() const { return int_value_; }
+
+  void initialize(uint32_t id,
+                  uint8_t type,
+                  uint64_t int_value,
+                  uint32_t size) {
+    id_ = id & kMaxId;
+    type_ = type;
+    int_value_ = int_value;
+    size_ = size;
+  }
+
+  // For use with templates. This is used by RepeatedFieldIterator::operator*().
+  void get(bool* val) const { *val = as_bool(); }
+  void get(uint32_t* val) const { *val = as_uint32(); }
+  void get(int32_t* val) const { *val = as_int32(); }
+  void get(uint64_t* val) const { *val = as_uint64(); }
+  void get(int64_t* val) const { *val = as_int64(); }
+  void get(float* val) const { *val = as_float(); }
+  void get(double* val) const { *val = as_double(); }
+  void get(std::string* val) const { *val = as_std_string(); }
+  void get(ConstChars* val) const { *val = as_string(); }
+  void get(ConstBytes* val) const { *val = as_bytes(); }
+  void get_signed(int32_t* val) const { *val = as_sint32(); }
+  void get_signed(int64_t* val) const { *val = as_sint64(); }
+
+  // For enum types.
+  template <typename T,
+            typename = typename std::enable_if<std::is_enum<T>::value, T>::type>
+  void get(T* val) const {
+    *val = static_cast<T>(as_int32());
+  }
+
+  // Serializes the field back into a proto-encoded byte stream and appends it
+  // to |dst|. |dst| is resized accordingly.
+  void SerializeAndAppendTo(std::string* dst) const;
+
+  // Serializes the field back into a proto-encoded byte stream and appends it
+  // to |dst|. |dst| is resized accordingly.
+  void SerializeAndAppendTo(std::vector<uint8_t>* dst) const;
+
+  static constexpr uint32_t kMaxId = (1 << 24) - 1;  // See id_ : 24 below.
+ private:
+  template <typename Container>
+  void SerializeAndAppendToInternal(Container* dst) const;
+
+  // Fields are deliberately not initialized to keep the class trivially
+  // constructible. It makes a large perf difference for ProtoDecoder.
+  uint64_t int_value_;  // In kLengthDelimited this contains the data() addr.
+  uint32_t size_;       // Only valid when when type == kLengthDelimited.
+
+  // Note: MSVC and clang-cl require bit-fields to be of the same type, hence
+  // the `: 8` below rather than uint8_t.
+  uint32_t id_ : 24;   // Proto field ordinal.
+  uint32_t type_ : 8;  // proto_utils::ProtoWireType.
+};
+// The Field struct is used in a lot of perf-sensitive contexts.
+static_assert(sizeof(Field) == 16, "Field struct too big");
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_FIELD_H_
diff --git a/src/libtracing/perfetto/protozero/field_writer.h b/src/libtracing/perfetto/protozero/field_writer.h
new file mode 100644
index 000000000..e8d76d795
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/field_writer.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/message.h"
+#include "perfetto/protozero/proto_utils.h"
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_FIELD_WRITER_H_
+#define INCLUDE_PERFETTO_PROTOZERO_FIELD_WRITER_H_
+
+namespace protozero {
+namespace internal {
+
+template <proto_utils::ProtoSchemaType proto_schema_type>
+struct FieldWriter {
+  static_assert(proto_schema_type != proto_utils::ProtoSchemaType::kMessage,
+                "FieldWriter can't be used with nested messages");
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kDouble> {
+  inline static void Append(Message& message, uint32_t field_id, double value) {
+    message.AppendFixed(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kFloat> {
+  inline static void Append(Message& message, uint32_t field_id, float value) {
+    message.AppendFixed(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kBool> {
+  inline static void Append(Message& message, uint32_t field_id, bool value) {
+    message.AppendTinyVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kInt32> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            int32_t value) {
+    message.AppendVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kInt64> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            int64_t value) {
+    message.AppendVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kUint32> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            uint32_t value) {
+    message.AppendVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kUint64> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            uint64_t value) {
+    message.AppendVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kSint32> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            int32_t value) {
+    message.AppendSignedVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kSint64> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            int64_t value) {
+    message.AppendSignedVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kFixed32> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            uint32_t value) {
+    message.AppendFixed(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kFixed64> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            uint64_t value) {
+    message.AppendFixed(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kSfixed32> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            int32_t value) {
+    message.AppendFixed(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kSfixed64> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            int64_t value) {
+    message.AppendFixed(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kEnum> {
+  template <typename EnumType>
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            EnumType value) {
+    message.AppendVarInt(field_id, value);
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kString> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            const char* data,
+                            size_t size) {
+    message.AppendBytes(field_id, data, size);
+  }
+
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            const std::string& value) {
+    message.AppendBytes(field_id, value.data(), value.size());
+  }
+};
+
+template <>
+struct FieldWriter<proto_utils::ProtoSchemaType::kBytes> {
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            const uint8_t* data,
+                            size_t size) {
+    message.AppendBytes(field_id, data, size);
+  }
+
+  inline static void Append(Message& message,
+                            uint32_t field_id,
+                            const std::string& value) {
+    message.AppendBytes(field_id, value.data(), value.size());
+  }
+};
+
+}  // namespace internal
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_FIELD_WRITER_H_
diff --git a/src/libtracing/perfetto/protozero/gen_field_helpers.h b/src/libtracing/perfetto/protozero/gen_field_helpers.h
new file mode 100644
index 000000000..b2957f145
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/gen_field_helpers.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_GEN_FIELD_HELPERS_H_
+#define INCLUDE_PERFETTO_PROTOZERO_GEN_FIELD_HELPERS_H_
+
+#include "perfetto/protozero/message.h"
+#include "perfetto/protozero/proto_decoder.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+
+namespace protozero {
+namespace internal {
+namespace gen_helpers {
+
+// This file implements some helpers used by the protobuf generated code in the
+// .gen.cc files.
+//
+// The .gen.cc generated protobuf implementation (as opposed to the .pbzero.h
+// implementation) is not zero-copy and is not supposed to be used in fast
+// paths, so most of these helpers are designed to reduce binary size.
+
+void DeserializeString(const protozero::Field& field, std::string* dst);
+
+// Read packed repeated elements (serialized as `wire_type`) from `field` into
+// the `*dst` vector. Returns false if some bytes of `field` could not be
+// interpreted correctly as `wire_type`.
+template <proto_utils::ProtoWireType wire_type, typename CppType>
+bool DeserializePackedRepeated(const protozero::Field& field,
+                               std::vector<CppType>* dst) {
+  bool parse_error = false;
+  for (::protozero::PackedRepeatedFieldIterator<wire_type, CppType> rep(
+           field.data(), field.size(), &parse_error);
+       rep; ++rep) {
+    dst->emplace_back(*rep);
+  }
+  return !parse_error;
+}
+
+extern template bool
+DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt, uint64_t>(
+    const protozero::Field& field,
+    std::vector<uint64_t>* dst);
+
+extern template bool
+DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt, int64_t>(
+    const protozero::Field& field,
+    std::vector<int64_t>* dst);
+
+extern template bool
+DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt, uint32_t>(
+    const protozero::Field& field,
+    std::vector<uint32_t>* dst);
+
+extern template bool
+DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt, int32_t>(
+    const protozero::Field& field,
+    std::vector<int32_t>* dst);
+
+// Serializers for different type of fields
+
+void SerializeTinyVarInt(uint32_t field_id, bool value, Message* msg);
+
+template <typename T>
+void SerializeExtendedVarInt(uint32_t field_id, T value, Message* msg) {
+  msg->AppendVarInt(field_id, value);
+}
+
+extern template void SerializeExtendedVarInt<uint64_t>(uint32_t field_id,
+                                                       uint64_t value,
+                                                       Message* msg);
+
+extern template void SerializeExtendedVarInt<uint32_t>(uint32_t field_id,
+                                                       uint32_t value,
+                                                       Message* msg);
+
+template <typename T>
+void SerializeVarInt(uint32_t field_id, T value, Message* msg) {
+  SerializeExtendedVarInt(
+      field_id, proto_utils::ExtendValueForVarIntSerialization(value), msg);
+}
+
+template <typename T>
+void SerializeSignedVarInt(uint32_t field_id, T value, Message* msg) {
+  SerializeVarInt(field_id, proto_utils::ZigZagEncode(value), msg);
+}
+
+template <typename T>
+void SerializeFixed(uint32_t field_id, T value, Message* msg) {
+  msg->AppendFixed(field_id, value);
+}
+
+extern template void SerializeFixed<double>(uint32_t field_id,
+                                            double value,
+                                            Message* msg);
+
+extern template void SerializeFixed<float>(uint32_t field_id,
+                                           float value,
+                                           Message* msg);
+
+extern template void SerializeFixed<uint64_t>(uint32_t field_id,
+                                              uint64_t value,
+                                              Message* msg);
+
+extern template void SerializeFixed<int64_t>(uint32_t field_id,
+                                             int64_t value,
+                                             Message* msg);
+
+extern template void SerializeFixed<uint32_t>(uint32_t field_id,
+                                              uint32_t value,
+                                              Message* msg);
+
+extern template void SerializeFixed<int32_t>(uint32_t field_id,
+                                             int32_t value,
+                                             Message* msg);
+
+void SerializeString(uint32_t field_id, const std::string& value, Message* msg);
+
+void SerializeUnknownFields(const std::string& unknown_fields, Message* msg);
+
+// Wrapper around HeapBuffered that avoids inlining.
+class MessageSerializer {
+ public:
+  MessageSerializer();
+  ~MessageSerializer();
+
+  Message* get() { return msg_.get(); }
+  std::vector<uint8_t> SerializeAsArray();
+  std::string SerializeAsString();
+
+ private:
+  HeapBuffered<Message> msg_;
+};
+
+// Wrapper about operator==() which reduces the binary size of generated protos.
+// This is needed because std::string's operator== is inlined aggressively (even
+// when optimizing for size). Having this layer of indirection with removes the
+// overhead.
+template <typename T>
+bool EqualsField(const T& a, const T& b) {
+  return a == b;
+}
+extern template bool EqualsField<std::string>(const std::string&,
+                                              const std::string&);
+
+}  // namespace gen_helpers
+}  // namespace internal
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_GEN_FIELD_HELPERS_H_
diff --git a/src/libtracing/perfetto/protozero/meson.build b/src/libtracing/perfetto/protozero/meson.build
new file mode 100644
index 000000000..64b0f8482
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/meson.build
@@ -0,0 +1,19 @@
+protozero_headers = files(
+  'contiguous_memory_range.h',
+  'copyable_ptr.h',
+  'cpp_message_obj.h',
+  'field.h',
+  'field_writer.h',
+  'gen_field_helpers.h',
+  'message_arena.h',
+  'message.h',
+  'message_handle.h',
+  'packed_repeated_fields.h',
+  'proto_decoder.h',
+  'proto_utils.h',
+  'root_message.h',
+  'scattered_heap_buffer.h',
+  'scattered_stream_null_delegate.h',
+  'scattered_stream_writer.h',
+  'static_buffer.h',
+)
diff --git a/src/libtracing/perfetto/protozero/message.h b/src/libtracing/perfetto/protozero/message.h
new file mode 100644
index 000000000..1bcadaf68
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/message.h
@@ -0,0 +1,260 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_MESSAGE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_MESSAGE_H_
+
+#include <assert.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <string>
+#include <type_traits>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/contiguous_memory_range.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+namespace perfetto {
+namespace shm_fuzz {
+class FakeProducer;
+}  // namespace shm_fuzz
+}  // namespace perfetto
+
+namespace protozero {
+
+class MessageArena;
+class MessageHandleBase;
+
+// Base class extended by the proto C++ stubs generated by the ProtoZero
+// compiler. This class provides the minimal runtime required to support
+// append-only operations and is designed for performance. None of the methods
+// require any dynamic memory allocation, unless more than 16 nested messages
+// are created via BeginNestedMessage() calls.
+class PERFETTO_EXPORT_COMPONENT Message {
+ public:
+  friend class MessageHandleBase;
+
+  // The ctor is deliberately a no-op to avoid forwarding args from all
+  // subclasses. The real initialization is performed by Reset().
+  // Nested messages are allocated via placement new by MessageArena and
+  // implictly destroyed when the RootMessage's arena goes away. This is
+  // fine as long as all the fields are PODs, which is checked by the
+  // static_assert()s in the Reset() method.
+  Message() = default;
+
+  // Clears up the state, allowing the message to be reused as a fresh one.
+  void Reset(ScatteredStreamWriter*, MessageArena*);
+
+  // Commits all the changes to the buffer (backfills the size field of this and
+  // all nested messages) and seals the message. Returns the size of the message
+  // (and all nested sub-messages), without taking into account any chunking.
+  // Finalize is idempotent and can be called several times w/o side effects.
+  // Short messages may be compacted in memory into the size field, since their
+  // size can be represented with fewer than
+  // proto_utils::kMessageLengthFieldSize bytes.
+  uint32_t Finalize();
+
+  // Optional. If is_valid() == true, the corresponding memory region (its
+  // length == proto_utils::kMessageLengthFieldSize) is backfilled with the size
+  // of this message. This is the mechanism used by messages to backfill their
+  // corresponding size field in the parent message. In most cases this is only
+  // used for nested messages and the ScatteredStreamWriter::Delegate (e.g.
+  // TraceWriterImpl), takes case of the outer message.
+  uint8_t* size_field() const { return size_field_; }
+  void set_size_field(uint8_t* size_field) { size_field_ = size_field; }
+
+  Message* nested_message() { return nested_message_; }
+
+  bool is_finalized() const {
+    return message_state_ != MessageState::kNotFinalized;
+  }
+
+#if PERFETTO_DCHECK_IS_ON()
+  void set_handle(MessageHandleBase* handle) { handle_ = handle; }
+#endif
+
+  // Proto types: uint64, uint32, int64, int32, bool, enum.
+  template <typename T>
+  void AppendVarInt(uint32_t field_id, T value) {
+    if (nested_message_)
+      EndNestedMessage();
+
+    uint8_t buffer[proto_utils::kMaxSimpleFieldEncodedSize];
+    uint8_t* pos = buffer;
+
+    pos = proto_utils::WriteVarInt(proto_utils::MakeTagVarInt(field_id), pos);
+    // WriteVarInt encodes signed values in two's complement form.
+    pos = proto_utils::WriteVarInt(value, pos);
+    WriteToStream(buffer, pos);
+  }
+
+  // Proto types: sint64, sint32.
+  template <typename T>
+  void AppendSignedVarInt(uint32_t field_id, T value) {
+    AppendVarInt(field_id, proto_utils::ZigZagEncode(value));
+  }
+
+  // Proto types: bool, enum (small).
+  // Faster version of AppendVarInt for tiny numbers.
+  void AppendTinyVarInt(uint32_t field_id, int32_t value) {
+    PERFETTO_DCHECK(0 <= value && value < 0x80);
+    if (nested_message_)
+      EndNestedMessage();
+
+    uint8_t buffer[proto_utils::kMaxSimpleFieldEncodedSize];
+    uint8_t* pos = buffer;
+    // MakeTagVarInt gets super optimized here for constexpr.
+    pos = proto_utils::WriteVarInt(proto_utils::MakeTagVarInt(field_id), pos);
+    *pos++ = static_cast<uint8_t>(value);
+    WriteToStream(buffer, pos);
+  }
+
+  // Proto types: fixed64, sfixed64, fixed32, sfixed32, double, float.
+  template <typename T>
+  void AppendFixed(uint32_t field_id, T value) {
+    if (nested_message_)
+      EndNestedMessage();
+
+    uint8_t buffer[proto_utils::kMaxSimpleFieldEncodedSize];
+    uint8_t* pos = buffer;
+
+    pos = proto_utils::WriteVarInt(proto_utils::MakeTagFixed<T>(field_id), pos);
+    memcpy(pos, &value, sizeof(T));
+    pos += sizeof(T);
+    // TODO: Optimize memcpy performance, see http://crbug.com/624311 .
+    WriteToStream(buffer, pos);
+  }
+
+  void AppendString(uint32_t field_id, const char* str);
+
+  void AppendString(uint32_t field_id, const std::string& str) {
+    AppendBytes(field_id, str.data(), str.size());
+  }
+
+  void AppendBytes(uint32_t field_id, const void* value, size_t size);
+
+  // Append raw bytes for a field, using the supplied |ranges| to
+  // copy from |num_ranges| individual buffers.
+  size_t AppendScatteredBytes(uint32_t field_id,
+                              ContiguousMemoryRange* ranges,
+                              size_t num_ranges);
+
+  // Begins a nested message. The returned object is owned by the MessageArena
+  // of the root message. The nested message ends either when Finalize() is
+  // called or when any other Append* method is called in the parent class.
+  // The template argument T is supposed to be a stub class auto generated from
+  // a .proto, hence a subclass of Message.
+  template <class T>
+  T* BeginNestedMessage(uint32_t field_id) {
+    // This is to prevent subclasses (which should be autogenerated, though), to
+    // introduce extra state fields (which wouldn't be initialized by Reset()).
+    static_assert(std::is_base_of<Message, T>::value,
+                  "T must be a subclass of Message");
+    static_assert(sizeof(T) == sizeof(Message),
+                  "Message subclasses cannot introduce extra state.");
+    return static_cast<T*>(BeginNestedMessageInternal(field_id));
+  }
+
+  // Gives read-only access to the underlying stream_writer. This is used only
+  // by few internals to query the state of the underlying buffer. It is almost
+  // always a bad idea to poke at the stream_writer() internals.
+  const ScatteredStreamWriter* stream_writer() const { return stream_writer_; }
+
+  // Appends some raw bytes to the message. The use-case for this is preserving
+  // unknown fields in the decode -> re-encode path of xxx.gen.cc classes
+  // generated by the cppgen_plugin.cc.
+  // The caller needs to guarantee that the appended data is properly
+  // proto-encoded and each field has a proto preamble.
+  void AppendRawProtoBytes(const void* data, size_t size) {
+    if (nested_message_)
+      EndNestedMessage();
+    const uint8_t* src = reinterpret_cast<const uint8_t*>(data);
+    WriteToStream(src, src + size);
+  }
+
+ private:
+  Message(const Message&) = delete;
+  Message& operator=(const Message&) = delete;
+
+  Message* BeginNestedMessageInternal(uint32_t field_id);
+
+  // Called by Finalize and Append* methods.
+  void EndNestedMessage();
+
+  void WriteToStream(const uint8_t* src_begin, const uint8_t* src_end) {
+    PERFETTO_DCHECK(!is_finalized());
+    PERFETTO_DCHECK(src_begin <= src_end);
+    const uint32_t size = static_cast<uint32_t>(src_end - src_begin);
+    stream_writer_->WriteBytes(src_begin, size);
+    size_ += size;
+  }
+
+  // Only POD fields are allowed. This class's dtor is never called.
+  // See the comment on the static_assert in the corresponding .cc file.
+
+  // The stream writer interface used for the serialization.
+  ScatteredStreamWriter* stream_writer_;
+
+  // The storage used to allocate nested Message objects.
+  // This is owned by RootMessage<T>.
+  MessageArena* arena_;
+
+  // Pointer to the last child message created through BeginNestedMessage(), if
+  // any, nullptr otherwise. There is no need to keep track of more than one
+  // message per nesting level as the proto-zero API contract mandates that
+  // nested fields can be filled only in a stacked fashion. In other words,
+  // nested messages are finalized and sealed when any other field is set in the
+  // parent message (or the parent message itself is finalized) and cannot be
+  // accessed anymore afterwards.
+  Message* nested_message_;
+
+  // [optional] Pointer to a non-aligned pre-reserved var-int slot of
+  // kMessageLengthFieldSize bytes. When set, the Finalize() method will write
+  // the size of proto-encoded message in the pointed memory region.
+  uint8_t* size_field_;
+
+  // Keeps track of the size of the current message.
+  uint32_t size_;
+
+  enum class MessageState : uint8_t {
+    // Message is still being written to.
+    kNotFinalized,
+    // Finalized, no more changes to the message are allowed. This is to DCHECK
+    // attempts of writing to a message which has been Finalize()-d.
+    kFinalized,
+    // Finalized, and additionally the message data has been partially or fully
+    // compacted into the last 3 bytes of `size_field_`. See the comment in
+    // Finalize().
+    kFinalizedWithCompaction,
+  };
+
+  MessageState message_state_;
+
+#if PERFETTO_DCHECK_IS_ON()
+  // Current generation of message. Incremented on Reset.
+  // Used to detect stale handles.
+  uint32_t generation_;
+
+  MessageHandleBase* handle_;
+#endif
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_MESSAGE_H_
diff --git a/src/libtracing/perfetto/protozero/message_arena.h b/src/libtracing/perfetto/protozero/message_arena.h
new file mode 100644
index 000000000..db29d0076
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/message_arena.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_MESSAGE_ARENA_H_
+#define INCLUDE_PERFETTO_PROTOZERO_MESSAGE_ARENA_H_
+
+#include <stdint.h>
+
+#include <forward_list>
+#include <type_traits>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/message.h"
+
+namespace protozero {
+
+class Message;
+
+// Object allocator for fixed-sized protozero::Message objects.
+// It's a simple bump-pointer allocator which leverages the stack-alike
+// usage pattern of protozero nested messages. It avoids hitting the system
+// allocator in most cases, by reusing the same block, and falls back on
+// allocating new blocks only when using deeply nested messages (which are
+// extremely rare).
+// This is used by RootMessage<T> to handle the storage for root-level messages.
+class PERFETTO_EXPORT_COMPONENT MessageArena {
+ public:
+  MessageArena();
+  ~MessageArena();
+
+  // Strictly no copies or moves as this is used to hand out pointers.
+  MessageArena(const MessageArena&) = delete;
+  MessageArena& operator=(const MessageArena&) = delete;
+  MessageArena(MessageArena&&) = delete;
+  MessageArena& operator=(MessageArena&&) = delete;
+
+  // Allocates a new Message object.
+  Message* NewMessage();
+
+  // Deletes the last message allocated. The |msg| argument is used only for
+  // DCHECKs, it MUST be the pointer obtained by the last NewMessage() call.
+  void DeleteLastMessage(Message* msg) {
+    PERFETTO_DCHECK(!blocks_.empty() && blocks_.front().entries > 0);
+    PERFETTO_DCHECK(&blocks_.front().storage[blocks_.front().entries - 1] ==
+                    static_cast<void*>(msg));
+    DeleteLastMessageInternal();
+  }
+
+  // Resets the state of the arena, clearing up all but one block. This is used
+  // to avoid leaking outstanding unfinished sub-messages while recycling the
+  // RootMessage object (this is extremely rare due to the RAII scoped handles
+  // but could happen if some client does some overly clever std::move() trick).
+  void Reset() {
+    PERFETTO_DCHECK(!blocks_.empty());
+    blocks_.resize(1);
+    auto& block = blocks_.front();
+    block.entries = 0;
+    PERFETTO_ASAN_POISON(block.storage, sizeof(block.storage));
+  }
+
+ private:
+  void DeleteLastMessageInternal();
+
+  struct Block {
+    static constexpr size_t kCapacity = 16;
+
+    Block() { PERFETTO_ASAN_POISON(storage, sizeof(storage)); }
+
+    std::aligned_storage<sizeof(Message), alignof(Message)>::type
+        storage[kCapacity];
+    uint32_t entries = 0;  // # Message entries used (<= kCapacity).
+  };
+
+  // blocks are used to hand out pointers and must not be moved. Hence why
+  // std::list rather than std::vector.
+  std::forward_list<Block> blocks_;
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_MESSAGE_ARENA_H_
diff --git a/src/libtracing/perfetto/protozero/message_handle.h b/src/libtracing/perfetto/protozero/message_handle.h
new file mode 100644
index 000000000..6ac62e048
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/message_handle.h
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_MESSAGE_HANDLE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_MESSAGE_HANDLE_H_
+
+#include <functional>
+
+#include "perfetto/base/export.h"
+#include "perfetto/protozero/message.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+namespace protozero {
+
+class Message;
+
+class PERFETTO_EXPORT_COMPONENT MessageFinalizationListener {
+ public:
+  virtual ~MessageFinalizationListener();
+  virtual void OnMessageFinalized(Message* message) = 0;
+};
+
+// MessageHandle allows to decouple the lifetime of a proto message
+// from the underlying storage. It gives the following guarantees:
+// - The underlying message is finalized (if still alive) if the handle goes
+//   out of scope.
+// - In Debug / DCHECK_ALWAYS_ON builds, the handle becomes null once the
+//   message is finalized. This is to enforce the append-only API. For instance
+//   when adding two repeated messages, the addition of the 2nd one forces
+//   the finalization of the first.
+// Think about this as a WeakPtr<Message> which calls
+// Message::Finalize() when going out of scope.
+
+class PERFETTO_EXPORT_COMPONENT MessageHandleBase {
+ public:
+  ~MessageHandleBase() {
+    if (message_) {
+#if PERFETTO_DCHECK_IS_ON()
+      PERFETTO_DCHECK(generation_ == message_->generation_);
+#endif
+      FinalizeMessage();
+    }
+  }
+
+  // Move-only type.
+  MessageHandleBase(MessageHandleBase&& other) noexcept {
+    Move(std::move(other));
+  }
+
+  MessageHandleBase& operator=(MessageHandleBase&& other) noexcept {
+    // If the current handle was pointing to a message and is being reset to a
+    // new one, finalize the old message. However, if the other message is the
+    // same as the one we point to, don't finalize.
+    if (message_ && message_ != other.message_)
+      FinalizeMessage();
+    Move(std::move(other));
+    return *this;
+  }
+
+  explicit operator bool() const {
+#if PERFETTO_DCHECK_IS_ON()
+    PERFETTO_DCHECK(!message_ || generation_ == message_->generation_);
+#endif
+    return !!message_;
+  }
+
+  void set_finalization_listener(MessageFinalizationListener* listener) {
+    listener_ = listener;
+  }
+
+  // Returns a (non-owned, it should not be deleted) pointer to the
+  // ScatteredStreamWriter used to write the message data. The Message becomes
+  // unusable after this point.
+  //
+  // The caller can now write directly, without using protozero::Message.
+  ScatteredStreamWriter* TakeStreamWriter() {
+    ScatteredStreamWriter* stream_writer = message_->stream_writer_;
+#if PERFETTO_DCHECK_IS_ON()
+    message_->set_handle(nullptr);
+#endif
+    message_ = nullptr;
+    listener_ = nullptr;
+    return stream_writer;
+  }
+
+ protected:
+  explicit MessageHandleBase(Message* message = nullptr) : message_(message) {
+#if PERFETTO_DCHECK_IS_ON()
+    generation_ = message_ ? message->generation_ : 0;
+    if (message_)
+      message_->set_handle(this);
+#endif
+  }
+
+  Message* operator->() const {
+#if PERFETTO_DCHECK_IS_ON()
+    PERFETTO_DCHECK(!message_ || generation_ == message_->generation_);
+#endif
+    return message_;
+  }
+  Message& operator*() const { return *(operator->()); }
+
+ private:
+  friend class Message;
+  MessageHandleBase(const MessageHandleBase&) = delete;
+  MessageHandleBase& operator=(const MessageHandleBase&) = delete;
+
+  void reset_message() {
+    // This is called by Message::Finalize().
+    PERFETTO_DCHECK(message_->is_finalized());
+    message_ = nullptr;
+    listener_ = nullptr;
+  }
+
+  void Move(MessageHandleBase&& other) {
+    message_ = other.message_;
+    other.message_ = nullptr;
+    listener_ = other.listener_;
+    other.listener_ = nullptr;
+#if PERFETTO_DCHECK_IS_ON()
+    if (message_) {
+      generation_ = message_->generation_;
+      message_->set_handle(this);
+    }
+#endif
+  }
+
+  void FinalizeMessage() {
+    // |message_| and |listener_| may be cleared by reset_message() during
+    // Message::Finalize().
+    auto* listener = listener_;
+    auto* message = message_;
+    message->Finalize();
+    if (listener)
+      listener->OnMessageFinalized(message);
+  }
+
+  Message* message_;
+  MessageFinalizationListener* listener_ = nullptr;
+#if PERFETTO_DCHECK_IS_ON()
+  uint32_t generation_;
+#endif
+};
+
+template <typename T>
+class MessageHandle : public MessageHandleBase {
+ public:
+  MessageHandle() : MessageHandle(nullptr) {}
+  explicit MessageHandle(T* message) : MessageHandleBase(message) {}
+
+  explicit operator bool() const { return MessageHandleBase::operator bool(); }
+
+  T& operator*() const {
+    return static_cast<T&>(MessageHandleBase::operator*());
+  }
+
+  T* operator->() const {
+    return static_cast<T*>(MessageHandleBase::operator->());
+  }
+
+  T* get() const { return static_cast<T*>(MessageHandleBase::operator->()); }
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_MESSAGE_HANDLE_H_
diff --git a/src/libtracing/perfetto/protozero/packed_repeated_fields.h b/src/libtracing/perfetto/protozero/packed_repeated_fields.h
new file mode 100644
index 000000000..dff45e7cb
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/packed_repeated_fields.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_PACKED_REPEATED_FIELDS_H_
+#define INCLUDE_PERFETTO_PROTOZERO_PACKED_REPEATED_FIELDS_H_
+
+#include <stdint.h>
+
+#include <array>
+#include <memory>
+#include <type_traits>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/proto_utils.h"
+
+namespace protozero {
+
+// This file contains classes used when encoding packed repeated fields.
+// To encode such a field, the caller is first expected to accumulate all of the
+// values in one of the following types (depending on the wire type of the
+// individual elements), defined below:
+// * protozero::PackedVarInt
+// * protozero::PackedFixedSizeInt</*element_type=*/ uint32_t>
+// Then that buffer is passed to the protozero-generated setters as an argument.
+// After calling the setter, the buffer can be destroyed.
+//
+// An example of encoding a packed field:
+//   protozero::HeapBuffered<protozero::Message> msg;
+//   protozero::PackedVarInt buf;
+//   buf.Append(42);
+//   buf.Append(-1);
+//   msg->set_fieldname(buf);
+//   msg.SerializeAsString();
+
+class PackedBufferBase {
+ public:
+  PackedBufferBase() { Reset(); }
+
+  // Copy or move is disabled due to pointers to stack addresses.
+  PackedBufferBase(const PackedBufferBase&) = delete;
+  PackedBufferBase(PackedBufferBase&&) = delete;
+  PackedBufferBase& operator=(const PackedBufferBase&) = delete;
+  PackedBufferBase& operator=(PackedBufferBase&&) = delete;
+
+  void Reset();
+
+  const uint8_t* data() const { return storage_begin_; }
+
+  size_t size() const {
+    return static_cast<size_t>(write_ptr_ - storage_begin_);
+  }
+
+ protected:
+  void GrowIfNeeded() {
+    PERFETTO_DCHECK(write_ptr_ >= storage_begin_ && write_ptr_ <= storage_end_);
+    if (PERFETTO_UNLIKELY(write_ptr_ + kMaxElementSize > storage_end_)) {
+      GrowSlowpath();
+    }
+  }
+
+  void GrowSlowpath();
+
+  // max(uint64_t varint encoding, biggest fixed type (uint64)).
+  static constexpr size_t kMaxElementSize = 10;
+
+  // So sizeof(this) == 8k.
+  static constexpr size_t kOnStackStorageSize = 8192 - 32;
+
+  uint8_t* storage_begin_;
+  uint8_t* storage_end_;
+  uint8_t* write_ptr_;
+  std::unique_ptr<uint8_t[]> heap_buf_;
+  alignas(uint64_t) uint8_t stack_buf_[kOnStackStorageSize];
+};
+
+class PackedVarInt : public PackedBufferBase {
+ public:
+  template <typename T>
+  void Append(T value) {
+    GrowIfNeeded();
+    write_ptr_ = proto_utils::WriteVarInt(value, write_ptr_);
+  }
+};
+
+template <typename T /* e.g. uint32_t for Fixed32 */>
+class PackedFixedSizeInt : public PackedBufferBase {
+ public:
+  void Append(T value) {
+    static_assert(sizeof(T) == 4 || sizeof(T) == 8,
+                  "PackedFixedSizeInt should be used only with 32/64-bit ints");
+    static_assert(sizeof(T) <= kMaxElementSize,
+                  "kMaxElementSize needs to be updated");
+    GrowIfNeeded();
+    PERFETTO_DCHECK(reinterpret_cast<size_t>(write_ptr_) % alignof(T) == 0);
+    memcpy(reinterpret_cast<T*>(write_ptr_), &value, sizeof(T));
+    write_ptr_ += sizeof(T);
+  }
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_PACKED_REPEATED_FIELDS_H_
diff --git a/src/libtracing/perfetto/protozero/proto_decoder.h b/src/libtracing/perfetto/protozero/proto_decoder.h
new file mode 100644
index 000000000..c27fcadf2
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/proto_decoder.h
@@ -0,0 +1,470 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_PROTO_DECODER_H_
+#define INCLUDE_PERFETTO_PROTOZERO_PROTO_DECODER_H_
+
+#include <stdint.h>
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/field.h"
+#include "perfetto/protozero/proto_utils.h"
+
+namespace protozero {
+
+// A generic protobuf decoder. Doesn't require any knowledge about the proto
+// schema. It tokenizes fields, retrieves their ID and type and exposes
+// accessors to retrieve its values.
+// It does NOT recurse in nested submessages, instead it just computes their
+// boundaries, recursion is left to the caller.
+// This class is designed to be used in perf-sensitive contexts. It does not
+// allocate and does not perform any proto semantic checks (e.g. repeated /
+// required / optional). It's supposedly safe wrt out-of-bounds memory accesses
+// (see proto_decoder_fuzzer.cc).
+// This class serves also as a building block for TypedProtoDecoder, used when
+// the schema is known at compile time.
+class PERFETTO_EXPORT_COMPONENT ProtoDecoder {
+ public:
+  // Creates a ProtoDecoder using the given |buffer| with size |length| bytes.
+  ProtoDecoder(const void* buffer, size_t length)
+      : begin_(reinterpret_cast<const uint8_t*>(buffer)),
+        end_(begin_ + length),
+        read_ptr_(begin_) {}
+  ProtoDecoder(const std::string& str) : ProtoDecoder(str.data(), str.size()) {}
+  ProtoDecoder(const ConstBytes& cb) : ProtoDecoder(cb.data, cb.size) {}
+
+  // Reads the next field from the buffer and advances the read cursor. If a
+  // full field cannot be read, the returned Field will be invalid (i.e.
+  // field.valid() == false).
+  Field ReadField();
+
+  // Finds the first field with the given id. Doesn't affect the read cursor.
+  Field FindField(uint32_t field_id);
+
+  // Resets the read cursor to the start of the buffer.
+  void Reset() { read_ptr_ = begin_; }
+
+  // Resets the read cursor to the given position (must be within the buffer).
+  void Reset(const uint8_t* pos) {
+    PERFETTO_DCHECK(pos >= begin_ && pos < end_);
+    read_ptr_ = pos;
+  }
+
+  // Returns the position of read cursor, relative to the start of the buffer.
+  size_t read_offset() const { return static_cast<size_t>(read_ptr_ - begin_); }
+
+  size_t bytes_left() const {
+    PERFETTO_DCHECK(read_ptr_ <= end_);
+    return static_cast<size_t>(end_ - read_ptr_);
+  }
+
+  const uint8_t* begin() const { return begin_; }
+  const uint8_t* end() const { return end_; }
+
+ protected:
+  const uint8_t* const begin_;
+  const uint8_t* const end_;
+  const uint8_t* read_ptr_ = nullptr;
+};
+
+// An iterator-like class used to iterate through repeated fields. Used by
+// TypedProtoDecoder. The iteration sequence is a bit counter-intuitive due to
+// the fact that fields_[field_id] holds the *last* value of the field, not the
+// first, but the remaining storage holds repeated fields in FIFO order.
+// Assume that we push the 10,11,12 into a repeated field with ID=1.
+//
+// Decoder memory layout:  [  fields storage  ] [ repeated fields storage ]
+// 1st iteration:           10
+// 2nd iteration:           11                   10
+// 3rd iteration:           12                   10 11
+//
+// We start the iteration @ fields_[num_fields], which is the start of the
+// repeated fields storage, proceed until the end and lastly jump @ fields_[id].
+template <typename T>
+class RepeatedFieldIterator {
+ public:
+  RepeatedFieldIterator(uint32_t field_id,
+                        const Field* begin,
+                        const Field* end,
+                        const Field* last)
+      : field_id_(field_id), iter_(begin), end_(end), last_(last) {
+    FindNextMatchingId();
+  }
+
+  // Constructs an invalid iterator.
+  RepeatedFieldIterator()
+      : field_id_(0u), iter_(nullptr), end_(nullptr), last_(nullptr) {}
+
+  explicit operator bool() const { return iter_ != end_; }
+  const Field& field() const { return *iter_; }
+
+  T operator*() const {
+    T val{};
+    iter_->get(&val);
+    return val;
+  }
+  const Field* operator->() const { return iter_; }
+
+  RepeatedFieldIterator& operator++() {
+    PERFETTO_DCHECK(iter_ != end_);
+    if (iter_ == last_) {
+      iter_ = end_;
+      return *this;
+    }
+    ++iter_;
+    FindNextMatchingId();
+    return *this;
+  }
+
+  RepeatedFieldIterator operator++(int) {
+    PERFETTO_DCHECK(iter_ != end_);
+    RepeatedFieldIterator it(*this);
+    ++(*this);
+    return it;
+  }
+
+ private:
+  void FindNextMatchingId() {
+    PERFETTO_DCHECK(iter_ != last_);
+    for (; iter_ != end_; ++iter_) {
+      if (iter_->id() == field_id_)
+        return;
+    }
+    iter_ = last_->valid() ? last_ : end_;
+  }
+
+  uint32_t field_id_;
+
+  // Initially points to the beginning of the repeated field storage, then is
+  // incremented as we call operator++().
+  const Field* iter_;
+
+  // Always points to fields_[size_], i.e. past the end of the storage.
+  const Field* end_;
+
+  // Always points to fields_[field_id].
+  const Field* last_;
+};
+
+// As RepeatedFieldIterator, but allows iterating over a packed repeated field
+// (which will be initially stored as a single length-delimited field).
+// See |GetPackedRepeatedField| for details.
+//
+// Assumes little endianness, and that the input buffers are well formed -
+// containing an exact multiple of encoded elements.
+template <proto_utils::ProtoWireType wire_type, typename CppType>
+class PackedRepeatedFieldIterator {
+ public:
+  PackedRepeatedFieldIterator(const uint8_t* data_begin,
+                              size_t size,
+                              bool* parse_error_ptr)
+      : data_end_(data_begin ? data_begin + size : nullptr),
+        read_ptr_(data_begin),
+        parse_error_(parse_error_ptr) {
+    using proto_utils::ProtoWireType;
+    static_assert(wire_type == ProtoWireType::kVarInt ||
+                      wire_type == ProtoWireType::kFixed32 ||
+                      wire_type == ProtoWireType::kFixed64,
+                  "invalid type");
+
+    PERFETTO_DCHECK(parse_error_ptr);
+
+    // Either the field is unset (and there are no data pointer), or the field
+    // is set with a zero length payload. Mark the iterator as invalid in both
+    // cases.
+    if (size == 0) {
+      curr_value_valid_ = false;
+      return;
+    }
+
+    if ((wire_type == ProtoWireType::kFixed32 && (size % 4) != 0) ||
+        (wire_type == ProtoWireType::kFixed64 && (size % 8) != 0)) {
+      *parse_error_ = true;
+      curr_value_valid_ = false;
+      return;
+    }
+
+    ++(*this);
+  }
+
+  const CppType operator*() const { return curr_value_; }
+  explicit operator bool() const { return curr_value_valid_; }
+
+  PackedRepeatedFieldIterator& operator++() {
+    using proto_utils::ProtoWireType;
+
+    if (PERFETTO_UNLIKELY(!curr_value_valid_))
+      return *this;
+
+    if (PERFETTO_UNLIKELY(read_ptr_ == data_end_)) {
+      curr_value_valid_ = false;
+      return *this;
+    }
+
+    if (wire_type == ProtoWireType::kVarInt) {
+      uint64_t new_value = 0;
+      const uint8_t* new_pos =
+          proto_utils::ParseVarInt(read_ptr_, data_end_, &new_value);
+
+      if (PERFETTO_UNLIKELY(new_pos == read_ptr_)) {
+        // Failed to decode the varint (probably incomplete buffer).
+        *parse_error_ = true;
+        curr_value_valid_ = false;
+      } else {
+        read_ptr_ = new_pos;
+        curr_value_ = static_cast<CppType>(new_value);
+      }
+    } else {  // kFixed32 or kFixed64
+      constexpr size_t kStep = wire_type == ProtoWireType::kFixed32 ? 4 : 8;
+
+      // NB: the raw buffer is not guaranteed to be aligned, so neither are
+      // these copies.
+      memcpy(&curr_value_, read_ptr_, sizeof(CppType));
+      read_ptr_ += kStep;
+    }
+
+    return *this;
+  }
+
+  PackedRepeatedFieldIterator operator++(int) {
+    PackedRepeatedFieldIterator it(*this);
+    ++(*this);
+    return it;
+  }
+
+ private:
+  // Might be null if the backing proto field isn't set.
+  const uint8_t* const data_end_;
+
+  // The iterator looks ahead by an element, so |curr_value| holds the value
+  // to be returned when the caller dereferences the iterator, and |read_ptr_|
+  // points at the start of the next element to be decoded.
+  // |read_ptr_| might be null if the backing proto field isn't set.
+  const uint8_t* read_ptr_;
+  CppType curr_value_ = {};
+
+  // Set to false once we've exhausted the iterator, or encountered an error.
+  bool curr_value_valid_ = true;
+
+  // Where to set parsing errors, supplied by the caller.
+  bool* const parse_error_;
+};
+
+// This decoder loads all fields upfront, without recursing in nested messages.
+// It is used as a base class for typed decoders generated by the pbzero plugin.
+// The split between TypedProtoDecoderBase and TypedProtoDecoder<> is to have
+// unique definition of functions like ParseAllFields() and ExpandHeapStorage().
+// The storage (either on-stack or on-heap) for this class is organized as
+// follows:
+// |-------------------------- fields_ ----------------------|
+// [ field 0 (invalid) ] [ fields 1 .. N ] [ repeated fields ]
+//                                        ^                  ^
+//                                        num_fields_        size_
+// Note that if a message has high field numbers, upon creation |size_| can be
+// < |num_fields_| (until a heap expansion is hit while inserting).
+class PERFETTO_EXPORT_COMPONENT TypedProtoDecoderBase : public ProtoDecoder {
+ public:
+  // If the field |id| is known at compile time, prefer the templated
+  // specialization at<kFieldNumber>().
+  const Field& Get(uint32_t id) const {
+    if (PERFETTO_LIKELY(id < num_fields_ && id < size_))
+      return fields_[id];
+    // If id >= num_fields_, the field id is invalid (was not known in the
+    // .proto) and we return the 0th field, which is always !valid().
+    // If id >= size_ and <= num_fields, the id is valid but the field has not
+    // been seen while decoding (hence the stack storage has not been expanded)
+    // so we return the 0th invalid field.
+    return fields_[0];
+  }
+
+  // Returns an object that allows to iterate over all instances of a repeated
+  // field given its id. Example usage:
+  //   for (auto it = decoder.GetRepeated<int32_t>(N); it; ++it) { ... }
+  template <typename T>
+  RepeatedFieldIterator<T> GetRepeated(uint32_t field_id) const {
+    const Field* repeated_begin;
+    // The storage for repeated fields starts after the slot for the highest
+    // field id (refer to the diagram in the class-level comment). However, if
+    // a message has more than INITIAL_STACK_CAPACITY field there will be no
+    // slots available for the repeated fields (if ExpandHeapStorage() was not
+    // called). Imagine a message that has highest field id = 102 and that is
+    // still using the stack:
+    // [ F0 ] [ F1 ] ... [ F100 ] [ F101 ] [ F1012] [ repeated fields ]
+    //                                            ^ num_fields_
+    //                          ^ size (== capacity)
+    if (PERFETTO_LIKELY(num_fields_ < size_)) {
+      repeated_begin = &fields_[num_fields_];
+    } else {
+      // This is the case of not having any storage space for repeated fields.
+      // This makes it so begin == end, so the iterator will just skip @ last.
+      repeated_begin = &fields_[size_];
+    }
+    const Field* repeated_end = &fields_[size_];
+    const Field* last = &Get(field_id);
+    return RepeatedFieldIterator<T>(field_id, repeated_begin, repeated_end,
+                                    last);
+  }
+
+  // Returns an objects that allows to iterate over all entries of a packed
+  // repeated field given its id and type. The |wire_type| is necessary for
+  // decoding the packed field, the |cpp_type| is for convenience & stronger
+  // typing.
+  //
+  // The caller must also supply a pointer to a bool that is set to true if the
+  // packed buffer is found to be malformed while iterating (so you need to
+  // exhaust the iterator if you want to check the full extent of the buffer).
+  //
+  // Note that unlike standard protobuf parsers, protozero does not allow
+  // treating of packed repeated fields as non-packed and vice-versa (therefore
+  // not making the packed option forwards and backwards compatible). So
+  // the caller needs to use the right accessor for correct results.
+  template <proto_utils::ProtoWireType wire_type, typename cpp_type>
+  PackedRepeatedFieldIterator<wire_type, cpp_type> GetPackedRepeated(
+      uint32_t field_id,
+      bool* parse_error_location) const {
+    const Field& field = Get(field_id);
+    if (field.valid() &&
+        field.type() == proto_utils::ProtoWireType::kLengthDelimited) {
+      return PackedRepeatedFieldIterator<wire_type, cpp_type>(
+          field.data(), field.size(), parse_error_location);
+    }
+    return PackedRepeatedFieldIterator<wire_type, cpp_type>(
+        nullptr, 0, parse_error_location);
+  }
+
+ protected:
+  TypedProtoDecoderBase(Field* storage,
+                        uint32_t num_fields,
+                        uint32_t capacity,
+                        const uint8_t* buffer,
+                        size_t length)
+      : ProtoDecoder(buffer, length),
+        fields_(storage),
+        num_fields_(num_fields),
+        // The reason for "capacity -1" is to avoid hitting the expansion path
+        // in TypedProtoDecoderBase::ParseAllFields() when we are just setting
+        // fields < INITIAL_STACK_CAPACITY (which is the most common case).
+        size_(std::min(num_fields, capacity - 1)),
+        capacity_(capacity) {
+    // The reason why Field needs to be trivially de/constructible is to avoid
+    // implicit initializers on all the ~1000 entries. We need it to initialize
+    // only on the first |max_field_id| fields, the remaining capacity doesn't
+    // require initialization.
+    static_assert(std::is_trivially_constructible<Field>::value &&
+                      std::is_trivially_destructible<Field>::value &&
+                      std::is_trivial<Field>::value,
+                  "Field must be a trivial aggregate type");
+    memset(fields_, 0, sizeof(Field) * capacity_);
+    PERFETTO_DCHECK(capacity > 0);
+  }
+
+  void ParseAllFields();
+
+  // Called when the default on-stack storage is exhausted and new repeated
+  // fields need to be pushed.
+  void ExpandHeapStorage();
+
+  // Used only in presence of a large number of repeated fields, when the
+  // default on-stack storage is exhausted.
+  std::unique_ptr<Field[]> heap_storage_;
+
+  // Points to the storage, either on-stack (default, provided by the template
+  // specialization) or |heap_storage_| after ExpandHeapStorage() is called, in
+  // case of a large number of repeated fields.
+  Field* fields_;
+
+  // Number of known fields, without accounting repeated storage. This is equal
+  // to MAX_FIELD_ID + 1 (to account for the invalid 0th field). It never
+  // changes after construction.
+  // This is unrelated with |size_| and |capacity_|. If the highest field id of
+  // a proto message is 131, |num_fields_| will be = 132 but, on initialization,
+  // |size_| = |capacity_| = 100 (INITIAL_STACK_CAPACITY).
+  // One cannot generally assume that |fields_| has enough storage to
+  // dereference every field. That is only true:
+  // - For field ids < INITIAL_STACK_CAPACITY.
+  // - After the first call to ExpandHeapStorage().
+  uint32_t num_fields_;
+
+  // Number of active |fields_| entries. This is initially equal to
+  // min(num_fields_, INITIAL_STACK_CAPACITY - 1) and after ExpandHeapStorage()
+  // becomes == |num_fields_|. If the message has non-packed repeated fields, it
+  // can grow further, up to |capacity_|.
+  // |size_| is always <= |capacity_|. But |num_fields_| can be > |size_|.
+  uint32_t size_;
+
+  // Initially equal to kFieldsCapacity of the TypedProtoDecoder
+  // specialization. Can grow when falling back on heap-based storage, in which
+  // case it represents the size (#fields with each entry of a repeated field
+  // counted individually) of the |heap_storage_| array.
+  uint32_t capacity_;
+};
+
+// This constant is a tradeoff between having a larger stack frame and being
+// able to decode field IDs up to N (or N - num_fields repeated fields) without
+// falling back on the heap.
+#define PROTOZERO_DECODER_INITIAL_STACK_CAPACITY 100
+
+// Template class instantiated by the auto-generated decoder classes declared in
+// xxx.pbzero.h files.
+template <int MAX_FIELD_ID, bool HAS_NONPACKED_REPEATED_FIELDS>
+class TypedProtoDecoder : public TypedProtoDecoderBase {
+ public:
+  TypedProtoDecoder(const uint8_t* buffer, size_t length)
+      : TypedProtoDecoderBase(on_stack_storage_,
+                              /*num_fields=*/MAX_FIELD_ID + 1,
+                              PROTOZERO_DECODER_INITIAL_STACK_CAPACITY,
+                              buffer,
+                              length) {
+    TypedProtoDecoderBase::ParseAllFields();
+  }
+
+  template <uint32_t FIELD_ID>
+  const Field& at() const {
+    static_assert(FIELD_ID <= MAX_FIELD_ID, "FIELD_ID > MAX_FIELD_ID");
+    // If the field id is < the on-stack capacity, it's safe to always
+    // dereference |fields_|, whether it's still using the stack or it fell
+    // back on the heap. Because both terms of the if () are known at compile
+    // time, the compiler elides the branch for ids < INITIAL_STACK_CAPACITY.
+    if (FIELD_ID < PROTOZERO_DECODER_INITIAL_STACK_CAPACITY) {
+      return fields_[FIELD_ID];
+    } else {
+      // Otherwise use the slowpath Get() which will do a runtime check.
+      return Get(FIELD_ID);
+    }
+  }
+
+  TypedProtoDecoder(TypedProtoDecoder&& other) noexcept
+      : TypedProtoDecoderBase(std::move(other)) {
+    // If the moved-from decoder was using on-stack storage, we need to update
+    // our pointer to point to this decoder's on-stack storage.
+    if (fields_ == other.on_stack_storage_) {
+      fields_ = on_stack_storage_;
+      memcpy(on_stack_storage_, other.on_stack_storage_,
+             sizeof(on_stack_storage_));
+    }
+  }
+
+ private:
+  Field on_stack_storage_[PROTOZERO_DECODER_INITIAL_STACK_CAPACITY];
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_PROTO_DECODER_H_
diff --git a/src/libtracing/perfetto/protozero/proto_utils.h b/src/libtracing/perfetto/protozero/proto_utils.h
new file mode 100644
index 000000000..b961bee53
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/proto_utils.h
@@ -0,0 +1,296 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_PROTO_UTILS_H_
+#define INCLUDE_PERFETTO_PROTOZERO_PROTO_UTILS_H_
+
+#include <stddef.h>
+
+#include <cinttypes>
+#include <type_traits>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/public/pb_utils.h"
+
+// Helper macro for the constexpr functions containing
+// the switch statement: if C++14 is supported, this macro
+// resolves to `constexpr` and just `inline` otherwise.
+#if __cpp_constexpr >= 201304
+#define PERFETTO_PROTOZERO_CONSTEXPR14_OR_INLINE constexpr
+#else
+#define PERFETTO_PROTOZERO_CONSTEXPR14_OR_INLINE inline
+#endif
+
+namespace protozero {
+namespace proto_utils {
+
+// See https://developers.google.com/protocol-buffers/docs/encoding wire types.
+// This is a type encoded into the proto that provides just enough info to
+// find the length of the following value.
+enum class ProtoWireType : uint32_t {
+  kVarInt = 0,
+  kFixed64 = 1,
+  kLengthDelimited = 2,
+  kFixed32 = 5,
+};
+
+// This is the type defined in the proto for each field. This information
+// is used to decide the translation strategy when writing the trace.
+enum class ProtoSchemaType {
+  kUnknown = 0,
+  kDouble,
+  kFloat,
+  kInt64,
+  kUint64,
+  kInt32,
+  kFixed64,
+  kFixed32,
+  kBool,
+  kString,
+  kGroup,  // Deprecated (proto2 only)
+  kMessage,
+  kBytes,
+  kUint32,
+  kEnum,
+  kSfixed32,
+  kSfixed64,
+  kSint32,
+  kSint64,
+};
+
+inline const char* ProtoSchemaToString(ProtoSchemaType v) {
+  switch (v) {
+    case ProtoSchemaType::kUnknown:
+      return "unknown";
+    case ProtoSchemaType::kDouble:
+      return "double";
+    case ProtoSchemaType::kFloat:
+      return "float";
+    case ProtoSchemaType::kInt64:
+      return "int64";
+    case ProtoSchemaType::kUint64:
+      return "uint64";
+    case ProtoSchemaType::kInt32:
+      return "int32";
+    case ProtoSchemaType::kFixed64:
+      return "fixed64";
+    case ProtoSchemaType::kFixed32:
+      return "fixed32";
+    case ProtoSchemaType::kBool:
+      return "bool";
+    case ProtoSchemaType::kString:
+      return "string";
+    case ProtoSchemaType::kGroup:
+      return "group";
+    case ProtoSchemaType::kMessage:
+      return "message";
+    case ProtoSchemaType::kBytes:
+      return "bytes";
+    case ProtoSchemaType::kUint32:
+      return "uint32";
+    case ProtoSchemaType::kEnum:
+      return "enum";
+    case ProtoSchemaType::kSfixed32:
+      return "sfixed32";
+    case ProtoSchemaType::kSfixed64:
+      return "sfixed64";
+    case ProtoSchemaType::kSint32:
+      return "sint32";
+    case ProtoSchemaType::kSint64:
+      return "sint64";
+  }
+  // For gcc:
+  PERFETTO_DCHECK(false);
+  return "";
+}
+
+// Maximum message size supported: 256 MiB (4 x 7-bit due to varint encoding).
+constexpr size_t kMessageLengthFieldSize = 4;
+constexpr size_t kMaxMessageLength = (1u << (kMessageLengthFieldSize * 7)) - 1;
+constexpr size_t kMaxOneByteMessageLength = (1 << 7) - 1;
+
+// Field tag is encoded as 32-bit varint (5 bytes at most).
+// Largest value of simple (not length-delimited) field is 64-bit varint
+// (10 bytes at most). 15 bytes buffer is enough to store a simple field.
+constexpr size_t kMaxTagEncodedSize = 5;
+constexpr size_t kMaxSimpleFieldEncodedSize = kMaxTagEncodedSize + 10;
+
+// Proto types: (int|uint|sint)(32|64), bool, enum.
+constexpr uint32_t MakeTagVarInt(uint32_t field_id) {
+  return (field_id << 3) | static_cast<uint32_t>(ProtoWireType::kVarInt);
+}
+
+// Proto types: fixed64, sfixed64, fixed32, sfixed32, double, float.
+template <typename T>
+constexpr uint32_t MakeTagFixed(uint32_t field_id) {
+  static_assert(sizeof(T) == 8 || sizeof(T) == 4, "Value must be 4 or 8 bytes");
+  return (field_id << 3) |
+         static_cast<uint32_t>((sizeof(T) == 8 ? ProtoWireType::kFixed64
+                                               : ProtoWireType::kFixed32));
+}
+
+// Proto types: string, bytes, embedded messages.
+constexpr uint32_t MakeTagLengthDelimited(uint32_t field_id) {
+  return (field_id << 3) |
+         static_cast<uint32_t>(ProtoWireType::kLengthDelimited);
+}
+
+// Proto types: sint64, sint32.
+template <typename T>
+inline typename std::make_unsigned<T>::type ZigZagEncode(T value) {
+  using UnsignedType = typename std::make_unsigned<T>::type;
+
+  // Right-shift of negative values is implementation specific.
+  // Assert the implementation does what we expect, which is that shifting any
+  // positive value by sizeof(T) * 8 - 1 gives an all 0 bitmap, and a negative
+  // value gives an all 1 bitmap.
+  constexpr uint64_t kUnsignedZero = 0u;
+  constexpr int64_t kNegativeOne = -1;
+  constexpr int64_t kPositiveOne = 1;
+  static_assert(static_cast<uint64_t>(kNegativeOne >> 63) == ~kUnsignedZero,
+                "implementation does not support assumed rightshift");
+  static_assert(static_cast<uint64_t>(kPositiveOne >> 63) == kUnsignedZero,
+                "implementation does not support assumed rightshift");
+
+  return (static_cast<UnsignedType>(value) << 1) ^
+         static_cast<UnsignedType>(value >> (sizeof(T) * 8 - 1));
+}
+
+// Proto types: sint64, sint32.
+template <typename T>
+inline typename std::make_signed<T>::type ZigZagDecode(T value) {
+  using UnsignedType = typename std::make_unsigned<T>::type;
+  using SignedType = typename std::make_signed<T>::type;
+  auto u_value = static_cast<UnsignedType>(value);
+  auto mask = static_cast<UnsignedType>(-static_cast<SignedType>(u_value & 1));
+  return static_cast<SignedType>((u_value >> 1) ^ mask);
+}
+
+template <typename T>
+auto ExtendValueForVarIntSerialization(T value) -> typename std::make_unsigned<
+    typename std::conditional<std::is_unsigned<T>::value, T, int64_t>::type>::
+    type {
+  // If value is <= 0 we must first sign extend to int64_t (see [1]).
+  // Finally we always cast to an unsigned value to to avoid arithmetic
+  // (sign expanding) shifts in the while loop.
+  // [1]: "If you use int32 or int64 as the type for a negative number, the
+  // resulting varint is always ten bytes long".
+  // - developers.google.com/protocol-buffers/docs/encoding
+  // So for each input type we do the following casts:
+  // uintX_t -> uintX_t -> uintX_t
+  // int8_t  -> int64_t -> uint64_t
+  // int16_t -> int64_t -> uint64_t
+  // int32_t -> int64_t -> uint64_t
+  // int64_t -> int64_t -> uint64_t
+  using MaybeExtendedType =
+      typename std::conditional<std::is_unsigned<T>::value, T, int64_t>::type;
+  using UnsignedType = typename std::make_unsigned<MaybeExtendedType>::type;
+
+  MaybeExtendedType extended_value = static_cast<MaybeExtendedType>(value);
+  UnsignedType unsigned_value = static_cast<UnsignedType>(extended_value);
+
+  return unsigned_value;
+}
+
+template <typename T>
+inline uint8_t* WriteVarInt(T value, uint8_t* target) {
+  auto unsigned_value = ExtendValueForVarIntSerialization(value);
+
+  while (unsigned_value >= 0x80) {
+    *target++ = static_cast<uint8_t>(unsigned_value) | 0x80;
+    unsigned_value >>= 7;
+  }
+  *target = static_cast<uint8_t>(unsigned_value);
+  return target + 1;
+}
+
+// Writes a fixed-size redundant encoding of the given |value|. This is
+// used to backfill fixed-size reservations for the length field using a
+// non-canonical varint encoding (e.g. \x81\x80\x80\x00 instead of \x01).
+// See https://github.com/google/protobuf/issues/1530.
+// This is used mainly in two cases:
+// 1) At trace writing time, when starting a nested messages. The size of a
+//    nested message is not known until all its field have been written.
+//    |kMessageLengthFieldSize| bytes are reserved to encode the size field and
+//    backfilled at the end.
+// 2) When rewriting a message at trace filtering time, in protozero/filtering.
+//    At that point we know only the upper bound of the length (a filtered
+//    message is <= the original one) and we backfill after the message has been
+//    filtered.
+inline void WriteRedundantVarInt(uint32_t value,
+                                 uint8_t* buf,
+                                 size_t size = kMessageLengthFieldSize) {
+  for (size_t i = 0; i < size; ++i) {
+    const uint8_t msb = (i < size - 1) ? 0x80 : 0;
+    buf[i] = static_cast<uint8_t>(value) | msb;
+    value >>= 7;
+  }
+}
+
+template <uint32_t field_id>
+void StaticAssertSingleBytePreamble() {
+  static_assert(field_id < 16,
+                "Proto field id too big to fit in a single byte preamble");
+}
+
+// Parses a VarInt from the encoded buffer [start, end). |end| is STL-style and
+// points one byte past the end of buffer.
+// The parsed int value is stored in the output arg |value|. Returns a pointer
+// to the next unconsumed byte (so start < retval <= end) or |start| if the
+// VarInt could not be fully parsed because there was not enough space in the
+// buffer.
+inline const uint8_t* ParseVarInt(const uint8_t* start,
+                                  const uint8_t* end,
+                                  uint64_t* out_value) {
+  return PerfettoPbParseVarInt(start, end, out_value);
+}
+
+enum class RepetitionType {
+  kNotRepeated,
+  kRepeatedPacked,
+  kRepeatedNotPacked,
+};
+
+// Provide a common base struct for all templated FieldMetadata types to allow
+// simple checks if a given type is a FieldMetadata or not.
+struct FieldMetadataBase {
+  constexpr FieldMetadataBase() = default;
+};
+
+template <uint32_t field_id,
+          RepetitionType repetition_type,
+          ProtoSchemaType proto_schema_type,
+          typename CppFieldType,
+          typename MessageType>
+struct FieldMetadata : public FieldMetadataBase {
+  constexpr FieldMetadata() = default;
+
+  static constexpr int kFieldId = field_id;
+  // Whether this field is repeated, packed (repeated [packed-true]) or not
+  // (optional).
+  static constexpr RepetitionType kRepetitionType = repetition_type;
+  // Proto type of this field (e.g. int64, fixed32 or nested message).
+  static constexpr ProtoSchemaType kProtoFieldType = proto_schema_type;
+  // C++ type of this field (for nested messages - C++ protozero class).
+  using cpp_field_type = CppFieldType;
+  // Protozero message which this field belongs to.
+  using message_type = MessageType;
+};
+
+}  // namespace proto_utils
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_PROTO_UTILS_H_
diff --git a/src/libtracing/perfetto/protozero/root_message.h b/src/libtracing/perfetto/protozero/root_message.h
new file mode 100644
index 000000000..40e232896
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/root_message.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_ROOT_MESSAGE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_ROOT_MESSAGE_H_
+
+#include "perfetto/protozero/message.h"
+#include "perfetto/protozero/message_arena.h"
+
+namespace protozero {
+
+// Helper class to hand out messages using the default MessageArena.
+// Usage:
+// RootMessage<perfetto::protos::zero::MyMessage> msg;
+// msg.Reset(stream_writer);
+// msg.set_foo(...);
+// auto* nested = msg.set_nested();
+template <typename T = Message>
+class RootMessage : public T {
+ public:
+  RootMessage() { T::Reset(nullptr, &root_arena_); }
+
+  // Disallow copy and move.
+  RootMessage(const RootMessage&) = delete;
+  RootMessage& operator=(const RootMessage&) = delete;
+  RootMessage(RootMessage&&) = delete;
+  RootMessage& operator=(RootMessage&&) = delete;
+
+  void Reset(ScatteredStreamWriter* writer) {
+    root_arena_.Reset();
+    Message::Reset(writer, &root_arena_);
+  }
+
+ private:
+  MessageArena root_arena_;
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_ROOT_MESSAGE_H_
diff --git a/src/libtracing/perfetto/protozero/scattered_heap_buffer.h b/src/libtracing/perfetto/protozero/scattered_heap_buffer.h
new file mode 100644
index 000000000..55d5875bc
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/scattered_heap_buffer.h
@@ -0,0 +1,185 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_SCATTERED_HEAP_BUFFER_H_
+#define INCLUDE_PERFETTO_PROTOZERO_SCATTERED_HEAP_BUFFER_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/root_message.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+namespace protozero {
+
+class Message;
+
+class PERFETTO_EXPORT_COMPONENT ScatteredHeapBuffer
+    : public protozero::ScatteredStreamWriter::Delegate {
+ public:
+  class PERFETTO_EXPORT_COMPONENT Slice {
+   public:
+    Slice();
+    explicit Slice(size_t size);
+    Slice(Slice&& slice) noexcept;
+    ~Slice();
+    Slice& operator=(Slice&&);
+
+    inline protozero::ContiguousMemoryRange GetTotalRange() const {
+      return {buffer_.get(), buffer_.get() + size_};
+    }
+
+    inline protozero::ContiguousMemoryRange GetUsedRange() const {
+      return {buffer_.get(), buffer_.get() + size_ - unused_bytes_};
+    }
+
+    uint8_t* start() const { return buffer_.get(); }
+    size_t size() const { return size_; }
+    size_t unused_bytes() const { return unused_bytes_; }
+    void set_unused_bytes(size_t unused_bytes) {
+      PERFETTO_DCHECK(unused_bytes_ <= size_);
+      unused_bytes_ = unused_bytes;
+    }
+
+    void Clear();
+
+   private:
+    std::unique_ptr<uint8_t[]> buffer_;
+    size_t size_;
+    size_t unused_bytes_;
+  };
+
+  ScatteredHeapBuffer(size_t initial_slice_size_bytes = 128,
+                      size_t maximum_slice_size_bytes = 128 * 1024);
+  ~ScatteredHeapBuffer() override;
+
+  // protozero::ScatteredStreamWriter::Delegate implementation.
+  protozero::ContiguousMemoryRange GetNewBuffer() override;
+
+  // Return the slices backing this buffer, adjusted for the number of bytes the
+  // writer has written.
+  const std::vector<Slice>& GetSlices();
+
+  // Stitch all the slices into a single contiguous buffer.
+  std::vector<uint8_t> StitchSlices();
+
+  // Note that the returned ranges point back to this buffer and thus cannot
+  // outlive it.
+  std::vector<protozero::ContiguousMemoryRange> GetRanges();
+
+  // Note that size of the last slice isn't updated to reflect the number of
+  // bytes written by the trace writer.
+  const std::vector<Slice>& slices() const { return slices_; }
+
+  void set_writer(protozero::ScatteredStreamWriter* writer) {
+    writer_ = writer;
+  }
+
+  // Update unused_bytes() of the current |Slice| based on the writer's state.
+  void AdjustUsedSizeOfCurrentSlice();
+
+  // Returns the total size the slices occupy in heap memory (including unused).
+  size_t GetTotalSize();
+
+  // Reset the contents of this buffer but retain one slice allocation (if it
+  // exists) to be reused for future writes.
+  void Reset();
+
+ private:
+  size_t next_slice_size_;
+  const size_t maximum_slice_size_;
+  protozero::ScatteredStreamWriter* writer_ = nullptr;
+  std::vector<Slice> slices_;
+
+  // Used to keep an allocated slice around after this buffer is reset.
+  Slice cached_slice_;
+};
+
+// Helper function to create heap-based protozero messages in one line.
+// Useful when manually serializing a protozero message (primarily in
+// tests/utilities). So instead of the following:
+//   protozero::MyMessage msg;
+//   protozero::ScatteredHeapBuffer shb;
+//   protozero::ScatteredStreamWriter writer(&shb);
+//   shb.set_writer(&writer);
+//   msg.Reset(&writer);
+//   ...
+// You can write:
+//   protozero::HeapBuffered<protozero::MyMessage> msg;
+//   msg->set_stuff(...);
+//   msg.SerializeAsString();
+template <typename T = ::protozero::Message>
+class HeapBuffered {
+ public:
+  HeapBuffered() : HeapBuffered(4096, 4096) {}
+  HeapBuffered(size_t initial_slice_size_bytes, size_t maximum_slice_size_bytes)
+      : shb_(initial_slice_size_bytes, maximum_slice_size_bytes),
+        writer_(&shb_) {
+    shb_.set_writer(&writer_);
+    msg_.Reset(&writer_);
+  }
+
+  // This can't be neither copied nor moved because Message hands out pointers
+  // to itself when creating submessages.
+  HeapBuffered(const HeapBuffered&) = delete;
+  HeapBuffered& operator=(const HeapBuffered&) = delete;
+  HeapBuffered(HeapBuffered&&) = delete;
+  HeapBuffered& operator=(HeapBuffered&&) = delete;
+
+  T* get() { return &msg_; }
+  T* operator->() { return &msg_; }
+
+  bool empty() const { return shb_.slices().empty(); }
+
+  std::vector<uint8_t> SerializeAsArray() {
+    msg_.Finalize();
+    return shb_.StitchSlices();
+  }
+
+  std::string SerializeAsString() {
+    auto vec = SerializeAsArray();
+    return std::string(reinterpret_cast<const char*>(vec.data()), vec.size());
+  }
+
+  std::vector<protozero::ContiguousMemoryRange> GetRanges() {
+    msg_.Finalize();
+    return shb_.GetRanges();
+  }
+
+  const std::vector<ScatteredHeapBuffer::Slice>& GetSlices() {
+    msg_.Finalize();
+    return shb_.GetSlices();
+  }
+
+  void Reset() {
+    shb_.Reset();
+    writer_.Reset(protozero::ContiguousMemoryRange{});
+    msg_.Reset(&writer_);
+    PERFETTO_DCHECK(empty());
+  }
+
+ private:
+  ScatteredHeapBuffer shb_;
+  ScatteredStreamWriter writer_;
+  RootMessage<T> msg_;
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_SCATTERED_HEAP_BUFFER_H_
diff --git a/src/libtracing/perfetto/protozero/scattered_stream_null_delegate.h b/src/libtracing/perfetto/protozero/scattered_stream_null_delegate.h
new file mode 100644
index 000000000..b06b91df7
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/scattered_stream_null_delegate.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_NULL_DELEGATE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_NULL_DELEGATE_H_
+
+#include <memory>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/contiguous_memory_range.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+namespace protozero {
+
+class PERFETTO_EXPORT_COMPONENT ScatteredStreamWriterNullDelegate
+    : public ScatteredStreamWriter::Delegate {
+ public:
+  explicit ScatteredStreamWriterNullDelegate(size_t chunk_size);
+  ~ScatteredStreamWriterNullDelegate() override;
+
+  // protozero::ScatteredStreamWriter::Delegate implementation.
+  ContiguousMemoryRange GetNewBuffer() override;
+
+ private:
+  const size_t chunk_size_;
+  std::unique_ptr<uint8_t[]> chunk_;
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_NULL_DELEGATE_H_
diff --git a/src/libtracing/perfetto/protozero/scattered_stream_writer.h b/src/libtracing/perfetto/protozero/scattered_stream_writer.h
new file mode 100644
index 000000000..719c4905d
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/scattered_stream_writer.h
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_WRITER_H_
+#define INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_WRITER_H_
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <algorithm>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/export.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/contiguous_memory_range.h"
+
+namespace protozero {
+
+// This class deals with the following problem: append-only proto messages want
+// to write a stream of bytes, without caring about the implementation of the
+// underlying buffer (which concretely will be either the trace ring buffer
+// or a heap-allocated buffer). The main deal is: proto messages don't know in
+// advance what their size will be.
+// Due to the tracing buffer being split into fixed-size chunks, on some
+// occasions, these writes need to be spread over two (or more) non-contiguous
+// chunks of memory. Similarly, when the buffer is backed by the heap, we want
+// to avoid realloc() calls, as they might cause a full copy of the contents
+// of the buffer.
+// The purpose of this class is to abstract away the non-contiguous write logic.
+// This class knows how to deal with writes as long as they fall in the same
+// ContiguousMemoryRange and defers the chunk-chaining logic to the Delegate.
+class PERFETTO_EXPORT_COMPONENT ScatteredStreamWriter {
+ public:
+  class PERFETTO_EXPORT_COMPONENT Delegate {
+   public:
+    static constexpr size_t kPatchSize = 4;
+    virtual ~Delegate();
+
+    // Returns a new chunk for writing.
+    virtual ContiguousMemoryRange GetNewBuffer() = 0;
+
+    // Signals the delegate that the location pointed by `to_patch` (which must
+    // be in the last chunk returned by GetNewBuffer()), kPatchSize long, needs
+    // to be updated later (after potentially multiple GetNewBuffer calls).
+    //
+    // The caller must write to the returned location later. If the returned
+    // pointer is nullptr, the caller should not write anything.
+    //
+    // The implementation considers the patch ready to apply when the caller
+    // writes the first byte a value that's different than 0 (the
+    // implementation periodically checks for this).
+    virtual uint8_t* AnnotatePatch(uint8_t* patch_addr);
+  };
+
+  explicit ScatteredStreamWriter(Delegate* delegate);
+  ~ScatteredStreamWriter();
+
+  inline void WriteByte(uint8_t value) {
+    if (write_ptr_ >= cur_range_.end)
+      Extend();
+    *write_ptr_++ = value;
+  }
+
+  // Assumes that the caller checked that there is enough headroom.
+  // TODO(primiano): perf optimization, this is a tracing hot path. The
+  // compiler can make strong optimization on std::copy if the size arg is a
+  // constexpr. Make a templated variant of this for fixed-size writes.
+  // TODO(primiano): restrict / noalias might also help.
+  inline void WriteBytesUnsafe(const uint8_t* src, size_t size) {
+    uint8_t* const end = write_ptr_ + size;
+    assert(end <= cur_range_.end);
+    std::copy(src, src + size, write_ptr_);
+    write_ptr_ = end;
+  }
+
+  inline void WriteBytes(const uint8_t* src,
+                         size_t size) PERFETTO_NO_SANITIZE_UNDEFINED {
+    // If the stream writer hasn't been initialized, constructing the end
+    // pointer below invokes undefined behavior because `write_ptr_` is null.
+    // Since this function is on the hot path, we suppress the warning instead
+    // of adding a conditional branch.
+    uint8_t* const end = write_ptr_ + size;
+    if (PERFETTO_LIKELY(end <= cur_range_.end))
+      return WriteBytesUnsafe(src, size);
+    WriteBytesSlowPath(src, size);
+  }
+
+  void WriteBytesSlowPath(const uint8_t* src, size_t size);
+
+  // Reserves a fixed amount of bytes to be backfilled later. The reserved range
+  // is guaranteed to be contiguous and not span across chunks. |size| has to be
+  // <= than the size of a new buffer returned by the Delegate::GetNewBuffer().
+  uint8_t* ReserveBytes(size_t size);
+
+  // Fast (but unsafe) version of the above. The caller must have previously
+  // checked that there are at least |size| contiguous bytes available.
+  // Returns only the start pointer of the reservation.
+  uint8_t* ReserveBytesUnsafe(size_t size) {
+    uint8_t* begin = write_ptr_;
+    write_ptr_ += size;
+    assert(write_ptr_ <= cur_range_.end);
+    return begin;
+  }
+
+  // Shifts the previously written `size` bytes backwards in memory by `offset`
+  // bytes, moving the write pointer back accordingly. The shifted result must
+  // still be fully contained by the current range.
+  void Rewind(size_t size, size_t offset) {
+    uint8_t* src = write_ptr_ - size;
+    uint8_t* dst = src - offset;
+    PERFETTO_DCHECK(src >= cur_range_.begin);
+    PERFETTO_DCHECK(src + size <= cur_range_.end);
+    PERFETTO_DCHECK(dst >= cur_range_.begin);
+    PERFETTO_DCHECK(dst + size <= cur_range_.end);
+    memmove(dst, src, size);
+    write_ptr_ -= offset;
+  }
+
+  // Resets the buffer boundaries and the write pointer to the given |range|.
+  // Subsequent WriteByte(s) will write into |range|.
+  void Reset(ContiguousMemoryRange range);
+
+  // Commits the current chunk and gets a new chunk from the delegate.
+  void Extend();
+
+  // Number of contiguous free bytes in |cur_range_| that can be written without
+  // requesting a new buffer.
+  size_t bytes_available() const {
+    return static_cast<size_t>(cur_range_.end - write_ptr_);
+  }
+
+  ContiguousMemoryRange cur_range() const { return cur_range_; }
+
+  uint8_t* write_ptr() const { return write_ptr_; }
+
+  void set_write_ptr(uint8_t* write_ptr) {
+    assert(cur_range_.begin <= write_ptr && write_ptr <= cur_range_.end);
+    write_ptr_ = write_ptr;
+  }
+
+  uint64_t written() const {
+    return written_previously_ +
+           static_cast<uint64_t>(write_ptr_ - cur_range_.begin);
+  }
+
+  uint64_t written_previously() const { return written_previously_; }
+
+  uint8_t* AnnotatePatch(uint8_t* patch_addr) {
+    return delegate_->AnnotatePatch(patch_addr);
+  }
+
+ private:
+  ScatteredStreamWriter(const ScatteredStreamWriter&) = delete;
+  ScatteredStreamWriter& operator=(const ScatteredStreamWriter&) = delete;
+
+  Delegate* const delegate_;
+  ContiguousMemoryRange cur_range_;
+  uint8_t* write_ptr_;
+  uint64_t written_previously_ = 0;
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_WRITER_H_
diff --git a/src/libtracing/perfetto/protozero/static_buffer.h b/src/libtracing/perfetto/protozero/static_buffer.h
new file mode 100644
index 000000000..cbc91e27e
--- /dev/null
+++ b/src/libtracing/perfetto/protozero/static_buffer.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PROTOZERO_STATIC_BUFFER_H_
+#define INCLUDE_PERFETTO_PROTOZERO_STATIC_BUFFER_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "perfetto/base/export.h"
+#include "perfetto/protozero/root_message.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+namespace protozero {
+
+class Message;
+
+// A simple implementation of ScatteredStreamWriter::Delegate backed by a
+// fixed-size buffer. It doesn't support expansion. The caller needs to ensure
+// to never write more than the size of the buffer. Will CHECK() otherwise.
+class PERFETTO_EXPORT_COMPONENT StaticBufferDelegate
+    : public ScatteredStreamWriter::Delegate {
+ public:
+  StaticBufferDelegate(uint8_t* buf, size_t len) : range_{buf, buf + len} {}
+  ~StaticBufferDelegate() override;
+
+  // ScatteredStreamWriter::Delegate implementation.
+  ContiguousMemoryRange GetNewBuffer() override;
+
+  ContiguousMemoryRange const range_;
+  bool get_new_buffer_called_once_ = false;
+};
+
+// Helper function to create protozero messages backed by a fixed-size buffer
+// in one line. You can write:
+//   protozero::Static<protozero::MyMessage> msg(buf.data(), buf.size());
+//   msg->set_stuff(...);
+//   size_t bytes_encoded = msg.Finalize();
+template <typename T /* protozero::Message */>
+class StaticBuffered {
+ public:
+  StaticBuffered(void* buf, size_t len)
+      : delegate_(reinterpret_cast<uint8_t*>(buf), len), writer_(&delegate_) {
+    msg_.Reset(&writer_);
+  }
+
+  // This can't be neither copied nor moved because Message hands out pointers
+  // to itself when creating submessages.
+  StaticBuffered(const StaticBuffered&) = delete;
+  StaticBuffered& operator=(const StaticBuffered&) = delete;
+  StaticBuffered(StaticBuffered&&) = delete;
+  StaticBuffered& operator=(StaticBuffered&&) = delete;
+
+  T* get() { return &msg_; }
+  T* operator->() { return &msg_; }
+
+  // The lack of a size() method is deliberate. It's to prevent that one
+  // accidentally calls size() before Finalize().
+
+  // Returns the number of encoded bytes (<= the size passed in the ctor).
+  size_t Finalize() {
+    msg_.Finalize();
+    return static_cast<size_t>(writer_.write_ptr() - delegate_.range_.begin);
+  }
+
+ private:
+  StaticBufferDelegate delegate_;
+  ScatteredStreamWriter writer_;
+  RootMessage<T> msg_;
+};
+
+// Helper function to create stack-based protozero messages in one line.
+// You can write:
+//   protozero::StackBuffered<protozero::MyMessage, 16> msg;
+//   msg->set_stuff(...);
+//   size_t bytes_encoded = msg.Finalize();
+template <typename T /* protozero::Message */, size_t N>
+class StackBuffered : public StaticBuffered<T> {
+ public:
+  StackBuffered() : StaticBuffered<T>(&buf_[0], N) {}
+
+ private:
+  uint8_t buf_[N];  // Deliberately not initialized.
+};
+
+}  // namespace protozero
+
+#endif  // INCLUDE_PERFETTO_PROTOZERO_STATIC_BUFFER_H_
diff --git a/src/libtracing/perfetto/public/BUILD.gn b/src/libtracing/perfetto/public/BUILD.gn
new file mode 100644
index 000000000..1b416f067
--- /dev/null
+++ b/src/libtracing/perfetto/public/BUILD.gn
@@ -0,0 +1,45 @@
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("base") {
+  sources = [ "compiler.h" ]
+  public_deps = [ "./abi:base" ]
+}
+
+source_set("protozero") {
+  sources = [ "pb_utils.h" ]
+}
+
+source_set("public") {
+  sources = [
+    "data_source.h",
+    "fnv1a.h",
+    "pb_decoder.h",
+    "pb_macros.h",
+    "pb_msg.h",
+    "pb_packed.h",
+    "producer.h",
+    "stream_writer.h",
+    "te_category_macros.h",
+    "te_macros.h",
+    "thread_utils.h",
+    "track_event.h",
+  ]
+  public_deps = [
+    ":base",
+    ":protozero",
+    "./abi:public",
+    "./protos",
+  ]
+}
diff --git a/src/libtracing/perfetto/public/abi/BUILD.gn b/src/libtracing/perfetto/public/abi/BUILD.gn
new file mode 100644
index 000000000..3a3d56e6e
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/BUILD.gn
@@ -0,0 +1,37 @@
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("base") {
+  sources = [
+    "atomic.h",
+    "export.h",
+  ]
+}
+
+source_set("public") {
+  sources = [
+    "backend_type.h",
+    "data_source_abi.h",
+    "heap_buffer.h",
+    "pb_decoder_abi.h",
+    "producer_abi.h",
+    "stream_writer_abi.h",
+    "thread_utils_abi.h",
+    "tracing_session_abi.h",
+    "track_event_abi.h",
+    "track_event_hl_abi.h",
+    "track_event_ll_abi.h",
+  ]
+  public_deps = [ ":base" ]
+}
diff --git a/src/libtracing/perfetto/public/abi/atomic.h b/src/libtracing/perfetto/public/abi/atomic.h
new file mode 100644
index 000000000..5506f8b20
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/atomic.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_ATOMIC_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_ATOMIC_H_
+
+// Problem: C++11 and C11 use a different syntax for atomics and the C11 syntax
+// is not supported in C++11.
+//
+// This header bridges the gap.
+//
+// This assumes that C++11 atomics are binary compatible with C11 atomics. While
+// this is technically not required by the standards, reasonable compilers
+// appear to guarantee this.
+
+#ifdef __cplusplus
+#include <atomic>
+#else
+#include <stdatomic.h>
+#endif
+
+#ifdef __cplusplus
+#define PERFETTO_ATOMIC(TYPE) std::atomic<TYPE>
+#else
+#define PERFETTO_ATOMIC(TYPE) _Atomic(TYPE)
+#endif
+
+#ifdef __cplusplus
+#define PERFETTO_ATOMIC_LOAD std::atomic_load
+#define PERFETTO_ATOMIC_LOAD_EXPLICIT std::atomic_load_explicit
+#define PERFETTO_ATOMIC_STORE std::atomic_store
+#define PERFETTO_ATOMIC_STORE_EXPLICIT std::atomic_store_explicit
+
+#define PERFETTO_MEMORY_ORDER_ACQ_REL std::memory_order_acq_rel
+#define PERFETTO_MEMORY_ORDER_ACQUIRE std::memory_order_acquire
+#define PERFETTO_MEMORY_ORDER_CONSUME std::memory_order_consume
+#define PERFETTO_MEMORY_ORDER_RELAXED std::memory_order_relaxed
+#define PERFETTO_MEMORY_ORDER_RELEASE std::memory_order_release
+#define PERFETTO_MEMORY_ORDER_SEQ_CST std::memory_order_seq_cst
+#else
+#define PERFETTO_ATOMIC_LOAD atomic_load
+#define PERFETTO_ATOMIC_LOAD_EXPLICIT atomic_load_explicit
+#define PERFETTO_ATOMIC_STORE atomic_store
+#define PERFETTO_ATOMIC_STORE_EXPLICIT atomic_store_explicit
+
+#define PERFETTO_MEMORY_ORDER_ACQ_REL memory_order_acq_rel
+#define PERFETTO_MEMORY_ORDER_ACQUIRE memory_order_acquire
+#define PERFETTO_MEMORY_ORDER_CONSUME memory_order_consume
+#define PERFETTO_MEMORY_ORDER_RELAXED memory_order_relaxed
+#define PERFETTO_MEMORY_ORDER_RELEASE memory_order_release
+#define PERFETTO_MEMORY_ORDER_SEQ_CST memory_order_seq_cst
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_ATOMIC_H_
diff --git a/src/libtracing/perfetto/public/abi/backend_type.h b/src/libtracing/perfetto/public/abi/backend_type.h
new file mode 100644
index 000000000..fe5fe48a3
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/backend_type.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_BACKEND_TYPE_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_BACKEND_TYPE_H_
+
+#include <stdint.h>
+
+enum {
+  // The in-process tracing backend. Keeps trace buffers in the process memory.
+  PERFETTO_BACKEND_IN_PROCESS = (1 << 0),
+
+  // The system tracing backend. Connects to the system tracing service (e.g.
+  // on Linux/Android/Mac uses a named UNIX socket).
+  PERFETTO_BACKEND_SYSTEM = (1 << 1),
+};
+
+// Or-combination of one or more of the above PERFETTO_BACKEND_ flags.
+typedef uint32_t PerfettoBackendTypes;
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_BACKEND_TYPE_H_
diff --git a/src/libtracing/perfetto/public/abi/data_source_abi.h b/src/libtracing/perfetto/public/abi/data_source_abi.h
new file mode 100644
index 000000000..1dece6329
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/data_source_abi.h
@@ -0,0 +1,372 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_DATA_SOURCE_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_DATA_SOURCE_ABI_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/abi/atomic.h"
+#include "perfetto/public/abi/export.h"
+#include "perfetto/public/abi/stream_writer_abi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Internal representation of a data source type.
+struct PerfettoDsImpl;
+
+// Internal thread local state of a data source type.
+struct PerfettoDsTlsImpl;
+
+// Internal thread local state of a data source instance used for tracing.
+struct PerfettoDsTracerImpl;
+
+// A global atomic boolean that's always false.
+extern PERFETTO_SDK_EXPORT PERFETTO_ATOMIC(bool) perfetto_atomic_false;
+
+// There can be more than one data source instance for each data source type.
+// This index identifies one of them.
+typedef uint32_t PerfettoDsInstanceIndex;
+
+// Creates a data source type.
+//
+// The data source type needs to be registered later with
+// PerfettoDsImplRegister().
+PERFETTO_SDK_EXPORT struct PerfettoDsImpl* PerfettoDsImplCreate(void);
+
+// Opaque handle used to perform operations from the OnSetup callback. Unused
+// for now.
+struct PerfettoDsOnSetupArgs;
+
+// Called when a data source instance of a specific type is created. `ds_config`
+// points to a serialized perfetto.protos.DataSourceConfig message,
+// `ds_config_size` bytes long. `user_arg` is the value passed to
+// PerfettoDsSetCbUserArg(). The return value of this is passed to all other
+// callbacks (for this data source instance) as `inst_ctx` and can be accessed
+// during tracing with PerfettoDsImplGetInstanceLocked().
+//
+// Can be called from any thread.
+typedef void* (*PerfettoDsOnSetupCb)(struct PerfettoDsImpl*,
+                                     PerfettoDsInstanceIndex inst_id,
+                                     void* ds_config,
+                                     size_t ds_config_size,
+                                     void* user_arg,
+                                     struct PerfettoDsOnSetupArgs* args);
+
+// Opaque handle used to perform operations from the OnSetup callback. Unused
+// for now.
+struct PerfettoDsOnStartArgs;
+
+// Called when tracing starts for a data source instance. `user_arg` is the
+// value passed to PerfettoDsSetCbUserArg(). `inst_ctx` is the return
+// value of PerfettoDsOnSetupCb.
+//
+// Can be called from any thread.
+typedef void (*PerfettoDsOnStartCb)(struct PerfettoDsImpl*,
+                                    PerfettoDsInstanceIndex inst_id,
+                                    void* user_arg,
+                                    void* inst_ctx,
+                                    struct PerfettoDsOnStartArgs* args);
+
+// Opaque handle used to perform operations from the OnStop callback.
+struct PerfettoDsOnStopArgs;
+
+// Opaque handle used to signal when the data source stop operation is
+// complete.
+struct PerfettoDsAsyncStopper;
+
+// Tells the tracing service to postpone the stopping of a data source instance.
+// The returned handle can be used to signal the tracing service when the data
+// source instance can be stopped.
+PERFETTO_SDK_EXPORT struct PerfettoDsAsyncStopper* PerfettoDsOnStopArgsPostpone(
+    struct PerfettoDsOnStopArgs*);
+
+// Tells the tracing service to stop a data source instance (whose stop
+// operation was previously postponed with PerfettoDsOnStopArgsPostpone).
+PERFETTO_SDK_EXPORT void PerfettoDsStopDone(struct PerfettoDsAsyncStopper*);
+
+// Called when tracing stops for a data source instance. `user_arg` is the value
+// passed to PerfettoDsSetCbUserArg(). `inst_ctx` is the return value of
+// PerfettoDsOnSetupCb.`args` can be used to postpone stopping this data source
+// instance. Note that, in general, it's not a good idea to destroy `inst_ctx`
+// here: PerfettoDsOnDestroyCb should be used instead.
+//
+// Can be called from any thread. Blocking this for too long it's not a good
+// idea and can cause deadlocks. Use PerfettoDsOnStopArgsPostpone() to postpone
+// disabling the data source instance.
+typedef void (*PerfettoDsOnStopCb)(struct PerfettoDsImpl*,
+                                   PerfettoDsInstanceIndex inst_id,
+                                   void* user_arg,
+                                   void* inst_ctx,
+                                   struct PerfettoDsOnStopArgs* args);
+
+// Called after tracing has been stopped for a data source instance, to signal
+// that `inst_ctx` (which is the return value of PerfettoDsOnSetupCb) can
+// potentially be destroyed. `user_arg` is the value passed to
+// PerfettoDsSetCbUserArg().
+//
+// Can be called from any thread.
+typedef void (*PerfettoDsOnDestroyCb)(struct PerfettoDsImpl*,
+                                      void* user_arg,
+                                      void* inst_ctx);
+
+// Opaque handle used to perform operations from the OnFlush callback.
+struct PerfettoDsOnFlushArgs;
+
+// Opaque handle used to signal when the data source flush operation is
+// complete.
+struct PerfettoDsAsyncFlusher;
+
+// Tells the tracing service to postpone acknowledging the flushing of a data
+// source instance. The returned handle can be used to signal the tracing
+// service when the data source instance flushing has completed.
+PERFETTO_SDK_EXPORT struct PerfettoDsAsyncFlusher*
+PerfettoDsOnFlushArgsPostpone(struct PerfettoDsOnFlushArgs*);
+
+// Tells the tracing service that the flush operation is complete for a data
+// source instance (whose stop operation was previously postponed with
+// PerfettoDsOnFlushArgsPostpone).
+PERFETTO_SDK_EXPORT void PerfettoDsFlushDone(struct PerfettoDsAsyncFlusher*);
+
+// Called when the tracing service requires all the pending tracing data to be
+// flushed for a data source instance. `user_arg` is the value passed to
+// PerfettoDsSetCbUserArg(). `inst_ctx` is the return value of
+// PerfettoDsOnSetupCb. `args` can be used to postpone stopping this data source
+// instance.
+//
+// Can be called from any thread. Blocking this for too long it's not a good
+// idea and can cause deadlocks. Use PerfettoDsOnFlushArgsPostpone() to postpone
+// disabling the data source instance.
+typedef void (*PerfettoDsOnFlushCb)(struct PerfettoDsImpl*,
+                                    PerfettoDsInstanceIndex inst_id,
+                                    void* user_arg,
+                                    void* inst_ctx,
+                                    struct PerfettoDsOnFlushArgs* args);
+
+// Creates custom state (either thread local state or incremental state) for
+// instance `inst_id`. `user_arg` is the value passed to
+// PerfettoDsSetCbUserArg().
+typedef void* (*PerfettoDsOnCreateCustomState)(
+    struct PerfettoDsImpl*,
+    PerfettoDsInstanceIndex inst_id,
+    struct PerfettoDsTracerImpl* tracer,
+    void* user_arg);
+
+// Deletes the previously created custom state `obj`.
+typedef void (*PerfettoDsOnDeleteCustomState)(void* obj);
+
+// Setters for callbacks: can not be called after PerfettoDsImplRegister().
+
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnSetupCallback(struct PerfettoDsImpl*,
+                                                      PerfettoDsOnSetupCb);
+
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnStartCallback(struct PerfettoDsImpl*,
+                                                      PerfettoDsOnStartCb);
+
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnStopCallback(struct PerfettoDsImpl*,
+                                                     PerfettoDsOnStopCb);
+
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnDestroyCallback(struct PerfettoDsImpl*,
+                                                        PerfettoDsOnDestroyCb);
+
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnFlushCallback(struct PerfettoDsImpl*,
+                                                      PerfettoDsOnFlushCb);
+
+// Callbacks for custom per instance thread local state.
+//
+// Called from inside a trace point. Trace points inside these will be
+// ignored.
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnCreateTls(
+    struct PerfettoDsImpl*,
+    PerfettoDsOnCreateCustomState);
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnDeleteTls(
+    struct PerfettoDsImpl*,
+    PerfettoDsOnDeleteCustomState);
+
+// Callbacks for custom per instance thread local incremental state.
+//
+// Called from inside a trace point. Trace points inside these will be
+// ignored.
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnCreateIncr(
+    struct PerfettoDsImpl*,
+    PerfettoDsOnCreateCustomState);
+PERFETTO_SDK_EXPORT void PerfettoDsSetOnDeleteIncr(
+    struct PerfettoDsImpl*,
+    PerfettoDsOnDeleteCustomState);
+
+// Stores the `user_arg` that's going to be passed later to the callbacks for
+// this data source type.
+PERFETTO_SDK_EXPORT void PerfettoDsSetCbUserArg(struct PerfettoDsImpl*,
+                                                void* user_arg);
+
+enum PerfettoDsBufferExhaustedPolicy {
+  // If the data source runs out of space when trying to acquire a new chunk,
+  // it will drop data.
+  PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP = 0,
+  // If the data source runs out of space when trying to acquire a new chunk,
+  // it will stall, retry and eventually abort if a free chunk is not acquired
+  // after a while.
+  PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT = 1,
+};
+
+// If the data source doesn't find an empty chunk when trying to emit tracing
+// data, it will behave according to `policy` (which is a `enum
+// PerfettoDsBufferExhaustedPolicy`).
+//
+// Should not be called after PerfettoDsImplRegister().
+//
+// Returns true if successful, false otherwise.
+PERFETTO_SDK_EXPORT bool PerfettoDsSetBufferExhaustedPolicy(
+    struct PerfettoDsImpl*,
+    uint32_t policy);
+
+// Registers the `*ds_impl` data source type.
+//
+// `ds_impl` must be obtained via a call to `PerfettoDsImplCreate()`.
+//
+// `**enabled_ptr` will be set to true when the data source type has been
+// enabled.
+//
+// `descriptor` should point to a serialized
+// perfetto.protos.DataSourceDescriptor message, `descriptor_size` bytes long.
+//
+// Returns `true` in case of success, `false` in case of failure (in which case
+// `ds_impl is invalid`).
+PERFETTO_SDK_EXPORT bool PerfettoDsImplRegister(struct PerfettoDsImpl* ds_impl,
+                                                PERFETTO_ATOMIC(bool) *
+                                                    *enabled_ptr,
+                                                const void* descriptor,
+                                                size_t descriptor_size);
+
+// Updates the descriptor the `*ds_impl` data source type.
+//
+// `descriptor` should point to a serialized
+// perfetto.protos.DataSourceDescriptor message, `descriptor_size` bytes long.
+PERFETTO_SDK_EXPORT void PerfettoDsImplUpdateDescriptor(
+    struct PerfettoDsImpl* ds_impl,
+    const void* descriptor,
+    size_t descriptor_size);
+
+// Tries to get the `inst_ctx` returned by PerfettoDsOnSetupCb() for the
+// instance with index `inst_id`.
+//
+// If successful, returns a non-null pointer and acquires a lock, which must be
+// released with PerfettoDsImplReleaseInstanceLocked.
+//
+// If unsuccessful (because the instance was destroyed in the meantime) or if
+// PerfettoDsOnSetupCb() returned a null value, returns null and does not
+// acquire any lock.
+PERFETTO_SDK_EXPORT void* PerfettoDsImplGetInstanceLocked(
+    struct PerfettoDsImpl* ds_impl,
+    PerfettoDsInstanceIndex inst_id);
+
+// Releases a lock previouly acquired by a PerfettoDsImplGetInstanceLocked()
+// call, which must have returned a non null value.
+PERFETTO_SDK_EXPORT void PerfettoDsImplReleaseInstanceLocked(
+    struct PerfettoDsImpl* ds_impl,
+    PerfettoDsInstanceIndex inst_id);
+
+// Gets the data source thread local instance custom state created by
+// the callback passed to `PerfettoDsSetOnCreateTls`.
+PERFETTO_SDK_EXPORT void* PerfettoDsImplGetCustomTls(
+    struct PerfettoDsImpl* ds_impl,
+    struct PerfettoDsTracerImpl* tracer,
+    PerfettoDsInstanceIndex inst_id);
+
+// Gets the data source thread local instance incremental state created by
+// the callback passed to `PerfettoDsSetOnCreateIncr`.
+PERFETTO_SDK_EXPORT void* PerfettoDsImplGetIncrementalState(
+    struct PerfettoDsImpl* ds_impl,
+    struct PerfettoDsTracerImpl* tracer,
+    PerfettoDsInstanceIndex inst_id);
+
+// Iterator for all the active instances (on this thread) of a data source type.
+struct PerfettoDsImplTracerIterator {
+  // Instance id.
+  PerfettoDsInstanceIndex inst_id;
+  // Caches a pointer to the internal thread local state of the data source
+  // type.
+  struct PerfettoDsTlsImpl* tls;
+  // Pointer to the object used to output trace packets. When nullptr, the
+  // iteration is over.
+  struct PerfettoDsTracerImpl* tracer;
+};
+
+// Start iterating over all the active instances of the data source type
+// (`ds_impl`).
+//
+// If the returned tracer is not nullptr, the user must continue the iteration
+// with PerfettoDsImplTraceIterateNext(), until it is. The iteration can
+// only be interrupted early by calling PerfettoDsImplTraceIterateBreak().
+PERFETTO_SDK_EXPORT struct PerfettoDsImplTracerIterator
+PerfettoDsImplTraceIterateBegin(struct PerfettoDsImpl* ds_impl);
+
+// Advances the iterator to the next active instance of the data source type
+// (`ds_impl`).
+//
+// The user must call PerfettoDsImplTraceIterateNext(), until it returns a
+// nullptr tracer. The iteration can only be interrupted early by calling
+// PerfettoDsImplTraceIterateBreak().
+PERFETTO_SDK_EXPORT void PerfettoDsImplTraceIterateNext(
+    struct PerfettoDsImpl* ds_impl,
+    struct PerfettoDsImplTracerIterator* iterator);
+
+// Prematurely interrupts iteration over all the active instances of the data
+// source type (`ds_impl`).
+PERFETTO_SDK_EXPORT void PerfettoDsImplTraceIterateBreak(
+    struct PerfettoDsImpl* ds_impl,
+    struct PerfettoDsImplTracerIterator* iterator);
+
+// Creates a new trace packet on `tracer`. Returns a stream writer that can be
+// used to write data to the packet. The caller must use
+// PerfettoDsTracerImplPacketEnd() when done.
+PERFETTO_SDK_EXPORT struct PerfettoStreamWriter PerfettoDsTracerImplPacketBegin(
+    struct PerfettoDsTracerImpl* tracer);
+
+// Signals that the trace packets created previously on `tracer` with
+// PerfettoDsTracerImplBeginPacket(), has been fully written.
+//
+// `writer` should point to the writer returned by
+// PerfettoDsTracerImplBeginPacket() and cannot be used anymore after this call.
+PERFETTO_SDK_EXPORT void PerfettoDsTracerImplPacketEnd(
+    struct PerfettoDsTracerImpl* tracer,
+    struct PerfettoStreamWriter* writer);
+
+// Called when a flush request is complete.
+typedef void (*PerfettoDsTracerOnFlushCb)(void* user_arg);
+
+// Forces a commit of the thread-local tracing data written so far to the
+// service.
+//
+// If `cb` is not NULL, it is called on a dedicated internal thread (with
+// `user_arg`), when flushing is complete. It may never be called (e.g. if the
+// tracing service disconnects).
+//
+// This is almost never required (tracing data is periodically committed as
+// trace pages are filled up) and has a non-negligible performance hit.
+PERFETTO_SDK_EXPORT void PerfettoDsTracerImplFlush(
+    struct PerfettoDsTracerImpl* tracer,
+    PerfettoDsTracerOnFlushCb cb,
+    void* user_arg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_DATA_SOURCE_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/export.h b/src/libtracing/perfetto/public/abi/export.h
new file mode 100644
index 000000000..734af852d
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/export.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_EXPORT_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_EXPORT_H_
+
+#ifdef _WIN32
+#define PERFETTO_INTERNAL_DLL_EXPORT __declspec(dllexport)
+#define PERFETTO_INTERNAL_DLL_IMPORT __declspec(dllimport)
+#else
+#define PERFETTO_INTERNAL_DLL_EXPORT __attribute__((visibility("default")))
+#define PERFETTO_INTERNAL_DLL_IMPORT
+#endif
+
+// PERFETTO_SDK_EXPORT: Exports a symbol from the perfetto SDK shared library.
+//
+// This is controlled by two defines (that likely come from the compiler command
+// line):
+// * PERFETTO_SDK_DISABLE_SHLIB_EXPORT: If this is defined, no export
+//   annotations are added. This might be useful when static linking.
+// * PERFETTO_SDK_SHLIB_IMPLEMENTATION: This must be defined when compiling the
+//   shared library itself (in order to export the symbols), but must be
+//   undefined when compiling objects that use the shared library (in order to
+//   import the symbols).
+#if !defined(PERFETTO_SDK_DISABLE_SHLIB_EXPORT)
+#if defined(PERFETTO_SHLIB_SDK_IMPLEMENTATION)
+#define PERFETTO_SDK_EXPORT PERFETTO_INTERNAL_DLL_EXPORT
+#else
+#define PERFETTO_SDK_EXPORT PERFETTO_INTERNAL_DLL_IMPORT
+#endif
+#else  // defined(PERFETTO_SDK_DISABLE_SHLIB_EXPORT)
+#define PERFETTO_SDK_EXPORT
+#endif  // defined(PERFETTO_SDK_DISABLE_SHLIB_EXPORT)
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_EXPORT_H_
diff --git a/src/libtracing/perfetto/public/abi/heap_buffer.h b/src/libtracing/perfetto/public/abi/heap_buffer.h
new file mode 100644
index 000000000..b5bc4ffbc
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/heap_buffer.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_HEAP_BUFFER_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_HEAP_BUFFER_H_
+
+#include "perfetto/public/abi/stream_writer_abi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// A PerfettoHeapBuffer can be used to serialize protobuf data using the
+// PerfettoStreamWriter interface. Stores data on heap allocated buffers, which
+// can be read back with PerfettoHeapBufferCopyInto().
+
+struct PerfettoHeapBuffer;
+
+// Creates a PerfettoHeapBuffer. Takes a pointer to an (uninitialized)
+// PerfettoStreamWriter (owned by the caller). The stream writer can be user
+// later to serialize protobuf data.
+PERFETTO_SDK_EXPORT struct PerfettoHeapBuffer* PerfettoHeapBufferCreate(
+    struct PerfettoStreamWriter*);
+
+// Copies data from the heap buffer to `dst` (up to `size` bytes).
+PERFETTO_SDK_EXPORT void PerfettoHeapBufferCopyInto(
+    struct PerfettoHeapBuffer*,
+    struct PerfettoStreamWriter*,
+    void* dst,
+    size_t size);
+
+// Destroys the heap buffer.
+PERFETTO_SDK_EXPORT void PerfettoHeapBufferDestroy(
+    struct PerfettoHeapBuffer*,
+    struct PerfettoStreamWriter*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_HEAP_BUFFER_H_
diff --git a/src/libtracing/perfetto/public/abi/pb_decoder_abi.h b/src/libtracing/perfetto/public/abi/pb_decoder_abi.h
new file mode 100644
index 000000000..05ba96f88
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/pb_decoder_abi.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_PB_DECODER_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_PB_DECODER_ABI_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "perfetto/public/abi/export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Stores the state required to decode a protobuf message (from a continuous
+// memory buffer).
+struct PerfettoPbDecoder {
+  // Pointer to the beginning of the next field that should be decoded.
+  const uint8_t* read_ptr;
+  // Pointer to one past the end of the buffer.
+  const uint8_t* end_ptr;
+};
+
+enum PerfettoPbDecoderStatus {
+  // A field has been decoded correctly. There is more data into the buffer,
+  // starting from an updated `read_ptr`.
+  PERFETTO_PB_DECODER_OK = 0,
+  // The last field has been decoded correctly until the end. There is no more
+  // data into the buffer.
+  PERFETTO_PB_DECODER_DONE = 1,
+  // The data starting at `read_ptr` cannot be fully decoded as a protobuf
+  // field. `read_ptr` has not been updated.
+  PERFETTO_PB_DECODER_ERROR = 2,
+};
+
+// The content of a length-delimited field (wire type 2)
+struct PerfettoPbDecoderDelimitedField {
+  const uint8_t* start;
+  size_t len;
+};
+
+// A field parsed by the decoder.
+struct PerfettoPbDecoderField {
+  // PerfettoPbDecoderStatus
+  uint32_t status;
+  // PerfettoPbWireType
+  uint32_t wire_type;
+  // The protobuf field id.
+  uint32_t id;
+  // The value of this field.
+  union {
+    // For wire type 2.
+    struct PerfettoPbDecoderDelimitedField delimited;
+    // For wire type 0 and 1.
+    uint64_t integer64;
+    // For wire type 5.
+    uint32_t integer32;
+    // For wire type 1.
+    double double_val;
+    // For wire type 5.
+    float float_val;
+  } value;
+};
+
+// Parses a field and returns it. Advances `*decoder->read_ptr` to point after
+// the field.
+PERFETTO_SDK_EXPORT struct PerfettoPbDecoderField PerfettoPbDecoderParseField(
+    struct PerfettoPbDecoder* decoder);
+
+// Advances `*decoder->read_ptr` to point after the current field.
+// Returns a `PerfettoPbDecoderStatus`.
+PERFETTO_SDK_EXPORT uint32_t
+PerfettoPbDecoderSkipField(struct PerfettoPbDecoder* decoder);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_PB_DECODER_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/producer_abi.h b/src/libtracing/perfetto/public/abi/producer_abi.h
new file mode 100644
index 000000000..a939b7370
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/producer_abi.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_PRODUCER_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_PRODUCER_ABI_H_
+
+#include <stdint.h>
+
+#include "perfetto/public/abi/export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Initializes the global system perfetto producer.
+PERFETTO_SDK_EXPORT void PerfettoProducerSystemInit(void);
+
+// Initializes the global in-process perfetto producer.
+PERFETTO_SDK_EXPORT void PerfettoProducerInProcessInit(void);
+
+// Informs the tracing services to activate any of these triggers if any tracing
+// session was waiting for them.
+//
+// `trigger_names` is an array of `const char*` (zero terminated strings). The
+// last pointer in the array must be NULL.
+//
+// Sends the trigger signal to all the initialized backends that are currently
+// connected and that connect in the next `ttl_ms` milliseconds (but
+// returns immediately anyway).
+PERFETTO_SDK_EXPORT void PerfettoProducerActivateTriggers(
+    const char* trigger_names[],
+    uint32_t ttl_ms);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_PRODUCER_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/stream_writer_abi.h b/src/libtracing/perfetto/public/abi/stream_writer_abi.h
new file mode 100644
index 000000000..0f685ef49
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/stream_writer_abi.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_STREAM_WRITER_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_STREAM_WRITER_ABI_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "perfetto/public/abi/export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// An opaque structure used to represent the internal implementation of a
+// protozero stream writer.
+struct PerfettoStreamWriterImpl;
+
+// A `PerfettoStreamWriter` owns a chunk of memory that the user can write
+// to. The section from `begin` (inclusive) to `write_ptr` (non inclusive)
+// already contains valid data. The section from `write_ptr` (inclusive) to
+// `end` (non inclusive) is empty and can be used for new data.
+//
+// --------------------------------------------------------------------------
+// |wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww                                    |
+// --------------------------------------------------------------------------
+//  ^                                   ^                                   ^
+//   \                                  |                                  /
+//    `begin`                       `write_ptr`                       `end`
+struct PerfettoStreamWriter {
+  struct PerfettoStreamWriterImpl* impl;
+
+  // Points to the first byte of the current chunk.
+  uint8_t* begin;
+
+  // Points to the first byte after the end of the current chunk (STL-style).
+  uint8_t* end;
+
+  // Write pointer: points to the first not-yet-written byte of the current
+  // chunk.
+  uint8_t* write_ptr;
+
+  // Keeps track of all the bytes written in previous chunks (bytes written in
+  // the current chunk are not included here).
+  size_t written_previously;
+};
+
+// Tells the writer that the current chunk has been written until `write_ptr`
+// (non inclusive).
+//
+// Returns the new state of the writer.
+PERFETTO_SDK_EXPORT void PerfettoStreamWriterUpdateWritePtr(
+    struct PerfettoStreamWriter*);
+
+// Commits the current chunk and gets a new chunk.
+PERFETTO_SDK_EXPORT void PerfettoStreamWriterNewChunk(
+    struct PerfettoStreamWriter*);
+
+// Appends `size` from `src` to the writer.
+PERFETTO_SDK_EXPORT void PerfettoStreamWriterAppendBytesSlowpath(
+    struct PerfettoStreamWriter*,
+    const uint8_t* src,
+    size_t size);
+
+#define PERFETTO_STREAM_WRITER_PATCH_SIZE 4
+
+// Tells the stream writer that the part of the current chunk pointed by
+// `patch_addr` (until `patch_addr`+`PERFETTO_STREAM_WRITER_PATCH_SIZE`) needs
+// to be changed after the current chunk goes away.
+//
+// The caller can write to the returned location (which may have been redirected
+// by the stream writer) after the current chunk has gone away. The caller
+// **must write a non-zero value as the first byte** eventually.
+//
+// The stream writer can also return NULL, in which case the caller should not
+// write anything.
+//
+// This can be used to backfill the size of a protozero message.
+PERFETTO_SDK_EXPORT uint8_t* PerfettoStreamWriterAnnotatePatch(
+    struct PerfettoStreamWriter*,
+    uint8_t* patch_addr);
+
+// Returns a pointer to an area of the chunk long `size` for writing. The
+// returned area is considered already written by the writer (it will not be
+// used again).
+//
+// WARNING: `size` should be smaller than the chunk size returned by the
+// `delegate`.
+PERFETTO_SDK_EXPORT
+void PerfettoStreamWriterReserveBytesSlowpath(struct PerfettoStreamWriter*,
+                                              size_t size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_STREAM_WRITER_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/thread_utils_abi.h b/src/libtracing/perfetto/public/abi/thread_utils_abi.h
new file mode 100644
index 000000000..e1b8b8825
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/thread_utils_abi.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_THREAD_UTILS_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_THREAD_UTILS_ABI_H_
+
+#include <stdint.h>
+
+#include "perfetto/public/abi/export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__Fuchsia__)
+#include <zircon/types.h>
+#elif defined(__linux__)
+#include <sys/types.h>
+#include <unistd.h>
+#elif defined(__APPLE__) || defined(_WIN32)
+#include <stdint.h>
+#else
+#include <pthread.h>
+#endif
+
+#if defined(__linux__) || defined(__native_client__)
+typedef pid_t PerfettoThreadId;
+#elif defined(__Fuchsia__)
+typedef zx_koid_t PerfettoThreadId;
+#elif defined(__APPLE__) || defined(_WIN32)
+typedef uint64_t PerfettoThreadId;
+#else
+typedef pthread_t PerfettoThreadId;
+#endif
+
+PERFETTO_SDK_EXPORT PerfettoThreadId PerfettoGetThreadIdImpl(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_THREAD_UTILS_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/tracing_session_abi.h b/src/libtracing/perfetto/public/abi/tracing_session_abi.h
new file mode 100644
index 000000000..4446bb85d
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/tracing_session_abi.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_TRACING_SESSION_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_TRACING_SESSION_ABI_H_
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "perfetto/public/abi/export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Opaque pointer to the internal representation of a tracing session.
+struct PerfettoTracingSessionImpl;
+
+PERFETTO_SDK_EXPORT struct PerfettoTracingSessionImpl*
+PerfettoTracingSessionSystemCreate(void);
+
+PERFETTO_SDK_EXPORT struct PerfettoTracingSessionImpl*
+PerfettoTracingSessionInProcessCreate(void);
+
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionSetup(
+    struct PerfettoTracingSessionImpl*,
+    void* cfg_begin,
+    size_t cfg_len);
+
+typedef void (*PerfettoTracingSessionStopCb)(struct PerfettoTracingSessionImpl*,
+                                             void* user_arg);
+
+// Calls `*cb` with `user_arg` when the tracing session is stopped.
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionSetStopCb(
+    struct PerfettoTracingSessionImpl*,
+    PerfettoTracingSessionStopCb cb,
+    void* user_arg);
+
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionStartAsync(
+    struct PerfettoTracingSessionImpl*);
+
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionStartBlocking(
+    struct PerfettoTracingSessionImpl*);
+
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionStopAsync(
+    struct PerfettoTracingSessionImpl*);
+
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionStopBlocking(
+    struct PerfettoTracingSessionImpl*);
+
+// Called back to signal that a previous flush request has completed. `success`
+// is true if every data source has acknowledged the flush request, false if the
+// timeout has expired or there was an error.
+typedef void (*PerfettoTracingSessionFlushCb)(
+    struct PerfettoTracingSessionImpl*,
+    bool success,
+    void* user_arg);
+
+// Issues a flush request, asking all data sources to ack the request, within
+// the specified timeout. A "flush" is a fence to ensure visibility of data in
+// the async tracing pipeline. It guarantees that all data written before the
+// call will be visible in the trace buffer and hence by the
+// PerfettoTracingSessionReadTraceBlocking() function. Returns immediately and
+// invokes a callback when the flush request is complete.
+// Args:
+//  `cb`: will be invoked on an internal perfetto thread when all data
+//    sources have acked, or the timeout is reached.
+//  `user_arg`: passed as is to `cb`.
+//  `timeout_ms`: how much time the service will wait for data source acks. If
+//    0, the global timeout specified in the TraceConfig (flush_timeout_ms)
+//    will be used. If flush_timeout_ms is also unspecified, a default value
+//    of 5s will be used.
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionFlushAsync(
+    struct PerfettoTracingSessionImpl*,
+    uint32_t timeout_ms,
+    PerfettoTracingSessionFlushCb cb,
+    void* user_arg);
+
+// Like PerfettoTracingSessionFlushAsync(), but blocks until the flush is
+// complete (i.e. every data source has acknowledged or the timeout has
+// expired).
+PERFETTO_SDK_EXPORT bool PerfettoTracingSessionFlushBlocking(
+    struct PerfettoTracingSessionImpl*,
+    uint32_t timeout_ms);
+
+// Called back to read pieces of tracing data. `data` points to a chunk of trace
+// data, `size` bytes long. `has_more` is true if there is more tracing data and
+// the callback will be invoked again.
+typedef void (*PerfettoTracingSessionReadCb)(struct PerfettoTracingSessionImpl*,
+                                             const void* data,
+                                             size_t size,
+                                             bool has_more,
+                                             void* user_arg);
+
+// Repeatedly calls cb with data from the tracing session. `user_arg` is passed
+// as is to the callback.
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionReadTraceBlocking(
+    struct PerfettoTracingSessionImpl*,
+    PerfettoTracingSessionReadCb cb,
+    void* user_arg);
+
+PERFETTO_SDK_EXPORT void PerfettoTracingSessionDestroy(
+    struct PerfettoTracingSessionImpl*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_TRACING_SESSION_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/track_event_abi.h b/src/libtracing/perfetto/public/abi/track_event_abi.h
new file mode 100644
index 000000000..6c07b30bd
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/track_event_abi.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_ABI_H_
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "perfetto/public/abi/atomic.h"
+#include "perfetto/public/abi/data_source_abi.h"
+#include "perfetto/public/abi/export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PERFETTO_SDK_EXPORT void PerfettoTeInit(void);
+
+// The attributes of a single category.
+struct PerfettoTeCategoryDescriptor {
+  // The category name. Null terminated string.
+  const char* name;
+  // A human readable string shown by the tracing service when listing the data
+  // sources. Null terminated string.
+  const char* desc;
+  // List of tags, can be null if num_tags is 0. Array of pointers to null
+  // terminated strings.
+  const char** tags;
+  // Number of elements in the `tags` array.
+  size_t num_tags;
+};
+
+// Opaque pointer to a registered category.
+struct PerfettoTeCategoryImpl;
+
+// An already registered category that's considered enabled if the track event
+// data source is enabled. Useful for dynamic categories.
+extern PERFETTO_SDK_EXPORT struct PerfettoTeCategoryImpl*
+    perfetto_te_any_categories;
+
+// Points to true if the track event data source is enabled.
+extern PERFETTO_SDK_EXPORT PERFETTO_ATOMIC(bool) *
+    perfetto_te_any_categories_enabled;
+
+// Registers a category.
+//
+// `desc` (and all the objects pointed by it) need to be alive until
+// PerfettoTeCategoryImplDestroy() is called.
+PERFETTO_SDK_EXPORT struct PerfettoTeCategoryImpl* PerfettoTeCategoryImplCreate(
+    struct PerfettoTeCategoryDescriptor* desc);
+
+// Tells the tracing service about newly registered categories. Must be called
+// after one or more call to PerfettoTeCategoryImplCreate() or
+// PerfettoTeCategoryImplDestroy().
+PERFETTO_SDK_EXPORT void PerfettoTePublishCategories(void);
+
+// Returns a pointer to a boolean that tells if the category is enabled or not.
+// The pointer is valid until the category is destroyed.
+PERFETTO_SDK_EXPORT PERFETTO_ATOMIC(bool) *
+    PerfettoTeCategoryImplGetEnabled(struct PerfettoTeCategoryImpl*);
+
+// Called when a data source instance is created (if `created` is true) or
+// destroyed (if `created` is false) with a registered category enabled.
+// `global_state_changed` is true if this was the first instance created with
+// the category enabled or the last instance destroyed with the category
+// enabled.
+typedef void (*PerfettoTeCategoryImplCallback)(struct PerfettoTeCategoryImpl*,
+                                               PerfettoDsInstanceIndex inst_id,
+                                               bool created,
+                                               bool global_state_changed,
+                                               void* user_arg);
+
+// Registers `cb` to be called every time a data source instance with `cat`
+// enabled is created or destroyed. `user_arg` will be passed unaltered to `cb`.
+//
+// `cb` can be NULL to disable the callback.
+PERFETTO_SDK_EXPORT void PerfettoTeCategoryImplSetCallback(
+    struct PerfettoTeCategoryImpl* cat,
+    PerfettoTeCategoryImplCallback cb,
+    void* user_arg);
+
+// Returns the interning id (iid) associated with the registered category `cat`.
+PERFETTO_SDK_EXPORT uint64_t
+PerfettoTeCategoryImplGetIid(struct PerfettoTeCategoryImpl* cat);
+
+// Destroys a previously registered category. The category cannot be used for
+// tracing anymore after this.
+PERFETTO_SDK_EXPORT void PerfettoTeCategoryImplDestroy(
+    struct PerfettoTeCategoryImpl*);
+
+enum PerfettoTeTimestampType {
+  PERFETTO_TE_TIMESTAMP_TYPE_MONOTONIC = 3,
+  PERFETTO_TE_TIMESTAMP_TYPE_BOOT = 6,
+  PERFETTO_TE_TIMESTAMP_TYPE_INCREMENTAL = 64,
+  PERFETTO_TE_TIMESTAMP_TYPE_ABSOLUTE = 65,
+};
+
+enum {
+#ifdef __linux__
+  PERFETTO_I_CLOCK_INCREMENTAL_UNDERNEATH = PERFETTO_TE_TIMESTAMP_TYPE_BOOT,
+#else
+  PERFETTO_I_CLOCK_INCREMENTAL_UNDERNEATH =
+      PERFETTO_TE_TIMESTAMP_TYPE_MONOTONIC,
+#endif
+};
+
+struct PerfettoTeTimestamp {
+  // PerfettoTeTimestampType
+  uint32_t clock_id;
+  uint64_t value;
+};
+
+// Returns the current timestamp.
+PERFETTO_SDK_EXPORT struct PerfettoTeTimestamp PerfettoTeGetTimestamp(void);
+
+struct PerfettoTeRegisteredTrackImpl {
+  void* descriptor;  // Owned (malloc).
+  size_t descriptor_size;
+  uint64_t uuid;
+};
+
+// The UUID of the process track for the current process.
+extern PERFETTO_SDK_EXPORT uint64_t perfetto_te_process_track_uuid;
+
+// The type of an event.
+enum PerfettoTeType {
+  PERFETTO_TE_TYPE_SLICE_BEGIN = 1,
+  PERFETTO_TE_TYPE_SLICE_END = 2,
+  PERFETTO_TE_TYPE_INSTANT = 3,
+  PERFETTO_TE_TYPE_COUNTER = 4,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/track_event_hl_abi.h b/src/libtracing/perfetto/public/abi/track_event_hl_abi.h
new file mode 100644
index 000000000..d176d5b26
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/track_event_hl_abi.h
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_HL_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_HL_ABI_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/abi/track_event_abi.h"
+
+// High level ABI to emit track events.
+//
+// For each tracepoint, the user must call PerfettoTeHlEmitImpl() once and pass
+// it all the required data for the event. The function will iterate all enabled
+// data source instances and serialize the tracing data as protobuf messages.
+//
+// This tries to cover the most common cases of track event. When hitting these
+// we minimize binary size at the trace-event call site, but we trade off the
+// ability to serialize custom protobuf messages.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// The type of an event extra parameter.
+enum PerfettoTeHlExtraType {
+  PERFETTO_TE_HL_EXTRA_TYPE_REGISTERED_TRACK = 1,
+  PERFETTO_TE_HL_EXTRA_TYPE_NAMED_TRACK = 2,
+  PERFETTO_TE_HL_EXTRA_TYPE_TIMESTAMP = 3,
+  PERFETTO_TE_HL_EXTRA_TYPE_DYNAMIC_CATEGORY = 4,
+  PERFETTO_TE_HL_EXTRA_TYPE_COUNTER_INT64 = 5,
+  PERFETTO_TE_HL_EXTRA_TYPE_COUNTER_DOUBLE = 6,
+  PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_BOOL = 7,
+  PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_UINT64 = 8,
+  PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_INT64 = 9,
+  PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_DOUBLE = 10,
+  PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_STRING = 11,
+  PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_POINTER = 12,
+  PERFETTO_TE_HL_EXTRA_TYPE_FLOW = 13,
+  PERFETTO_TE_HL_EXTRA_TYPE_TERMINATING_FLOW = 14,
+  PERFETTO_TE_HL_EXTRA_TYPE_FLUSH = 15,
+  PERFETTO_TE_HL_EXTRA_TYPE_NO_INTERN = 16,
+};
+
+// List of extra event parameters. Each type of parameter should embed this as
+// its first member.
+struct PerfettoTeHlExtra {
+  // enum PerfettoTeHlExtraType. Identifies the exact type of this.
+  uint32_t type;
+  // Pointer to the next PerfettoTeHlExtra in the list or NULL.
+  const struct PerfettoTeHlExtra* next;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_REGISTERED_TRACK
+struct PerfettoTeHlExtraRegisteredTrack {
+  struct PerfettoTeHlExtra header;
+  // Pointer to a registered track.
+  const struct PerfettoTeRegisteredTrackImpl* track;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_NAMED_TRACK
+struct PerfettoTeHlExtraNamedTrack {
+  struct PerfettoTeHlExtra header;
+  // The name of the track
+  const char* name;
+  uint64_t id;
+  uint64_t parent_uuid;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_TIMESTAMP
+struct PerfettoTeHlExtraTimestamp {
+  struct PerfettoTeHlExtra header;
+  // The timestamp for this event.
+  struct PerfettoTeTimestamp timestamp;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_DYNAMIC_CATEGORY
+struct PerfettoTeHlExtraDynamicCategory {
+  struct PerfettoTeHlExtra header;
+  // Pointer to a category descriptor. The descriptor will be evaluated against
+  // the configuration. If the descriptor is considered disabled, the trace
+  // point will be skipped.
+  const struct PerfettoTeCategoryDescriptor* desc;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_COUNTER_INT64
+struct PerfettoTeHlExtraCounterInt64 {
+  struct PerfettoTeHlExtra header;
+  // The counter value.
+  int64_t value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_COUNTER_DOUBLE
+struct PerfettoTeHlExtraCounterDouble {
+  struct PerfettoTeHlExtra header;
+  // The counter value.
+  double value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_BOOL
+struct PerfettoTeHlExtraDebugArgBool {
+  struct PerfettoTeHlExtra header;
+  // Pointer to the name of this debug annotation.
+  const char* name;
+  // The value of this debug annotation.
+  bool value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_UINT64
+struct PerfettoTeHlExtraDebugArgUint64 {
+  struct PerfettoTeHlExtra header;
+  // Pointer to the name of this debug annotation.
+  const char* name;
+  // The value of this debug annotation.
+  uint64_t value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_INT64
+struct PerfettoTeHlExtraDebugArgInt64 {
+  struct PerfettoTeHlExtra header;
+  // Pointer to the name of this debug annotation.
+  const char* name;
+  // The value of this debug annotation.
+  int64_t value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_DOUBLE
+struct PerfettoTeHlExtraDebugArgDouble {
+  struct PerfettoTeHlExtra header;
+  // Pointer to the name of this debug annotation.
+  const char* name;
+  // The value of this debug annotation.
+  double value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_STRING
+struct PerfettoTeHlExtraDebugArgString {
+  struct PerfettoTeHlExtra header;
+  // Pointer to the name of this debug annotation.
+  const char* name;
+  // The value of this debug annotation.
+  const char* value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_POINTER
+struct PerfettoTeHlExtraDebugArgPointer {
+  struct PerfettoTeHlExtra header;
+  // Pointer to the name of this debug annotation.
+  const char* name;
+  // The value of this debug annotation.
+  uintptr_t value;
+};
+
+// PERFETTO_TE_HL_EXTRA_TYPE_FLOW
+// PERFETTO_TE_HL_EXTRA_TYPE_TERMINATING_FLOW
+struct PerfettoTeHlExtraFlow {
+  struct PerfettoTeHlExtra header;
+  // Specifies that this event starts (or terminates) a flow (i.e. a link
+  // between two events) identified by this id.
+  uint64_t id;
+};
+
+// Emits an event on all active instances of the track event data source.
+// * `cat`: The registered category of the event, it knows on which data source
+//          instances the event should be emitted. Use
+//          `perfetto_te_all_categories` for dynamic categories.
+// * `type`: the event type (slice begin, slice end, ...). See `enum
+//           PerfettoTeType`.
+// * `name`: All events (except when PERFETTO_TE_TYPE_SLICE_END) can have an
+//           associated name. It can be nullptr.
+// * `extra_data`: Optional parameters associated with the events.
+PERFETTO_SDK_EXPORT void PerfettoTeHlEmitImpl(
+    struct PerfettoTeCategoryImpl* cat,
+    int32_t type,
+    const char* name,
+    const struct PerfettoTeHlExtra* extra_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_HL_ABI_H_
diff --git a/src/libtracing/perfetto/public/abi/track_event_ll_abi.h b/src/libtracing/perfetto/public/abi/track_event_ll_abi.h
new file mode 100644
index 000000000..377452f34
--- /dev/null
+++ b/src/libtracing/perfetto/public/abi/track_event_ll_abi.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_LL_ABI_H_
+#define INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_LL_ABI_H_
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "perfetto/public/abi/data_source_abi.h"
+#include "perfetto/public/abi/track_event_abi.h"
+
+// Low level ABI to emit track events.
+//
+// The library provides functions to iterate the active data source instances
+// (PerfettoTeLlImplBegin and PerfettoTeLlImplNext). The app is responsible for
+// serializing the "track event" protobuf messages on each instance.
+// In contrast to the high-level ABI (see track_event_hl_abi.h) this gives the
+// developer more flexibility and exposes more tracing features, at the cost of
+// more machine-code per event.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Thread local incremental data of a track event data source instance. Opaque
+// type.
+struct PerfettoTeLlImplIncr;
+
+// Thread local data of a track event data source instance. Opaque type.
+struct PerfettoTeLlImplTls;
+
+// Iterator for all the active instances (on this thread) of the track event
+// data source.
+struct PerfettoTeLlImplIterator {
+  struct PerfettoDsImplTracerIterator ds;
+  struct PerfettoTeLlImplIncr* incr;
+  struct PerfettoTeLlImplTls* tls;
+};
+
+// Starts the iteration of all the active track event data source instances for
+// the category `cat`.
+//
+// Returns an iterator. If the returned value `ds.tracer` is NULL, there are no
+// active data source instances.
+PERFETTO_SDK_EXPORT struct PerfettoTeLlImplIterator PerfettoTeLlImplBegin(
+    struct PerfettoTeCategoryImpl* cat,
+    struct PerfettoTeTimestamp ts);
+
+// Advances the iterator over the next active track event data source instance
+// for the category `cat`.
+//
+// If iterator->ds.tracer is NULL, there are no more active data source
+// instances.
+PERFETTO_SDK_EXPORT void PerfettoTeLlImplNext(
+    struct PerfettoTeCategoryImpl* cat,
+    struct PerfettoTeTimestamp ts,
+    struct PerfettoTeLlImplIterator* iterator);
+
+// Prematurely terminates an iteration started by PerfettoTeLlImplBegin().
+PERFETTO_SDK_EXPORT void PerfettoTeLlImplBreak(
+    struct PerfettoTeCategoryImpl*,
+    struct PerfettoTeLlImplIterator*);
+
+// Returns true if the category desc `dyn_cat` (which does not need to be
+// previously registered) is enabled for the track event instance represented by
+// `tracer` and `inst_id` (from `struct PerfettoTeLlImplIterator`).
+PERFETTO_SDK_EXPORT bool PerfettoTeLlImplDynCatEnabled(
+    struct PerfettoDsTracerImpl* tracer,
+    PerfettoDsInstanceIndex inst_id,
+    const struct PerfettoTeCategoryDescriptor* dyn_cat);
+
+// Returns true if the track event incremental state has already seen in the
+// past the given track UUID.
+PERFETTO_SDK_EXPORT bool PerfettoTeLlImplTrackSeen(struct PerfettoTeLlImplIncr*,
+                                                   uint64_t uuid);
+
+// Interning:
+//
+// it's possible to avoid repeating the same data over and over in a trace by
+// using "interning".
+//
+// `type` is a field id in the `perfetto.protos.InternedData` protobuf message.
+// `data` and `data_size` point to the raw data that is potentially repeated.
+// The buffer pointed by `data` can be anything (e.g. a serialized protobuf
+// message, or a small integer) that uniquely identifies the potentially
+// repeated data.
+//
+// The function returns an integer (the iid) that can be used instead of
+// serializing the data directly in the packet. `*seen` is set to false if this
+// is the first time the library observed this data for this specific type
+// (therefore it allocated a new iid).
+PERFETTO_SDK_EXPORT uint64_t
+PerfettoTeLlImplIntern(struct PerfettoTeLlImplIncr* incr,
+                       int32_t type,
+                       const void* data,
+                       size_t data_size,
+                       bool* seen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_ABI_TRACK_EVENT_LL_ABI_H_
diff --git a/src/libtracing/perfetto/public/compiler.h b/src/libtracing/perfetto/public/compiler.h
new file mode 100644
index 000000000..3e38853a7
--- /dev/null
+++ b/src/libtracing/perfetto/public/compiler.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_COMPILER_H_
+#define INCLUDE_PERFETTO_PUBLIC_COMPILER_H_
+
+#include <stddef.h>
+
+#if defined(__GNUC__) || defined(__clang__)
+#define PERFETTO_LIKELY(_x) __builtin_expect(!!(_x), 1)
+#define PERFETTO_UNLIKELY(_x) __builtin_expect(!!(_x), 0)
+#else
+#define PERFETTO_LIKELY(_x) (_x)
+#define PERFETTO_UNLIKELY(_x) (_x)
+#endif
+
+// PERFETTO_STATIC_CAST(TYPE, VAL): avoids the -Wold-style-cast warning when
+// writing code that needs to be compiled as C and C++.
+#ifdef __cplusplus
+#define PERFETTO_STATIC_CAST(TYPE, VAL) static_cast<TYPE>(VAL)
+#else
+#define PERFETTO_STATIC_CAST(TYPE, VAL) ((TYPE)(VAL))
+#endif
+
+// PERFETTO_REINTERPRET_CAST(TYPE, VAL): avoids the -Wold-style-cast warning
+// when writing code that needs to be compiled as C and C++.
+#ifdef __cplusplus
+#define PERFETTO_REINTERPRET_CAST(TYPE, VAL) reinterpret_cast<TYPE>(VAL)
+#else
+#define PERFETTO_REINTERPRET_CAST(TYPE, VAL) ((TYPE)(VAL))
+#endif
+
+// PERFETTO_NULL: avoids the -Wzero-as-null-pointer-constant warning when
+// writing code that needs to be compiled as C and C++.
+#ifdef __cplusplus
+#define PERFETTO_NULL nullptr
+#else
+#define PERFETTO_NULL NULL
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_COMPILER_H_
diff --git a/src/libtracing/perfetto/public/data_source.h b/src/libtracing/perfetto/public/data_source.h
new file mode 100644
index 000000000..23fba9250
--- /dev/null
+++ b/src/libtracing/perfetto/public/data_source.h
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_DATA_SOURCE_H_
+#define INCLUDE_PERFETTO_PUBLIC_DATA_SOURCE_H_
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "perfetto/public/abi/atomic.h"
+#include "perfetto/public/abi/data_source_abi.h"
+#include "perfetto/public/abi/heap_buffer.h"
+#include "perfetto/public/compiler.h"
+#include "perfetto/public/pb_msg.h"
+#include "perfetto/public/pb_utils.h"
+#include "perfetto/public/protos/common/data_source_descriptor.pzc.h"
+#include "perfetto/public/protos/trace/trace_packet.pzc.h"
+
+// A data source type.
+struct PerfettoDs {
+  // Pointer to a (atomic) boolean, which is set to true if there is at
+  // least one enabled instance of this data source type.
+  PERFETTO_ATOMIC(bool) * enabled;
+  struct PerfettoDsImpl* impl;
+};
+
+// Initializes a PerfettoDs struct.
+#define PERFETTO_DS_INIT() \
+  { &perfetto_atomic_false, PERFETTO_NULL }
+
+// All the callbacks are optional and can be NULL if not needed.
+//
+struct PerfettoDsParams {
+  // Instance lifecycle callbacks.
+  //
+  // Can be called from any thread.
+  PerfettoDsOnSetupCb on_setup_cb;
+  PerfettoDsOnStartCb on_start_cb;
+  PerfettoDsOnStopCb on_stop_cb;
+  PerfettoDsOnDestroyCb on_destroy_cb;
+  PerfettoDsOnFlushCb on_flush_cb;
+
+  // These are called to create/delete custom thread-local instance state, which
+  // can be accessed with PerfettoDsTracerImplGetCustomTls().
+  //
+  // Called from inside a trace point. Trace points inside these will be
+  // ignored.
+  PerfettoDsOnCreateCustomState on_create_tls_cb;
+  PerfettoDsOnDeleteCustomState on_delete_tls_cb;
+
+  // These are called to create/delete custom thread-local instance incremental
+  // state. Incremental state may be cleared periodically by the tracing service
+  // and can be accessed with PerfettoDsTracerImplGetIncrementalState().
+  //
+  // Called from inside a trace point. Trace points inside these will be
+  // ignored.
+  PerfettoDsOnCreateCustomState on_create_incr_cb;
+  PerfettoDsOnDeleteCustomState on_delete_incr_cb;
+
+  // Passed to all the callbacks as the `user_arg` param.
+  void* user_arg;
+
+  // How to behave when running out of shared memory buffer space.
+  enum PerfettoDsBufferExhaustedPolicy buffer_exhausted_policy;
+};
+
+static inline struct PerfettoDsParams PerfettoDsParamsDefault(void) {
+  struct PerfettoDsParams ret = {PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_NULL,
+                                 PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP};
+  return ret;
+}
+
+// Registers the data source type `ds`, named `data_source_name` with the global
+// perfetto producer.
+static inline bool PerfettoDsRegister(struct PerfettoDs* ds,
+                                      const char* data_source_name,
+                                      struct PerfettoDsParams params) {
+  struct PerfettoDsImpl* ds_impl;
+  bool success;
+  void* desc_buf;
+  size_t desc_size;
+
+  ds->enabled = &perfetto_atomic_false;
+  ds->impl = PERFETTO_NULL;
+
+  {
+    struct PerfettoPbMsgWriter writer;
+    struct PerfettoHeapBuffer* hb = PerfettoHeapBufferCreate(&writer.writer);
+    struct perfetto_protos_DataSourceDescriptor desc;
+    PerfettoPbMsgInit(&desc.msg, &writer);
+
+    perfetto_protos_DataSourceDescriptor_set_cstr_name(&desc, data_source_name);
+
+    desc_size = PerfettoStreamWriterGetWrittenSize(&writer.writer);
+    desc_buf = malloc(desc_size);
+    PerfettoHeapBufferCopyInto(hb, &writer.writer, desc_buf, desc_size);
+    PerfettoHeapBufferDestroy(hb, &writer.writer);
+  }
+
+  if (!desc_buf) {
+    return false;
+  }
+
+  ds_impl = PerfettoDsImplCreate();
+  if (params.on_setup_cb) {
+    PerfettoDsSetOnSetupCallback(ds_impl, params.on_setup_cb);
+  }
+  if (params.on_start_cb) {
+    PerfettoDsSetOnStartCallback(ds_impl, params.on_start_cb);
+  }
+  if (params.on_stop_cb) {
+    PerfettoDsSetOnStopCallback(ds_impl, params.on_stop_cb);
+  }
+  if (params.on_destroy_cb) {
+    PerfettoDsSetOnDestroyCallback(ds_impl, params.on_destroy_cb);
+  }
+  if (params.on_flush_cb) {
+    PerfettoDsSetOnFlushCallback(ds_impl, params.on_flush_cb);
+  }
+  if (params.on_create_tls_cb) {
+    PerfettoDsSetOnCreateTls(ds_impl, params.on_create_tls_cb);
+  }
+  if (params.on_delete_tls_cb) {
+    PerfettoDsSetOnDeleteTls(ds_impl, params.on_delete_tls_cb);
+  }
+  if (params.on_create_incr_cb) {
+    PerfettoDsSetOnCreateIncr(ds_impl, params.on_create_incr_cb);
+  }
+  if (params.on_delete_incr_cb) {
+    PerfettoDsSetOnDeleteIncr(ds_impl, params.on_delete_incr_cb);
+  }
+  if (params.user_arg) {
+    PerfettoDsSetCbUserArg(ds_impl, params.user_arg);
+  }
+  if (params.buffer_exhausted_policy !=
+      PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP) {
+    PerfettoDsSetBufferExhaustedPolicy(ds_impl, params.buffer_exhausted_policy);
+  }
+
+  success = PerfettoDsImplRegister(ds_impl, &ds->enabled, desc_buf, desc_size);
+  free(desc_buf);
+  if (!success) {
+    return false;
+  }
+  ds->impl = ds_impl;
+  return true;
+}
+
+// Iterator for all the active instances (on this thread) of a data source type.
+struct PerfettoDsTracerIterator {
+  struct PerfettoDsImplTracerIterator impl;
+};
+
+static inline struct PerfettoDsTracerIterator PerfettoDsTraceIterateBegin(
+    struct PerfettoDs* ds) {
+  struct PerfettoDsTracerIterator ret;
+  PERFETTO_ATOMIC(bool)* enabled = ds->enabled;
+  if (PERFETTO_LIKELY(!PERFETTO_ATOMIC_LOAD_EXPLICIT(
+          enabled, PERFETTO_MEMORY_ORDER_RELAXED))) {
+    // Tracing fast path: bail out immediately if the enabled flag is false.
+    ret.impl.tracer = PERFETTO_NULL;
+  } else {
+    // Else, make an ABI call to start iteration over the data source type
+    // active instances.
+    ret.impl = PerfettoDsImplTraceIterateBegin(ds->impl);
+  }
+  return ret;
+}
+
+static inline void PerfettoDsTraceIterateNext(
+    struct PerfettoDs* ds,
+    struct PerfettoDsTracerIterator* iterator) {
+  PerfettoDsImplTraceIterateNext(ds->impl, &iterator->impl);
+}
+
+static inline void PerfettoDsTraceIterateBreak(
+    struct PerfettoDs* ds,
+    struct PerfettoDsTracerIterator* iterator) {
+  if (iterator->impl.tracer) {
+    PerfettoDsImplTraceIterateBreak(ds->impl, &iterator->impl);
+  }
+}
+
+// For loop over the active instances of a data source type.
+//
+// `NAME` is the data source type (struct PerfettoDs).
+//
+// A local variable called `ITERATOR` will be instantiated. It can be used to
+// perform tracing on each instance.
+//
+// N.B. The iteration MUST NOT be interrupted early with `break`.
+// PERFETTO_DS_TRACE_BREAK should be used instead.
+#define PERFETTO_DS_TRACE(NAME, ITERATOR)         \
+  for (struct PerfettoDsTracerIterator ITERATOR = \
+           PerfettoDsTraceIterateBegin(&(NAME));  \
+       (ITERATOR).impl.tracer != NULL;            \
+       PerfettoDsTraceIterateNext(&(NAME), &(ITERATOR)))
+
+// Used to break the iteration in a PERFETTO_DS_TRACE loop.
+#define PERFETTO_DS_TRACE_BREAK(NAME, ITERATOR)      \
+  PerfettoDsTraceIterateBreak(&(NAME), &(ITERATOR)); \
+  break
+
+static inline void* PerfettoDsGetCustomTls(
+    struct PerfettoDs* ds,
+    struct PerfettoDsTracerIterator* iterator) {
+  return PerfettoDsImplGetCustomTls(ds->impl, iterator->impl.tracer,
+                                    iterator->impl.inst_id);
+}
+
+static inline void* PerfettoDsGetIncrementalState(
+    struct PerfettoDs* ds,
+    struct PerfettoDsTracerIterator* iterator) {
+  return PerfettoDsImplGetIncrementalState(ds->impl, iterator->impl.tracer,
+                                           iterator->impl.inst_id);
+}
+
+// Used to write a TracePacket on a data source instance. Stores the writer and
+// the TracePacket message.
+struct PerfettoDsRootTracePacket {
+  struct PerfettoPbMsgWriter writer;
+  struct perfetto_protos_TracePacket msg;
+};
+
+// Initializes `root` to write a new packet to the data source instance pointed
+// by `iterator`.
+static inline void PerfettoDsTracerPacketBegin(
+    struct PerfettoDsTracerIterator* iterator,
+    struct PerfettoDsRootTracePacket* root) {
+  root->writer.writer = PerfettoDsTracerImplPacketBegin(iterator->impl.tracer);
+  PerfettoPbMsgInit(&root->msg.msg, &root->writer);
+}
+
+// Finishes writing the packet pointed by `root` on the data source instance
+// pointer by `iterator`.
+static inline void PerfettoDsTracerPacketEnd(
+    struct PerfettoDsTracerIterator* iterator,
+    struct PerfettoDsRootTracePacket* root) {
+  PerfettoPbMsgFinalize(&root->msg.msg);
+  PerfettoDsTracerImplPacketEnd(iterator->impl.tracer, &root->writer.writer);
+}
+
+static inline void PerfettoDsTracerFlush(
+    struct PerfettoDsTracerIterator* iterator,
+    PerfettoDsTracerOnFlushCb cb,
+    void* ctx) {
+  PerfettoDsTracerImplFlush(iterator->impl.tracer, cb, ctx);
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_DATA_SOURCE_H_
diff --git a/src/libtracing/perfetto/public/fnv1a.h b/src/libtracing/perfetto/public/fnv1a.h
new file mode 100644
index 000000000..720aeda7a
--- /dev/null
+++ b/src/libtracing/perfetto/public/fnv1a.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_FNV1A_H_
+#define INCLUDE_PERFETTO_PUBLIC_FNV1A_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "perfetto/public/compiler.h"
+
+static inline uint64_t PerfettoFnv1a(const void* data, size_t size) {
+  const uint64_t kFnv1a64OffsetBasis = 0xcbf29ce484222325;
+  const uint64_t kFnv1a64Prime = 0x100000001b3;
+
+  uint64_t value = kFnv1a64OffsetBasis;
+
+  for (size_t i = 0; i < size; i++) {
+    value =
+        (value ^ PERFETTO_STATIC_CAST(const uint8_t*, data)[i]) * kFnv1a64Prime;
+  }
+  return value;
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_FNV1A_H_
diff --git a/src/libtracing/perfetto/public/pb_decoder.h b/src/libtracing/perfetto/public/pb_decoder.h
new file mode 100644
index 000000000..070882098
--- /dev/null
+++ b/src/libtracing/perfetto/public/pb_decoder.h
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_PB_DECODER_H_
+#define INCLUDE_PERFETTO_PUBLIC_PB_DECODER_H_
+
+#include "perfetto/public/abi/pb_decoder_abi.h"
+#include "perfetto/public/compiler.h"
+#include "perfetto/public/pb_utils.h"
+
+// Iterator for parsing protobuf messages.
+//
+// Example usage:
+//
+// const char* msg_buf = ...
+// size_t msg_size = ...
+//
+// for (struct PerfettoPbDecoderIterator it =
+//          PerfettoPbDecoderIterateBegin(msg_buf, msg_size);
+//      it.field.status == PERFETTO_PB_DECODER_OK;
+//      PerfettoPbDecoderIterateNext(&it)) {
+//   // Do something with it.field
+// }
+struct PerfettoPbDecoderIterator {
+  struct PerfettoPbDecoder decoder;
+  struct PerfettoPbDecoderField field;
+};
+
+static inline struct PerfettoPbDecoderIterator PerfettoPbDecoderIterateBegin(
+    const void* start,
+    size_t size) {
+  struct PerfettoPbDecoderIterator ret;
+  ret.decoder.read_ptr = PERFETTO_REINTERPRET_CAST(const uint8_t*, start);
+  ret.decoder.end_ptr = PERFETTO_REINTERPRET_CAST(const uint8_t*, start) + size;
+  ret.field = PerfettoPbDecoderParseField(&ret.decoder);
+  return ret;
+}
+
+static inline struct PerfettoPbDecoderIterator
+PerfettoPbDecoderIterateNestedBegin(
+    struct PerfettoPbDecoderDelimitedField val) {
+  struct PerfettoPbDecoderIterator ret;
+  ret.decoder.read_ptr = val.start;
+  ret.decoder.end_ptr = val.start + val.len;
+  ret.field = PerfettoPbDecoderParseField(&ret.decoder);
+  return ret;
+}
+
+static inline void PerfettoPbDecoderIterateNext(
+    struct PerfettoPbDecoderIterator* iterator) {
+  iterator->field = PerfettoPbDecoderParseField(&iterator->decoder);
+}
+
+static inline bool PerfettoPbDecoderFieldGetUint32(
+    const PerfettoPbDecoderField* field,
+    uint32_t* out) {
+  switch (field->wire_type) {
+    case PERFETTO_PB_WIRE_TYPE_VARINT:
+    case PERFETTO_PB_WIRE_TYPE_FIXED64:
+      *out = PERFETTO_STATIC_CAST(uint32_t, field->value.integer64);
+      return true;
+    case PERFETTO_PB_WIRE_TYPE_FIXED32:
+      *out = field->value.integer32;
+      return true;
+  }
+  return false;
+}
+
+static inline bool PerfettoPbDecoderFieldGetInt32(
+    const PerfettoPbDecoderField* field,
+    int32_t* out) {
+  switch (field->wire_type) {
+    case PERFETTO_PB_WIRE_TYPE_VARINT:
+    case PERFETTO_PB_WIRE_TYPE_FIXED64:
+      *out = PERFETTO_STATIC_CAST(int32_t, field->value.integer64);
+      return true;
+    case PERFETTO_PB_WIRE_TYPE_FIXED32:
+      *out = PERFETTO_STATIC_CAST(int32_t, field->value.integer32);
+      return true;
+  }
+  return false;
+}
+
+static inline bool PerfettoPbDecoderFieldGetUint64(
+    const PerfettoPbDecoderField* field,
+    uint64_t* out) {
+  switch (field->wire_type) {
+    case PERFETTO_PB_WIRE_TYPE_VARINT:
+    case PERFETTO_PB_WIRE_TYPE_FIXED64:
+      *out = field->value.integer64;
+      return true;
+    case PERFETTO_PB_WIRE_TYPE_FIXED32:
+      *out = field->value.integer32;
+      return true;
+  }
+  return false;
+}
+
+static inline bool PerfettoPbDecoderFieldGetInt64(
+    const PerfettoPbDecoderField* field,
+    int64_t* out) {
+  switch (field->wire_type) {
+    case PERFETTO_PB_WIRE_TYPE_VARINT:
+    case PERFETTO_PB_WIRE_TYPE_FIXED64:
+      *out = PERFETTO_STATIC_CAST(int64_t, field->value.integer64);
+      return true;
+    case PERFETTO_PB_WIRE_TYPE_FIXED32:
+      *out = PERFETTO_STATIC_CAST(int64_t, field->value.integer32);
+      return true;
+  }
+  return false;
+}
+
+static inline bool PerfettoPbDecoderFieldGetBool(
+    const PerfettoPbDecoderField* field,
+    bool* out) {
+  switch (field->wire_type) {
+    case PERFETTO_PB_WIRE_TYPE_VARINT:
+    case PERFETTO_PB_WIRE_TYPE_FIXED64:
+      *out = field->value.integer64 != 0;
+      return true;
+    case PERFETTO_PB_WIRE_TYPE_FIXED32:
+      *out = field->value.integer32 != 0;
+      return true;
+  }
+  return false;
+}
+
+static inline bool PerfettoPbDecoderFieldGetFloat(
+    const PerfettoPbDecoderField* field,
+    float* out) {
+  switch (field->wire_type) {
+    case PERFETTO_PB_WIRE_TYPE_FIXED64:
+      *out = PERFETTO_STATIC_CAST(float, field->value.double_val);
+      return true;
+    case PERFETTO_PB_WIRE_TYPE_FIXED32:
+      *out = field->value.float_val;
+      return true;
+  }
+  return false;
+}
+
+static inline bool PerfettoPbDecoderFieldGetDouble(
+    const PerfettoPbDecoderField* field,
+    double* out) {
+  switch (field->wire_type) {
+    case PERFETTO_PB_WIRE_TYPE_FIXED64:
+      *out = field->value.double_val;
+      return true;
+    case PERFETTO_PB_WIRE_TYPE_FIXED32:
+      *out = PERFETTO_STATIC_CAST(double, field->value.float_val);
+      return true;
+  }
+  return false;
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PB_DECODER_H_
diff --git a/src/libtracing/perfetto/public/pb_macros.h b/src/libtracing/perfetto/public/pb_macros.h
new file mode 100644
index 000000000..03724a5fd
--- /dev/null
+++ b/src/libtracing/perfetto/public/pb_macros.h
@@ -0,0 +1,280 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_PB_MACROS_H_
+#define INCLUDE_PERFETTO_PUBLIC_PB_MACROS_H_
+
+#include "perfetto/public/compiler.h"   // IWYU pragma: export
+#include "perfetto/public/pb_msg.h"     // IWYU pragma: export
+#include "perfetto/public/pb_packed.h"  // IWYU pragma: export
+#include "perfetto/public/pb_utils.h"   // IWYU pragma: export
+
+// This header contains macros that define types and accessors for protobuf
+// messages.
+//
+// Example usage:
+//
+// PERFETTO_PB_ENUM(perfetto_protos_BuiltinClock){
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_UNKNOWN) = 0,
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_REALTIME) = 1,
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_REALTIME_COARSE)
+//         = 2,
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MONOTONIC) = 3,
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MONOTONIC_COARSE)
+//         = 4,
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MONOTONIC_RAW) = 5,
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_BOOTTIME) = 6,
+//     PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MAX_ID) = 63,
+// };
+//
+// PERFETTO_PB_MSG(perfetto_protos_TraceConfig_BuiltinDataSource);
+// PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+//                   VARINT,
+//                   perfetto_protos_BuiltinClock,
+//                   primary_trace_clock,
+//                   5);
+//
+// PERFETTO_PB_MSG(perfetto_protos_TraceConfig);
+// PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TraceConfig, LockdownModeOperation){
+//     PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+//         LOCKDOWN_UNCHANGED) = 0,
+//     PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+//         LOCKDOWN_CLEAR) = 1,
+//     PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+//         LOCKDOWN_SET) = 2,
+// };
+// PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+//                   VARINT,
+//                   perfetto_protos_TraceConfig_LockdownModeOperation,
+//                   lockdown_mode,
+//                   5);
+//
+// PERFETTO_PB_MSG_DECL(perfetto_protos_DebugAnnotation);
+// PERFETTO_PB_MSG_DECL(perfetto_protos_TestEvent_TestPayload);
+//
+// PERFETTO_PB_MSG(perfetto_protos_TestEvent);
+// PERFETTO_PB_FIELD(perfetto_protos_TestEvent, STRING, const char*, str, 1);
+// PERFETTO_PB_FIELD(perfetto_protos_TestEvent, VARINT, uint32_t, seq_value, 2);
+// PERFETTO_PB_FIELD(perfetto_protos_TestEvent, VARINT, uint64_t, counter, 3);
+// PERFETTO_PB_FIELD(perfetto_protos_TestEvent,
+//                   MSG,
+//                   perfetto_protos_TestEvent_TestPayload,
+//                   payload,
+//                   5);
+//
+// PERFETTO_PB_MSG(perfetto_protos_TestEvent_TestPayload);
+// PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+//                   STRING,
+//                   const char*,
+//                   str,
+//                   1);
+// PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+//                   MSG,
+//                   perfetto_protos_DebugAnnotation,
+//                   debug_annotations,
+//                   7);
+
+#define PERFETTO_I_PB_CONCAT_4_(A, B, C, D) A##B##C##D
+#define PERFETTO_I_PB_CONCAT_4(A, B, C, D) PERFETTO_I_PB_CONCAT_4_(A, B, C, D)
+
+#define PERFETTO_I_PB_CONCAT_3_(A, B, C) A##B##C
+#define PERFETTO_I_PB_CONCAT_3(A, B, C) PERFETTO_I_PB_CONCAT_3_(A, B, C)
+
+#define PERFETTO_I_PB_SETTER_NAME(PROTO, NAME) \
+  PERFETTO_I_PB_CONCAT_3(PROTO, _set_, NAME)
+
+#define PERFETTO_I_PB_SETTER_CSTR_NAME(PROTO, NAME) \
+  PERFETTO_I_PB_CONCAT_3(PROTO, _set_cstr_, NAME)
+
+#define PERFETTO_I_PB_SETTER_BEGIN_NAME(PROTO, NAME) \
+  PERFETTO_I_PB_CONCAT_3(PROTO, _begin_, NAME)
+
+#define PERFETTO_I_PB_SETTER_END_NAME(PROTO, NAME) \
+  PERFETTO_I_PB_CONCAT_3(PROTO, _end_, NAME)
+
+#define PERFETTO_I_PB_NUM_FIELD_NAME(PROTO, NAME) \
+  PERFETTO_I_PB_CONCAT_4(PROTO, _, NAME, _field_number)
+
+#define PERFETTO_I_PB_GET_MSG(C_TYPE) PERFETTO_I_PB_CONCAT_3(C_TYPE, _, get_msg)
+
+#define PERFETTO_I_PB_FIELD_STRING(PROTO, C_TYPE, NAME, NUM)              \
+  static inline void PERFETTO_I_PB_SETTER_CSTR_NAME(PROTO, NAME)(         \
+      struct PROTO * msg, const char* value) {                            \
+    PerfettoPbMsgAppendCStrField(&msg->msg, NUM, value);                  \
+  }                                                                       \
+  static inline void PERFETTO_I_PB_SETTER_NAME(PROTO, NAME)(              \
+      struct PROTO * msg, const void* data, size_t len) {                 \
+    PerfettoPbMsgAppendType2Field(                                        \
+        &msg->msg, NUM, PERFETTO_STATIC_CAST(const uint8_t*, data), len); \
+  }                                                                       \
+  static inline void PERFETTO_I_PB_SETTER_BEGIN_NAME(PROTO, NAME)(        \
+      struct PROTO * msg, struct PerfettoPbMsg * nested) {                \
+    PerfettoPbMsgBeginNested(&msg->msg, nested, NUM);                     \
+  }                                                                       \
+  static inline void PERFETTO_I_PB_SETTER_END_NAME(PROTO, NAME)(          \
+      struct PROTO * msg, struct PerfettoPbMsg * nested) {                \
+    (void)nested;                                                         \
+    PerfettoPbMsgEndNested(&msg->msg);                                    \
+  }
+
+#define PERFETTO_I_PB_FIELD_VARINT(PROTO, C_TYPE, NAME, NUM)              \
+  static inline void PERFETTO_I_PB_SETTER_NAME(PROTO, NAME)(              \
+      struct PROTO * msg, C_TYPE value) {                                 \
+    PerfettoPbMsgAppendType0Field(&msg->msg, NUM,                         \
+                                  PERFETTO_STATIC_CAST(uint64_t, value)); \
+  }
+
+#define PERFETTO_I_PB_FIELD_ZIGZAG(PROTO, C_TYPE, NAME, NUM)            \
+  static inline void PERFETTO_I_PB_SETTER_NAME(PROTO, NAME)(            \
+      struct PROTO * msg, C_TYPE value) {                               \
+    uint64_t encoded =                                                  \
+        PerfettoPbZigZagEncode64(PERFETTO_STATIC_CAST(int64_t, value)); \
+    PerfettoPbMsgAppendType0Field(&msg->msg, NUM, encoded);             \
+  }
+
+#define PERFETTO_I_PB_FIELD_FIXED64(PROTO, C_TYPE, NAME, NUM) \
+  static inline void PERFETTO_I_PB_SETTER_NAME(PROTO, NAME)(  \
+      struct PROTO * msg, C_TYPE value) {                     \
+    uint64_t val;                                             \
+    memcpy(&val, &value, sizeof val);                         \
+    PerfettoPbMsgAppendFixed64Field(&msg->msg, NUM, val);     \
+  }
+
+#define PERFETTO_I_PB_FIELD_FIXED32(PROTO, C_TYPE, NAME, NUM) \
+  static inline void PERFETTO_I_PB_SETTER_NAME(PROTO, NAME)(  \
+      struct PROTO * msg, C_TYPE value) {                     \
+    uint32_t val;                                             \
+    memcpy(&val, &value, sizeof val);                         \
+    PerfettoPbMsgAppendFixed32Field(&msg->msg, NUM, val);     \
+  }
+
+#define PERFETTO_I_PB_FIELD_MSG(PROTO, C_TYPE, NAME, NUM)          \
+  static inline void PERFETTO_I_PB_SETTER_BEGIN_NAME(PROTO, NAME)( \
+      struct PROTO * msg, struct C_TYPE * nested) {                \
+    struct PerfettoPbMsg* nested_msg =                             \
+        PERFETTO_REINTERPRET_CAST(struct PerfettoPbMsg*, nested);  \
+    PerfettoPbMsgBeginNested(&msg->msg, nested_msg, NUM);          \
+  }                                                                \
+  static inline void PERFETTO_I_PB_SETTER_END_NAME(PROTO, NAME)(   \
+      struct PROTO * msg, struct C_TYPE * nested) {                \
+    (void)nested;                                                  \
+    PerfettoPbMsgEndNested(&msg->msg);                             \
+  }
+
+#define PERFETTO_I_PB_FIELD_PACKED(PROTO, C_TYPE, NAME, NUM)                  \
+  static inline void PERFETTO_I_PB_SETTER_NAME(PROTO, NAME)(                  \
+      struct PROTO * msg, const void* data, size_t len) {                     \
+    PerfettoPbMsgAppendType2Field(                                            \
+        &msg->msg, NUM, PERFETTO_STATIC_CAST(const uint8_t*, data), len);     \
+  }                                                                           \
+  static inline void PERFETTO_I_PB_SETTER_BEGIN_NAME(PROTO, NAME)(            \
+      struct PROTO * msg, struct PerfettoPbPackedMsg##C_TYPE * nested) {      \
+    struct PerfettoPbMsg* nested_msg =                                        \
+        PERFETTO_REINTERPRET_CAST(struct PerfettoPbMsg*, nested);             \
+    PerfettoPbMsgBeginNested(&msg->msg, nested_msg, NUM);                     \
+  }                                                                           \
+  static inline void PERFETTO_I_PB_SETTER_END_NAME(PROTO, NAME)(              \
+      struct PROTO * msg, struct PerfettoPbPackedMsg##C_TYPE * nested) {      \
+    (void)nested;                                                             \
+    PerfettoPbMsgEndNested(&msg->msg);                                        \
+  }                                                                           \
+
+#define PERFETTO_I_PB_NUM_FIELD(PROTO, NAME, NUM) \
+  enum { PERFETTO_I_PB_NUM_FIELD_NAME(PROTO, NAME) = NUM }
+
+// Below are public macros that can be used to define protos. All the macros
+// above are just implementation details and can change at any time.
+
+// Defines the type for a protobuf message.
+// `PROTO` is the name of the message type. For nested messages, an underscore
+// should be used as a separator.
+#define PERFETTO_PB_MSG(PROTO) \
+  struct PROTO {               \
+    struct PerfettoPbMsg msg;  \
+  }
+
+// Declares the type for a protobuf message. Useful when a file references a
+// type (because it is used as type for a field), but doesn't need the full
+// definition.
+#define PERFETTO_PB_MSG_DECL(PROTO) struct PROTO
+
+// Defines accessors for a field of a message.
+// * `PROTO`: The message that contains this field. This should be the same
+//   identifier passed to PERFETTO_PB_MSG.
+// * `NAME`: The name of the field. It will be concatenated with `PROTO` to
+//   produce the name for the accessors.
+// * `NUM`: The numeric identifier for this field.
+// * `TYPE`: The protobuf type of the field. Possible options:
+//   * `VARINT`: For most integer (scalar and repeated non-packed) and enum
+//     field types. `CTYPE` is the corresponding C type of the field. Generates
+//     a single NAMESPACE_PROTO_set_NAME(CTYPE value accessor).
+//   * `ZIGZAG`: For sint* (scalar and repeated non-packed) field types. `CTYPE`
+//     is the corresponding C type of the field. Generates a single
+//     PROTO_set_NAME(struct PROTO*, CTYPE) value setter.
+//   * `FIXED32`: For fixed32, sfixed32 and float (scalar and repeated
+//     non-packed) field types. `CTYPE` can be uint32_t, int32_t or float.
+//     Generates a single PROTO_set_NAME(struct PROTO*, CTYPE) value setter.
+//   * `FIXED64`: For fixed64, sfixed64 or double (scalar and repeated
+//     non-packed) field types. `CTYPE` can be uint64_t or int64_t or double.
+//     Generates a single PROTO_set_NAME(struct PROTO*, CTYPE) value setter.
+//   * `MSG`: for nested (scalar and repeated) messages field types. `CTYPE` is
+//     the type of the nested message (full type, including the namespace).
+//     Generates
+//     `PROTO_begin_NAME(struct PROTO*, struct CTYPE* nested)` and
+//     `PROTO_end_NAME(struct PROTO*, struct CTYPE* nested)` that allows to
+//     begin and end a nested submessage. `*nested` doesn't need to be
+//     initialized.
+//   * `STRING`: for bytes and string field types. `CTYPE` should be
+//     `const char *`. Generates multiple accessors:
+//      * PROTO_set_cstr_NAME(struct PROTO*, const char*): Sets the value of the
+//        field by copying from a null terminated string.
+//      * PROTO_set_NAME(struct PROTO*, const void*, size_t): Sets the value of
+//        the field by copying from a buffer at an address with the specified
+//        size.
+//      * PROTO_begin_NAME(struct PROTO*, struct PerfettoPbMsg* nested) and
+//        PROTO_end_NAME(struct PROTO*, struct PerfettoPbMsg* nested):
+//        Begins (and ends) a nested submessage to allow users to generate part
+//        of the length delimited buffer piece by piece.
+//   * `PACKED`: for packed repeated field types. `CTYPE` should be
+//     one of `PerfettoPbPacked*`. Generates multiple accessors:
+//      * PROTO_set_NAME(struct PROTO*, const void*, size_t): Sets the value of
+//        the field by copying from a buffer at an address with the specified
+//        size.
+//      * PROTO_begin_NAME(struct PROTO*, struct PerfettoPbPackedMsgCTYPE*
+//        nested) and
+//        PROTO_end_NAME(struct PROTO*, struct PerfettoPbPackedMsgCTYPE*
+//        nested): Begins (and ends) a packed helper nested submessage (of the
+//        right type) to allow users to push repeated entries one by one
+//        directly into the stream writer buffer.
+#define PERFETTO_PB_FIELD(PROTO, TYPE, C_TYPE, NAME, NUM) \
+  PERFETTO_I_PB_FIELD_##TYPE(PROTO, C_TYPE, NAME, NUM)    \
+      PERFETTO_I_PB_NUM_FIELD(PROTO, NAME, NUM)
+
+// Defines an enum type nested inside a message (PROTO).
+#define PERFETTO_PB_ENUM_IN_MSG(PROTO, ENUM) \
+  enum PERFETTO_I_PB_CONCAT_3(PROTO, _, ENUM)
+
+// Defines an entry for an enum tpye nested inside a message.
+#define PERFETTO_PB_ENUM_IN_MSG_ENTRY(PROTO, NAME) \
+  PERFETTO_I_PB_CONCAT_3(PROTO, _, NAME)
+
+// Defines a global enum type.
+#define PERFETTO_PB_ENUM(ENUM) enum ENUM
+
+// Defines an entry for global enum type.
+#define PERFETTO_PB_ENUM_ENTRY(NAME) NAME
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PB_MACROS_H_
diff --git a/src/libtracing/perfetto/public/pb_msg.h b/src/libtracing/perfetto/public/pb_msg.h
new file mode 100644
index 000000000..717a080d9
--- /dev/null
+++ b/src/libtracing/perfetto/public/pb_msg.h
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_PB_MSG_H_
+#define INCLUDE_PERFETTO_PUBLIC_PB_MSG_H_
+
+#include <assert.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "perfetto/public/abi/stream_writer_abi.h"
+#include "perfetto/public/compiler.h"
+#include "perfetto/public/pb_utils.h"
+#include "perfetto/public/stream_writer.h"
+
+// The number of bytes reserved by this implementation to encode a protobuf type
+// 2 field size as var-int. Keep this in sync with kMessageLengthFieldSize in
+// proto_utils.h.
+#define PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE 4
+
+// Points to the memory used by a `PerfettoPbMsg` for writing.
+struct PerfettoPbMsgWriter {
+  struct PerfettoStreamWriter writer;
+};
+
+struct PerfettoPbMsg {
+  // Pointer to a non-aligned pre-reserved var-int slot of
+  // PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE bytes. If not NULL,
+  // protozero_length_buf_finalize() will write the size of proto-encoded
+  // message in the pointed memory region.
+  uint8_t* size_field;
+
+  // Current size of the buffer.
+  uint32_t size;
+
+  struct PerfettoPbMsgWriter* writer;
+
+  struct PerfettoPbMsg* nested;
+  struct PerfettoPbMsg* parent;
+};
+
+static inline void PerfettoPbMsgInit(struct PerfettoPbMsg* msg,
+                                     struct PerfettoPbMsgWriter* writer) {
+  msg->size_field = PERFETTO_NULL;
+  msg->size = 0;
+  msg->writer = writer;
+  msg->nested = PERFETTO_NULL;
+  msg->parent = PERFETTO_NULL;
+}
+
+static inline void PerfettoPbMsgPatch(struct PerfettoPbMsg* msg) {
+  static_assert(
+      PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE == PERFETTO_STREAM_WRITER_PATCH_SIZE,
+      "PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE doesn't match patch size");
+  msg->size_field =
+      PerfettoStreamWriterAnnotatePatch(&msg->writer->writer, msg->size_field);
+}
+
+static inline void PerfettoPbMsgPatchStack(struct PerfettoPbMsg* msg) {
+  uint8_t* const cur_range_end = msg->writer->writer.end;
+  uint8_t* const cur_range_begin = msg->writer->writer.begin;
+  while (msg && cur_range_begin <= msg->size_field &&
+         msg->size_field < cur_range_end) {
+    PerfettoPbMsgPatch(msg);
+    msg = msg->parent;
+  }
+}
+
+static inline void PerfettoPbMsgAppendBytes(struct PerfettoPbMsg* msg,
+                                            const uint8_t* begin,
+                                            size_t size) {
+  if (PERFETTO_UNLIKELY(
+          size > PerfettoStreamWriterAvailableBytes(&msg->writer->writer))) {
+    PerfettoPbMsgPatchStack(msg);
+  }
+  PerfettoStreamWriterAppendBytes(&msg->writer->writer, begin, size);
+  msg->size += size;
+}
+
+static inline void PerfettoPbMsgAppendByte(struct PerfettoPbMsg* msg,
+                                           uint8_t value) {
+  PerfettoPbMsgAppendBytes(msg, &value, 1);
+}
+
+static inline void PerfettoPbMsgAppendVarInt(struct PerfettoPbMsg* msg,
+                                             uint64_t value) {
+  uint8_t* buf_end;
+  uint8_t buf[PERFETTO_PB_VARINT_MAX_SIZE_64];
+  buf_end = PerfettoPbWriteVarInt(value, buf);
+
+  PerfettoPbMsgAppendBytes(msg, buf,
+                           PERFETTO_STATIC_CAST(size_t, buf_end - buf));
+}
+
+static inline void PerfettoPbMsgAppendFixed64(struct PerfettoPbMsg* msg,
+                                              uint64_t value) {
+  uint8_t buf[8];
+  PerfettoPbWriteFixed64(value, buf);
+
+  PerfettoPbMsgAppendBytes(msg, buf, 8);
+}
+
+static inline void PerfettoPbMsgAppendFixed32(struct PerfettoPbMsg* msg,
+                                              uint32_t value) {
+  uint8_t buf[4];
+  PerfettoPbWriteFixed32(value, buf);
+
+  PerfettoPbMsgAppendBytes(msg, buf, 4);
+}
+
+static inline void PerfettoPbMsgAppendType0Field(struct PerfettoPbMsg* msg,
+                                                 int32_t field_id,
+                                                 uint64_t value) {
+  uint8_t* buf_end;
+  uint8_t buf[PERFETTO_PB_VARINT_MAX_SIZE_64 + PERFETTO_PB_VARINT_MAX_SIZE_32];
+  buf_end = PerfettoPbWriteVarInt(
+      PerfettoPbMakeTag(field_id, PERFETTO_PB_WIRE_TYPE_VARINT), buf);
+  buf_end = PerfettoPbWriteVarInt(value, buf_end);
+
+  PerfettoPbMsgAppendBytes(msg, buf,
+                           PERFETTO_STATIC_CAST(size_t, buf_end - buf));
+}
+
+static inline void PerfettoPbMsgAppendType2Field(struct PerfettoPbMsg* msg,
+                                                 int32_t field_id,
+                                                 const uint8_t* data,
+                                                 size_t size) {
+  uint8_t* buf_end;
+  uint8_t buf[PERFETTO_PB_VARINT_MAX_SIZE_64 + PERFETTO_PB_VARINT_MAX_SIZE_32];
+  buf_end = PerfettoPbWriteVarInt(
+      PerfettoPbMakeTag(field_id, PERFETTO_PB_WIRE_TYPE_DELIMITED), buf);
+  buf_end =
+      PerfettoPbWriteVarInt(PERFETTO_STATIC_CAST(uint64_t, size), buf_end);
+  PerfettoPbMsgAppendBytes(msg, buf,
+                           PERFETTO_STATIC_CAST(size_t, buf_end - buf));
+
+  PerfettoPbMsgAppendBytes(msg, data, size);
+}
+
+static inline void PerfettoPbMsgAppendFixed32Field(struct PerfettoPbMsg* msg,
+                                                   int32_t field_id,
+                                                   uint32_t value) {
+  uint8_t* buf_end;
+  uint8_t buf[PERFETTO_PB_VARINT_MAX_SIZE_32 + 4];
+  buf_end = PerfettoPbWriteVarInt(
+      PerfettoPbMakeTag(field_id, PERFETTO_PB_WIRE_TYPE_FIXED32), buf);
+  buf_end = PerfettoPbWriteFixed32(value, buf_end);
+
+  PerfettoPbMsgAppendBytes(msg, buf,
+                           PERFETTO_STATIC_CAST(size_t, buf_end - buf));
+}
+
+static inline void PerfettoPbMsgAppendFloatField(struct PerfettoPbMsg* msg,
+                                                 int32_t field_id,
+                                                 float value) {
+  uint32_t val;
+  memcpy(&val, &value, sizeof val);
+  PerfettoPbMsgAppendFixed32Field(msg, field_id, val);
+}
+
+static inline void PerfettoPbMsgAppendFixed64Field(struct PerfettoPbMsg* msg,
+                                                   int32_t field_id,
+                                                   uint64_t value) {
+  uint8_t* buf_end;
+  uint8_t buf[PERFETTO_PB_VARINT_MAX_SIZE_32 + 8];
+  buf_end = PerfettoPbWriteVarInt(
+      PerfettoPbMakeTag(field_id, PERFETTO_PB_WIRE_TYPE_FIXED64), buf);
+  buf_end = PerfettoPbWriteFixed64(value, buf_end);
+
+  PerfettoPbMsgAppendBytes(msg, buf,
+                           PERFETTO_STATIC_CAST(size_t, buf_end - buf));
+}
+
+static inline void PerfettoPbMsgAppendDoubleField(struct PerfettoPbMsg* msg,
+                                                  int32_t field_id,
+                                                  double value) {
+  uint64_t val;
+  memcpy(&val, &value, sizeof val);
+  PerfettoPbMsgAppendFixed64Field(msg, field_id, val);
+}
+
+static inline void PerfettoPbMsgAppendCStrField(struct PerfettoPbMsg* msg,
+                                                int32_t field_id,
+                                                const char* c_str) {
+  PerfettoPbMsgAppendType2Field(
+      msg, field_id, PERFETTO_REINTERPRET_CAST(const uint8_t*, c_str),
+      strlen(c_str));
+}
+
+static inline void PerfettoPbMsgBeginNested(struct PerfettoPbMsg* parent,
+                                            struct PerfettoPbMsg* nested,
+                                            int32_t field_id) {
+  PerfettoPbMsgAppendVarInt(
+      parent, PerfettoPbMakeTag(field_id, PERFETTO_PB_WIRE_TYPE_DELIMITED));
+
+  PerfettoPbMsgInit(nested, parent->writer);
+  if (PERFETTO_UNLIKELY(
+          PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE >
+          PerfettoStreamWriterAvailableBytes(&parent->writer->writer))) {
+    PerfettoPbMsgPatchStack(parent);
+  }
+  nested->size_field = PERFETTO_REINTERPRET_CAST(
+      uint8_t*,
+      PerfettoStreamWriterReserveBytes(&nested->writer->writer,
+                                       PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE));
+  nested->parent = parent;
+  parent->size += PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE;
+  parent->nested = nested;
+}
+
+static inline size_t PerfettoPbMsgFinalize(struct PerfettoPbMsg* msg);
+
+static inline void PerfettoPbMsgEndNested(struct PerfettoPbMsg* parent) {
+  parent->size += PerfettoPbMsgFinalize(parent->nested);
+  parent->nested = PERFETTO_NULL;
+}
+
+static inline size_t PerfettoPbMsgFinalize(struct PerfettoPbMsg* msg) {
+  if (msg->nested)
+    PerfettoPbMsgEndNested(msg);
+
+  // Write the length of the nested message a posteriori, using a leading-zero
+  // redundant varint encoding.
+  if (msg->size_field) {
+    uint32_t size_to_write;
+    size_to_write = msg->size;
+    for (size_t i = 0; i < PROTOZERO_MESSAGE_LENGTH_FIELD_SIZE; i++) {
+      const uint8_t msb = (i < 3) ? 0x80 : 0;
+      msg->size_field[i] = (size_to_write & 0xFF) | msb;
+      size_to_write >>= 7;
+    }
+    msg->size_field = PERFETTO_NULL;
+  }
+
+  return msg->size;
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PB_MSG_H_
diff --git a/src/libtracing/perfetto/public/pb_packed.h b/src/libtracing/perfetto/public/pb_packed.h
new file mode 100644
index 000000000..2d9bb68c8
--- /dev/null
+++ b/src/libtracing/perfetto/public/pb_packed.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_PB_PACKED_H_
+#define INCLUDE_PERFETTO_PUBLIC_PB_PACKED_H_
+
+#include <stdint.h>
+#include <string.h>
+
+#include "perfetto/public/compiler.h"
+#include "perfetto/public/pb_msg.h"
+#include "perfetto/public/pb_utils.h"
+
+// This file provides a way of serializing packed repeated fields. All the
+// strongly typed `struct PerfettoPbPackedMsg*` variants behave as protozero
+// nested messages and allow zero-copy serialization. A protobuf message that
+// has a packed repeated field provides begin and end operations that accept a
+// PerfettoPbPackedMsg. The downside of this approach is that (like all
+// protozero nested messages), it reserves 4 bytes to encode the length, so it
+// might add overhead for lots of small messages.
+
+// ***
+// Sample usage of PerfettoPbPackedMsg*
+// ***
+// ```
+// struct PerfettoPbPackedMsgUint64 f;
+// PROTO_begin_FIELD_NAME(&msg, &f);
+// PerfettoPbPackedMsgUint64Append(&f, 1);
+// PerfettoPbPackedMsgUint64Append(&f, 2);
+// PROTO_end_FIELD_NAME(&msg, &f);
+// ```
+
+// ***
+// Implementations of struct PerfettoPbPackedMsg for all supported field types.
+// ***
+struct PerfettoPbPackedMsgUint64 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgUint64Append(
+    struct PerfettoPbPackedMsgUint64* buf,
+    uint64_t value) {
+  PerfettoPbMsgAppendVarInt(&buf->msg, value);
+}
+
+struct PerfettoPbPackedMsgUint32 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgUint32Append(
+    struct PerfettoPbPackedMsgUint32* buf,
+    uint32_t value) {
+  PerfettoPbMsgAppendVarInt(&buf->msg, value);
+}
+
+struct PerfettoPbPackedMsgInt64 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgInt64Append(
+    struct PerfettoPbPackedMsgInt64* buf,
+    int64_t value) {
+  PerfettoPbMsgAppendVarInt(&buf->msg, PERFETTO_STATIC_CAST(uint64_t, value));
+}
+
+struct PerfettoPbPackedMsgInt32 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgInt32Append(
+    struct PerfettoPbPackedMsgInt32* buf,
+    int32_t value) {
+  PerfettoPbMsgAppendVarInt(&buf->msg, PERFETTO_STATIC_CAST(uint64_t, value));
+}
+
+struct PerfettoPbPackedMsgSint64 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgSint64Append(
+    struct PerfettoPbPackedMsgSint64* buf,
+    int64_t value) {
+  uint64_t encoded = PerfettoPbZigZagEncode64(value);
+  PerfettoPbMsgAppendVarInt(&buf->msg, encoded);
+}
+
+struct PerfettoPbPackedMsgSint32 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgSint32Append(
+    struct PerfettoPbPackedMsgSint32* buf,
+    int32_t value) {
+  uint64_t encoded =
+      PerfettoPbZigZagEncode64(PERFETTO_STATIC_CAST(int64_t, value));
+  PerfettoPbMsgAppendVarInt(&buf->msg, encoded);
+}
+
+struct PerfettoPbPackedMsgFixed64 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgFixed64Append(
+    struct PerfettoPbPackedMsgFixed64* buf,
+    uint64_t value) {
+  PerfettoPbMsgAppendFixed64(&buf->msg, value);
+}
+
+struct PerfettoPbPackedMsgFixed32 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgFixed32Append(
+    struct PerfettoPbPackedMsgFixed32* buf,
+    uint32_t value) {
+  PerfettoPbMsgAppendFixed32(&buf->msg, value);
+}
+
+struct PerfettoPbPackedMsgSfixed64 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgSfixed64Append(
+    struct PerfettoPbPackedMsgSfixed64* buf,
+    int64_t value) {
+  uint64_t encoded;
+  memcpy(&encoded, &value, sizeof(encoded));
+  PerfettoPbMsgAppendFixed64(&buf->msg, encoded);
+}
+
+struct PerfettoPbPackedMsgSfixed32 {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgSfixed32Append(
+    struct PerfettoPbPackedMsgSfixed32* buf,
+    int32_t value) {
+  uint32_t encoded;
+  memcpy(&encoded, &value, sizeof(encoded));
+  PerfettoPbMsgAppendFixed32(&buf->msg, encoded);
+}
+
+struct PerfettoPbPackedMsgDouble {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgDoubleAppend(
+    struct PerfettoPbPackedMsgDouble* buf,
+    double value) {
+  uint64_t encoded;
+  memcpy(&encoded, &value, sizeof(encoded));
+  PerfettoPbMsgAppendFixed64(&buf->msg, encoded);
+}
+
+struct PerfettoPbPackedMsgFloat {
+  struct PerfettoPbMsg msg;
+};
+static inline void PerfettoPbPackedMsgFloatAppend(
+    struct PerfettoPbPackedMsgFloat* buf,
+    float value) {
+  uint32_t encoded;
+  memcpy(&encoded, &value, sizeof(encoded));
+  PerfettoPbMsgAppendFixed32(&buf->msg, encoded);
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PB_PACKED_H_
diff --git a/src/libtracing/perfetto/public/pb_utils.h b/src/libtracing/perfetto/public/pb_utils.h
new file mode 100644
index 000000000..8c36389c5
--- /dev/null
+++ b/src/libtracing/perfetto/public/pb_utils.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_PB_UTILS_H_
+#define INCLUDE_PERFETTO_PUBLIC_PB_UTILS_H_
+
+#include <assert.h>
+#include <stdint.h>
+
+#include "perfetto/public/compiler.h"
+
+// Type of fields that can be found in a protobuf serialized message.
+enum PerfettoPbWireType {
+  PERFETTO_PB_WIRE_TYPE_VARINT = 0,
+  PERFETTO_PB_WIRE_TYPE_FIXED64 = 1,
+  PERFETTO_PB_WIRE_TYPE_DELIMITED = 2,
+  PERFETTO_PB_WIRE_TYPE_FIXED32 = 5,
+};
+
+// Creates a field tag, which encodes the field type and the field id.
+static inline uint32_t PerfettoPbMakeTag(int32_t field_id,
+                                         enum PerfettoPbWireType wire_type) {
+  return ((PERFETTO_STATIC_CAST(uint32_t, field_id)) << 3) |
+         PERFETTO_STATIC_CAST(uint32_t, wire_type);
+}
+
+enum {
+  // Maximum bytes size of a 64-bit integer encoded as a VarInt.
+  PERFETTO_PB_VARINT_MAX_SIZE_64 = 10,
+  // Maximum bytes size of a 32-bit integer encoded as a VarInt.
+  PERFETTO_PB_VARINT_MAX_SIZE_32 = 5,
+};
+
+// Encodes `value` as a VarInt into `*dst`.
+//
+// `dst` must point into a buffer big enough to represent `value`:
+// PERFETTO_PB_VARINT_MAX_SIZE_* can help.
+static inline uint8_t* PerfettoPbWriteVarInt(uint64_t value, uint8_t* dst) {
+  uint8_t byte;
+  while (value >= 0x80) {
+    byte = (value & 0x7f) | 0x80;
+    *dst++ = byte;
+    value >>= 7;
+  }
+  byte = value & 0x7f;
+  *dst++ = byte;
+
+  return dst;
+}
+
+// Encodes `value` as a fixed32 (little endian) into `*dst`.
+//
+// `dst` must point into a buffer with at least 4 bytes of space.
+static inline uint8_t* PerfettoPbWriteFixed32(uint32_t value, uint8_t* buf) {
+  buf[0] = PERFETTO_STATIC_CAST(uint8_t, value);
+  buf[1] = PERFETTO_STATIC_CAST(uint8_t, value >> 8);
+  buf[2] = PERFETTO_STATIC_CAST(uint8_t, value >> 16);
+  buf[3] = PERFETTO_STATIC_CAST(uint8_t, value >> 24);
+  return buf + 4;
+}
+
+// Encodes `value` as a fixed32 (little endian) into `*dst`.
+//
+// `dst` must point into a buffer with at least 8 bytes of space.
+static inline uint8_t* PerfettoPbWriteFixed64(uint64_t value, uint8_t* buf) {
+  buf[0] = PERFETTO_STATIC_CAST(uint8_t, value);
+  buf[1] = PERFETTO_STATIC_CAST(uint8_t, value >> 8);
+  buf[2] = PERFETTO_STATIC_CAST(uint8_t, value >> 16);
+  buf[3] = PERFETTO_STATIC_CAST(uint8_t, value >> 24);
+  buf[4] = PERFETTO_STATIC_CAST(uint8_t, value >> 32);
+  buf[5] = PERFETTO_STATIC_CAST(uint8_t, value >> 40);
+  buf[6] = PERFETTO_STATIC_CAST(uint8_t, value >> 48);
+  buf[7] = PERFETTO_STATIC_CAST(uint8_t, value >> 56);
+  return buf + 8;
+}
+
+// Parses a VarInt from the encoded buffer [start, end). |end| is STL-style and
+// points one byte past the end of buffer.
+// The parsed int value is stored in the output arg |value|. Returns a pointer
+// to the next unconsumed byte (so start < retval <= end) or |start| if the
+// VarInt could not be fully parsed because there was not enough space in the
+// buffer.
+static inline const uint8_t* PerfettoPbParseVarInt(const uint8_t* start,
+                                                   const uint8_t* end,
+                                                   uint64_t* out_value) {
+  const uint8_t* pos = start;
+  uint64_t value = 0;
+  for (uint32_t shift = 0; pos < end && shift < 64u; shift += 7) {
+    // Cache *pos into |cur_byte| to prevent that the compiler dereferences the
+    // pointer twice (here and in the if() below) due to char* aliasing rules.
+    uint8_t cur_byte = *pos++;
+    value |= PERFETTO_STATIC_CAST(uint64_t, cur_byte & 0x7f) << shift;
+    if ((cur_byte & 0x80) == 0) {
+      // In valid cases we get here.
+      *out_value = value;
+      return pos;
+    }
+  }
+  *out_value = 0;
+  return start;
+}
+
+static inline uint32_t PerfettoPbZigZagEncode32(int32_t value) {
+#if defined(__cplusplus) || \
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
+  // Right-shift of negative values is implementation specific.
+  // Assert the implementation does what we expect, which is that shifting an
+  // positive int32_t by 31 gives an all 0 bitmap, and a negative int32_t gives
+  // an all 1 bitmap.
+  static_assert(
+      PERFETTO_STATIC_CAST(uint32_t, INT32_C(-1) >> 31) == ~UINT32_C(0),
+      "implementation does not support assumed rightshift");
+  static_assert(PERFETTO_STATIC_CAST(uint32_t, INT32_C(1) >> 31) == UINT32_C(0),
+                "implementation does not support assumed rightshift");
+#endif
+
+  return (PERFETTO_STATIC_CAST(uint32_t, value) << 1) ^
+         PERFETTO_STATIC_CAST(uint32_t, value >> 31);
+}
+
+static inline uint64_t PerfettoPbZigZagEncode64(int64_t value) {
+#if defined(__cplusplus) || \
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
+  // Right-shift of negative values is implementation specific.
+  // Assert the implementation does what we expect, which is that shifting an
+  // positive int64_t by 63 gives an all 0 bitmap, and a negative int64_t gives
+  // an all 1 bitmap.
+  static_assert(
+      PERFETTO_STATIC_CAST(uint64_t, INT64_C(-1) >> 63) == ~UINT64_C(0),
+      "implementation does not support assumed rightshift");
+  static_assert(PERFETTO_STATIC_CAST(uint64_t, INT64_C(1) >> 63) == UINT64_C(0),
+                "implementation does not support assumed rightshift");
+#endif
+
+  return (PERFETTO_STATIC_CAST(uint64_t, value) << 1) ^
+         PERFETTO_STATIC_CAST(uint64_t, value >> 63);
+}
+
+static inline int32_t PerfettoPbZigZagDecode32(uint32_t value) {
+  uint32_t mask =
+      PERFETTO_STATIC_CAST(uint32_t, -PERFETTO_STATIC_CAST(int32_t, value & 1));
+  return PERFETTO_STATIC_CAST(int32_t, ((value >> 1) ^ mask));
+}
+
+static inline int64_t PerfettoPbZigZagDecode64(uint64_t value) {
+  uint64_t mask =
+      PERFETTO_STATIC_CAST(uint64_t, -PERFETTO_STATIC_CAST(int64_t, value & 1));
+  return PERFETTO_STATIC_CAST(int64_t, ((value >> 1) ^ mask));
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PB_UTILS_H_
diff --git a/src/libtracing/perfetto/public/producer.h b/src/libtracing/perfetto/public/producer.h
new file mode 100644
index 000000000..8fa1351b2
--- /dev/null
+++ b/src/libtracing/perfetto/public/producer.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_PRODUCER_H_
+#define INCLUDE_PERFETTO_PUBLIC_PRODUCER_H_
+
+#include <stdint.h>
+
+#include "perfetto/public/abi/backend_type.h"
+#include "perfetto/public/abi/producer_abi.h"
+#include "perfetto/public/compiler.h"
+
+// Arguments for PerfettoProducerInit. This struct is not ABI-stable, fields can
+// be added and rearranged.
+struct PerfettoProducerInitArgs {
+  // Bitwise-or of backends that should be enabled.
+  PerfettoBackendTypes backends;
+};
+
+// Initializes a PerfettoProducerInitArgs struct.
+#define PERFETTO_PRODUCER_INIT_ARGS_INIT() \
+  { 0 }
+
+// Initializes the global perfetto producer.
+static inline void PerfettoProducerInit(struct PerfettoProducerInitArgs args) {
+  if (args.backends & PERFETTO_BACKEND_IN_PROCESS) {
+    PerfettoProducerInProcessInit();
+  }
+  if (args.backends & PERFETTO_BACKEND_SYSTEM) {
+    PerfettoProducerSystemInit();
+  }
+}
+
+// Informs the tracing services to activate the single trigger `trigger_name` if
+// any tracing session was waiting for it.
+//
+// Sends the trigger signal to all the initialized backends that are currently
+// connected and that connect in the next `ttl_ms` milliseconds (but
+// returns immediately anyway).
+static inline void PerfettoProducerActivateTrigger(const char* trigger_name,
+                                                   uint32_t ttl_ms) {
+  const char* trigger_names[2];
+  trigger_names[0] = trigger_name;
+  trigger_names[1] = PERFETTO_NULL;
+  PerfettoProducerActivateTriggers(trigger_names, ttl_ms);
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PRODUCER_H_
diff --git a/src/libtracing/perfetto/public/protos/BUILD.gn b/src/libtracing/perfetto/public/protos/BUILD.gn
new file mode 100644
index 000000000..f134d356a
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/BUILD.gn
@@ -0,0 +1,32 @@
+# Copyright (C) 2023 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("protos") {
+  sources = [
+    "common/builtin_clock.pzc.h",
+    "common/data_source_descriptor.pzc.h",
+    "config/data_source_config.pzc.h",
+    "config/trace_config.pzc.h",
+    "config/track_event/track_event_config.pzc.h",
+    "trace/interned_data/interned_data.pzc.h",
+    "trace/test_event.pzc.h",
+    "trace/trace.pzc.h",
+    "trace/trace_packet.pzc.h",
+    "trace/track_event/counter_descriptor.pzc.h",
+    "trace/track_event/debug_annotation.pzc.h",
+    "trace/track_event/track_descriptor.pzc.h",
+    "trace/track_event/track_event.pzc.h",
+    "trace/trigger.pzc.h",
+  ]
+}
diff --git a/src/libtracing/perfetto/public/protos/common/builtin_clock.pzc.h b/src/libtracing/perfetto/public/protos/common/builtin_clock.pzc.h
new file mode 100644
index 000000000..51218e460
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/common/builtin_clock.pzc.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_COMMON_BUILTIN_CLOCK_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_COMMON_BUILTIN_CLOCK_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_ENUM(perfetto_protos_BuiltinClock){
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_UNKNOWN) = 0,
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_REALTIME) = 1,
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_REALTIME_COARSE) = 2,
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MONOTONIC) = 3,
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MONOTONIC_COARSE) = 4,
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MONOTONIC_RAW) = 5,
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_BOOTTIME) = 6,
+    PERFETTO_PB_ENUM_ENTRY(perfetto_protos_BUILTIN_CLOCK_MAX_ID) = 63,
+};
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_COMMON_BUILTIN_CLOCK_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/common/data_source_descriptor.pzc.h b/src/libtracing/perfetto/public/protos/common/data_source_descriptor.pzc.h
new file mode 100644
index 000000000..e2cd133b5
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/common/data_source_descriptor.pzc.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_COMMON_DATA_SOURCE_DESCRIPTOR_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_COMMON_DATA_SOURCE_DESCRIPTOR_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_FtraceDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GpuCounterDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TrackEventDescriptor);
+
+PERFETTO_PB_MSG(perfetto_protos_DataSourceDescriptor);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  STRING,
+                  const char*,
+                  name,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  VARINT,
+                  uint64_t,
+                  id,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  VARINT,
+                  bool,
+                  will_notify_on_stop,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  VARINT,
+                  bool,
+                  will_notify_on_start,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  VARINT,
+                  bool,
+                  handles_incremental_state_clear,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  VARINT,
+                  bool,
+                  no_flush,
+                  9);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  MSG,
+                  perfetto_protos_GpuCounterDescriptor,
+                  gpu_counter_descriptor,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  MSG,
+                  perfetto_protos_TrackEventDescriptor,
+                  track_event_descriptor,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceDescriptor,
+                  MSG,
+                  perfetto_protos_FtraceDescriptor,
+                  ftrace_descriptor,
+                  8);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_COMMON_DATA_SOURCE_DESCRIPTOR_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/config/data_source_config.pzc.h b/src/libtracing/perfetto/public/protos/config/data_source_config.pzc.h
new file mode 100644
index 000000000..ed7632ba4
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/config/data_source_config.pzc.h
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_DATA_SOURCE_CONFIG_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_DATA_SOURCE_CONFIG_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidGameInterventionListConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidInputEventConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidLogConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidPolledStateConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidPowerConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidSdkSyspropGuardConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidSystemPropertyConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_EtwConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_FtraceConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GpuCounterConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_HeapprofdConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InodeFileConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InterceptorConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_JavaHprofConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_NetworkPacketTraceConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_PackagesListConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_PerfEventConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProcessStatsConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProtoLogConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_StatsdTracingConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SurfaceFlingerLayersConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SurfaceFlingerTransactionsConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SysStatsConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SystemInfoConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TestConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TrackEventConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_V8Config);
+PERFETTO_PB_MSG_DECL(perfetto_protos_VulkanMemoryConfig);
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_DataSourceConfig, SessionInitiator){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_DataSourceConfig,
+                                  SESSION_INITIATOR_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_DataSourceConfig,
+                                  SESSION_INITIATOR_TRUSTED_SYSTEM) = 1,
+};
+
+PERFETTO_PB_MSG(perfetto_protos_DataSourceConfig);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  STRING,
+                  const char*,
+                  name,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  VARINT,
+                  uint32_t,
+                  target_buffer,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  VARINT,
+                  uint32_t,
+                  trace_duration_ms,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  VARINT,
+                  bool,
+                  prefer_suspend_clock_for_duration,
+                  122);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  VARINT,
+                  uint32_t,
+                  stop_timeout_ms,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  VARINT,
+                  bool,
+                  enable_extra_guardrails,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  VARINT,
+                  enum perfetto_protos_DataSourceConfig_SessionInitiator,
+                  session_initiator,
+                  8);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  VARINT,
+                  uint64_t,
+                  tracing_session_id,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_FtraceConfig,
+                  ftrace_config,
+                  100);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_InodeFileConfig,
+                  inode_file_config,
+                  102);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_ProcessStatsConfig,
+                  process_stats_config,
+                  103);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_SysStatsConfig,
+                  sys_stats_config,
+                  104);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_HeapprofdConfig,
+                  heapprofd_config,
+                  105);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_JavaHprofConfig,
+                  java_hprof_config,
+                  110);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_AndroidPowerConfig,
+                  android_power_config,
+                  106);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_AndroidLogConfig,
+                  android_log_config,
+                  107);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_GpuCounterConfig,
+                  gpu_counter_config,
+                  108);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_AndroidGameInterventionListConfig,
+                  android_game_intervention_list_config,
+                  116);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_PackagesListConfig,
+                  packages_list_config,
+                  109);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_PerfEventConfig,
+                  perf_event_config,
+                  111);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_VulkanMemoryConfig,
+                  vulkan_memory_config,
+                  112);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_TrackEventConfig,
+                  track_event_config,
+                  113);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_AndroidPolledStateConfig,
+                  android_polled_state_config,
+                  114);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_AndroidSystemPropertyConfig,
+                  android_system_property_config,
+                  118);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_StatsdTracingConfig,
+                  statsd_tracing_config,
+                  117);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_SystemInfoConfig,
+                  system_info_config,
+                  119);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_ChromeConfig,
+                  chrome_config,
+                  101);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_V8Config,
+                  v8_config,
+                  127);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_InterceptorConfig,
+                  interceptor_config,
+                  115);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_NetworkPacketTraceConfig,
+                  network_packet_trace_config,
+                  120);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_SurfaceFlingerLayersConfig,
+                  surfaceflinger_layers_config,
+                  121);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_SurfaceFlingerTransactionsConfig,
+                  surfaceflinger_transactions_config,
+                  123);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_AndroidSdkSyspropGuardConfig,
+                  android_sdk_sysprop_guard_config,
+                  124);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_EtwConfig,
+                  etw_config,
+                  125);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_ProtoLogConfig,
+                  protolog_config,
+                  126);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_AndroidInputEventConfig,
+                  android_input_event_config,
+                  128);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  STRING,
+                  const char*,
+                  legacy_config,
+                  1000);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_TestConfig,
+                  for_testing,
+                  1001);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_DATA_SOURCE_CONFIG_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/config/trace_config.pzc.h b/src/libtracing/perfetto/public/protos/config/trace_config.pzc.h
new file mode 100644
index 000000000..76492e33b
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/config/trace_config.pzc.h
@@ -0,0 +1,570 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_TRACE_CONFIG_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_TRACE_CONFIG_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+#include "perfetto/public/protos/common/builtin_clock.pzc.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_DataSourceConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_AndroidReportConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_BufferConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_BuiltinDataSource);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_CmdTraceStartDelay);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_DataSource);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_GuardrailOverrides);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_IncidentReportConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_IncrementalStateConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_ProducerConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_StatsdMetadata);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_TraceFilter);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_TraceFilter_StringFilterChain);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_TraceFilter_StringFilterRule);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_TriggerConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig_TriggerConfig_Trigger);
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TraceConfig, LockdownModeOperation){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  LOCKDOWN_UNCHANGED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  LOCKDOWN_CLEAR) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  LOCKDOWN_SET) = 2,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TraceConfig, CompressionType){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  COMPRESSION_TYPE_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  COMPRESSION_TYPE_DEFLATE) = 1,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TraceConfig, StatsdLogging){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  STATSD_LOGGING_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  STATSD_LOGGING_ENABLED) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig,
+                                  STATSD_LOGGING_DISABLED) = 2,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TraceConfig_TraceFilter,
+                        StringFilterPolicy){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TraceFilter,
+                                  SFP_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TraceFilter,
+                                  SFP_MATCH_REDACT_GROUPS) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TraceFilter,
+                                  SFP_ATRACE_MATCH_REDACT_GROUPS) = 2,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TraceFilter,
+                                  SFP_MATCH_BREAK) = 3,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TraceFilter,
+                                  SFP_ATRACE_MATCH_BREAK) = 4,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TraceFilter,
+                                  SFP_ATRACE_REPEATED_SEARCH_REDACT_GROUPS) = 5,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TraceConfig_TriggerConfig, TriggerMode){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TriggerConfig,
+                                  UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TriggerConfig,
+                                  START_TRACING) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TriggerConfig,
+                                  STOP_TRACING) = 2,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_TriggerConfig,
+                                  CLONE_SNAPSHOT) = 4,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TraceConfig_BufferConfig, FillPolicy){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_BufferConfig,
+                                  UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_BufferConfig,
+                                  RING_BUFFER) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TraceConfig_BufferConfig,
+                                  DISCARD) = 2,
+};
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_BufferConfig,
+                  buffers,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_DataSource,
+                  data_sources,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_BuiltinDataSource,
+                  builtin_data_sources,
+                  20);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  uint32_t,
+                  duration_ms,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  bool,
+                  prefer_suspend_clock_for_duration,
+                  36);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  bool,
+                  enable_extra_guardrails,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  enum perfetto_protos_TraceConfig_LockdownModeOperation,
+                  lockdown_mode,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_ProducerConfig,
+                  producers,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_StatsdMetadata,
+                  statsd_metadata,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  bool,
+                  write_into_file,
+                  8);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  STRING,
+                  const char*,
+                  output_path,
+                  29);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  uint32_t,
+                  file_write_period_ms,
+                  9);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  uint64_t,
+                  max_file_size_bytes,
+                  10);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_GuardrailOverrides,
+                  guardrail_overrides,
+                  11);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  bool,
+                  deferred_start,
+                  12);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  uint32_t,
+                  flush_period_ms,
+                  13);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  uint32_t,
+                  flush_timeout_ms,
+                  14);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  uint32_t,
+                  data_source_stop_timeout_ms,
+                  23);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  bool,
+                  notify_traceur,
+                  16);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  int32_t,
+                  bugreport_score,
+                  30);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  STRING,
+                  const char*,
+                  bugreport_filename,
+                  38);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_TriggerConfig,
+                  trigger_config,
+                  17);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  STRING,
+                  const char*,
+                  activate_triggers,
+                  18);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_IncrementalStateConfig,
+                  incremental_state_config,
+                  21);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  bool,
+                  allow_user_build_tracing,
+                  19);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  STRING,
+                  const char*,
+                  unique_session_name,
+                  22);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  enum perfetto_protos_TraceConfig_CompressionType,
+                  compression_type,
+                  24);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_IncidentReportConfig,
+                  incident_report_config,
+                  25);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  enum perfetto_protos_TraceConfig_StatsdLogging,
+                  statsd_logging,
+                  31);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  int64_t,
+                  trace_uuid_msb,
+                  27);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  VARINT,
+                  int64_t,
+                  trace_uuid_lsb,
+                  28);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_TraceFilter,
+                  trace_filter,
+                  33);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_AndroidReportConfig,
+                  android_report_config,
+                  34);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_CmdTraceStartDelay,
+                  cmd_trace_start_delay,
+                  35);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_CmdTraceStartDelay);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_CmdTraceStartDelay,
+                  VARINT,
+                  uint32_t,
+                  min_delay_ms,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_CmdTraceStartDelay,
+                  VARINT,
+                  uint32_t,
+                  max_delay_ms,
+                  2);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_AndroidReportConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_AndroidReportConfig,
+                  STRING,
+                  const char*,
+                  reporter_service_package,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_AndroidReportConfig,
+                  STRING,
+                  const char*,
+                  reporter_service_class,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_AndroidReportConfig,
+                  VARINT,
+                  bool,
+                  skip_report,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_AndroidReportConfig,
+                  VARINT,
+                  bool,
+                  use_pipe_in_framework_for_testing,
+                  4);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_TraceFilter);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TraceFilter,
+                  STRING,
+                  const char*,
+                  bytecode,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TraceFilter,
+                  STRING,
+                  const char*,
+                  bytecode_v2,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TraceFilter,
+                  MSG,
+                  perfetto_protos_TraceConfig_TraceFilter_StringFilterChain,
+                  string_filter_chain,
+                  3);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_TraceFilter_StringFilterChain);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TraceFilter_StringFilterChain,
+                  MSG,
+                  perfetto_protos_TraceConfig_TraceFilter_StringFilterRule,
+                  rules,
+                  1);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_TraceFilter_StringFilterRule);
+PERFETTO_PB_FIELD(
+    perfetto_protos_TraceConfig_TraceFilter_StringFilterRule,
+    VARINT,
+    enum perfetto_protos_TraceConfig_TraceFilter_StringFilterPolicy,
+    policy,
+    1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TraceFilter_StringFilterRule,
+                  STRING,
+                  const char*,
+                  regex_pattern,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TraceFilter_StringFilterRule,
+                  STRING,
+                  const char*,
+                  atrace_payload_starts_with,
+                  3);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_IncidentReportConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_IncidentReportConfig,
+                  STRING,
+                  const char*,
+                  destination_package,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_IncidentReportConfig,
+                  STRING,
+                  const char*,
+                  destination_class,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_IncidentReportConfig,
+                  VARINT,
+                  int32_t,
+                  privacy_level,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_IncidentReportConfig,
+                  VARINT,
+                  bool,
+                  skip_incidentd,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_IncidentReportConfig,
+                  VARINT,
+                  bool,
+                  skip_dropbox,
+                  4);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_IncrementalStateConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_IncrementalStateConfig,
+                  VARINT,
+                  uint32_t,
+                  clear_period_ms,
+                  1);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_TriggerConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig,
+                  VARINT,
+                  enum perfetto_protos_TraceConfig_TriggerConfig_TriggerMode,
+                  trigger_mode,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig,
+                  VARINT,
+                  bool,
+                  use_clone_snapshot_if_available,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig,
+                  MSG,
+                  perfetto_protos_TraceConfig_TriggerConfig_Trigger,
+                  triggers,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig,
+                  VARINT,
+                  uint32_t,
+                  trigger_timeout_ms,
+                  3);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_TriggerConfig_Trigger);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig_Trigger,
+                  STRING,
+                  const char*,
+                  name,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig_Trigger,
+                  STRING,
+                  const char*,
+                  producer_name_regex,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig_Trigger,
+                  VARINT,
+                  uint32_t,
+                  stop_delay_ms,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig_Trigger,
+                  VARINT,
+                  uint32_t,
+                  max_per_24_h,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_TriggerConfig_Trigger,
+                  FIXED64,
+                  double,
+                  skip_probability,
+                  5);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_GuardrailOverrides);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_GuardrailOverrides,
+                  VARINT,
+                  uint64_t,
+                  max_upload_per_day_bytes,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_GuardrailOverrides,
+                  VARINT,
+                  uint32_t,
+                  max_tracing_buffer_size_kb,
+                  2);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_StatsdMetadata);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_StatsdMetadata,
+                  VARINT,
+                  int64_t,
+                  triggering_alert_id,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_StatsdMetadata,
+                  VARINT,
+                  int32_t,
+                  triggering_config_uid,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_StatsdMetadata,
+                  VARINT,
+                  int64_t,
+                  triggering_config_id,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_StatsdMetadata,
+                  VARINT,
+                  int64_t,
+                  triggering_subscription_id,
+                  4);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_ProducerConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_ProducerConfig,
+                  STRING,
+                  const char*,
+                  producer_name,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_ProducerConfig,
+                  VARINT,
+                  uint32_t,
+                  shm_size_kb,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_ProducerConfig,
+                  VARINT,
+                  uint32_t,
+                  page_size_kb,
+                  3);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_BuiltinDataSource);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  bool,
+                  disable_clock_snapshotting,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  bool,
+                  disable_trace_config,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  bool,
+                  disable_system_info,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  bool,
+                  disable_service_events,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  enum perfetto_protos_BuiltinClock,
+                  primary_trace_clock,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  uint32_t,
+                  snapshot_interval_ms,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  bool,
+                  prefer_suspend_clock_for_snapshot,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  bool,
+                  disable_chunk_usage_histograms,
+                  8);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_DataSource);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_DataSource,
+                  MSG,
+                  perfetto_protos_DataSourceConfig,
+                  config,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_DataSource,
+                  STRING,
+                  const char*,
+                  producer_name_filter,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_DataSource,
+                  STRING,
+                  const char*,
+                  producer_name_regex_filter,
+                  3);
+
+PERFETTO_PB_MSG(perfetto_protos_TraceConfig_BufferConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BufferConfig,
+                  VARINT,
+                  uint32_t,
+                  size_kb,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BufferConfig,
+                  VARINT,
+                  enum perfetto_protos_TraceConfig_BufferConfig_FillPolicy,
+                  fill_policy,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BufferConfig,
+                  VARINT,
+                  bool,
+                  transfer_on_clone,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BufferConfig,
+                  VARINT,
+                  bool,
+                  clear_before_clone,
+                  6);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_TRACE_CONFIG_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/config/track_event/track_event_config.pzc.h b/src/libtracing/perfetto/public/protos/config/track_event/track_event_config.pzc.h
new file mode 100644
index 000000000..aede7d58f
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/config/track_event/track_event_config.pzc.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_TRACK_EVENT_TRACK_EVENT_CONFIG_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_TRACK_EVENT_TRACK_EVENT_CONFIG_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG(perfetto_protos_TrackEventConfig);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  STRING,
+                  const char*,
+                  disabled_categories,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  STRING,
+                  const char*,
+                  enabled_categories,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  STRING,
+                  const char*,
+                  disabled_tags,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  STRING,
+                  const char*,
+                  enabled_tags,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  VARINT,
+                  bool,
+                  disable_incremental_timestamps,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  VARINT,
+                  uint64_t,
+                  timestamp_unit_multiplier,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  VARINT,
+                  bool,
+                  filter_debug_annotations,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  VARINT,
+                  bool,
+                  enable_thread_time_sampling,
+                  8);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventConfig,
+                  VARINT,
+                  bool,
+                  filter_dynamic_event_names,
+                  9);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_CONFIG_TRACK_EVENT_TRACK_EVENT_CONFIG_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/interned_data/interned_data.pzc.h b/src/libtracing/perfetto/public/protos/trace/interned_data/interned_data.pzc.h
new file mode 100644
index 000000000..71e26fa00
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/interned_data/interned_data.pzc.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_INTERNED_DATA_INTERNED_DATA_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_INTERNED_DATA_INTERNED_DATA_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_Callstack);
+PERFETTO_PB_MSG_DECL(perfetto_protos_DebugAnnotationName);
+PERFETTO_PB_MSG_DECL(perfetto_protos_DebugAnnotationValueTypeName);
+PERFETTO_PB_MSG_DECL(perfetto_protos_EventCategory);
+PERFETTO_PB_MSG_DECL(perfetto_protos_EventName);
+PERFETTO_PB_MSG_DECL(perfetto_protos_Frame);
+PERFETTO_PB_MSG_DECL(perfetto_protos_HistogramName);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedGpuRenderStageSpecification);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedGraphicsContext);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedString);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedV8Isolate);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedV8JsFunction);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedV8JsScript);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedV8String);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedV8WasmScript);
+PERFETTO_PB_MSG_DECL(perfetto_protos_LogMessageBody);
+PERFETTO_PB_MSG_DECL(perfetto_protos_Mapping);
+PERFETTO_PB_MSG_DECL(perfetto_protos_NetworkPacketContext);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProfiledFrameSymbols);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SourceLocation);
+PERFETTO_PB_MSG_DECL(perfetto_protos_UnsymbolizedSourceLocation);
+
+PERFETTO_PB_MSG(perfetto_protos_InternedData);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_EventCategory,
+                  event_categories,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_EventName,
+                  event_names,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_DebugAnnotationName,
+                  debug_annotation_names,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_DebugAnnotationValueTypeName,
+                  debug_annotation_value_type_names,
+                  27);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_SourceLocation,
+                  source_locations,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_UnsymbolizedSourceLocation,
+                  unsymbolized_source_locations,
+                  28);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_LogMessageBody,
+                  log_message_body,
+                  20);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_HistogramName,
+                  histogram_names,
+                  25);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  build_ids,
+                  16);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  mapping_paths,
+                  17);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  source_paths,
+                  18);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  function_names,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_ProfiledFrameSymbols,
+                  profiled_frame_symbols,
+                  21);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_Mapping,
+                  mappings,
+                  19);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_Frame,
+                  frames,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_Callstack,
+                  callstacks,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  vulkan_memory_keys,
+                  22);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedGraphicsContext,
+                  graphics_contexts,
+                  23);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedGpuRenderStageSpecification,
+                  gpu_specifications,
+                  24);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  kernel_symbols,
+                  26);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  debug_annotation_string_values,
+                  29);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_NetworkPacketContext,
+                  packet_context,
+                  30);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedV8String,
+                  v8_js_function_name,
+                  31);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedV8JsFunction,
+                  v8_js_function,
+                  32);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedV8JsScript,
+                  v8_js_script,
+                  33);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedV8WasmScript,
+                  v8_wasm_script,
+                  34);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedV8Isolate,
+                  v8_isolate,
+                  35);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  protolog_string_args,
+                  36);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedString,
+                  protolog_stacktrace,
+                  37);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_INTERNED_DATA_INTERNED_DATA_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/test_event.pzc.h b/src/libtracing/perfetto/public/protos/trace/test_event.pzc.h
new file mode 100644
index 000000000..b4e483fb6
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/test_event.pzc.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TEST_EVENT_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TEST_EVENT_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_DebugAnnotation);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TestEvent_TestPayload);
+
+PERFETTO_PB_MSG(perfetto_protos_TestEvent);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent, STRING, const char*, str, 1);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent, VARINT, uint32_t, seq_value, 2);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent, VARINT, uint64_t, counter, 3);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent, VARINT, bool, is_last, 4);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent,
+                  MSG,
+                  perfetto_protos_TestEvent_TestPayload,
+                  payload,
+                  5);
+
+PERFETTO_PB_MSG(perfetto_protos_TestEvent_TestPayload);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+                  STRING,
+                  const char*,
+                  str,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+                  MSG,
+                  perfetto_protos_TestEvent_TestPayload,
+                  nested,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+                  STRING,
+                  const char*,
+                  single_string,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+                  VARINT,
+                  int32_t,
+                  single_int,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+                  VARINT,
+                  int32_t,
+                  repeated_ints,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+                  VARINT,
+                  uint32_t,
+                  remaining_nesting_depth,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TestEvent_TestPayload,
+                  MSG,
+                  perfetto_protos_DebugAnnotation,
+                  debug_annotations,
+                  7);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TEST_EVENT_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/trace.pzc.h b/src/libtracing/perfetto/public/protos/trace/trace.pzc.h
new file mode 100644
index 000000000..9625f6e06
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/trace.pzc.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACE_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACE_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_TracePacket);
+
+PERFETTO_PB_MSG(perfetto_protos_Trace);
+PERFETTO_PB_FIELD(perfetto_protos_Trace,
+                  MSG,
+                  perfetto_protos_TracePacket,
+                  packet,
+                  1);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACE_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/trace_packet.pzc.h b/src/libtracing/perfetto/public/protos/trace/trace_packet.pzc.h
new file mode 100644
index 000000000..d83ab18d1
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/trace_packet.pzc.h
@@ -0,0 +1,548 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACE_PACKET_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACE_PACKET_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidCameraFrameEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidCameraSessionStats);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidEnergyEstimationBreakdown);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidGameInterventionList);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidInputEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidLogPacket);
+PERFETTO_PB_MSG_DECL(perfetto_protos_AndroidSystemProperty);
+PERFETTO_PB_MSG_DECL(perfetto_protos_BatteryCounters);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeBenchmarkMetadata);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeEventBundle);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeMetadataPacket);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ClockSnapshot);
+PERFETTO_PB_MSG_DECL(perfetto_protos_CpuInfo);
+PERFETTO_PB_MSG_DECL(perfetto_protos_DeobfuscationMapping);
+PERFETTO_PB_MSG_DECL(perfetto_protos_EntityStateResidency);
+PERFETTO_PB_MSG_DECL(perfetto_protos_EtwTraceEventBundle);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ExtensionDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_FrameTimelineEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_FtraceEventBundle);
+PERFETTO_PB_MSG_DECL(perfetto_protos_FtraceStats);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GpuCounterEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GpuLog);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GpuMemTotalEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GpuRenderStageEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GraphicsFrameEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_HeapGraph);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InitialDisplayState);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InodeFileMap);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedData);
+PERFETTO_PB_MSG_DECL(perfetto_protos_LayersSnapshotProto);
+PERFETTO_PB_MSG_DECL(perfetto_protos_MemoryTrackerSnapshot);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ModuleSymbols);
+PERFETTO_PB_MSG_DECL(perfetto_protos_NetworkPacketBundle);
+PERFETTO_PB_MSG_DECL(perfetto_protos_NetworkPacketEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_PackagesList);
+PERFETTO_PB_MSG_DECL(perfetto_protos_PerfSample);
+PERFETTO_PB_MSG_DECL(perfetto_protos_PerfettoMetatrace);
+PERFETTO_PB_MSG_DECL(perfetto_protos_PowerRails);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProcessDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProcessStats);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProcessTree);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProfilePacket);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProfiledFrameSymbols);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProtoLogMessage);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProtoLogViewerConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_RemoteClockSync);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ShellHandlerMappings);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ShellTransition);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SmapsPacket);
+PERFETTO_PB_MSG_DECL(perfetto_protos_StatsdAtom);
+PERFETTO_PB_MSG_DECL(perfetto_protos_StreamingAllocation);
+PERFETTO_PB_MSG_DECL(perfetto_protos_StreamingFree);
+PERFETTO_PB_MSG_DECL(perfetto_protos_StreamingProfilePacket);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SysStats);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SystemInfo);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TestEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ThreadDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TracePacketDefaults);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceStats);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TraceUuid);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TracingServiceEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TrackDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TrackEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TrackEventRangeOfInterest);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TransactionTraceEntry);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TranslationTable);
+PERFETTO_PB_MSG_DECL(perfetto_protos_Trigger);
+PERFETTO_PB_MSG_DECL(perfetto_protos_UiState);
+PERFETTO_PB_MSG_DECL(perfetto_protos_V8CodeMove);
+PERFETTO_PB_MSG_DECL(perfetto_protos_V8InternalCode);
+PERFETTO_PB_MSG_DECL(perfetto_protos_V8JsCode);
+PERFETTO_PB_MSG_DECL(perfetto_protos_V8RegExpCode);
+PERFETTO_PB_MSG_DECL(perfetto_protos_V8WasmCode);
+PERFETTO_PB_MSG_DECL(perfetto_protos_VulkanApiEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_VulkanMemoryEvent);
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TracePacket, SequenceFlags){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TracePacket,
+                                  SEQ_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TracePacket,
+                                  SEQ_INCREMENTAL_STATE_CLEARED) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TracePacket,
+                                  SEQ_NEEDS_INCREMENTAL_STATE) = 2,
+};
+
+PERFETTO_PB_MSG(perfetto_protos_TracePacket);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket, VARINT, uint64_t, timestamp, 8);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  uint32_t,
+                  timestamp_clock_id,
+                  58);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ProcessTree,
+                  process_tree,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ProcessStats,
+                  process_stats,
+                  9);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_InodeFileMap,
+                  inode_file_map,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ChromeEventBundle,
+                  chrome_events,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ClockSnapshot,
+                  clock_snapshot,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_SysStats,
+                  sys_stats,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TrackEvent,
+                  track_event,
+                  11);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TraceUuid,
+                  trace_uuid,
+                  89);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TraceConfig,
+                  trace_config,
+                  33);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_FtraceStats,
+                  ftrace_stats,
+                  34);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TraceStats,
+                  trace_stats,
+                  35);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ProfilePacket,
+                  profile_packet,
+                  37);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_StreamingAllocation,
+                  streaming_allocation,
+                  74);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_StreamingFree,
+                  streaming_free,
+                  75);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_BatteryCounters,
+                  battery,
+                  38);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_PowerRails,
+                  power_rails,
+                  40);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_AndroidLogPacket,
+                  android_log,
+                  39);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_SystemInfo,
+                  system_info,
+                  45);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_Trigger,
+                  trigger,
+                  46);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_PackagesList,
+                  packages_list,
+                  47);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ChromeBenchmarkMetadata,
+                  chrome_benchmark_metadata,
+                  48);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_PerfettoMetatrace,
+                  perfetto_metatrace,
+                  49);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ChromeMetadataPacket,
+                  chrome_metadata,
+                  51);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_GpuCounterEvent,
+                  gpu_counter_event,
+                  52);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_GpuRenderStageEvent,
+                  gpu_render_stage_event,
+                  53);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_StreamingProfilePacket,
+                  streaming_profile_packet,
+                  54);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_HeapGraph,
+                  heap_graph,
+                  56);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_GraphicsFrameEvent,
+                  graphics_frame_event,
+                  57);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_VulkanMemoryEvent,
+                  vulkan_memory_event,
+                  62);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_GpuLog,
+                  gpu_log,
+                  63);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_VulkanApiEvent,
+                  vulkan_api_event,
+                  65);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_PerfSample,
+                  perf_sample,
+                  66);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_CpuInfo,
+                  cpu_info,
+                  67);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_SmapsPacket,
+                  smaps_packet,
+                  68);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TracingServiceEvent,
+                  service_event,
+                  69);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_InitialDisplayState,
+                  initial_display_state,
+                  70);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_GpuMemTotalEvent,
+                  gpu_mem_total_event,
+                  71);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_MemoryTrackerSnapshot,
+                  memory_tracker_snapshot,
+                  73);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_FrameTimelineEvent,
+                  frame_timeline_event,
+                  76);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_AndroidEnergyEstimationBreakdown,
+                  android_energy_estimation_breakdown,
+                  77);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_UiState,
+                  ui_state,
+                  78);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_AndroidCameraFrameEvent,
+                  android_camera_frame_event,
+                  80);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_AndroidCameraSessionStats,
+                  android_camera_session_stats,
+                  81);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TranslationTable,
+                  translation_table,
+                  82);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_AndroidGameInterventionList,
+                  android_game_intervention_list,
+                  83);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_StatsdAtom,
+                  statsd_atom,
+                  84);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_AndroidSystemProperty,
+                  android_system_property,
+                  86);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_EntityStateResidency,
+                  entity_state_residency,
+                  91);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ProfiledFrameSymbols,
+                  profiled_frame_symbols,
+                  55);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ModuleSymbols,
+                  module_symbols,
+                  61);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_DeobfuscationMapping,
+                  deobfuscation_mapping,
+                  64);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TrackDescriptor,
+                  track_descriptor,
+                  60);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ProcessDescriptor,
+                  process_descriptor,
+                  43);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ThreadDescriptor,
+                  thread_descriptor,
+                  44);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_FtraceEventBundle,
+                  ftrace_events,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  STRING,
+                  const char*,
+                  synchronization_marker,
+                  36);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  STRING,
+                  const char*,
+                  compressed_packets,
+                  50);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ExtensionDescriptor,
+                  extension_descriptor,
+                  72);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_NetworkPacketEvent,
+                  network_packet,
+                  88);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_NetworkPacketBundle,
+                  network_packet_bundle,
+                  92);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TrackEventRangeOfInterest,
+                  track_event_range_of_interest,
+                  90);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_LayersSnapshotProto,
+                  surfaceflinger_layers_snapshot,
+                  93);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TransactionTraceEntry,
+                  surfaceflinger_transactions,
+                  94);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ShellTransition,
+                  shell_transition,
+                  96);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ShellHandlerMappings,
+                  shell_handler_mappings,
+                  97);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ProtoLogMessage,
+                  protolog_message,
+                  104);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_ProtoLogViewerConfig,
+                  protolog_viewer_config,
+                  105);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_EtwTraceEventBundle,
+                  etw_events,
+                  95);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_V8JsCode,
+                  v8_js_code,
+                  99);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_V8InternalCode,
+                  v8_internal_code,
+                  100);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_V8WasmCode,
+                  v8_wasm_code,
+                  101);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_V8RegExpCode,
+                  v8_reg_exp_code,
+                  102);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_V8CodeMove,
+                  v8_code_move,
+                  103);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_AndroidInputEvent,
+                  android_input_event,
+                  106);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_RemoteClockSync,
+                  remote_clock_sync,
+                  107);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TestEvent,
+                  for_testing,
+                  900);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket, VARINT, int32_t, trusted_uid, 3);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  uint32_t,
+                  trusted_packet_sequence_id,
+                  10);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  int32_t,
+                  trusted_pid,
+                  79);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_InternedData,
+                  interned_data,
+                  12);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  uint32_t,
+                  sequence_flags,
+                  13);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  bool,
+                  incremental_state_cleared,
+                  41);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_TracePacketDefaults,
+                  trace_packet_defaults,
+                  59);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  bool,
+                  previous_packet_dropped,
+                  42);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  bool,
+                  first_packet_on_sequence,
+                  87);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  VARINT,
+                  uint32_t,
+                  machine_id,
+                  98);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACE_PACKET_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/track_event/counter_descriptor.pzc.h b/src/libtracing/perfetto/public/protos/trace/track_event/counter_descriptor.pzc.h
new file mode 100644
index 000000000..322ee8ea1
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/track_event/counter_descriptor.pzc.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_COUNTER_DESCRIPTOR_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_COUNTER_DESCRIPTOR_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_CounterDescriptor, BuiltinCounterType){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_CounterDescriptor,
+                                  COUNTER_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_CounterDescriptor,
+                                  COUNTER_THREAD_TIME_NS) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_CounterDescriptor,
+                                  COUNTER_THREAD_INSTRUCTION_COUNT) = 2,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_CounterDescriptor, Unit){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_CounterDescriptor,
+                                  UNIT_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_CounterDescriptor,
+                                  UNIT_TIME_NS) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_CounterDescriptor,
+                                  UNIT_COUNT) = 2,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_CounterDescriptor,
+                                  UNIT_SIZE_BYTES) = 3,
+};
+
+PERFETTO_PB_MSG(perfetto_protos_CounterDescriptor);
+PERFETTO_PB_FIELD(perfetto_protos_CounterDescriptor,
+                  VARINT,
+                  enum perfetto_protos_CounterDescriptor_BuiltinCounterType,
+                  type,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_CounterDescriptor,
+                  STRING,
+                  const char*,
+                  categories,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_CounterDescriptor,
+                  VARINT,
+                  enum perfetto_protos_CounterDescriptor_Unit,
+                  unit,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_CounterDescriptor,
+                  STRING,
+                  const char*,
+                  unit_name,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_CounterDescriptor,
+                  VARINT,
+                  int64_t,
+                  unit_multiplier,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_CounterDescriptor,
+                  VARINT,
+                  bool,
+                  is_incremental,
+                  5);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_COUNTER_DESCRIPTOR_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/track_event/debug_annotation.pzc.h b/src/libtracing/perfetto/public/protos/trace/track_event/debug_annotation.pzc.h
new file mode 100644
index 000000000..3183f24e1
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/track_event/debug_annotation.pzc.h
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_DEBUG_ANNOTATION_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_DEBUG_ANNOTATION_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_DebugAnnotation);
+PERFETTO_PB_MSG_DECL(perfetto_protos_DebugAnnotation_NestedValue);
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_DebugAnnotation_NestedValue,
+                        NestedType){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_DebugAnnotation_NestedValue,
+                                  UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_DebugAnnotation_NestedValue,
+                                  DICT) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_DebugAnnotation_NestedValue,
+                                  ARRAY) = 2,
+};
+
+PERFETTO_PB_MSG(perfetto_protos_DebugAnnotationValueTypeName);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotationValueTypeName,
+                  VARINT,
+                  uint64_t,
+                  iid,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotationValueTypeName,
+                  STRING,
+                  const char*,
+                  name,
+                  2);
+
+PERFETTO_PB_MSG(perfetto_protos_DebugAnnotationName);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotationName,
+                  VARINT,
+                  uint64_t,
+                  iid,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotationName,
+                  STRING,
+                  const char*,
+                  name,
+                  2);
+
+PERFETTO_PB_MSG(perfetto_protos_DebugAnnotation);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  VARINT,
+                  uint64_t,
+                  name_iid,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  STRING,
+                  const char*,
+                  name,
+                  10);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation, VARINT, bool, bool_value, 2);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  VARINT,
+                  uint64_t,
+                  uint_value,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  VARINT,
+                  int64_t,
+                  int_value,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  FIXED64,
+                  double,
+                  double_value,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  VARINT,
+                  uint64_t,
+                  pointer_value,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  MSG,
+                  perfetto_protos_DebugAnnotation_NestedValue,
+                  nested_value,
+                  8);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  STRING,
+                  const char*,
+                  legacy_json_value,
+                  9);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  STRING,
+                  const char*,
+                  string_value,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  VARINT,
+                  uint64_t,
+                  string_value_iid,
+                  17);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  STRING,
+                  const char*,
+                  proto_type_name,
+                  16);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  VARINT,
+                  uint64_t,
+                  proto_type_name_iid,
+                  13);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  STRING,
+                  const char*,
+                  proto_value,
+                  14);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  MSG,
+                  perfetto_protos_DebugAnnotation,
+                  dict_entries,
+                  11);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation,
+                  MSG,
+                  perfetto_protos_DebugAnnotation,
+                  array_values,
+                  12);
+
+PERFETTO_PB_MSG(perfetto_protos_DebugAnnotation_NestedValue);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  VARINT,
+                  enum perfetto_protos_DebugAnnotation_NestedValue_NestedType,
+                  nested_type,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  STRING,
+                  const char*,
+                  dict_keys,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  MSG,
+                  perfetto_protos_DebugAnnotation_NestedValue,
+                  dict_values,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  MSG,
+                  perfetto_protos_DebugAnnotation_NestedValue,
+                  array_values,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  VARINT,
+                  int64_t,
+                  int_value,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  FIXED64,
+                  double,
+                  double_value,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  VARINT,
+                  bool,
+                  bool_value,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_DebugAnnotation_NestedValue,
+                  STRING,
+                  const char*,
+                  string_value,
+                  8);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_DEBUG_ANNOTATION_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/track_event/track_descriptor.pzc.h b/src/libtracing/perfetto/public/protos/trace/track_event/track_descriptor.pzc.h
new file mode 100644
index 000000000..ee3d9788d
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/track_event/track_descriptor.pzc.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_TRACK_DESCRIPTOR_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_TRACK_DESCRIPTOR_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeProcessDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeThreadDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_CounterDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ProcessDescriptor);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ThreadDescriptor);
+
+PERFETTO_PB_MSG(perfetto_protos_TrackDescriptor);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor, VARINT, uint64_t, uuid, 1);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  VARINT,
+                  uint64_t,
+                  parent_uuid,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  STRING,
+                  const char*,
+                  name,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  MSG,
+                  perfetto_protos_ProcessDescriptor,
+                  process,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  MSG,
+                  perfetto_protos_ChromeProcessDescriptor,
+                  chrome_process,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  MSG,
+                  perfetto_protos_ThreadDescriptor,
+                  thread,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  MSG,
+                  perfetto_protos_ChromeThreadDescriptor,
+                  chrome_thread,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  MSG,
+                  perfetto_protos_CounterDescriptor,
+                  counter,
+                  8);
+PERFETTO_PB_FIELD(perfetto_protos_TrackDescriptor,
+                  VARINT,
+                  bool,
+                  disallow_merging_with_system_tracks,
+                  9);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_TRACK_DESCRIPTOR_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/track_event/track_event.pzc.h b/src/libtracing/perfetto/public/protos/trace/track_event/track_event.pzc.h
new file mode 100644
index 000000000..2ee81f180
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/track_event/track_event.pzc.h
@@ -0,0 +1,391 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by the ProtoZero C compiler plugin.
+// Invoked by tools/gen_c_protos
+// DO NOT EDIT.
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_TRACK_EVENT_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_TRACK_EVENT_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeActiveProcesses);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeApplicationStateInfo);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeCompositorSchedulerState);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeContentSettingsEventInfo);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeFrameReporter);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeHistogramSample);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeKeyedService);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeLatencyInfo);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeLegacyIpc);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeMessagePump);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeMojoEventInfo);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeRendererSchedulerState);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeUserEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_ChromeWindowHandleEventInfo);
+PERFETTO_PB_MSG_DECL(perfetto_protos_DebugAnnotation);
+PERFETTO_PB_MSG_DECL(perfetto_protos_LogMessage);
+PERFETTO_PB_MSG_DECL(perfetto_protos_Screenshot);
+PERFETTO_PB_MSG_DECL(perfetto_protos_SourceLocation);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TaskExecution);
+PERFETTO_PB_MSG_DECL(perfetto_protos_TrackEvent_LegacyEvent);
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TrackEvent, Type){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent,
+                                  TYPE_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent,
+                                  TYPE_SLICE_BEGIN) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent,
+                                  TYPE_SLICE_END) = 2,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent, TYPE_INSTANT) = 3,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent, TYPE_COUNTER) = 4,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TrackEvent_LegacyEvent, FlowDirection){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  FLOW_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  FLOW_IN) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  FLOW_OUT) = 2,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  FLOW_INOUT) = 3,
+};
+
+PERFETTO_PB_ENUM_IN_MSG(perfetto_protos_TrackEvent_LegacyEvent,
+                        InstantEventScope){
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  SCOPE_UNSPECIFIED) = 0,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  SCOPE_GLOBAL) = 1,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  SCOPE_PROCESS) = 2,
+    PERFETTO_PB_ENUM_IN_MSG_ENTRY(perfetto_protos_TrackEvent_LegacyEvent,
+                                  SCOPE_THREAD) = 3,
+};
+
+PERFETTO_PB_MSG(perfetto_protos_EventName);
+PERFETTO_PB_FIELD(perfetto_protos_EventName, VARINT, uint64_t, iid, 1);
+PERFETTO_PB_FIELD(perfetto_protos_EventName, STRING, const char*, name, 2);
+
+PERFETTO_PB_MSG(perfetto_protos_EventCategory);
+PERFETTO_PB_FIELD(perfetto_protos_EventCategory, VARINT, uint64_t, iid, 1);
+PERFETTO_PB_FIELD(perfetto_protos_EventCategory, STRING, const char*, name, 2);
+
+PERFETTO_PB_MSG(perfetto_protos_TrackEventDefaults);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventDefaults,
+                  VARINT,
+                  uint64_t,
+                  track_uuid,
+                  11);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventDefaults,
+                  VARINT,
+                  uint64_t,
+                  extra_counter_track_uuids,
+                  31);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEventDefaults,
+                  VARINT,
+                  uint64_t,
+                  extra_double_counter_track_uuids,
+                  45);
+
+PERFETTO_PB_MSG(perfetto_protos_TrackEvent);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  uint64_t,
+                  category_iids,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  STRING,
+                  const char*,
+                  categories,
+                  22);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent, VARINT, uint64_t, name_iid, 10);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent, STRING, const char*, name, 23);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  enum perfetto_protos_TrackEvent_Type,
+                  type,
+                  9);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent, VARINT, uint64_t, track_uuid, 11);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  counter_value,
+                  30);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  FIXED64,
+                  double,
+                  double_counter_value,
+                  44);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  uint64_t,
+                  extra_counter_track_uuids,
+                  31);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  extra_counter_values,
+                  12);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  uint64_t,
+                  extra_double_counter_track_uuids,
+                  45);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  FIXED64,
+                  double,
+                  extra_double_counter_values,
+                  46);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  uint64_t,
+                  flow_ids_old,
+                  36);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent, FIXED64, uint64_t, flow_ids, 47);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  uint64_t,
+                  terminating_flow_ids_old,
+                  42);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  FIXED64,
+                  uint64_t,
+                  terminating_flow_ids,
+                  48);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_DebugAnnotation,
+                  debug_annotations,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_TaskExecution,
+                  task_execution,
+                  5);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_LogMessage,
+                  log_message,
+                  21);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeCompositorSchedulerState,
+                  cc_scheduler_state,
+                  24);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeUserEvent,
+                  chrome_user_event,
+                  25);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeKeyedService,
+                  chrome_keyed_service,
+                  26);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeLegacyIpc,
+                  chrome_legacy_ipc,
+                  27);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeHistogramSample,
+                  chrome_histogram_sample,
+                  28);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeLatencyInfo,
+                  chrome_latency_info,
+                  29);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeFrameReporter,
+                  chrome_frame_reporter,
+                  32);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeApplicationStateInfo,
+                  chrome_application_state_info,
+                  39);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeRendererSchedulerState,
+                  chrome_renderer_scheduler_state,
+                  40);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeWindowHandleEventInfo,
+                  chrome_window_handle_event_info,
+                  41);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeContentSettingsEventInfo,
+                  chrome_content_settings_event_info,
+                  43);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeActiveProcesses,
+                  chrome_active_processes,
+                  49);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_Screenshot,
+                  screenshot,
+                  50);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_SourceLocation,
+                  source_location,
+                  33);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  uint64_t,
+                  source_location_iid,
+                  34);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeMessagePump,
+                  chrome_message_pump,
+                  35);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_ChromeMojoEventInfo,
+                  chrome_mojo_event_info,
+                  38);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  timestamp_delta_us,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  timestamp_absolute_us,
+                  16);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  thread_time_delta_us,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  thread_time_absolute_us,
+                  17);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  thread_instruction_count_delta,
+                  8);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  VARINT,
+                  int64_t,
+                  thread_instruction_count_absolute,
+                  20);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent,
+                  MSG,
+                  perfetto_protos_TrackEvent_LegacyEvent,
+                  legacy_event,
+                  6);
+
+PERFETTO_PB_MSG(perfetto_protos_TrackEvent_LegacyEvent);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  uint64_t,
+                  name_iid,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  int32_t,
+                  phase,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  int64_t,
+                  duration_us,
+                  3);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  int64_t,
+                  thread_duration_us,
+                  4);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  int64_t,
+                  thread_instruction_delta,
+                  15);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  uint64_t,
+                  unscoped_id,
+                  6);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  uint64_t,
+                  local_id,
+                  10);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  uint64_t,
+                  global_id,
+                  11);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  STRING,
+                  const char*,
+                  id_scope,
+                  7);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  bool,
+                  use_async_tts,
+                  9);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  uint64_t,
+                  bind_id,
+                  8);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  bool,
+                  bind_to_enclosing,
+                  12);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  enum perfetto_protos_TrackEvent_LegacyEvent_FlowDirection,
+                  flow_direction,
+                  13);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  enum perfetto_protos_TrackEvent_LegacyEvent_InstantEventScope,
+                  instant_event_scope,
+                  14);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  int32_t,
+                  pid_override,
+                  18);
+PERFETTO_PB_FIELD(perfetto_protos_TrackEvent_LegacyEvent,
+                  VARINT,
+                  int32_t,
+                  tid_override,
+                  19);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRACK_EVENT_TRACK_EVENT_PZC_H_
diff --git a/src/libtracing/perfetto/public/protos/trace/trigger.pzc.h b/src/libtracing/perfetto/public/protos/trace/trigger.pzc.h
new file mode 100644
index 000000000..1ad674906
--- /dev/null
+++ b/src/libtracing/perfetto/public/protos/trace/trigger.pzc.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRIGGER_PZC_H_
+#define INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRIGGER_PZC_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "perfetto/public/pb_macros.h"
+
+PERFETTO_PB_MSG(perfetto_protos_Trigger);
+PERFETTO_PB_FIELD(perfetto_protos_Trigger,
+                  STRING,
+                  const char*,
+                  trigger_name,
+                  1);
+PERFETTO_PB_FIELD(perfetto_protos_Trigger,
+                  STRING,
+                  const char*,
+                  producer_name,
+                  2);
+PERFETTO_PB_FIELD(perfetto_protos_Trigger,
+                  VARINT,
+                  int32_t,
+                  trusted_producer_uid,
+                  3);
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_TRIGGER_PZC_H_
diff --git a/src/libtracing/perfetto/public/stream_writer.h b/src/libtracing/perfetto/public/stream_writer.h
new file mode 100644
index 000000000..fa98507c6
--- /dev/null
+++ b/src/libtracing/perfetto/public/stream_writer.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_STREAM_WRITER_H_
+#define INCLUDE_PERFETTO_PUBLIC_STREAM_WRITER_H_
+
+#include <assert.h>
+#include <string.h>
+
+#include "perfetto/public/abi/stream_writer_abi.h"
+#include "perfetto/public/compiler.h"
+
+// Returns the number of bytes available for writing in the current chunk.
+static inline size_t PerfettoStreamWriterAvailableBytes(
+    const struct PerfettoStreamWriter* w) {
+  return PERFETTO_STATIC_CAST(size_t, w->end - w->write_ptr);
+}
+
+// Writes `size` bytes from `src` to the writer.
+//
+// WARNING: PerfettoStreamWriterAvailableBytes(`w`) must be >= `size`.
+static inline void PerfettoStreamWriterAppendBytesUnsafe(
+    struct PerfettoStreamWriter* w,
+    const uint8_t* src,
+    size_t size) {
+  assert(size <= PerfettoStreamWriterAvailableBytes(w));
+  memcpy(w->write_ptr, src, size);
+  w->write_ptr += size;
+}
+
+// Writes `size` bytes from `src` to the writer.
+static inline void PerfettoStreamWriterAppendBytes(
+    struct PerfettoStreamWriter* w,
+    const uint8_t* src,
+    size_t size) {
+  if (PERFETTO_LIKELY(size <= PerfettoStreamWriterAvailableBytes(w))) {
+    PerfettoStreamWriterAppendBytesUnsafe(w, src, size);
+  } else {
+    PerfettoStreamWriterAppendBytesSlowpath(w, src, size);
+  }
+}
+
+// Writes the single byte `value` to the writer.
+static inline void PerfettoStreamWriterAppendByte(
+    struct PerfettoStreamWriter* w,
+    uint8_t value) {
+  if (PERFETTO_UNLIKELY(PerfettoStreamWriterAvailableBytes(w) < 1)) {
+    PerfettoStreamWriterNewChunk(w);
+  }
+  *w->write_ptr++ = value;
+}
+
+// Returns a pointer to an area of the chunk long `size` for writing. The
+// returned area is considered already written by the writer (it will not be
+// used again).
+//
+// WARNING: PerfettoStreamWriterAvailableBytes(`w`) must be >= `size`.
+static inline uint8_t* PerfettoStreamWriterReserveBytesUnsafe(
+    struct PerfettoStreamWriter* w,
+    size_t size) {
+  uint8_t* ret = w->write_ptr;
+  assert(size <= PerfettoStreamWriterAvailableBytes(w));
+  w->write_ptr += size;
+  return ret;
+}
+
+// Returns a pointer to an area of the chunk long `size` for writing. The
+// returned area is considered already written by the writer (it will not be
+// used again).
+//
+// WARNING: `size` should be smaller than the chunk size returned by the
+// `delegate`.
+static inline uint8_t* PerfettoStreamWriterReserveBytes(
+    struct PerfettoStreamWriter* w,
+    size_t size) {
+  if (PERFETTO_LIKELY(size <= PerfettoStreamWriterAvailableBytes(w))) {
+    return PerfettoStreamWriterReserveBytesUnsafe(w, size);
+  }
+  PerfettoStreamWriterReserveBytesSlowpath(w, size);
+  return w->write_ptr - size;
+}
+
+// Returns the number of bytes written to the stream writer from the start.
+static inline size_t PerfettoStreamWriterGetWrittenSize(
+    const struct PerfettoStreamWriter* w) {
+  return w->written_previously +
+         PERFETTO_STATIC_CAST(size_t, w->write_ptr - w->begin);
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_STREAM_WRITER_H_
diff --git a/src/libtracing/perfetto/public/te_category_macros.h b/src/libtracing/perfetto/public/te_category_macros.h
new file mode 100644
index 000000000..a9f5071f5
--- /dev/null
+++ b/src/libtracing/perfetto/public/te_category_macros.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_TE_CATEGORY_MACROS_H_
+#define INCLUDE_PERFETTO_PUBLIC_TE_CATEGORY_MACROS_H_
+
+#include "perfetto/public/track_event.h"
+
+/* This header provides helper macros to list and register perfetto track event
+   categories.
+
+   Example:
+
+   ```
+   #define MY_CATEGORIES(C)                                   \
+     C(c1, "c1", "My category 1 description", "tag1", "tag2") \
+     C(c2, "c2", "My category 2 description", "tag1")         \
+     C(c3, "c3", "My category 3 description")
+
+   PERFETTO_TE_CATEGORIES_DEFINE(MY_CATEGORIES)
+
+   //...
+
+   int main() {
+     //..
+    PERFETTO_TE_REGISTER_CATEGORIES(MY_CATEGORIES);
+   ```
+
+   Three categories are defined (as global variables) `c1`, `c2` and `c3`. The
+   tracing service knows them as "c1", "c2" and "c3" respectively. The extra
+   strings in `C()` after the description are the tags (there can be zero to
+   four tags).
+*/
+
+// Implementation details:
+//
+// The macros have been tested on GCC, clang and MSVC. The MSVC traditional
+// preprocessor behaves slightly differently (see
+// https://learn.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview)
+// so it sometimes requires an extra level of indirection with an intermediate
+// macro.
+//
+// The header is not technically C99 or C++11 standard compliant for a single
+// reason: sometimes `...` receives zero arguments (this has been relaxed in the
+// post 2020 standards). Despite this, the header never uses __VA_ARGS__ when
+// it would expand to zero arguments, because the behavior is compiler
+// dependent.
+
+#if defined(__GNUC__)
+#pragma GCC system_header
+#endif
+
+#define PERFETTO_I_TE_CAT_DESCRIPTION_GET(D, ...) D
+#define PERFETTO_I_TE_CAT_DESCRIPTION_CALL(MACRO, ARGS) MACRO ARGS
+#define PERFETTO_I_TE_CAT_DESCRIPTION(D, ...) \
+  PERFETTO_I_TE_CAT_DESCRIPTION_CALL(PERFETTO_I_TE_CAT_DESCRIPTION_GET, (D))
+
+#define PERFETTO_I_TE_CAT_NUM_TAGS_(A, B, C, D, E, N, ...) N
+#define PERFETTO_I_TE_CAT_NUM_TAGS(...) \
+  PERFETTO_I_TE_CAT_NUM_TAGS_(__VA_ARGS__, 4, 3, 2, 1, 0)
+
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS_0(...)
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS_1(NAME, DESC, TAG1) \
+  static const char* NAME##_tags[] = {TAG1};
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS_2(NAME, DESC, TAG1, TAG2) \
+  static const char* NAME##_tags[] = {TAG1, TAG2};
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS_3(NAME, DESC, TAG1, TAG2, TAG3) \
+  static const char* NAME##_tags[] = {TAG1, TAG2, TAG3};
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS_4(NAME, DESC, TAG1, TAG2, TAG3, TAG4) \
+  static const char* NAME##_tags[] = {TAG1, TAG2, TAG3, TAG4};
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS_GET_MACRO(NAME, _1, _2, _3, _4, MACRO, \
+                                                ...)                         \
+  MACRO
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS_CALL(MACRO, ARGS) MACRO ARGS
+#define PERFETTO_I_TE_CAT_DEFINE_TAGS(NAME, ...)                             \
+  PERFETTO_I_TE_CAT_DEFINE_TAGS_CALL(                                        \
+      PERFETTO_I_TE_CAT_DEFINE_TAGS_GET_MACRO(                               \
+          __VA_ARGS__, PERFETTO_I_TE_CAT_DEFINE_TAGS_4,                      \
+          PERFETTO_I_TE_CAT_DEFINE_TAGS_3, PERFETTO_I_TE_CAT_DEFINE_TAGS_2,  \
+          PERFETTO_I_TE_CAT_DEFINE_TAGS_1, PERFETTO_I_TE_CAT_DEFINE_TAGS_0), \
+      (NAME, __VA_ARGS__))
+
+#define PERFETTO_I_TE_CAT_LIST_TAGS_0(NAME) PERFETTO_NULL
+#define PERFETTO_I_TE_CAT_LIST_TAGS_1(NAME) NAME##_tags
+#define PERFETTO_I_TE_CAT_LIST_TAGS_2(NAME) NAME##_tags
+#define PERFETTO_I_TE_CAT_LIST_TAGS_3(NAME) NAME##_tags
+#define PERFETTO_I_TE_CAT_LIST_TAGS_4(NAME) NAME##_tags
+#define PERFETTO_I_TE_CAT_LIST_TAGS_GET_MACRO(NAME, A, B, C, D, MACRO, ...) \
+  MACRO
+#define PERFETTO_I_TE_CAT_LIST_TAGS_CALL(MACRO, ARGS) MACRO ARGS
+#define PERFETTO_I_TE_CAT_LIST_TAGS(NAME, ...)                           \
+  PERFETTO_I_TE_CAT_LIST_TAGS_CALL(                                      \
+      PERFETTO_I_TE_CAT_LIST_TAGS_GET_MACRO(                             \
+          __VA_ARGS__, PERFETTO_I_TE_CAT_LIST_TAGS_4,                    \
+          PERFETTO_I_TE_CAT_LIST_TAGS_3, PERFETTO_I_TE_CAT_LIST_TAGS_2,  \
+          PERFETTO_I_TE_CAT_LIST_TAGS_1, PERFETTO_I_TE_CAT_LIST_TAGS_0), \
+      (NAME))
+
+#define PERFETTO_I_TE_CAT_DEFINE_CAT(NAME, NAME_STR, ...) \
+  PERFETTO_I_TE_CAT_DEFINE_TAGS(NAME, __VA_ARGS__)        \
+  struct PerfettoTeCategory NAME = {                      \
+      &perfetto_atomic_false,                             \
+      PERFETTO_NULL,                                      \
+      {                                                   \
+          NAME_STR,                                       \
+          PERFETTO_I_TE_CAT_DESCRIPTION(__VA_ARGS__),     \
+          PERFETTO_I_TE_CAT_LIST_TAGS(NAME, __VA_ARGS__), \
+          PERFETTO_I_TE_CAT_NUM_TAGS(__VA_ARGS__),        \
+      },                                                  \
+      0,                                                  \
+  };
+
+#define PERFETTO_I_TE_CAT_DECLARE_CAT(NAME, ...) \
+  extern struct PerfettoTeCategory NAME;
+
+#define PERFETTO_I_TE_CAT_LIST_CAT_COMMA(NAME, ...) &NAME,
+
+// Declares (without defining) categories as global variables. `MACROS` is used
+// to specify the categories, see above for an example.
+#define PERFETTO_TE_CATEGORIES_DECLARE(MACRO) \
+  MACRO(PERFETTO_I_TE_CAT_DECLARE_CAT)
+
+// Defines categories as global variables. `MACROS` is used to specify the
+// categories, see above for an example.
+#define PERFETTO_TE_CATEGORIES_DEFINE(MACRO) \
+  PERFETTO_TE_CATEGORIES_DECLARE(MACRO)      \
+  MACRO(PERFETTO_I_TE_CAT_DEFINE_CAT)
+
+// Registers categories defined with PERFETTO_TE_CATEGORIES_DEFINE(MACRO).
+#define PERFETTO_TE_REGISTER_CATEGORIES(MACRO)                                 \
+  do {                                                                         \
+    struct PerfettoTeCategory* perfetto_i_cat_registry[] = {                   \
+        MACRO(PERFETTO_I_TE_CAT_LIST_CAT_COMMA)};                              \
+    PerfettoTeRegisterCategories(                                              \
+        perfetto_i_cat_registry,                                               \
+        sizeof(perfetto_i_cat_registry) / sizeof(perfetto_i_cat_registry[0])); \
+    PerfettoTePublishCategories();                                             \
+  } while (0)
+
+// Unregisters categories defined with PERFETTO_TE_CATEGORIES_DEFINE(MACRO).
+//
+// WARNING: The categories cannot be used for tracing anymore after this.
+// Executing PERFETTO_TE() on unregistered categories will cause a null pointer
+// dereference.
+#define PERFETTO_TE_UNREGISTER_CATEGORIES(MACRO)                               \
+  do {                                                                         \
+    struct PerfettoTeCategory* perfetto_i_cat_registry[] = {                   \
+        MACRO(PERFETTO_I_TE_CAT_LIST_CAT_COMMA)};                              \
+    PerfettoTeUnregisterCategories(                                            \
+        perfetto_i_cat_registry,                                               \
+        sizeof(perfetto_i_cat_registry) / sizeof(perfetto_i_cat_registry[0])); \
+    PerfettoTePublishCategories();                                             \
+  } while (0)
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_TE_CATEGORY_MACROS_H_
diff --git a/src/libtracing/perfetto/public/te_macros.h b/src/libtracing/perfetto/public/te_macros.h
new file mode 100644
index 000000000..f54823801
--- /dev/null
+++ b/src/libtracing/perfetto/public/te_macros.h
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_TE_MACROS_H_
+#define INCLUDE_PERFETTO_PUBLIC_TE_MACROS_H_
+
+#include <assert.h>
+
+#include "perfetto/public/abi/track_event_hl_abi.h"
+#include "perfetto/public/track_event.h"
+
+// This header defines the PERFETTO_TE macros and its possible params (at the
+// end of the file). The rest of the file contains internal implementation
+// details of the macros, which are subject to change at any time.
+//
+// The macro uses the High level ABI to emit track events.
+
+#define PERFETTO_I_TE_STATIC_ASSERT_NUM_PARAMS_(                              \
+    NAME_AND_TYPE1, NAME_AND_TYPE2, EXTRA1, EXTRA2, EXTRA3, EXTRA4, SENTINEL, \
+    ...)                                                                      \
+  static_assert((SENTINEL) == 0,                                              \
+                "Too many arguments for PERFETTO_TE "                         \
+                "macro")
+
+// Fails to compile if there are too many params and they don't fit into
+// PerfettoTeHlMacroParams.
+#define PERFETTO_I_TE_STATIC_ASSERT_NUM_PARAMS(...) \
+  PERFETTO_I_TE_STATIC_ASSERT_NUM_PARAMS_(__VA_ARGS__, 0, 0, 0, 0, 0, 0)
+
+#define PERFETTO_I_TE_LIMIT_4__(NAME_AND_TYPE1, NAME_AND_TYPE2, EXTRA1, \
+                                EXTRA2, EXTRA3, EXTRA4, ...)            \
+  NAME_AND_TYPE1, NAME_AND_TYPE2, EXTRA1, EXTRA2, EXTRA3, EXTRA4
+#define PERFETTO_I_TE_LIMIT_4_(MACRO, ARGS) MACRO ARGS
+#define PERFETTO_I_TE_LIMIT_4(...) \
+  PERFETTO_I_TE_LIMIT_4_(PERFETTO_I_TE_LIMIT_4__, (__VA_ARGS__))
+
+// In C we have to use a compound literal. In C++ we can use a regular
+// initializer.
+#ifndef __cplusplus
+#define PERFETTO_I_TE_HL_MACRO_PARAMS_PREAMBLE (struct PerfettoTeHlMacroParams)
+#else
+#define PERFETTO_I_TE_HL_MACRO_PARAMS_PREAMBLE
+#endif
+
+// Provides an initializer for `struct PerfettoTeHlMacroParams` and sets all the
+// unused extra fields to PERFETTO_NULL.
+#define PERFETTO_I_TE_HL_MACRO_PARAMS(...)                             \
+  PERFETTO_I_TE_HL_MACRO_PARAMS_PREAMBLE {                             \
+    PERFETTO_I_TE_LIMIT_4(__VA_ARGS__, PERFETTO_NULL, PERFETTO_NULL,   \
+                          PERFETTO_NULL, PERFETTO_NULL, PERFETTO_NULL, \
+                          PERFETTO_NULL)                               \
+  }
+
+#ifndef __cplusplus
+#define PERFETTO_I_TE_COMPOUND_LITERAL_ADDR(STRUCT, ...) \
+  &(struct STRUCT)__VA_ARGS__
+#define PERFETTO_I_TE_EXTRA(STRUCT, ...)                           \
+  ((struct PerfettoTeHlExtra*)PERFETTO_I_TE_COMPOUND_LITERAL_ADDR( \
+      STRUCT, __VA_ARGS__))
+#else
+#define PERFETTO_I_TE_COMPOUND_LITERAL_ADDR(STRUCT, ...) \
+  &(STRUCT{} = STRUCT __VA_ARGS__)
+#define PERFETTO_I_TE_EXTRA(STRUCT, ...)       \
+  reinterpret_cast<struct PerfettoTeHlExtra*>( \
+      PERFETTO_I_TE_COMPOUND_LITERAL_ADDR(STRUCT, __VA_ARGS__))
+#endif
+
+struct PerfettoTeHlMacroNameAndType {
+  const char* name;
+  int32_t type;
+};
+
+struct PerfettoTeHlMacroParams {
+  struct PerfettoTeHlMacroNameAndType name_and_type;
+  struct PerfettoTeHlExtra* extra1;
+  struct PerfettoTeHlExtra* extra2;
+  struct PerfettoTeHlExtra* extra3;
+  struct PerfettoTeHlExtra* extra4;
+};
+
+static inline void PerfettoTeHlCall(struct PerfettoTeCategoryImpl* cat,
+                                    struct PerfettoTeHlMacroParams params) {
+  struct PerfettoTeHlExtra* perfetto_i_extra_data = PERFETTO_NULL;
+  if (params.extra1) {
+    params.extra1->next = perfetto_i_extra_data;
+    perfetto_i_extra_data = params.extra1;
+  }
+  if (params.extra2) {
+    params.extra2->next = perfetto_i_extra_data;
+    perfetto_i_extra_data = params.extra2;
+  }
+  if (params.extra3) {
+    params.extra3->next = perfetto_i_extra_data;
+    perfetto_i_extra_data = params.extra3;
+  }
+  if (params.extra4) {
+    params.extra4->next = perfetto_i_extra_data;
+    perfetto_i_extra_data = params.extra4;
+  }
+  PerfettoTeHlEmitImpl(cat, params.name_and_type.type,
+                       params.name_and_type.name, perfetto_i_extra_data);
+}
+
+// Instead of a previously registered category, this macro can be used to
+// specify that the category will be provided dynamically as a param.
+#define PERFETTO_TE_DYNAMIC_CATEGORY PerfettoTeRegisteredDynamicCategory()
+
+// -------------------------------------------------
+// Possible types of event for the PERFETTO_TE macro
+// -------------------------------------------------
+
+// Begins a slice named `const char* NAME` on a track.
+#define PERFETTO_TE_SLICE_BEGIN(NAME) \
+  { NAME, PERFETTO_TE_TYPE_SLICE_BEGIN }
+
+// Ends the last slice opened on a track.
+#define PERFETTO_TE_SLICE_END() \
+  { PERFETTO_NULL, PERFETTO_TE_TYPE_SLICE_END }
+
+// Reports an instant event named `const char* NAME`.
+#define PERFETTO_TE_INSTANT(NAME) \
+  { NAME, PERFETTO_TE_TYPE_INSTANT }
+
+// Reports the value of a counter. The counter value must be specified
+// separately on another param with PERFETTO_TE_INT_COUNTER() or
+// PERFETTO_TE_DOUBLE_COUNTER().
+#define PERFETTO_TE_COUNTER() \
+  { PERFETTO_NULL, PERFETTO_TE_TYPE_COUNTER }
+
+// -------------------------------------------------
+// Possible types of event for the PERFETTO_TE macro
+// -------------------------------------------------
+
+// The value (`C`) of an integer counter. A separate parameter must describe the
+// counter track this refers to. This should only be used for events with
+// type PERFETTO_TE_COUNTER().
+#define PERFETTO_TE_INT_COUNTER(C)   \
+  PERFETTO_I_TE_EXTRA(               \
+      PerfettoTeHlExtraCounterInt64, \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_COUNTER_INT64, PERFETTO_NULL}, C})
+
+// The value (`C`) of a floating point. A separate parameter must describe the
+// counter track this refers to. This should only be used for events with type
+// PERFETTO_TE_COUNTER().
+#define PERFETTO_TE_DOUBLE_COUNTER(C) \
+  PERFETTO_I_TE_EXTRA(                \
+      PerfettoTeHlExtraCounterDouble, \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_COUNTER_DOUBLE, PERFETTO_NULL}, C})
+
+// Uses the timestamp `struct PerfettoTeTimestamp T` to report this event. If
+// this is not specified, PERFETTO_TE() reads the current timestamp with
+// PerfettoTeGetTimestamp().
+#define PERFETTO_TE_TIMESTAMP(T)  \
+  PERFETTO_I_TE_EXTRA(            \
+      PerfettoTeHlExtraTimestamp, \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_TIMESTAMP, PERFETTO_NULL}, T})
+
+// Specifies that the current track for this event is
+// `struct PerfettoTeRegisteredTrack* T`, which must have been previously
+// registered.
+#define PERFETTO_TE_REGISTERED_TRACK(T)                             \
+  PERFETTO_I_TE_EXTRA(                                              \
+      PerfettoTeHlExtraRegisteredTrack,                             \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_REGISTERED_TRACK, PERFETTO_NULL}, \
+       &(T)->impl})
+
+// Specifies that the current track for this event is a track named `const char
+// *NAME`, child of a track whose uuid is `PARENT_UUID`. `NAME`, `uint64_t ID`
+// and `PARENT_UUID` uniquely identify a track. Common values for `PARENT_UUID`
+// include PerfettoTeProcessTrackUuid(), PerfettoTeThreadTrackUuid() or
+// PerfettoTeGlobalTrackUuid().
+#define PERFETTO_TE_NAMED_TRACK(NAME, ID, PARENT_UUID)                         \
+  PERFETTO_I_TE_EXTRA(PerfettoTeHlExtraNamedTrack,                             \
+                      {{PERFETTO_TE_HL_EXTRA_TYPE_NAMED_TRACK, PERFETTO_NULL}, \
+                       NAME,                                                   \
+                       ID,                                                     \
+                       PARENT_UUID})
+
+// When PERFETTO_TE_DYNAMIC_CATEGORY is used, this is used to specify `const
+// char* S` as a category name.
+#define PERFETTO_TE_DYNAMIC_CATEGORY_STRING(S)                      \
+  PERFETTO_I_TE_EXTRA(                                              \
+      PerfettoTeHlExtraDynamicCategory,                             \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_DYNAMIC_CATEGORY, PERFETTO_NULL}, \
+       PERFETTO_I_TE_COMPOUND_LITERAL_ADDR(                         \
+           PerfettoTeCategoryDescriptor,                            \
+           {S, PERFETTO_NULL, PERFETTO_NULL, 0})})
+
+// Adds the debug annotation named `const char * NAME` with value `bool VALUE`.
+#define PERFETTO_TE_ARG_BOOL(NAME, VALUE)                         \
+  PERFETTO_I_TE_EXTRA(                                            \
+      PerfettoTeHlExtraDebugArgBool,                              \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_BOOL, PERFETTO_NULL}, \
+       NAME,                                                      \
+       VALUE})
+
+// Adds the debug annotation named `const char * NAME` with value `uint64_t
+// VALUE`.
+#define PERFETTO_TE_ARG_UINT64(NAME, VALUE)                         \
+  PERFETTO_I_TE_EXTRA(                                              \
+      PerfettoTeHlExtraDebugArgUint64,                              \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_UINT64, PERFETTO_NULL}, \
+       NAME,                                                        \
+       VALUE})
+
+// Adds the debug annotation named `const char * NAME` with value `int64_t
+// VALUE`.
+#define PERFETTO_TE_ARG_INT64(NAME, VALUE)                         \
+  PERFETTO_I_TE_EXTRA(                                             \
+      PerfettoTeHlExtraDebugArgInt64,                              \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_INT64, PERFETTO_NULL}, \
+       NAME,                                                       \
+       VALUE})
+
+// Adds the debug annotation named `const char * NAME` with value `double
+// VALUE`.
+#define PERFETTO_TE_ARG_DOUBLE(NAME, VALUE)                         \
+  PERFETTO_I_TE_EXTRA(                                              \
+      PerfettoTeHlExtraDebugArgDouble,                              \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_DOUBLE, PERFETTO_NULL}, \
+       NAME,                                                        \
+       VALUE})
+
+// Adds the debug annotation named `const char * NAME` with value `const char*
+// VALUE`.
+#define PERFETTO_TE_ARG_STRING(NAME, VALUE)                         \
+  PERFETTO_I_TE_EXTRA(                                              \
+      PerfettoTeHlExtraDebugArgString,                              \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_STRING, PERFETTO_NULL}, \
+       NAME,                                                        \
+       VALUE})
+
+// Adds the debug annotation named `const char * NAME` with value `void* VALUE`.
+#define PERFETTO_TE_ARG_POINTER(NAME, VALUE)                         \
+  PERFETTO_I_TE_EXTRA(                                               \
+      PerfettoTeHlExtraDebugArgPointer,                              \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_DEBUG_ARG_POINTER, PERFETTO_NULL}, \
+       NAME,                                                         \
+       VALUE})
+
+// Specifies that this event is part (or starts) a "flow" (i.e. a link among
+// different events). The flow is identified by `struct PerfettoTeFlow VALUE`.
+#define PERFETTO_TE_FLOW(VALUE) \
+  PERFETTO_I_TE_EXTRA(          \
+      PerfettoTeHlExtraFlow,    \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_FLOW, PERFETTO_NULL}, (VALUE).id})
+
+// Specifies that this event terminates a "flow" (i.e. a link among different
+// events). The flow is identified by `struct PerfettoTeFlow VALUE`.
+#define PERFETTO_TE_TERMINATING_FLOW(VALUE)                         \
+  PERFETTO_I_TE_EXTRA(                                              \
+      PerfettoTeHlExtraFlow,                                        \
+      {{PERFETTO_TE_HL_EXTRA_TYPE_TERMINATING_FLOW, PERFETTO_NULL}, \
+       (VALUE).id})
+
+// Flushes the shared memory buffer and makes sure that all the previous events
+// emitted by this thread are visibile in the central tracing buffer.
+#define PERFETTO_TE_FLUSH()              \
+  PERFETTO_I_TE_EXTRA(PerfettoTeHlExtra, \
+                      {PERFETTO_TE_HL_EXTRA_TYPE_FLUSH, PERFETTO_NULL})
+
+// Turns off interning for event names.
+#define PERFETTO_TE_NO_INTERN()          \
+  PERFETTO_I_TE_EXTRA(PerfettoTeHlExtra, \
+                      {PERFETTO_TE_HL_EXTRA_TYPE_NO_INTERN, PERFETTO_NULL})
+
+// ----------------------------------
+// The main PERFETTO_TE tracing macro
+// ----------------------------------
+//
+// If tracing is active and the passed tracing category is enabled, adds an
+// entry in the tracing stream of the perfetto track event data source.
+// Parameters:
+// * `CAT`: The tracing category (it should be a struct
+//   PerfettoTeCategory object). It can be
+//   PERFETTO_TE_DYNAMIC_CATEGORY for dynamic categories (the dynamic category
+//   name should be passed later with)
+// * The type of the event. It can be one of:
+//   * PERFETTO_TE_SLICE_BEGIN(name)
+//   * PERFETTO_TE_SLICE_END()
+//   * PERFETTO_TE_INSTANT()
+//   * PERFETTO_TE_COUNTER()
+// * `...`: One or more (up to 4) macro parameters from the above list that
+//   specify the data to be traced.
+//
+// Examples:
+//
+// PERFETTO_TE(category, PERFETTO_TE_SLICE_BEGIN("name"),
+//             PERFETTO_TE_ARG_UINT64("extra_arg", 42));
+// PERFETTO_TE(category, PERFETTO_TE_SLICE_END());
+// PERFETTO_TE(category, PERFETTO_TE_COUNTER(),
+//             PERFETTO_TE_REGISTERED_TRACK(&mycounter),
+//             PERFETTO_TE_INT_COUNTER(79));
+// PERFETTO_TE(PERFETTO_TE_DYNAMIC_CATEGORY, PERFETTO_TE_INSTANT("instant"),
+//             PERFETTO_TE_DYNAMIC_CATEGORY_STRING("category"));
+//
+#define PERFETTO_TE(CAT, ...)                                       \
+  do {                                                              \
+    if (PERFETTO_UNLIKELY(PERFETTO_ATOMIC_LOAD_EXPLICIT(            \
+            (CAT).enabled, PERFETTO_MEMORY_ORDER_RELAXED))) {       \
+      PERFETTO_I_TE_STATIC_ASSERT_NUM_PARAMS(__VA_ARGS__);          \
+      PerfettoTeHlCall((CAT).impl,                                  \
+                       PERFETTO_I_TE_HL_MACRO_PARAMS(__VA_ARGS__)); \
+    }                                                               \
+  } while (0)
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_TE_MACROS_H_
diff --git a/src/libtracing/perfetto/public/thread_utils.h b/src/libtracing/perfetto/public/thread_utils.h
new file mode 100644
index 000000000..55cd096be
--- /dev/null
+++ b/src/libtracing/perfetto/public/thread_utils.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_THREAD_UTILS_H_
+#define INCLUDE_PERFETTO_PUBLIC_THREAD_UTILS_H_
+
+#include <stdlib.h>
+
+#include "perfetto/public/abi/thread_utils_abi.h"
+#include "perfetto/public/compiler.h"
+
+#if defined(__BIONIC__)
+
+#include <unistd.h>
+
+static inline PerfettoThreadId PerfettoGetThreadId(void) {
+  return gettid();
+}
+#elif defined(__linux__)
+
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <unistd.h>
+static inline PerfettoThreadId PerfettoGetThreadId(void) {
+  return PERFETTO_STATIC_CAST(PerfettoThreadId, syscall(__NR_gettid));
+}
+
+#else
+
+static inline PerfettoThreadId PerfettoGetThreadId(void) {
+  return PerfettoGetThreadIdImpl();
+}
+
+#endif
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_THREAD_UTILS_H_
diff --git a/src/libtracing/perfetto/public/tracing_session.h b/src/libtracing/perfetto/public/tracing_session.h
new file mode 100644
index 000000000..9b8b69b1c
--- /dev/null
+++ b/src/libtracing/perfetto/public/tracing_session.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_TRACING_SESSION_H_
+#define INCLUDE_PERFETTO_PUBLIC_TRACING_SESSION_H_
+
+#include "perfetto/public/abi/backend_type.h"
+#include "perfetto/public/abi/tracing_session_abi.h"
+
+static inline struct PerfettoTracingSessionImpl* PerfettoTracingSessionCreate(
+    PerfettoBackendTypes backend) {
+  if (backend == PERFETTO_BACKEND_IN_PROCESS) {
+    return PerfettoTracingSessionInProcessCreate();
+  }
+  if (backend == PERFETTO_BACKEND_SYSTEM) {
+    return PerfettoTracingSessionSystemCreate();
+  }
+  return nullptr;
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_TRACING_SESSION_H_
diff --git a/src/libtracing/perfetto/public/track_event.h b/src/libtracing/perfetto/public/track_event.h
new file mode 100644
index 000000000..5db77c6e2
--- /dev/null
+++ b/src/libtracing/perfetto/public/track_event.h
@@ -0,0 +1,508 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INCLUDE_PERFETTO_PUBLIC_TRACK_EVENT_H_
+#define INCLUDE_PERFETTO_PUBLIC_TRACK_EVENT_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "perfetto/public/abi/heap_buffer.h"
+#include "perfetto/public/abi/track_event_abi.h"     // IWYU pragma: export
+#include "perfetto/public/abi/track_event_hl_abi.h"  // IWYU pragma: export
+#include "perfetto/public/abi/track_event_ll_abi.h"  // IWYU pragma: export
+#include "perfetto/public/compiler.h"
+#include "perfetto/public/data_source.h"
+#include "perfetto/public/fnv1a.h"
+#include "perfetto/public/pb_msg.h"
+#include "perfetto/public/protos/trace/interned_data/interned_data.pzc.h"
+#include "perfetto/public/protos/trace/trace_packet.pzc.h"
+#include "perfetto/public/protos/trace/track_event/counter_descriptor.pzc.h"
+#include "perfetto/public/protos/trace/track_event/track_descriptor.pzc.h"
+#include "perfetto/public/protos/trace/track_event/track_event.pzc.h"
+#include "perfetto/public/thread_utils.h"
+
+// A registered category.
+struct PerfettoTeCategory {
+  PERFETTO_ATOMIC(bool) * enabled;
+  struct PerfettoTeCategoryImpl* impl;
+  struct PerfettoTeCategoryDescriptor desc;
+  uint64_t cat_iid;
+};
+
+// Registers the category `cat`. `cat->desc` must be filled before calling this.
+// The rest of the structure is filled by the function.
+static inline void PerfettoTeCategoryRegister(struct PerfettoTeCategory* cat) {
+  cat->impl = PerfettoTeCategoryImplCreate(&cat->desc);
+  cat->enabled = PerfettoTeCategoryImplGetEnabled(cat->impl);
+  cat->cat_iid = PerfettoTeCategoryImplGetIid(cat->impl);
+}
+
+// Calls PerfettoTeCategoryRegister() on multiple categories.
+static inline void PerfettoTeRegisterCategories(
+    struct PerfettoTeCategory* cats[],
+    size_t size) {
+  for (size_t i = 0; i < size; i++) {
+    PerfettoTeCategoryRegister(cats[i]);
+  }
+}
+
+// Registers `cb` to be called every time a data source instance with `reg_cat`
+// enabled is created or destroyed. `user_arg` will be passed unaltered to `cb`.
+//
+// `cb` can be NULL to disable the callback.
+static inline void PerfettoTeCategorySetCallback(
+    struct PerfettoTeCategory* reg_cat,
+    PerfettoTeCategoryImplCallback cb,
+    void* user_arg) {
+  PerfettoTeCategoryImplSetCallback(reg_cat->impl, cb, user_arg);
+}
+
+// Unregisters the category `cat`.
+//
+// WARNING: The category cannot be used for tracing anymore after this.
+// Executing PERFETTO_TE() on an unregistered category will cause a null pointer
+// dereference.
+static inline void PerfettoTeCategoryUnregister(
+    struct PerfettoTeCategory* cat) {
+  PerfettoTeCategoryImplDestroy(cat->impl);
+  cat->impl = PERFETTO_NULL;
+  cat->enabled = &perfetto_atomic_false;
+  cat->cat_iid = 0;
+}
+
+// Calls PerfettoTeCategoryUnregister() on multiple categories.
+//
+// WARNING: The categories cannot be used for tracing anymore after this.
+// Executing PERFETTO_TE() on unregistered categories will cause a null pointer
+// dereference.
+static inline void PerfettoTeUnregisterCategories(
+    struct PerfettoTeCategory* cats[],
+    size_t size) {
+  for (size_t i = 0; i < size; i++) {
+    PerfettoTeCategoryUnregister(cats[i]);
+  }
+}
+
+// A track. Must be registered before it can be used in trace events.
+struct PerfettoTeRegisteredTrack {
+  struct PerfettoTeRegisteredTrackImpl impl;
+};
+
+// Returns the track uuid for the current process.
+static inline uint64_t PerfettoTeProcessTrackUuid(void) {
+  return perfetto_te_process_track_uuid;
+}
+
+// Returns the track uuid for the current thread.
+static inline uint64_t PerfettoTeThreadTrackUuid(void) {
+  return perfetto_te_process_track_uuid ^
+         PERFETTO_STATIC_CAST(uint64_t, PerfettoGetThreadId());
+}
+
+// Returns the root track uuid.
+static inline uint64_t PerfettoTeGlobalTrackUuid(void) {
+  return 0;
+}
+
+// Computes the track uuid for a counter track named `name` whose parent track
+// has `parent_uuid`.
+static inline uint64_t PerfettoTeCounterTrackUuid(const char* name,
+                                                  uint64_t parent_uuid) {
+  const uint64_t kCounterMagic = 0xb1a4a67d7970839eul;
+  uint64_t uuid = kCounterMagic;
+  uuid ^= parent_uuid;
+  uuid ^= PerfettoFnv1a(name, strlen(name));
+  return uuid;
+}
+
+// Computes the track uuid for a track named `name` with unique `id` whose
+// parent track has `parent_uuid`.
+static inline uint64_t PerfettoTeNamedTrackUuid(const char* name,
+                                                uint64_t id,
+                                                uint64_t parent_uuid) {
+  uint64_t uuid = parent_uuid;
+  uuid ^= PerfettoFnv1a(name, strlen(name));
+  uuid ^= id;
+  return uuid;
+}
+
+// Serializes the descriptor for a counter track named `name` with
+// `parent_uuid`. `track_uuid` must be the return value of
+// PerfettoTeCounterTrackUuid().
+static inline void PerfettoTeCounterTrackFillDesc(
+    struct perfetto_protos_TrackDescriptor* desc,
+    const char* name,
+    uint64_t parent_track_uuid,
+    uint64_t track_uuid) {
+  perfetto_protos_TrackDescriptor_set_uuid(desc, track_uuid);
+  if (parent_track_uuid) {
+    perfetto_protos_TrackDescriptor_set_parent_uuid(desc, parent_track_uuid);
+  }
+  perfetto_protos_TrackDescriptor_set_cstr_name(desc, name);
+  {
+    struct perfetto_protos_CounterDescriptor counter;
+    perfetto_protos_TrackDescriptor_begin_counter(desc, &counter);
+    perfetto_protos_TrackDescriptor_end_counter(desc, &counter);
+  }
+}
+
+// Serializes the descriptor for a track named `name` with unique `id` and
+// `parent_uuid`. `track_uuid` must be the return value of
+// PerfettoTeNamedTrackUuid().
+static inline void PerfettoTeNamedTrackFillDesc(
+    struct perfetto_protos_TrackDescriptor* desc,
+    const char* track_name,
+    uint64_t id,
+    uint64_t parent_track_uuid,
+    uint64_t track_uuid) {
+  (void)id;
+  perfetto_protos_TrackDescriptor_set_uuid(desc, track_uuid);
+  if (parent_track_uuid) {
+    perfetto_protos_TrackDescriptor_set_parent_uuid(desc, parent_track_uuid);
+  }
+  perfetto_protos_TrackDescriptor_set_cstr_name(desc, track_name);
+}
+
+// Registers a track named `name` with unique `id` and `parent_uuid` into
+// `track`.
+static inline void PerfettoTeNamedTrackRegister(
+    struct PerfettoTeRegisteredTrack* track,
+    const char* name,
+    uint64_t id,
+    uint64_t parent_track_uuid) {
+  uint64_t uuid;
+  // Build the TrackDescriptor protobuf message.
+  struct PerfettoPbMsgWriter writer;
+  struct PerfettoHeapBuffer* hb = PerfettoHeapBufferCreate(&writer.writer);
+  struct perfetto_protos_TrackDescriptor desc;
+  PerfettoPbMsgInit(&desc.msg, &writer);
+
+  uuid = PerfettoTeNamedTrackUuid(name, id, parent_track_uuid);
+
+  PerfettoTeNamedTrackFillDesc(&desc, name, id, parent_track_uuid, uuid);
+
+  track->impl.descriptor_size =
+      PerfettoStreamWriterGetWrittenSize(&writer.writer);
+  track->impl.descriptor = malloc(track->impl.descriptor_size);
+  track->impl.uuid = uuid;
+  PerfettoHeapBufferCopyInto(hb, &writer.writer, track->impl.descriptor,
+                             track->impl.descriptor_size);
+  PerfettoHeapBufferDestroy(hb, &writer.writer);
+}
+
+// Registers a counter track named `name` with and `parent_uuid` into `track`.
+static inline void PerfettoTeCounterTrackRegister(
+    struct PerfettoTeRegisteredTrack* track,
+    const char* name,
+    uint64_t parent_track_uuid) {
+  uint64_t uuid;
+  struct PerfettoPbMsgWriter writer;
+  struct PerfettoHeapBuffer* hb = PerfettoHeapBufferCreate(&writer.writer);
+  struct perfetto_protos_TrackDescriptor desc;
+  PerfettoPbMsgInit(&desc.msg, &writer);
+
+  uuid = PerfettoTeCounterTrackUuid(name, parent_track_uuid);
+
+  PerfettoTeCounterTrackFillDesc(&desc, name, parent_track_uuid, uuid);
+
+  track->impl.descriptor_size =
+      PerfettoStreamWriterGetWrittenSize(&writer.writer);
+  track->impl.descriptor = malloc(track->impl.descriptor_size);
+  track->impl.uuid = uuid;
+  PerfettoHeapBufferCopyInto(hb, &writer.writer, track->impl.descriptor,
+                             track->impl.descriptor_size);
+  PerfettoHeapBufferDestroy(hb, &writer.writer);
+}
+
+// Unregisters the previously registered track `track`.
+static inline void PerfettoTeRegisteredTrackUnregister(
+    struct PerfettoTeRegisteredTrack* track) {
+  free(track->impl.descriptor);
+  track->impl.descriptor = PERFETTO_NULL;
+  track->impl.descriptor_size = 0;
+}
+
+// Identifies a flow: a link between two events.
+struct PerfettoTeFlow {
+  uint64_t id;
+};
+
+// Returns a flow that's scoped to this process. It can be used to link events
+// inside this process.
+static inline struct PerfettoTeFlow PerfettoTeProcessScopedFlow(uint64_t id) {
+  struct PerfettoTeFlow ret;
+  ret.id = id ^ perfetto_te_process_track_uuid;
+  return ret;
+}
+
+// Returns a global flow. It can be used to link events between different
+// processes.
+static inline struct PerfettoTeFlow PerfettoTeGlobalFlow(uint64_t id) {
+  struct PerfettoTeFlow ret;
+  ret.id = id;
+  return ret;
+}
+
+// Returns a static-category-like object used when dynamic categories are passed
+// as extra parameters.
+static inline struct PerfettoTeCategory PerfettoTeRegisteredDynamicCategory(
+    void) {
+  struct PerfettoTeCategory ret = {
+      perfetto_te_any_categories_enabled,
+      perfetto_te_any_categories,
+      {PERFETTO_NULL, PERFETTO_NULL, PERFETTO_NULL, 0},
+      0};
+  return ret;
+}
+
+// Iterator for all the active instances (on this thread) of a data source type.
+struct PerfettoTeLlIterator {
+  struct PerfettoTeLlImplIterator impl;
+};
+
+static inline struct PerfettoTeLlIterator PerfettoTeLlBeginSlowPath(
+    struct PerfettoTeCategory* cat,
+    struct PerfettoTeTimestamp ts) {
+  struct PerfettoTeLlIterator ret;
+  ret.impl = PerfettoTeLlImplBegin(cat->impl, ts);
+  return ret;
+}
+
+static inline void PerfettoTeLlNext(struct PerfettoTeCategory* cat,
+                                    struct PerfettoTeTimestamp ts,
+                                    struct PerfettoTeLlIterator* iterator) {
+  PerfettoTeLlImplNext(cat->impl, ts, &iterator->impl);
+}
+
+static inline void PerfettoTeLlBreak(struct PerfettoTeCategory* cat,
+                                     struct PerfettoTeLlIterator* iterator) {
+  if (iterator->impl.ds.tracer) {
+    PerfettoTeLlImplBreak(cat->impl, &iterator->impl);
+  }
+}
+
+// Checks if the category descriptor `dyn_cat` is enabled in the current active
+// instance pointed by `iterator`.
+static inline bool PerfettoTeLlDynCatEnabled(
+    struct PerfettoTeLlIterator* iterator,
+    const struct PerfettoTeCategoryDescriptor* dyn_cat) {
+  return PerfettoTeLlImplDynCatEnabled(iterator->impl.ds.tracer,
+                                       iterator->impl.ds.inst_id, dyn_cat);
+}
+
+// Initializes `root` to write a new packet to the data source instance pointed
+// by `iterator`.
+static inline void PerfettoTeLlPacketBegin(
+    struct PerfettoTeLlIterator* iterator,
+    struct PerfettoDsRootTracePacket* root) {
+  root->writer.writer =
+      PerfettoDsTracerImplPacketBegin(iterator->impl.ds.tracer);
+  PerfettoPbMsgInit(&root->msg.msg, &root->writer);
+}
+
+// Finishes writing the packet pointed by `root` on the data source instance
+// pointer by `iterator`.
+static inline void PerfettoTeLlPacketEnd(
+    struct PerfettoTeLlIterator* iterator,
+    struct PerfettoDsRootTracePacket* root) {
+  PerfettoPbMsgFinalize(&root->msg.msg);
+  PerfettoDsTracerImplPacketEnd(iterator->impl.ds.tracer, &root->writer.writer);
+}
+
+static inline void PerfettoTeLlFlushPacket(
+    struct PerfettoTeLlIterator* iterator) {
+  PerfettoDsTracerImplFlush(iterator->impl.ds.tracer, PERFETTO_NULL,
+                            PERFETTO_NULL);
+}
+
+// Returns true if the track event incremental state has already seen in the
+// past a track with `uuid` as track UUID.
+static inline bool PerfettoTeLlTrackSeen(struct PerfettoTeLlImplIncr* incr,
+                                         uint64_t uuid) {
+  return PerfettoTeLlImplTrackSeen(incr, uuid);
+}
+
+// Interning:
+//
+// it's possible to avoid repeating the same data over and over in a trace by
+// using "interning".
+//
+// `type` is a field id in the `perfetto.protos.InternedData` protobuf message.
+// `data` and `data_size` point to the raw data that is potentially repeated.
+// The function returns an integer (the iid) that can be used instead of
+// serializing the data directly in the packet. `*seen` is set to false if this
+// is the first time the library observed this data for this specific type
+// (therefore it allocated a new iid).
+static inline uint64_t PerfettoTeLlIntern(struct PerfettoTeLlImplIncr* incr,
+                                          int32_t type,
+                                          const void* data,
+                                          size_t data_size,
+                                          bool* seen) {
+  return PerfettoTeLlImplIntern(incr, type, data, data_size, seen);
+}
+
+// Used to lazily start, only if required, a nested InternedData submessage for
+// a TracePacket `tp`. `incr` is the incremental state ABI pointer received from
+// PerfettoTeLlIterator.
+struct PerfettoTeLlInternContext {
+  struct PerfettoTeLlImplIncr* incr;
+  struct perfetto_protos_TracePacket* tp;
+  struct perfetto_protos_InternedData interned;
+  // true if the nested `interned` submessage has been started, false otherwise.
+  bool started;
+};
+
+static inline void PerfettoTeLlInternContextInit(
+    struct PerfettoTeLlInternContext* ctx,
+    struct PerfettoTeLlImplIncr* incr,
+    struct perfetto_protos_TracePacket* tp) {
+  ctx->incr = incr;
+  ctx->tp = tp;
+  ctx->started = false;
+}
+
+static inline void PerfettoTeLlInternContextStartIfNeeded(
+    struct PerfettoTeLlInternContext* ctx) {
+  if (!ctx->started) {
+    ctx->started = true;
+    perfetto_protos_TracePacket_begin_interned_data(ctx->tp, &ctx->interned);
+  }
+}
+
+static inline void PerfettoTeLlInternContextDestroy(
+    struct PerfettoTeLlInternContext* ctx) {
+  if (ctx->started) {
+    perfetto_protos_TracePacket_end_interned_data(ctx->tp, &ctx->interned);
+  }
+}
+
+static inline void PerfettoTeLlInternRegisteredCat(
+    struct PerfettoTeLlInternContext* ctx,
+    struct PerfettoTeCategory* reg_cat) {
+  uint64_t iid = reg_cat->cat_iid;
+  bool seen;
+
+  if (!iid) {
+    return;
+  }
+  PerfettoTeLlIntern(ctx->incr,
+                     perfetto_protos_InternedData_event_categories_field_number,
+                     &iid, sizeof(iid), &seen);
+  if (!seen) {
+    struct perfetto_protos_EventCategory event_category;
+    PerfettoTeLlInternContextStartIfNeeded(ctx);
+
+    perfetto_protos_InternedData_begin_event_categories(&ctx->interned,
+                                                        &event_category);
+    perfetto_protos_EventCategory_set_iid(&event_category, iid);
+    perfetto_protos_EventCategory_set_cstr_name(&event_category,
+                                                reg_cat->desc.name);
+    perfetto_protos_InternedData_end_event_categories(&ctx->interned,
+                                                      &event_category);
+  }
+}
+
+static inline void PerfettoTeLlWriteRegisteredCat(
+    struct perfetto_protos_TrackEvent* te,
+    struct PerfettoTeCategory* reg_cat) {
+  if (reg_cat->cat_iid) {
+    perfetto_protos_TrackEvent_set_category_iids(te, reg_cat->cat_iid);
+  } else if (reg_cat->desc.name) {
+    perfetto_protos_TrackEvent_set_cstr_categories(te, reg_cat->desc.name);
+  }
+}
+
+static inline void PerfettoTeLlWriteDynamicCat(
+    struct perfetto_protos_TrackEvent* te,
+    struct PerfettoTeCategoryDescriptor* dyn_cat,
+    int32_t type) {
+  if (dyn_cat && type != PERFETTO_TE_TYPE_SLICE_END &&
+      type != PERFETTO_TE_TYPE_COUNTER) {
+    perfetto_protos_TrackEvent_set_cstr_categories(te, dyn_cat->name);
+  }
+}
+
+static inline uint64_t PerfettoTeLlInternEventName(
+    struct PerfettoTeLlInternContext* ctx,
+    const char* name) {
+  uint64_t iid = 0;
+  if (name) {
+    bool seen;
+    iid = PerfettoTeLlIntern(
+        ctx->incr, perfetto_protos_InternedData_event_names_field_number, name,
+        strlen(name), &seen);
+    if (!seen) {
+      struct perfetto_protos_EventName event_name;
+      PerfettoTeLlInternContextStartIfNeeded(ctx);
+      perfetto_protos_InternedData_begin_event_names(&ctx->interned,
+                                                     &event_name);
+      perfetto_protos_EventName_set_iid(&event_name, iid);
+      perfetto_protos_EventName_set_cstr_name(&event_name, name);
+      perfetto_protos_InternedData_end_event_names(&ctx->interned, &event_name);
+    }
+  }
+  return iid;
+}
+
+static inline void PerfettoTeLlWriteEventName(
+    struct perfetto_protos_TrackEvent* te,
+    const char* name) {
+  if (name) {
+    perfetto_protos_TrackEvent_set_cstr_name(te, name);
+  }
+}
+
+static inline void PerfettoTeLlWriteInternedEventName(
+    struct perfetto_protos_TrackEvent* te,
+    uint64_t iid) {
+  if (iid != 0) {
+    perfetto_protos_TrackEvent_set_name_iid(te, iid);
+  }
+}
+
+static inline void PerfettoTeLlWriteTimestamp(
+    struct perfetto_protos_TracePacket* tp,
+    const struct PerfettoTeTimestamp* ts) {
+  uint32_t clock_id = ts->clock_id;
+  perfetto_protos_TracePacket_set_timestamp(tp, ts->value);
+  perfetto_protos_TracePacket_set_timestamp_clock_id(tp, clock_id);
+}
+
+static inline uint64_t PerfettoTeLlInternDbgArgName(
+    struct PerfettoTeLlInternContext* ctx,
+    const char* name) {
+  uint64_t iid = 0;
+  if (name) {
+    bool seen;
+    iid = PerfettoTeLlIntern(
+        ctx->incr,
+        perfetto_protos_InternedData_debug_annotation_names_field_number, name,
+        strlen(name), &seen);
+    if (!seen) {
+      struct perfetto_protos_EventName event_name;
+      PerfettoTeLlInternContextStartIfNeeded(ctx);
+      perfetto_protos_InternedData_begin_event_names(&ctx->interned,
+                                                     &event_name);
+      perfetto_protos_EventName_set_iid(&event_name, iid);
+      perfetto_protos_EventName_set_cstr_name(&event_name, name);
+      perfetto_protos_InternedData_end_event_names(&ctx->interned, &event_name);
+    }
+  }
+  return iid;
+}
+
+#endif  // INCLUDE_PERFETTO_PUBLIC_TRACK_EVENT_H_
diff --git a/src/libtracing/protos/README.md b/src/libtracing/protos/README.md
new file mode 100644
index 000000000..20d4af549
--- /dev/null
+++ b/src/libtracing/protos/README.md
@@ -0,0 +1,20 @@
+# Perfetto Protobuf definitions
+
+There are three groups of protos in the respective perfetto/X directories:
+
+`trace/`: This directory contains all protos that are output-ed by Perfetto
+when capturing a trace.
+
+`config/`: This directory contains the configuration passed as input to
+various parts of Perfetto, such as:
+  * (i) the whole trace config that the Consumer sends to the Perfetto trace
+    daemon.
+  * (ii) the per-data-source config that the trace daemon relays to each
+    Producer.
+  * (iii) the per-data-source descriptor that each Producer advertises to the
+    trace daemon when registering.
+
+`ipc/`: This directory contains the definition of the IPC surface between
+the Perfetto components (Producer, trace daemon and Consumer(s)). This is
+relevant only in some Perfetto build configuration (i.e. in Android but not
+in Chrome).
diff --git a/src/libtracing/protos/perfetto/common/android_energy_consumer_descriptor.proto b/src/libtracing/protos/perfetto/common/android_energy_consumer_descriptor.proto
new file mode 100644
index 000000000..3e72cc025
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/android_energy_consumer_descriptor.proto
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Energy consumer based on aidl class:
+// android.hardware.power.stats.EnergyConsumer.
+message AndroidEnergyConsumer {
+  // Unique ID of this energy consumer.  Matches the ID in a
+  // AndroidEnergyEstimationBreakdown.
+  optional int32 energy_consumer_id = 1;
+
+  // For a group of energy consumers of the same logical type, sorting by
+  // ordinal gives their physical order. Ordinals must be consecutive integers
+  // starting from 0.
+  optional int32 ordinal = 2;
+
+  // Type of this energy consumer.
+  optional string type = 3;
+
+  // Unique name of this energy consumer. Vendor/device specific. Opaque to
+  // framework.
+  optional string name = 4;
+}
+
+message AndroidEnergyConsumerDescriptor {
+  repeated AndroidEnergyConsumer energy_consumers = 1;
+}
diff --git a/src/libtracing/protos/perfetto/common/android_log_constants.proto b/src/libtracing/protos/perfetto/common/android_log_constants.proto
new file mode 100644
index 000000000..d041b874f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/android_log_constants.proto
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Values from NDK's android/log.h.
+enum AndroidLogId {
+  // MAIN.
+  LID_DEFAULT = 0;
+
+  LID_RADIO = 1;
+  LID_EVENTS = 2;
+  LID_SYSTEM = 3;
+  LID_CRASH = 4;
+  LID_STATS = 5;
+  LID_SECURITY = 6;
+  LID_KERNEL = 7;
+}
+
+enum AndroidLogPriority {
+  PRIO_UNSPECIFIED = 0;
+
+  // _DEFAULT, but should never be seen in logs.
+  PRIO_UNUSED = 1;
+
+  PRIO_VERBOSE = 2;
+  PRIO_DEBUG = 3;
+  PRIO_INFO = 4;
+  PRIO_WARN = 5;
+  PRIO_ERROR = 6;
+  PRIO_FATAL = 7;
+}
diff --git a/src/libtracing/protos/perfetto/common/builtin_clock.proto b/src/libtracing/protos/perfetto/common/builtin_clock.proto
new file mode 100644
index 000000000..6b1ecc159
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/builtin_clock.proto
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+enum BuiltinClock {
+  BUILTIN_CLOCK_UNKNOWN = 0;
+  BUILTIN_CLOCK_REALTIME = 1;
+  BUILTIN_CLOCK_REALTIME_COARSE = 2;
+  BUILTIN_CLOCK_MONOTONIC = 3;
+  BUILTIN_CLOCK_MONOTONIC_COARSE = 4;
+  BUILTIN_CLOCK_MONOTONIC_RAW = 5;
+  BUILTIN_CLOCK_BOOTTIME = 6;
+  BUILTIN_CLOCK_TSC = 9;
+  BUILTIN_CLOCK_MAX_ID = 63;
+
+  reserved 7, 8;
+}
diff --git a/src/libtracing/protos/perfetto/common/commit_data_request.proto b/src/libtracing/protos/perfetto/common/commit_data_request.proto
new file mode 100644
index 000000000..7a1cb8904
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/commit_data_request.proto
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message CommitDataRequest {
+  // When |chunks_to_move| is present, the producer is requesting the service to
+  // move the given chunks form the share memory buffer into the central
+  // trace buffer(s).
+  message ChunksToMove {
+    // The 0-based index of the page in the Shared Memory Buffer.
+    optional uint32 page = 1;
+
+    // The 0-based chunk index [0..13] within the page.
+    optional uint32 chunk = 2;
+
+    // The target buffer it should be moved onto. The service will check that
+    // the producer is allowed to write into that buffer before the move.
+    optional uint32 target_buffer = 3;
+
+    // Sending the chunk data over the wire. Used for transports that don't
+    // support shared memory (e.g. vsock or TCP sockets). In the default case
+    // (tracing protocol over a Unix socket), this field is not used and tracing
+    // data is stored in the shmem buffer and referenced by the fields above.
+    // See |use_shemem_emulation| in the codebase for reference.
+    optional bytes data = 4;
+  }
+  repeated ChunksToMove chunks_to_move = 1;
+
+  // Used to patch chunks that have already been sent to the service. The chunk
+  // might not be in the shared memory buffer anymore as it could have been
+  // moved by the service in response to a prior CommitDataRequest.
+  // It is perfectly valid to patch a chunk that is being notified in the same
+  // message (a chunk can show up both in the |changed_pages| and |patches|
+  // field within the same CommitDataRequest message).
+  // In other words, |chunks_to_patch| is always processed after
+  // |chunks_to_move|.
+  message ChunkToPatch {
+    message Patch {
+      // Offset in bytes from the start of the chunk payload. e.g., offset == 0
+      // corresponds to the first byte of the first packet (or fragment) in the
+      // chunk.
+      optional uint32 offset = 1;
+
+      // Bytes to patch at the given offset.
+      optional bytes data = 2;
+    }
+
+    optional uint32 target_buffer = 1;
+
+    // {WriterID, ChunkID} uniquely identify a chunk for the current producer.
+    optional uint32 writer_id = 2;
+    optional uint32 chunk_id = 3;
+
+    // List of patches to apply to the given chunk.
+    repeated Patch patches = 4;
+
+    // When true more patches will follow in future requests and the chunk
+    // should be still considered as patch-pending. When false the chunk becomes
+    // eligible for reading.
+    optional bool has_more_patches = 5;
+  }
+  repeated ChunkToPatch chunks_to_patch = 2;
+
+  // Optional. If this commit is made in response to a Flush(id) request coming
+  // from the service, copy back the id of the request so the service can tell
+  // when the flush happened.
+  optional uint64 flush_request_id = 3;
+}
diff --git a/src/libtracing/protos/perfetto/common/data_source_descriptor.proto b/src/libtracing/protos/perfetto/common/data_source_descriptor.proto
new file mode 100644
index 000000000..057e8ccf8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/data_source_descriptor.proto
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/common/ftrace_descriptor.proto";
+import "protos/perfetto/common/gpu_counter_descriptor.proto";
+import "protos/perfetto/common/track_event_descriptor.proto";
+
+// This message is sent from Producer(s) to the tracing Service when registering
+// to advertise their capabilities. It describes the structure of tracing
+// protos that will be produced by the data source and the supported filters.
+message DataSourceDescriptor {
+  // e.g., "linux.ftrace", "chromium.tracing"
+  optional string name = 1;
+
+  // When non-zero, this is a unique ID within the scope of the Producer for
+  // this data source (it is NOT globally unique). This is useful to
+  // differentiate between data sources with matching names when calling
+  // UpdateDataSource(). This field has been introduced in November 2021
+  // (v22, Android T) and is not supported on older versions.
+  optional uint64 id = 7;
+
+  // When true the data source is expected to ack the stop request through the
+  // NotifyDataSourceStopped() IPC. This field has been introduced after
+  // Android P in Jul 2018 and is not supported on older versions.
+  optional bool will_notify_on_stop = 2;
+
+  // When true the data source is expected to ack the start request through the
+  // NotifyDataSourceStarted() IPC. This field has been introduced after
+  // Android P in March 2019 and is not supported on older versions.
+  optional bool will_notify_on_start = 3;
+
+  // If true, opt into receiving the ClearIncrementalState() IPC. This should be
+  // set if the data source writes packets that refer to previous trace
+  // contents, and knows how to stop referring to the already-emitted data.
+  optional bool handles_incremental_state_clear = 4;
+
+  // If true, indicates that the data source does nothing upon Flush. This
+  // allows the service to reduce the flush-related IPC traffic and better deal
+  // with frozen producers (see go/perfetto-frozen). This is usually the case
+  // for data sources like 'track_event' that don't have access to the various
+  // thread task runners to post a flush task and rely purely on server-side
+  // scraping.
+  // Introduced in v39 / Android V.
+  optional bool no_flush = 9;
+
+  // Optional specification about available GPU counters.
+  optional GpuCounterDescriptor gpu_counter_descriptor = 5 [lazy = true];
+
+  optional TrackEventDescriptor track_event_descriptor = 6 [lazy = true];
+
+  optional FtraceDescriptor ftrace_descriptor = 8 [lazy = true];
+}
diff --git a/src/libtracing/protos/perfetto/common/descriptor.proto b/src/libtracing/protos/perfetto/common/descriptor.proto
new file mode 100644
index 000000000..6684a7037
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/descriptor.proto
@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This is a subset of descriptor.proto from the Protobuf library.
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The protocol compiler can output a FileDescriptorSet containing the .proto
+// files it parses.
+message FileDescriptorSet {
+  repeated FileDescriptorProto file = 1;
+}
+
+// Describes a complete .proto file.
+message FileDescriptorProto {
+  // file name, relative to root of source tree
+  optional string name = 1;
+  // e.g. "foo", "foo.bar", etc.
+  optional string package = 2;
+
+  // Names of files imported by this file.
+  repeated string dependency = 3;
+  // Indexes of the public imported files in the dependency list above.
+  repeated int32 public_dependency = 10;
+  // Indexes of the weak imported files in the dependency list.
+  // For Google-internal migration only. Do not use.
+  repeated int32 weak_dependency = 11;
+
+  // All top-level definitions in this file.
+  repeated DescriptorProto message_type = 4;
+  repeated EnumDescriptorProto enum_type = 5;
+  repeated FieldDescriptorProto extension = 7;
+
+  reserved 6;
+  reserved 8;
+  reserved 9;
+  reserved 12;
+}
+
+// Describes a message type.
+message DescriptorProto {
+  optional string name = 1;
+
+  repeated FieldDescriptorProto field = 2;
+  repeated FieldDescriptorProto extension = 6;
+
+  repeated DescriptorProto nested_type = 3;
+  repeated EnumDescriptorProto enum_type = 4;
+
+  reserved 5;
+
+  repeated OneofDescriptorProto oneof_decl = 8;
+
+  reserved 7;
+
+  // Range of reserved tag numbers. Reserved tag numbers may not be used by
+  // fields or extension ranges in the same message. Reserved ranges may
+  // not overlap.
+  message ReservedRange {
+    // Inclusive.
+    optional int32 start = 1;
+    // Exclusive.
+    optional int32 end = 2;
+  }
+  repeated ReservedRange reserved_range = 9;
+  // Reserved field names, which may not be used by fields in the same message.
+  // A given name may only be reserved once.
+  repeated string reserved_name = 10;
+}
+
+// A message representing a option the parser does not recognize. This only
+// appears in options protos created by the compiler::Parser class.
+// DescriptorPool resolves these when building Descriptor objects. Therefore,
+// options protos in descriptor objects (e.g. returned by Descriptor::options(),
+// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
+// in them.
+message UninterpretedOption {
+  // The name of the uninterpreted option.  Each string represents a segment in
+  // a dot-separated name.  is_extension is true iff a segment represents an
+  // extension (denoted with parentheses in options specs in .proto files).
+  // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+  // "foo.(bar.baz).moo".
+  message NamePart {
+    optional string name_part = 1;
+    optional bool is_extension = 2;
+  }
+  repeated NamePart name = 2;
+
+  // The value of the uninterpreted option, in whatever type the tokenizer
+  // identified it as during parsing. Exactly one of these should be set.
+  optional string identifier_value = 3;
+  optional uint64 positive_int_value = 4;
+  optional int64 negative_int_value = 5;
+  optional double double_value = 6;
+  optional bytes string_value = 7;
+  optional string aggregate_value = 8;
+}
+
+message FieldOptions {
+  // The packed option can be enabled for repeated primitive fields to enable
+  // a more efficient representation on the wire. Rather than repeatedly
+  // writing the tag and type for each element, the entire array is encoded as
+  // a single length-delimited blob. In proto3, only explicit setting it to
+  // false will avoid using packed encoding.
+  optional bool packed = 2;
+
+  // The parser stores options it doesn't recognize here. See above.
+  repeated UninterpretedOption uninterpreted_option = 999;
+}
+
+// Describes a field within a message.
+message FieldDescriptorProto {
+  enum Type {
+    // 0 is reserved for errors.
+    // Order is weird for historical reasons.
+    TYPE_DOUBLE = 1;
+    TYPE_FLOAT = 2;
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
+    // negative values are likely.
+    TYPE_INT64 = 3;
+    TYPE_UINT64 = 4;
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
+    // negative values are likely.
+    TYPE_INT32 = 5;
+    TYPE_FIXED64 = 6;
+    TYPE_FIXED32 = 7;
+    TYPE_BOOL = 8;
+    TYPE_STRING = 9;
+    // Tag-delimited aggregate.
+    // Group type is deprecated and not supported in proto3. However, Proto3
+    // implementations should still be able to parse the group wire format and
+    // treat group fields as unknown fields.
+    TYPE_GROUP = 10;
+    // Length-delimited aggregate.
+    TYPE_MESSAGE = 11;
+
+    // New in version 2.
+    TYPE_BYTES = 12;
+    TYPE_UINT32 = 13;
+    TYPE_ENUM = 14;
+    TYPE_SFIXED32 = 15;
+    TYPE_SFIXED64 = 16;
+    // Uses ZigZag encoding.
+    TYPE_SINT32 = 17;
+    // Uses ZigZag encoding.
+    TYPE_SINT64 = 18;
+  };
+
+  enum Label {
+    // 0 is reserved for errors
+    LABEL_OPTIONAL = 1;
+    LABEL_REQUIRED = 2;
+    LABEL_REPEATED = 3;
+  };
+
+  optional string name = 1;
+  optional int32 number = 3;
+  optional Label label = 4;
+
+  // If type_name is set, this need not be set.  If both this and type_name
+  // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
+  optional Type type = 5;
+
+  // For message and enum types, this is the name of the type.  If the name
+  // starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
+  // rules are used to find the type (i.e. first the nested types within this
+  // message are searched, then within the parent, on up to the root
+  // namespace).
+  optional string type_name = 6;
+
+  // For extensions, this is the name of the type being extended.  It is
+  // resolved in the same manner as type_name.
+  optional string extendee = 2;
+
+  // For numeric types, contains the original text representation of the value.
+  // For booleans, "true" or "false".
+  // For strings, contains the default text contents (not escaped in any way).
+  // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
+  // TODO(kenton):  Base-64 encode?
+  optional string default_value = 7;
+
+  optional FieldOptions options = 8;
+
+  // If set, gives the index of a oneof in the containing type's oneof_decl
+  // list.  This field is a member of that oneof.
+  optional int32 oneof_index = 9;
+
+  reserved 10;
+}
+
+// Describes a oneof.
+message OneofDescriptorProto {
+  optional string name = 1;
+  optional OneofOptions options = 2;
+}
+
+// Describes an enum type.
+message EnumDescriptorProto {
+  optional string name = 1;
+
+  repeated EnumValueDescriptorProto value = 2;
+
+  reserved 3;
+  reserved 4;
+
+  // Reserved enum value names, which may not be reused. A given name may only
+  // be reserved once.
+  repeated string reserved_name = 5;
+}
+
+// Describes a value within an enum.
+message EnumValueDescriptorProto {
+  optional string name = 1;
+  optional int32 number = 2;
+
+  reserved 3;
+}
+
+message OneofOptions {
+  reserved 999;
+
+  // Clients can define custom options in extensions of this message. See above.
+  extensions 1000 to max;
+}
diff --git a/src/libtracing/protos/perfetto/common/ftrace_descriptor.proto b/src/libtracing/protos/perfetto/common/ftrace_descriptor.proto
new file mode 100644
index 000000000..5406d6d00
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/ftrace_descriptor.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message FtraceDescriptor {
+  message AtraceCategory {
+    optional string name = 1;
+    optional string description = 2;
+  }
+
+  // Report the available atrace categories.
+  //
+  // Used by Traceur via `perfetto --query`.
+  repeated AtraceCategory atrace_categories = 1;
+}
diff --git a/src/libtracing/protos/perfetto/common/gpu_counter_descriptor.proto b/src/libtracing/protos/perfetto/common/gpu_counter_descriptor.proto
new file mode 100644
index 000000000..9591054f6
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/gpu_counter_descriptor.proto
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Description of GPU counters.
+// This message is sent by a GPU counter producer to specify the counters
+// available in the hardware.
+message GpuCounterDescriptor {
+  // Logical groups for a counter.  This is used in the UI to present the
+  // related counters together.
+  enum GpuCounterGroup {
+    UNCLASSIFIED = 0;
+    SYSTEM = 1;
+    VERTICES = 2;
+    FRAGMENTS = 3;
+    PRIMITIVES = 4;
+    // Includes counters relating to caching and bandwidth.
+    MEMORY = 5;
+    COMPUTE = 6;
+  }
+
+  message GpuCounterSpec {
+    optional uint32 counter_id = 1;
+    optional string name = 2;
+    optional string description = 3;
+    // MeasureUnit unit (deprecated)
+    reserved 4;
+    oneof peak_value {
+      int64 int_peak_value = 5;
+      double double_peak_value = 6;
+    }
+    repeated MeasureUnit numerator_units = 7;
+    repeated MeasureUnit denominator_units = 8;
+    optional bool select_by_default = 9;
+    repeated GpuCounterGroup groups = 10;
+  }
+  repeated GpuCounterSpec specs = 1;
+
+  // Allow producer to group counters into block to represent counter islands.
+  // A capacity may be specified to indicate the number of counters that can be
+  // enable simultaneously in that block.
+  message GpuCounterBlock {
+    // required. Unique ID for the counter group.
+    optional uint32 block_id = 1;
+    // optional. Number of counters supported by the block. No limit if unset.
+    optional uint32 block_capacity = 2;
+    // optional. Name of block.
+    optional string name = 3;
+    // optional. Description for the block.
+    optional string description = 4;
+    // list of counters that are part of the block.
+    repeated uint32 counter_ids = 5;
+  }
+  repeated GpuCounterBlock blocks = 2;
+
+  // optional.  Minimum sampling period supported by the producer in
+  // nanoseconds.
+  optional uint64 min_sampling_period_ns = 3;
+
+  // optional.  Maximum sampling period supported by the producer in
+  // nanoseconds.
+  optional uint64 max_sampling_period_ns = 4;
+
+  // optional.  The producer supports counter sampling by instrumenting the
+  // command buffer.
+  optional bool supports_instrumented_sampling = 5;
+
+  // next id: 41
+  enum MeasureUnit {
+    NONE = 0;
+
+    BIT = 1;
+    KILOBIT = 2;
+    MEGABIT = 3;
+    GIGABIT = 4;
+    TERABIT = 5;
+    PETABIT = 6;
+
+    BYTE = 7;
+    KILOBYTE = 8;
+    MEGABYTE = 9;
+    GIGABYTE = 10;
+    TERABYTE = 11;
+    PETABYTE = 12;
+
+    HERTZ = 13;
+    KILOHERTZ = 14;
+    MEGAHERTZ = 15;
+    GIGAHERTZ = 16;
+    TERAHERTZ = 17;
+    PETAHERTZ = 18;
+
+    NANOSECOND = 19;
+    MICROSECOND = 20;
+    MILLISECOND = 21;
+    SECOND = 22;
+    MINUTE = 23;
+    HOUR = 24;
+
+    VERTEX = 25;
+    PIXEL = 26;
+    TRIANGLE = 27;
+    PRIMITIVE = 38;
+    FRAGMENT = 39;
+
+    MILLIWATT = 28;
+    WATT = 29;
+    KILOWATT = 30;
+
+    JOULE = 31;
+    VOLT = 32;
+    AMPERE = 33;
+
+    CELSIUS = 34;
+    FAHRENHEIT = 35;
+    KELVIN = 36;
+
+    // Values should be out of 100.
+    PERCENT = 37;
+
+    INSTRUCTION = 40;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/common/interceptor_descriptor.proto b/src/libtracing/protos/perfetto/common/interceptor_descriptor.proto
new file mode 100644
index 000000000..e5f7a0080
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/interceptor_descriptor.proto
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Used to configure the properties of a data source interceptor.
+message InterceptorDescriptor {
+  // e.g., "console", "etw"
+  optional string name = 1;
+}
diff --git a/src/libtracing/protos/perfetto/common/observable_events.proto b/src/libtracing/protos/perfetto/common/observable_events.proto
new file mode 100644
index 000000000..85767a62a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/observable_events.proto
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message ObservableEvents {
+  enum Type {
+    TYPE_UNSPECIFIED = 0;
+
+    // State changes of data source instances associated with the consumer's
+    // session. Note that not all data sources may support these notifications.
+    // See |will_notify_on_start/stop| in DataSourceDescriptor.
+    TYPE_DATA_SOURCES_INSTANCES = 1;
+
+    // State change triggered when all data sources are in the STARTED state.
+    // For data sources that registered with |will_notify_on_start| this happens
+    // only after the data source has acked the start. This allows the consumer
+    // to synchronize with the data sources and to perform actions (e.g. start a
+    // test binary) only after trace recording is actually started.
+    // Introduced in Android 11 (R).
+    TYPE_ALL_DATA_SOURCES_STARTED = 2;
+
+    // When a tracing session has one or more triggers of type CLONE_SNAPSHOT
+    // and a matching trigger is hit, the service will send this notification to
+    // the consumer after |stop_delay_ms|.
+    TYPE_CLONE_TRIGGER_HIT = 4;
+
+    // Note: internally these are used as OR flags. Next values: 4, 8, 16, ...
+
+    // TODO(eseckler): Extend this for producer & data source registrations.
+  }
+
+  enum DataSourceInstanceState {
+    // A data source is created in stopped state.
+    DATA_SOURCE_INSTANCE_STATE_STOPPED = 1;
+    DATA_SOURCE_INSTANCE_STATE_STARTED = 2;
+  }
+
+  message DataSourceInstanceStateChange {
+    optional string producer_name = 1;
+    optional string data_source_name = 2;
+    optional DataSourceInstanceState state = 3;
+  }
+
+  message CloneTriggerHit {
+    // The TracingSessionID of the original tracing session which had a
+    // CLONE_SNAPSHOT trigger defined. This is necessary just because the
+    // consumer has no idea of what is the TSID of its own tracing session and
+    // there is no other good way to plumb it.
+    optional int64 tracing_session_id = 1;
+  }
+
+  repeated DataSourceInstanceStateChange instance_state_changes = 1;
+  optional bool all_data_sources_started = 2;
+  optional CloneTriggerHit clone_trigger_hit = 3;
+}
diff --git a/src/libtracing/protos/perfetto/common/perf_events.proto b/src/libtracing/protos/perfetto/common/perf_events.proto
new file mode 100644
index 000000000..270bacb12
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/perf_events.proto
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Next id: 12
+message PerfEvents {
+  // What event to sample on, and how often. Commented from the perspective of
+  // its use in |PerfEventConfig|.
+  message Timebase {
+    // How often the per-cpu sampling will occur. Not guaranteed to be honored
+    // as the kernel can throttle the sampling rate if it's too high.
+    // If unset, an implementation-defined default is used.
+    oneof interval {
+      // Per-cpu sampling frequency in Hz, as requested from the kernel. Not the
+      // same as 1/period.
+      // Details: the actual sampling will still be based on a period, but the
+      // kernel will dynamically adjust it based on the observed event rate, to
+      // approximate this frequency. Works best with steady-rate events like
+      // timers.
+      uint64 frequency = 2;
+
+      // Per-cpu sampling will occur every |period| counts of |event|.
+      // Prefer |frequency| by default, as it's easier to oversample with a
+      // fixed period.
+      uint64 period = 1;
+    }
+
+    // Counting event to use as a timebase for the sampling.
+    // If unset, implies the CPU timer (SW_CPU_CLOCK) as the event,
+    // which is what you usually want.
+    // See common/perf_events.proto for the definitions.
+    oneof event {
+      Counter counter = 4;
+      Tracepoint tracepoint = 3;
+      RawEvent raw_event = 5;
+    }
+
+    // If set, samples will be timestamped with the given clock.
+    // If unset, the clock is chosen by the implementation.
+    // For software events, prefer PERF_CLOCK_BOOTTIME. However it cannot be
+    // used for hardware events (due to interrupt safety), for which the
+    // recommendation is to use one of the monotonic clocks.
+    optional PerfClock timestamp_clock = 11;
+
+    // Optional arbitrary name for the event, to identify it in the parsed
+    // trace. Does *not* affect the profiling itself. If unset, the trace
+    // parser will choose a suitable name.
+    optional string name = 10;
+  }
+
+  // Builtin counter names from the uapi header. Commented with their perf tool
+  // aliases.
+  // TODO(rsavitski): consider generating enums for cache events (should be
+  // finite), and generally make this list as extensive as possible. Excluding
+  // things like dynamic PMUs since those don't fit into a static enum.
+  // Next id: 21
+  enum Counter {
+    UNKNOWN_COUNTER = 0;
+
+    // cpu-clock
+    SW_CPU_CLOCK = 1;
+    // page-faults, faults
+    SW_PAGE_FAULTS = 2;
+    // task-clock
+    SW_TASK_CLOCK = 3;
+    // context-switches, cs
+    SW_CONTEXT_SWITCHES = 4;
+    // cpu-migrations, migrations
+    SW_CPU_MIGRATIONS = 5;
+    // minor-faults
+    SW_PAGE_FAULTS_MIN = 6;
+    // major-faults
+    SW_PAGE_FAULTS_MAJ = 7;
+    // alignment-faults
+    SW_ALIGNMENT_FAULTS = 8;
+    // emulation-faults
+    SW_EMULATION_FAULTS = 9;
+    // dummy
+    SW_DUMMY = 20;
+
+    // cpu-cycles, cycles
+    HW_CPU_CYCLES = 10;
+    // instructions
+    HW_INSTRUCTIONS = 11;
+    // cache-references
+    HW_CACHE_REFERENCES = 12;
+    // cache-misses
+    HW_CACHE_MISSES = 13;
+    // branch-instructions, branches
+    HW_BRANCH_INSTRUCTIONS = 14;
+    // branch-misses
+    HW_BRANCH_MISSES = 15;
+    // bus-cycles
+    HW_BUS_CYCLES = 16;
+    // stalled-cycles-frontend, idle-cycles-frontend
+    HW_STALLED_CYCLES_FRONTEND = 17;
+    // stalled-cycles-backend, idle-cycles-backend
+    HW_STALLED_CYCLES_BACKEND = 18;
+    // ref-cycles
+    HW_REF_CPU_CYCLES = 19;
+  }
+
+  message Tracepoint {
+    // Group and name for the tracepoint, acceptable forms:
+    // * "sched/sched_switch"
+    // * "sched:sched_switch"
+    optional string name = 1;
+
+    // Optional field-level filter for the tracepoint. Only events matching this
+    // filter will be counted (and therefore contribute to the sampling period).
+    // Example: "prev_pid >= 42 && next_pid == 0".
+    // For full syntax, see kernel documentation on "Event filtering":
+    // https://www.kernel.org/doc/Documentation/trace/events.txt
+    optional string filter = 2;
+  }
+
+  // Syscall-level description of the event, propagated to the perf_event_attr
+  // struct. Primarily for local use-cases, since the event availability and
+  // encoding is hardware-specific.
+  message RawEvent {
+    optional uint32 type = 1;
+    optional uint64 config = 2;
+    optional uint64 config1 = 3;
+    optional uint64 config2 = 4;
+  }
+
+  // Subset of clocks that is supported by perf timestamping.
+  // CLOCK_TAI is excluded since it's not expected to be used in practice, but
+  // would require additions to the trace clock synchronisation logic.
+  enum PerfClock {
+    UNKNOWN_PERF_CLOCK = 0;
+    PERF_CLOCK_REALTIME = 1;
+    PERF_CLOCK_MONOTONIC = 2;
+    PERF_CLOCK_MONOTONIC_RAW = 3;
+    PERF_CLOCK_BOOTTIME = 4;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/common/protolog_common.proto b/src/libtracing/protos/perfetto/common/protolog_common.proto
new file mode 100644
index 000000000..18f630f6d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/protolog_common.proto
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+enum ProtoLogLevel {
+  PROTOLOG_LEVEL_UNDEFINED = 0;
+  PROTOLOG_LEVEL_DEBUG = 1;
+  PROTOLOG_LEVEL_VERBOSE = 2;
+  PROTOLOG_LEVEL_INFO = 3;
+  PROTOLOG_LEVEL_WARN = 4;
+  PROTOLOG_LEVEL_ERROR = 5;
+  PROTOLOG_LEVEL_WTF = 6;
+}
diff --git a/src/libtracing/protos/perfetto/common/sys_stats_counters.proto b/src/libtracing/protos/perfetto/common/sys_stats_counters.proto
new file mode 100644
index 000000000..4b23cddf0
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/sys_stats_counters.proto
@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// When editing entries here remember also to update "sys_stats_counters.h" with
+// the corresponding string definitions for the actual /proc files parser.
+
+// Counter definitions for Linux's /proc/meminfo.
+enum MeminfoCounters {
+  MEMINFO_UNSPECIFIED = 0;
+  MEMINFO_MEM_TOTAL = 1;
+  MEMINFO_MEM_FREE = 2;
+  MEMINFO_MEM_AVAILABLE = 3;
+  MEMINFO_BUFFERS = 4;
+  MEMINFO_CACHED = 5;
+  MEMINFO_SWAP_CACHED = 6;
+  MEMINFO_ACTIVE = 7;
+  MEMINFO_INACTIVE = 8;
+  MEMINFO_ACTIVE_ANON = 9;
+  MEMINFO_INACTIVE_ANON = 10;
+  MEMINFO_ACTIVE_FILE = 11;
+  MEMINFO_INACTIVE_FILE = 12;
+  MEMINFO_UNEVICTABLE = 13;
+  MEMINFO_MLOCKED = 14;
+  MEMINFO_SWAP_TOTAL = 15;
+  MEMINFO_SWAP_FREE = 16;
+  MEMINFO_DIRTY = 17;
+  MEMINFO_WRITEBACK = 18;
+  MEMINFO_ANON_PAGES = 19;
+  MEMINFO_MAPPED = 20;
+  MEMINFO_SHMEM = 21;
+  MEMINFO_SLAB = 22;
+  MEMINFO_SLAB_RECLAIMABLE = 23;
+  MEMINFO_SLAB_UNRECLAIMABLE = 24;
+  MEMINFO_KERNEL_STACK = 25;
+  MEMINFO_PAGE_TABLES = 26;
+  MEMINFO_COMMIT_LIMIT = 27;
+  MEMINFO_COMMITED_AS = 28;
+  MEMINFO_VMALLOC_TOTAL = 29;
+  MEMINFO_VMALLOC_USED = 30;
+  MEMINFO_VMALLOC_CHUNK = 31;
+  MEMINFO_CMA_TOTAL = 32;
+  MEMINFO_CMA_FREE = 33;
+}
+
+// Counter definitions for Linux's /proc/vmstat.
+enum VmstatCounters {
+  VMSTAT_UNSPECIFIED = 0;
+  VMSTAT_NR_FREE_PAGES = 1;
+  VMSTAT_NR_ALLOC_BATCH = 2;
+  VMSTAT_NR_INACTIVE_ANON = 3;
+  VMSTAT_NR_ACTIVE_ANON = 4;
+  VMSTAT_NR_INACTIVE_FILE = 5;
+  VMSTAT_NR_ACTIVE_FILE = 6;
+  VMSTAT_NR_UNEVICTABLE = 7;
+  VMSTAT_NR_MLOCK = 8;
+  VMSTAT_NR_ANON_PAGES = 9;
+  VMSTAT_NR_MAPPED = 10;
+  VMSTAT_NR_FILE_PAGES = 11;
+  VMSTAT_NR_DIRTY = 12;
+  VMSTAT_NR_WRITEBACK = 13;
+  VMSTAT_NR_SLAB_RECLAIMABLE = 14;
+  VMSTAT_NR_SLAB_UNRECLAIMABLE = 15;
+  VMSTAT_NR_PAGE_TABLE_PAGES = 16;
+  VMSTAT_NR_KERNEL_STACK = 17;
+  VMSTAT_NR_OVERHEAD = 18;
+  VMSTAT_NR_UNSTABLE = 19;
+  VMSTAT_NR_BOUNCE = 20;
+  VMSTAT_NR_VMSCAN_WRITE = 21;
+  VMSTAT_NR_VMSCAN_IMMEDIATE_RECLAIM = 22;
+  VMSTAT_NR_WRITEBACK_TEMP = 23;
+  VMSTAT_NR_ISOLATED_ANON = 24;
+  VMSTAT_NR_ISOLATED_FILE = 25;
+  VMSTAT_NR_SHMEM = 26;
+  VMSTAT_NR_DIRTIED = 27;
+  VMSTAT_NR_WRITTEN = 28;
+  VMSTAT_NR_PAGES_SCANNED = 29;
+  VMSTAT_WORKINGSET_REFAULT = 30;
+  VMSTAT_WORKINGSET_ACTIVATE = 31;
+  VMSTAT_WORKINGSET_NODERECLAIM = 32;
+  VMSTAT_NR_ANON_TRANSPARENT_HUGEPAGES = 33;
+  VMSTAT_NR_FREE_CMA = 34;
+  VMSTAT_NR_SWAPCACHE = 35;
+  VMSTAT_NR_DIRTY_THRESHOLD = 36;
+  VMSTAT_NR_DIRTY_BACKGROUND_THRESHOLD = 37;
+  VMSTAT_PGPGIN = 38;
+  VMSTAT_PGPGOUT = 39;
+  VMSTAT_PGPGOUTCLEAN = 40;
+  VMSTAT_PSWPIN = 41;
+  VMSTAT_PSWPOUT = 42;
+  VMSTAT_PGALLOC_DMA = 43;
+  VMSTAT_PGALLOC_NORMAL = 44;
+  VMSTAT_PGALLOC_MOVABLE = 45;
+  VMSTAT_PGFREE = 46;
+  VMSTAT_PGACTIVATE = 47;
+  VMSTAT_PGDEACTIVATE = 48;
+  VMSTAT_PGFAULT = 49;
+  VMSTAT_PGMAJFAULT = 50;
+  VMSTAT_PGREFILL_DMA = 51;
+  VMSTAT_PGREFILL_NORMAL = 52;
+  VMSTAT_PGREFILL_MOVABLE = 53;
+  VMSTAT_PGSTEAL_KSWAPD_DMA = 54;
+  VMSTAT_PGSTEAL_KSWAPD_NORMAL = 55;
+  VMSTAT_PGSTEAL_KSWAPD_MOVABLE = 56;
+  VMSTAT_PGSTEAL_DIRECT_DMA = 57;
+  VMSTAT_PGSTEAL_DIRECT_NORMAL = 58;
+  VMSTAT_PGSTEAL_DIRECT_MOVABLE = 59;
+  VMSTAT_PGSCAN_KSWAPD_DMA = 60;
+  VMSTAT_PGSCAN_KSWAPD_NORMAL = 61;
+  VMSTAT_PGSCAN_KSWAPD_MOVABLE = 62;
+  VMSTAT_PGSCAN_DIRECT_DMA = 63;
+  VMSTAT_PGSCAN_DIRECT_NORMAL = 64;
+  VMSTAT_PGSCAN_DIRECT_MOVABLE = 65;
+  VMSTAT_PGSCAN_DIRECT_THROTTLE = 66;
+  VMSTAT_PGINODESTEAL = 67;
+  VMSTAT_SLABS_SCANNED = 68;
+  VMSTAT_KSWAPD_INODESTEAL = 69;
+  VMSTAT_KSWAPD_LOW_WMARK_HIT_QUICKLY = 70;
+  VMSTAT_KSWAPD_HIGH_WMARK_HIT_QUICKLY = 71;
+  VMSTAT_PAGEOUTRUN = 72;
+  VMSTAT_ALLOCSTALL = 73;
+  VMSTAT_PGROTATED = 74;
+  VMSTAT_DROP_PAGECACHE = 75;
+  VMSTAT_DROP_SLAB = 76;
+  VMSTAT_PGMIGRATE_SUCCESS = 77;
+  VMSTAT_PGMIGRATE_FAIL = 78;
+  VMSTAT_COMPACT_MIGRATE_SCANNED = 79;
+  VMSTAT_COMPACT_FREE_SCANNED = 80;
+  VMSTAT_COMPACT_ISOLATED = 81;
+  VMSTAT_COMPACT_STALL = 82;
+  VMSTAT_COMPACT_FAIL = 83;
+  VMSTAT_COMPACT_SUCCESS = 84;
+  VMSTAT_COMPACT_DAEMON_WAKE = 85;
+  VMSTAT_UNEVICTABLE_PGS_CULLED = 86;
+  VMSTAT_UNEVICTABLE_PGS_SCANNED = 87;
+  VMSTAT_UNEVICTABLE_PGS_RESCUED = 88;
+  VMSTAT_UNEVICTABLE_PGS_MLOCKED = 89;
+  VMSTAT_UNEVICTABLE_PGS_MUNLOCKED = 90;
+  VMSTAT_UNEVICTABLE_PGS_CLEARED = 91;
+  VMSTAT_UNEVICTABLE_PGS_STRANDED = 92;
+  VMSTAT_NR_ZSPAGES = 93;
+  VMSTAT_NR_ION_HEAP = 94;
+  VMSTAT_NR_GPU_HEAP = 95;
+  VMSTAT_ALLOCSTALL_DMA = 96;
+  VMSTAT_ALLOCSTALL_MOVABLE = 97;
+  VMSTAT_ALLOCSTALL_NORMAL = 98;
+  VMSTAT_COMPACT_DAEMON_FREE_SCANNED = 99;
+  VMSTAT_COMPACT_DAEMON_MIGRATE_SCANNED = 100;
+  VMSTAT_NR_FASTRPC = 101;
+  VMSTAT_NR_INDIRECTLY_RECLAIMABLE = 102;
+  VMSTAT_NR_ION_HEAP_POOL = 103;
+  VMSTAT_NR_KERNEL_MISC_RECLAIMABLE = 104;
+  VMSTAT_NR_SHADOW_CALL_STACK_BYTES = 105;
+  VMSTAT_NR_SHMEM_HUGEPAGES = 106;
+  VMSTAT_NR_SHMEM_PMDMAPPED = 107;
+  VMSTAT_NR_UNRECLAIMABLE_PAGES = 108;
+  VMSTAT_NR_ZONE_ACTIVE_ANON = 109;
+  VMSTAT_NR_ZONE_ACTIVE_FILE = 110;
+  VMSTAT_NR_ZONE_INACTIVE_ANON = 111;
+  VMSTAT_NR_ZONE_INACTIVE_FILE = 112;
+  VMSTAT_NR_ZONE_UNEVICTABLE = 113;
+  VMSTAT_NR_ZONE_WRITE_PENDING = 114;
+  VMSTAT_OOM_KILL = 115;
+  VMSTAT_PGLAZYFREE = 116;
+  VMSTAT_PGLAZYFREED = 117;
+  VMSTAT_PGREFILL = 118;
+  VMSTAT_PGSCAN_DIRECT = 119;
+  VMSTAT_PGSCAN_KSWAPD = 120;
+  VMSTAT_PGSKIP_DMA = 121;
+  VMSTAT_PGSKIP_MOVABLE = 122;
+  VMSTAT_PGSKIP_NORMAL = 123;
+  VMSTAT_PGSTEAL_DIRECT = 124;
+  VMSTAT_PGSTEAL_KSWAPD = 125;
+  VMSTAT_SWAP_RA = 126;
+  VMSTAT_SWAP_RA_HIT = 127;
+  VMSTAT_WORKINGSET_RESTORE = 128;
+  VMSTAT_ALLOCSTALL_DEVICE = 129;
+  VMSTAT_ALLOCSTALL_DMA32 = 130;
+  VMSTAT_BALLOON_DEFLATE = 131;
+  VMSTAT_BALLOON_INFLATE = 132;
+  VMSTAT_BALLOON_MIGRATE = 133;
+  VMSTAT_CMA_ALLOC_FAIL = 134;
+  VMSTAT_CMA_ALLOC_SUCCESS = 135;
+  VMSTAT_NR_FILE_HUGEPAGES = 136;
+  VMSTAT_NR_FILE_PMDMAPPED = 137;
+  VMSTAT_NR_FOLL_PIN_ACQUIRED = 138;
+  VMSTAT_NR_FOLL_PIN_RELEASED = 139;
+  VMSTAT_NR_SEC_PAGE_TABLE_PAGES = 140;
+  VMSTAT_NR_SHADOW_CALL_STACK = 141;
+  VMSTAT_NR_SWAPCACHED = 142;
+  VMSTAT_NR_THROTTLED_WRITTEN = 143;
+  VMSTAT_PGALLOC_DEVICE = 144;
+  VMSTAT_PGALLOC_DMA32 = 145;
+  VMSTAT_PGDEMOTE_DIRECT = 146;
+  VMSTAT_PGDEMOTE_KSWAPD = 147;
+  VMSTAT_PGREUSE = 148;
+  VMSTAT_PGSCAN_ANON = 149;
+  VMSTAT_PGSCAN_FILE = 150;
+  VMSTAT_PGSKIP_DEVICE = 151;
+  VMSTAT_PGSKIP_DMA32 = 152;
+  VMSTAT_PGSTEAL_ANON = 153;
+  VMSTAT_PGSTEAL_FILE = 154;
+  VMSTAT_THP_COLLAPSE_ALLOC = 155;
+  VMSTAT_THP_COLLAPSE_ALLOC_FAILED = 156;
+  VMSTAT_THP_DEFERRED_SPLIT_PAGE = 157;
+  VMSTAT_THP_FAULT_ALLOC = 158;
+  VMSTAT_THP_FAULT_FALLBACK = 159;
+  VMSTAT_THP_FAULT_FALLBACK_CHARGE = 160;
+  VMSTAT_THP_FILE_ALLOC = 161;
+  VMSTAT_THP_FILE_FALLBACK = 162;
+  VMSTAT_THP_FILE_FALLBACK_CHARGE = 163;
+  VMSTAT_THP_FILE_MAPPED = 164;
+  VMSTAT_THP_MIGRATION_FAIL = 165;
+  VMSTAT_THP_MIGRATION_SPLIT = 166;
+  VMSTAT_THP_MIGRATION_SUCCESS = 167;
+  VMSTAT_THP_SCAN_EXCEED_NONE_PTE = 168;
+  VMSTAT_THP_SCAN_EXCEED_SHARE_PTE = 169;
+  VMSTAT_THP_SCAN_EXCEED_SWAP_PTE = 170;
+  VMSTAT_THP_SPLIT_PAGE = 171;
+  VMSTAT_THP_SPLIT_PAGE_FAILED = 172;
+  VMSTAT_THP_SPLIT_PMD = 173;
+  VMSTAT_THP_SWPOUT = 174;
+  VMSTAT_THP_SWPOUT_FALLBACK = 175;
+  VMSTAT_THP_ZERO_PAGE_ALLOC = 176;
+  VMSTAT_THP_ZERO_PAGE_ALLOC_FAILED = 177;
+  VMSTAT_VMA_LOCK_ABORT = 178;
+  VMSTAT_VMA_LOCK_MISS = 179;
+  VMSTAT_VMA_LOCK_RETRY = 180;
+  VMSTAT_VMA_LOCK_SUCCESS = 181;
+  VMSTAT_WORKINGSET_ACTIVATE_ANON = 182;
+  VMSTAT_WORKINGSET_ACTIVATE_FILE = 183;
+  VMSTAT_WORKINGSET_NODES = 184;
+  VMSTAT_WORKINGSET_REFAULT_ANON = 185;
+  VMSTAT_WORKINGSET_REFAULT_FILE = 186;
+  VMSTAT_WORKINGSET_RESTORE_ANON = 187;
+  VMSTAT_WORKINGSET_RESTORE_FILE = 188;
+}
diff --git a/src/libtracing/protos/perfetto/common/trace_stats.proto b/src/libtracing/protos/perfetto/common/trace_stats.proto
new file mode 100644
index 000000000..c63a8cbe0
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/trace_stats.proto
@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Statistics for the internals of the tracing service.
+//
+// Next id: 19.
+message TraceStats {
+  // From TraceBuffer::Stats.
+  //
+  // Next id: 21.
+  message BufferStats {
+    // Size of the circular buffer in bytes.
+    optional uint64 buffer_size = 12;
+
+    // Num. bytes written into the circular buffer, including chunk headers.
+    optional uint64 bytes_written = 1;
+
+    // Num. bytes overwritten before they have been read (i.e. loss of data).
+    optional uint64 bytes_overwritten = 13;
+
+    // Total size of chunks that were fully read from the circular buffer by the
+    // consumer. This may not be equal to |bytes_written| either in the middle
+    // of tracing, or if |chunks_overwritten| is non-zero. Note that this is the
+    // size of the chunks read from the buffer, including chunk headers, which
+    // will be different from the total size of packets returned to the
+    // consumer.
+    //
+    // The current utilization of the trace buffer (mid-tracing) can be obtained
+    // by subtracting |bytes_read| and |bytes_overwritten| from |bytes_written|,
+    // adding the difference of |padding_bytes_written| and
+    // |padding_bytes_cleared|, and comparing this sum to the |buffer_size|.
+    // Note that this represents the total size of buffered data in the buffer,
+    // yet this data may be spread non-contiguously through the buffer and may
+    // be overridden before the utilization reaches 100%.
+    optional uint64 bytes_read = 14;
+
+    // Num. bytes that were allocated as padding between chunks in the circular
+    // buffer.
+    optional uint64 padding_bytes_written = 15;
+
+    // Num. of padding bytes that were removed from the circular buffer when
+    // they were overwritten.
+    //
+    // The difference between |padding_bytes_written| and
+    // |padding_bytes_cleared| denotes the total size of padding currently
+    // present in the buffer.
+    optional uint64 padding_bytes_cleared = 16;
+
+    // Num. chunks (!= packets) written into the buffer.
+    optional uint64 chunks_written = 2;
+
+    // Num. chunks (!= packets) rewritten into the buffer. This means we rewrote
+    // the same chunk with additional packets appended to the end.
+    optional uint64 chunks_rewritten = 10;
+
+    // Num. chunks overwritten before they have been read (i.e. loss of data).
+    optional uint64 chunks_overwritten = 3;
+
+    // Num. chunks discarded (i.e. loss of data). Can be > 0 only when a buffer
+    // is configured with FillPolicy == DISCARD.
+    optional uint64 chunks_discarded = 18;
+
+    // Num. chunks (!= packets) that were fully read from the circular buffer by
+    // the consumer. This may not be equal to |chunks_written| either in the
+    // middle of tracing, or if |chunks_overwritten| is non-zero.
+    optional uint64 chunks_read = 17;
+
+    // Num. chunks that were committed out of order.
+    optional uint64 chunks_committed_out_of_order = 11;
+
+    // Num. times the ring buffer wrapped around.
+    optional uint64 write_wrap_count = 4;
+
+    // Num. out-of-band (OOB) patches that succeeded.
+    optional uint64 patches_succeeded = 5;
+
+    // Num. OOB patches that failed (e.g., the chunk to patch was gone).
+    optional uint64 patches_failed = 6;
+
+    // Num. readaheads (for large multi-chunk packet reads) that ended up in a
+    // successful packet read.
+    optional uint64 readaheads_succeeded = 7;
+
+    // Num. readaheads aborted because of missing chunks in the sequence stream.
+    // Note that a small number > 0 is totally expected: occasionally, when
+    // issuing a read, the very last packet in a sequence might be incomplete
+    // (because the producer is still writing it while we read). The read will
+    // stop at that point, for that sequence, increasing this counter.
+    optional uint64 readaheads_failed = 8;
+
+    // Num. of violations of the SharedMemoryABI found while writing or reading
+    // the buffer. This is an indication of either a bug in the producer(s) or
+    // malicious producer(s).
+    optional uint64 abi_violations = 9;
+
+    // The fields below have been introduced in Android R.
+
+    // Num. of times the service detected packet loss on a trace writer
+    // sequence. This is usually caused by exhaustion of available chunks in the
+    // writer process's SMB. Note that this relies on the client's TraceWriter
+    // indicating this loss to the service -- packets lost for other reasons are
+    // not reflected in this stat.
+    optional uint64 trace_writer_packet_loss = 19;
+  }
+
+  // Stats for the TraceBuffer(s) of the current trace session.
+  repeated BufferStats buffer_stats = 1;
+
+  // Per TraceWriter stat. Each {producer, trace writer} tuple is publicly
+  // visible as a unique sequence ID in the trace.
+  message WriterStats {
+    // This matches the TracePacket.trusted_packet_sequence_id and is used to
+    // correlate the stats with the actual packet types.
+    optional uint64 sequence_id = 1;
+
+    // The buffer index (0..N, as defined in the TraceConfig).
+    optional uint32 buffer = 4;
+
+    // These two arrays have the same cardinality and match the cardinality of
+    // chunk_payload_histogram_def + 1 (for the overflow bucket, see below).
+    // `sum` contains the SUM(entries) and `counts` contains the COUNT(entries)
+    // for each bucket.
+    repeated uint64 chunk_payload_histogram_counts = 2 [packed = true];
+    repeated int64 chunk_payload_histogram_sum = 3 [packed = true];
+  }
+
+  // The thresholds of each the `writer_stats` histogram buckets. This is
+  // emitted only once as all WriterStats share the same bucket layout.
+  // This field has the same cardinality of the
+  // `writer_stats.chunk_payload_histogram_{counts,sum}` - 1.
+  // (The -1 is because the last overflow bucket is not reported in the _def).
+  // An array of values [10, 100, 1000] in the _def array means that there are
+  // four buckets (3 + the implicit overflow bucket):
+  // [0]: x <= 10; [1]: 100 < x <= 1000; [2]: 1000 < x <= 1000; [3]: x > 1000.
+  repeated int64 chunk_payload_histogram_def = 17;
+  repeated WriterStats writer_stats = 18;
+
+  // Num. producers connected (whether they are involved in the current tracing
+  // session or not).
+  optional uint32 producers_connected = 2;
+
+  // Num. producers ever seen for all trace sessions since startup (it's a good
+  // proxy for inferring num. producers crashed / killed).
+  optional uint64 producers_seen = 3;
+
+  // Num. data sources registered for all trace sessions.
+  optional uint32 data_sources_registered = 4;
+
+  // Num. data sources ever seen for all trace sessions since startup.
+  optional uint64 data_sources_seen = 5;
+
+  // Num. concurrently active tracing sessions.
+  optional uint32 tracing_sessions = 6;
+
+  // Num. buffers for all tracing session (not just the current one). This will
+  // be >= buffer_stats.size(), because the latter is only about the current
+  // session.
+  optional uint32 total_buffers = 7;
+
+  // The fields below have been introduced in Android Q.
+
+  // Num. chunks that were discarded by the service before attempting to commit
+  // them to a buffer, e.g. because the producer specified an invalid buffer ID.
+  optional uint64 chunks_discarded = 8;
+
+  // Num. patches that were discarded by the service before attempting to apply
+  // them to a buffer, e.g. because the producer specified an invalid buffer ID.
+  optional uint64 patches_discarded = 9;
+
+  // Packets that failed validation of the TrustedPacket. If this is > 0, there
+  // is a bug in the producer.
+  optional uint64 invalid_packets = 10;
+
+  // This is set only when the TraceConfig specifies a TraceFilter.
+  message FilterStats {
+    optional uint64 input_packets = 1;
+    optional uint64 input_bytes = 2;
+    optional uint64 output_bytes = 3;
+    optional uint64 errors = 4;
+    optional uint64 time_taken_ns = 5;
+
+    // The number of bytes discarded by the filter (i.e. output - input).
+    // The array has one entry for each buffer defined in the config (unless no
+    // packets for that buffer were seen and hence filtered).
+    // Note: the SUM(bytes_discarded_per_buffer) will be <= but not == the total
+    // (output_bytes - input_bytes) because the filter might also discard
+    // server-generated synthetic packets, that have no buffer index.
+    repeated uint64 bytes_discarded_per_buffer = 20;
+  }
+  optional FilterStats filter_stats = 11;
+
+  // Count of Flush() requests (either from the Consumer, or self-induced
+  // periodic flushes). The final Flush() is also included in the count.
+  optional uint64 flushes_requested = 12;
+
+  // The count of the Flush() requests that were completed successfully.
+  // In a well behaving trace this should always be == `flush_requests`.
+  optional uint64 flushes_succeeded = 13;
+
+  // The count of the Flush() requests that failed (in most timed out).
+  // In a well behaving trace this should always be == 0.
+  optional uint64 flushes_failed = 14;
+
+  enum FinalFlushOutcome {
+    FINAL_FLUSH_UNSPECIFIED = 0;
+    FINAL_FLUSH_SUCCEEDED = 1;
+    FINAL_FLUSH_FAILED = 2;
+  }
+  optional FinalFlushOutcome final_flush_outcome = 15;
+}
diff --git a/src/libtracing/protos/perfetto/common/tracing_service_capabilities.proto b/src/libtracing/protos/perfetto/common/tracing_service_capabilities.proto
new file mode 100644
index 000000000..308f18df8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/tracing_service_capabilities.proto
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/observable_events.proto";
+
+package perfetto.protos;
+
+message TracingServiceCapabilities {
+  // Whether the service supports QueryCapabilities() at all or not.
+  // This is only used at the C++ level to distinguish the case of talking to
+  // an older version of the service that doesn't support QueryCapabilities().
+  // In that case the IPC layer will just reject the unknown call, and the
+  // consumer_ipc_client_impl.cc will return an empty message where this field
+  // is false. In all other cases, this is always set to true.
+  optional bool has_query_capabilities = 1;
+
+  // The set of known events that can be passed to ConsumerPort.ObserveEvents().
+  repeated ObservableEvents.Type observable_events = 2;
+
+  // Whether the service supports TraceConfig.output_path (for asking traced to
+  // create the output file instead of passing a file descriptor).
+  optional bool has_trace_config_output_path = 3;
+
+  // Whether the service supports CloneSession and CLONE_SNAPSHOT triggers.
+  optional bool has_clone_session = 4;
+}
diff --git a/src/libtracing/protos/perfetto/common/tracing_service_state.proto b/src/libtracing/protos/perfetto/common/tracing_service_state.proto
new file mode 100644
index 000000000..97f9784c3
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/tracing_service_state.proto
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/common/data_source_descriptor.proto";
+
+// Reports the state of the tracing service. Used to gather details about the
+// data sources connected.
+// See ConsumerPort::QueryServiceState().
+message TracingServiceState {
+  // Describes a producer process.
+  message Producer {
+    // Unique ID of the producer (monotonic counter).
+    optional int32 id = 1;
+
+    // Typically matches the process name.
+    optional string name = 2;
+
+    // Unix pid of the remote process. Supported only on Linux-based systems.
+    // Introduced in v24 / Android T.
+    optional int32 pid = 5;
+
+    // Unix uid of the remote process.
+    optional int32 uid = 3;
+
+    // The version of the client library used by the producer.
+    // This is a human readable string with and its format varies depending on
+    // the build system and the repo (standalone vs AOSP).
+    // This is intended for human debugging only.
+    optional string sdk_version = 4;
+  }
+
+  // Describes a data source registered by a producer. Data sources are listed
+  // regardless of the fact that they are being used or not.
+  message DataSource {
+    // Descriptor passed by the data source when calling RegisterDataSource().
+    optional DataSourceDescriptor ds_descriptor = 1;
+
+    // ID of the producer, as per Producer.id.
+    optional int32 producer_id = 2;
+  }
+
+  message TracingSession {
+    // The TracingSessionID.
+    optional uint64 id = 1;
+
+    // The Unix uid of the consumer that started the session.
+    // This is meaningful only if the caller is root. In all other cases only
+    // tracing sessions that match the caller UID will be displayed.
+    optional int32 consumer_uid = 2;
+
+    // Internal state of the tracing session.
+    // These strings are FYI only and subjected to change.
+    optional string state = 3;
+
+    // The unique_session_name as set in the trace config (might be empty).
+    optional string unique_session_name = 4;
+
+    // The number and size of each buffer.
+    repeated uint32 buffer_size_kb = 5;
+
+    // Duration, as specified in the TraceConfig.duration_ms.
+    optional uint32 duration_ms = 6;
+
+    // Number of data sources involved in the session.
+    optional uint32 num_data_sources = 7;
+
+    // Time when the session was started, in the CLOCK_REALTIME domain.
+    // Available only on Linux-based systems.
+    optional int64 start_realtime_ns = 8;
+
+    // The fields below have been introduced in v42.
+
+    // The bugreport_score, as set in TraceConfig.bugreport_score.
+    optional int32 bugreport_score = 9;
+
+    // As per TraceConfig.bugreport_filename.
+    optional string bugreport_filename = 10;
+
+    // If true, the session is in the STARTED state. If false the session is in
+    // any other state (see `state` field).
+    optional bool is_started = 11;
+  }
+
+  // Lists all the producers connected.
+  repeated Producer producers = 1;
+
+  // Lists the data sources available.
+  repeated DataSource data_sources = 2;
+
+  // Lists the tracing sessions active AND owned by a consumer that has the same
+  // UID of the caller (or all of them if the caller is root).
+  // Introduced in v24 / Android T.
+  repeated TracingSession tracing_sessions = 6;
+
+  // This is always set to true from v24 and beyond. This flag is only used to
+  // tell the difference between: (1) talking to a recent service which happens
+  // to have no tracing session active; (2) talking to an older version of the
+  // service which will never report any tracing session.
+  optional bool supports_tracing_sessions = 7;
+
+  // Total number of tracing sessions.
+  optional int32 num_sessions = 3;
+
+  // Number of tracing sessions in the started state. Always <= num_sessions.
+  optional int32 num_sessions_started = 4;
+
+  // The version of traced (the same returned by `traced --version`).
+  // This is a human readable string with and its format varies depending on
+  // the build system and the repo (standalone vs AOSP).
+  // This is intended for human debugging only.
+  optional string tracing_service_version = 5;
+}
diff --git a/src/libtracing/protos/perfetto/common/track_event_descriptor.proto b/src/libtracing/protos/perfetto/common/track_event_descriptor.proto
new file mode 100644
index 000000000..00121f216
--- /dev/null
+++ b/src/libtracing/protos/perfetto/common/track_event_descriptor.proto
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message TrackEventCategory {
+  optional string name = 1;
+  optional string description = 2;
+  repeated string tags = 3;
+}
+
+message TrackEventDescriptor {
+  repeated TrackEventCategory available_categories = 1;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/android_game_intervention_list_config.proto b/src/libtracing/protos/perfetto/config/android/android_game_intervention_list_config.proto
new file mode 100644
index 000000000..945a590b3
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/android_game_intervention_list_config.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Data source that lists game modes and game interventions of games
+// on an Android device.
+message AndroidGameInterventionListConfig {
+  // If not empty, emit info about only the following list of package names
+  // (exact match, no regex). Otherwise, emit info about all packages.
+  repeated string package_name_filter = 1;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/android_input_event_config.proto b/src/libtracing/protos/perfetto/config/android/android_input_event_config.proto
new file mode 100644
index 000000000..0b4e22c23
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/android_input_event_config.proto
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Custom configuration for the "android.input.inputevent" data source.
+//
+// NOTE: Input traces can only be taken on debuggable (userdebug/eng) builds!
+//
+// Next ID: 5
+message AndroidInputEventConfig {
+
+    // Trace modes are tracing presets that are included in the system.
+    enum TraceMode {
+        // Preset mode for maximal tracing.
+        // WARNING: This will bypass all privacy measures on debuggable builds, and will record all
+        //          input events processed by the system, regardless of the context in which they
+        //          were processed. It should only be used for tracing on a local device or for
+        //          tests. It should NEVER be used for field tracing.
+        TRACE_MODE_TRACE_ALL = 0;
+        // Use the tracing rules defined in this config to specify what events to trace.
+        TRACE_MODE_USE_RULES = 1;
+    }
+
+    // The tracing mode to use. If unspecified, it will default to TRACE_MODE_USE_RULES.
+    optional TraceMode mode = 1;
+
+    // The level of tracing that should be applied to an event.
+    enum TraceLevel {
+        // Do not trace the input event.
+        TRACE_LEVEL_NONE = 0;
+        // Trace the event as a redacted event, where certain sensitive fields are omitted from
+        // the trace, including the coordinates of pointer events and the key/scan codes of key
+        // events.
+        TRACE_LEVEL_REDACTED = 1;
+        // Trace the complete event.
+        TRACE_LEVEL_COMPLETE = 2;
+    }
+
+    // A rule that specifies the TraceLevel for an event based on matching conditions.
+    // All matchers in the rule are optional. To trigger this rule, an event must match all
+    // of its specified matchers (i.e. the matchers function like a series of conditions connected
+    // by a logical 'AND' operator). A rule with no specified matchers will match all events.
+    // Next ID: 6
+    message TraceRule {
+        // The trace level to be used for events that trigger this rule.
+        // If unspecified, TRACE_LEVEL_NONE will be used by default.
+        optional TraceLevel trace_level = 1;
+
+        // --- Optional Matchers ---
+
+        // Package matchers
+        //
+        // Respectively matches if all or any of the target apps for this event are contained in
+        // the specified list of package names.
+        //
+        // Intended usage:
+        //   - Use match_all_packages to selectively allow tracing for the listed packages.
+        //   - Use match_any_packages to selectively deny tracing for certain packages.
+        //
+        // WARNING: Great care must be taken when designing rules for field tracing!
+        //          This is because each event is almost always sent to more than one app.
+        //              For example, when allowing tracing for a package that has a spy window
+        //          over the display (e.g. SystemUI) using match_any_packages, essentially all
+        //          input will be recorded on that display. This is because the events will be sent
+        //          to the spy as well as the foreground app, and regardless of what the foreground
+        //          app is, the event will end up being traced.
+        //              Alternatively, when attempting to block tracing for specific packages using
+        //          match_all_packages, no events will likely be blocked. This is because the event
+        //          will also be sent to other apps (such as, but not limited to, ones with spy
+        //          windows), so the matcher will not match unless all other targets are also
+        //          listed under the match_all_packages list.
+        repeated string match_all_packages = 2;
+        repeated string match_any_packages = 3;
+
+        // Matches if the event is secure, which means that at least one of the targets of
+        // this event is using the window flag FLAG_SECURE.
+        optional bool match_secure = 4;
+
+        // Matches if there was an active IME connection while this event was being processed.
+        optional bool match_ime_connection_active = 5;
+    }
+
+    // The list of rules to use to determine the trace level of events.
+    // Each event will be traced using the TraceLevel of the first rule that it triggers
+    // from this list. The rules are evaluated in the order in which they are specified.
+    // If an event does not match any of the rules, TRACE_LEVEL_NONE will be used by default.
+    repeated TraceRule rules = 2;
+
+    // --- Control flags ---
+
+    // Trace input events processed by the system as they are being dispatched
+    // to application windows. All trace rules will apply.
+    //   - If this flag is used without enabling trace_dispatcher_window_dispatch, it will
+    //     trace InputDispatcher's inbound events (which does not include events synthesized
+    //     within InputDispatcher) that match the rules.
+    //   - If used with trace_dispatcher_window_dispatch, all inbound and outbound events
+    //     matching the rules, including all events synthesized within InputDispatcher,
+    //     will be traced.
+    optional bool trace_dispatcher_input_events = 3;
+
+    // Trace details about which windows the system is sending each input event to.
+    // All trace rules will apply.
+    optional bool trace_dispatcher_window_dispatch = 4;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/android_log_config.proto b/src/libtracing/protos/perfetto/config/android/android_log_config.proto
new file mode 100644
index 000000000..57ae31651
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/android_log_config.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+import "protos/perfetto/common/android_log_constants.proto";
+
+message AndroidLogConfig {
+  repeated AndroidLogId log_ids = 1;
+
+  // Was |poll_ms|, deprecated.
+  reserved 2;
+
+  // If set ignores all log messages whose prio is < the given value.
+  optional AndroidLogPriority min_prio = 3;
+
+  // If non-empty ignores all log messages whose tag doesn't match one of the
+  // specified values.
+  repeated string filter_tags = 4;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/android_polled_state_config.proto b/src/libtracing/protos/perfetto/config/android/android_polled_state_config.proto
new file mode 100644
index 000000000..21e25c2be
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/android_polled_state_config.proto
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Data source that polls for display state. This should only be used for
+// backward-compatibility; AndroidSystemPropertyConfig should be preferred.
+message AndroidPolledStateConfig {
+  // Frequency of polling. If absent the state will be recorded once, at the
+  // start of the trace.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 poll_ms = 1;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto b/src/libtracing/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto
new file mode 100644
index 000000000..61f5f53ba
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Data source that controls the system properties used to guard initialization
+// of track_event producers (i.e. Skia) in apps using HWUI, and certain
+// processes like SurfaceFlinger.
+//
+// This data source only tells Skia to initialized the Perfetto SDK and start
+// routing data to the Track Event system instead of ATrace. For those events
+// to actually show up in a trace, the track_event data source must be used as
+// well. The Perfetto SDK cannot be de-initialized, so some long-lived apps and
+// processes may need to be restarted for Skia to revert to using ATrace if
+// Track Events are no longer desired.
+//
+// In addition to switching Skia to use Perfetto's track_event data source,
+// this "guard" also controls Skia's "broad tracing", which removes Skia's
+// internal tracing constraints and allows the track_event config to specify
+// which categories should be traced. Filtering to the "skia.always" category
+// *tag* in a track_event config can be used to re-enable the standard
+// constraints typically used with ATrace.
+//
+// Data source name: android.sdk_sysprop_guard
+// Introduced in Android 14 (U) QPR1.
+// Next id: 4
+message AndroidSdkSyspropGuardConfig {
+  // If true, configures SurfaceFlinger to initialize Skia's Perfetto
+  // integration with the track_event data source in RenderEngine.
+  // If false or omitted, the simpler ATrace fallback is used.
+  //
+  // NOTE: once enabled, Skia will only revert to ATrace if SurfaceFlinger is
+  // restarted.
+  //
+  // Specifically this sets the following system properties:
+  //   - debug.tracing.ctl.renderengine.skia_tracing_enabled
+  //   - debug.tracing.ctl.renderengine.skia_use_perfetto_track_events
+  //
+  // Does not affect actual track_event data *collection*, which must be
+  // configured seperately.
+  optional bool surfaceflinger_skia_track_events = 1;
+
+  // If true, configures HWUI apps to initialize Skia's Perfetto integration
+  // with the track_event data source. hwui_package_name_filter
+  // can be used to control which apps are affected.
+  // If false or omitted, the simpler ATrace fallback is used.
+  //
+  // NOTE: once enabled, Skia will only revert to ATrace if the app is
+  // restarted.
+  //
+  // ATTENTION: affects ALL HWUI APPS if hwui_package_name_filter is not set!
+  // If filtering is NOT set, this controls these GLOBAL system properties:
+  //   - debug.tracing.ctl.hwui.skia_tracing_enabled
+  //   - debug.tracing.ctl.hwui.skia_use_perfetto_track_events
+  // If filtering IS set, this controls these APP-SPECIFIC system properties,
+  // for each package listed in the filter:
+  //   - debug.tracing.ctl.hwui.skia_tracing_enabled.<package.name>
+  //   - debug.tracing.ctl.hwui.skia_use_perfetto_track_events.<package.name>
+  //
+  // Does not affect actual track_event data *collection*, which must be
+  // configured seperately.
+  optional bool hwui_skia_track_events = 2;
+
+  // If non-empty, hwui_skia_track_events applies to only the packages listed.
+  // Otherwise, hwui_skia_track_events applies globally to all HWUI apps.
+  repeated string hwui_package_name_filter = 3;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/android_system_property_config.proto b/src/libtracing/protos/perfetto/config/android/android_system_property_config.proto
new file mode 100644
index 000000000..fbf106226
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/android_system_property_config.proto
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Data source that polls for system properties.
+message AndroidSystemPropertyConfig {
+  // Frequency of polling. If absent the state will be recorded once, at the
+  // start of the trace.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 poll_ms = 1;
+
+  // Properties to poll. All property names must start with "debug.tracing.".
+  repeated string property_name = 2;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/network_trace_config.proto b/src/libtracing/protos/perfetto/config/android/network_trace_config.proto
new file mode 100644
index 000000000..ad5196b62
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/network_trace_config.proto
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Network tracing data source that records details on all packets sent or
+// received by the network.
+message NetworkPacketTraceConfig {
+  // Polling frequency in milliseconds. Network tracing writes to a fixed size
+  // ring buffer. The polling interval should be such that the ring buffer is
+  // unlikely to fill in that interval (or that filling is an acceptable risk).
+  // The minimum polling rate is 100ms (values below this are ignored).
+  // Introduced in Android 14 (U).
+  optional uint32 poll_ms = 1;
+
+  // The aggregation_threshold is the number of packets at which an event will
+  // switch from per-packet details to aggregate details. For example, a value
+  // of 50 means that if a particular event (grouped by the unique combinations
+  // of metadata fields: {interface, direction, uid, etc}) has fewer than 50
+  // packets, the exact timestamp and length are recorded for each packet. If
+  // there were 50 or more packets in an event, it would only record the total
+  // duration, packets, and length. A value of zero or unspecified will always
+  /// record per-packet details. A value of 1 always records aggregate details.
+  optional uint32 aggregation_threshold = 2;
+
+  // Specifies the maximum number of packet contexts to intern at a time. This
+  // prevents the interning table from growing too large and controls whether
+  // interning is enabled or disabled (a value of zero disables interning and
+  // is the default). When a data sources interning table reaches this amount,
+  // packet contexts will be inlined into NetworkPacketEvents.
+  optional uint32 intern_limit = 3;
+
+  // The following fields specify whether certain fields should be dropped from
+  // the output. Dropping fields improves normalization results, reduces the
+  // size of the interning table, and slightly reduces event size.
+  optional bool drop_local_port = 4;
+  optional bool drop_remote_port = 5;
+  optional bool drop_tcp_flags = 6;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/packages_list_config.proto b/src/libtracing/protos/perfetto/config/android/packages_list_config.proto
new file mode 100644
index 000000000..171fc10e1
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/packages_list_config.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Data source that lists details (such as version code) about packages on an
+// Android device.
+message PackagesListConfig {
+  // If not empty, emit info about only the following list of package names
+  // (exact match, no regex). Otherwise, emit info about all packages.
+  repeated string package_name_filter = 1;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/protolog_config.proto b/src/libtracing/protos/perfetto/config/android/protolog_config.proto
new file mode 100644
index 000000000..af61c2be0
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/protolog_config.proto
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/protolog_common.proto";
+
+package perfetto.protos;
+
+// Custom configuration for the "android.protolog" data source.
+// ProtoLog is a logging mechanism that is intented to be more efficient than
+// logcat. This configures what logs to capture in the tracing instance.
+message ProtoLogConfig {
+  enum TracingMode {
+    // When using the DEFAULT tracing mode, only log groups and levels specified
+    // in the group_overrides are traced.
+    DEFAULT = 0;
+    // When using the ENABLE_ALL tracing mode, all log groups and levels are
+    // traced, unless specified in the group_overrides.
+    ENABLE_ALL = 1;
+  }
+
+  // Specified the configurations for each of the logging groups. If none is
+  // specified for a group the defaults will be used.
+  repeated ProtoLogGroup group_overrides = 1;
+  // Specified what tracing mode to use for the tracing instance.
+  optional TracingMode tracing_mode = 2;
+}
+
+message ProtoLogGroup {
+  // The ProtoLog group name this configuration entry applies to.
+  optional string group_name = 1;
+  // Specify the level from which to start capturing protologs.
+  // e.g. if ProtoLogLevel.WARN is specified only warning, errors and fatal log
+  // message will be traced.
+  optional ProtoLogLevel log_from = 2;
+  // When set to true we will collect the stacktrace for each protolog message
+  // in this group that we are tracing.
+  optional bool collect_stacktrace = 3;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/surfaceflinger_layers_config.proto b/src/libtracing/protos/perfetto/config/android/surfaceflinger_layers_config.proto
new file mode 100644
index 000000000..0b8d10848
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/surfaceflinger_layers_config.proto
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Custom configuration for the "android.surfaceflinger.layers" data source.
+message SurfaceFlingerLayersConfig {
+  enum Mode {
+    MODE_UNSPECIFIED = 0;
+
+    // Trace layers snapshots. A snapshot is taken every time a layers change
+    // occurs.
+    MODE_ACTIVE = 1;
+
+    // Generate layers snapshots from the transactions kept in the
+    // SurfaceFlinger's internal ring buffer.
+    // The layers snapshots generation occurs when this data source is flushed.
+    MODE_GENERATED = 2;
+
+    // Trace a single layers snapshot.
+    MODE_DUMP = 3;
+
+    // Default mode (applied by SurfaceFlinger if no mode is specified).
+    // Same as MODE_GENERATED, but triggers the layers snapshots generation only when a bugreport
+    // is taken.
+    MODE_GENERATED_BUGREPORT_ONLY = 4;
+  }
+  optional Mode mode = 1;
+
+  enum TraceFlag {
+    TRACE_FLAG_UNSPECIFIED = 0;
+    TRACE_FLAG_INPUT = 0x02;
+    TRACE_FLAG_COMPOSITION = 0x04;
+    TRACE_FLAG_EXTRA = 0x08;
+    TRACE_FLAG_HWC = 0x10;
+    TRACE_FLAG_BUFFERS = 0x20;
+    TRACE_FLAG_VIRTUAL_DISPLAYS = 0x40;
+
+    // INPUT | COMPOSITION | EXTRA
+    TRACE_FLAG_ALL = 0x0e;
+  }
+  repeated TraceFlag trace_flags = 2;
+}
diff --git a/src/libtracing/protos/perfetto/config/android/surfaceflinger_transactions_config.proto b/src/libtracing/protos/perfetto/config/android/surfaceflinger_transactions_config.proto
new file mode 100644
index 000000000..ffb732b9f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/android/surfaceflinger_transactions_config.proto
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Custom configuration for the "android.surfaceflinger.transactions" data
+// source.
+message SurfaceFlingerTransactionsConfig {
+  enum Mode {
+    MODE_UNSPECIFIED = 0;
+
+    // Default mode (applied by SurfaceFlinger if no mode is specified).
+    // SurfaceFlinger writes its internal ring buffer of transactions every time
+    // the data source is flushed. The ring buffer contains the SurfaceFlinger's
+    // initial state and the latest transactions.
+    MODE_CONTINUOUS = 1;
+
+    // SurfaceFlinger writes the initial state and then each incoming
+    // transaction until the data source is stopped.
+    MODE_ACTIVE = 2;
+  }
+  optional Mode mode = 1;
+}
diff --git a/src/libtracing/protos/perfetto/config/chrome/chrome_config.proto b/src/libtracing/protos/perfetto/config/chrome/chrome_config.proto
new file mode 100644
index 000000000..aa9333bf9
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/chrome/chrome_config.proto
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message ChromeConfig {
+  optional string trace_config = 1;
+
+  // When enabled, the data source should only fill in fields in the output that
+  // are not potentially privacy sensitive.
+  optional bool privacy_filtering_enabled = 2;
+
+  // Instead of emitting binary protobuf, convert the trace data to the legacy
+  // JSON format. Note that the trace data will still be returned as a series of
+  // TracePackets, but the embedded data will be JSON instead of serialized
+  // protobuf.
+  optional bool convert_to_legacy_json = 3;
+
+  // Priority of the tracing session client. A higher priority session may
+  // preempt a lower priority one in configurations where concurrent sessions
+  // aren't supported.
+  enum ClientPriority {
+    UNKNOWN = 0;
+    BACKGROUND = 1;
+    USER_INITIATED = 2;
+  }
+  optional ClientPriority client_priority = 4;
+
+  // Applicable only when using legacy JSON format.
+  // If |json_agent_label_filter| is not empty, only data pertaining to
+  // the specified tracing agent label (e.g. "traceEvents") will be returned.
+  optional string json_agent_label_filter = 5;
+}
diff --git a/src/libtracing/protos/perfetto/config/chrome/scenario_config.proto b/src/libtracing/protos/perfetto/config/chrome/scenario_config.proto
new file mode 100644
index 000000000..276060cca
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/chrome/scenario_config.proto
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/config/trace_config.proto";
+
+// Rule that triggers scenario events (e.g. start, stop).
+message TriggerRule {
+  // Rule unique name.
+  optional string name = 1;
+
+  // A value between 0 and 1 which encodes the probability this rule is
+  // triggered.
+  optional float trigger_chance = 2;
+
+  // Additional delay *after* the trigger below. This is mostly useful
+  // to trace beyond a triggered event in upload rules. Other triggers
+  // can still be serviced during this period.
+  optional uint64 delay_ms = 3;
+
+  // Delay *before* which the rule is activated. Trigger events during this
+  // period are ignored by this rule. This is mostly useful to trace for a
+  // minimum duration before watching trigger events.
+  optional uint64 activation_delay_ms = 8;
+
+  // Triggers when a value within the specified bounds [min_value,
+  // max_value] is emitted into a Chrome histogram.
+  message HistogramTrigger {
+    optional string histogram_name = 1;
+    optional int64 min_value = 2;
+    optional int64 max_value = 3;
+  }
+  // Triggers on a repeating interval, every `period_ms` milliseconds if
+  // `randomized` is false, and at random time within a `period_ms` window
+  // otherwise, thus ticking with an average period of `period_ms` milliseconds.
+  message RepeatingInterval {
+    optional uint64 period_ms = 1;
+    optional bool randomized = 2;
+  }
+  oneof trigger {
+    // Triggers when the associated named trigger is manually emitted in Chrome
+    // client code.
+    string manual_trigger_name = 4;
+    HistogramTrigger histogram = 5;
+    RepeatingInterval repeating_interval = 6;
+  }
+}
+
+// Chrome field tracing defines a set of scenarios, each associated with
+// specific tracing configs, and nested scenarios that can cover interesting
+// tracing regions within a parent scenario. Both scenarios and nested scenarios
+// are enrolled by clients based on a set of start and stop rules that
+// delimitate a meaningful tracing interval, usually covering a user journey or
+// a guardian metric (e.g. FirstContentfulPaint). Collected traces may be saved
+// and uploaded based on upload rules. Scenario enrollment and trace uploads may
+// also be affected by client side scenario and upload limits.
+
+// Start rules from all scenarios in the config are observed by default (when no
+// scenario is active). Once enrolled in a specific scenario, other scenarios
+// are ignored until the active one is exited. Start rules for nested scenarios
+// are only observed once the parent scenario becomes active.
+
+message NestedScenarioConfig {
+  // Nested scenario name, unique within the parent scenario.
+  optional string scenario_name = 1;
+
+  // When triggered, this scenario becomes active. This activates `upload_rules`
+  // and `stop_rules`.
+  repeated TriggerRule start_rules = 2;
+  // When triggered, exits the scenario. This reverts back to the parent
+  // scenario. All nested scenarios within the parent scenario will be observed
+  // again.
+  repeated TriggerRule stop_rules = 3;
+  // When triggered, exits both this scenario and the parent scenario, stops the
+  // tracing session, and attempts to upload the trace. All scenarios are
+  // observed again.
+  repeated TriggerRule upload_rules = 4;
+}
+
+message ScenarioConfig {
+  // Scenario name, unique within the whole field tracing config.
+  optional string scenario_name = 1;
+
+  // When triggered, this scenario becomes active. Initializes a tracing session
+  // and starts recording data sources. This activates `upload_rules` and
+  // `stop_rules`.
+  repeated TriggerRule start_rules = 2;
+  // When triggered, exits the scenario. This stops the tracing session and
+  // discards the trace. All scenarios will be observed again.
+  repeated TriggerRule stop_rules = 3;
+  // When triggered, exits the scenario, stops the tracing session, and attempts
+  // to upload the trace. All scenarios will be observed again.
+  repeated TriggerRule upload_rules = 4;
+  // When triggered, this scenario becomes active. Initializes a tracing
+  // session, without recording data sources, and waits for a `start_rules` or
+  // to enter a `nested_scenarios`, which would start recording. This also
+  // activates `stop_rules`.
+  repeated TriggerRule setup_rules = 5;
+
+  optional TraceConfig trace_config = 6;
+
+  repeated NestedScenarioConfig nested_scenarios = 7;
+}
+
+message ChromeFieldTracingConfig {
+  repeated ScenarioConfig scenarios = 1;
+}
+
+message TracingTriggerRulesConfig {
+  repeated TriggerRule rules = 1;
+}
diff --git a/src/libtracing/protos/perfetto/config/chrome/v8_config.proto b/src/libtracing/protos/perfetto/config/chrome/v8_config.proto
new file mode 100644
index 000000000..bcb0e5b16
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/chrome/v8_config.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+message V8Config {
+  // Whether to log the actual content of scripts (e.g. content of the JS file
+  // that was compiled to generate code).
+  // ATTENTION: This could considerably increase the size of the resuling trace
+  //            file.
+  optional bool log_script_sources = 1;
+  // Whether to log the generated code for jitted functions (machine code or
+  // bytecode).
+  // ATTENTION: This could considerably increase the size of the resuling trace
+  //            file.
+  optional bool log_instructions = 2;
+}
diff --git a/src/libtracing/protos/perfetto/config/data_source_config.proto b/src/libtracing/protos/perfetto/config/data_source_config.proto
new file mode 100644
index 000000000..e9a259444
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/data_source_config.proto
@@ -0,0 +1,214 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/config/android/android_game_intervention_list_config.proto";
+import "protos/perfetto/config/android/android_input_event_config.proto";
+import "protos/perfetto/config/android/android_log_config.proto";
+import "protos/perfetto/config/android/android_polled_state_config.proto";
+import "protos/perfetto/config/android/android_system_property_config.proto";
+import "protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto";
+import "protos/perfetto/config/android/network_trace_config.proto";
+import "protos/perfetto/config/android/packages_list_config.proto";
+import "protos/perfetto/config/android/protolog_config.proto";
+import "protos/perfetto/config/android/surfaceflinger_layers_config.proto";
+import "protos/perfetto/config/android/surfaceflinger_transactions_config.proto";
+import "protos/perfetto/config/chrome/chrome_config.proto";
+import "protos/perfetto/config/chrome/v8_config.proto";
+import "protos/perfetto/config/etw/etw_config.proto";
+import "protos/perfetto/config/ftrace/ftrace_config.proto";
+import "protos/perfetto/config/gpu/gpu_counter_config.proto";
+import "protos/perfetto/config/gpu/vulkan_memory_config.proto";
+import "protos/perfetto/config/inode_file/inode_file_config.proto";
+import "protos/perfetto/config/interceptor_config.proto";
+import "protos/perfetto/config/power/android_power_config.proto";
+import "protos/perfetto/config/statsd/statsd_tracing_config.proto";
+import "protos/perfetto/config/process_stats/process_stats_config.proto";
+import "protos/perfetto/config/profiling/heapprofd_config.proto";
+import "protos/perfetto/config/profiling/java_hprof_config.proto";
+import "protos/perfetto/config/profiling/perf_event_config.proto";
+import "protos/perfetto/config/sys_stats/sys_stats_config.proto";
+import "protos/perfetto/config/test_config.proto";
+import "protos/perfetto/config/track_event/track_event_config.proto";
+import "protos/perfetto/config/system_info/system_info.proto";
+
+// The configuration that is passed to each data source when starting tracing.
+// Next id: 129
+message DataSourceConfig {
+  enum SessionInitiator {
+    SESSION_INITIATOR_UNSPECIFIED = 0;
+    // This trace was initiated from a trusted system app has DUMP and
+    // USAGE_STATS permission. This system app is expected to not expose the
+    // trace to the user of the device.
+    // This is determined by checking the UID initiating the trace.
+    SESSION_INITIATOR_TRUSTED_SYSTEM = 1;
+  };
+  // Data source unique name, e.g., "linux.ftrace". This must match
+  // the name passed by the data source when it registers (see
+  // RegisterDataSource()).
+  optional string name = 1;
+
+  // The index of the logging buffer where TracePacket(s) will be stored.
+  // This field doesn't make a major difference for the Producer(s). The final
+  // logging buffers, in fact, are completely owned by the Service. We just ask
+  // the Producer to copy this number into the chunk headers it emits, so that
+  // the Service can quickly identify the buffer where to move the chunks into
+  // without expensive lookups on its fastpath.
+  optional uint32 target_buffer = 2;
+
+  // Set by the service to indicate the duration of the trace.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint32 trace_duration_ms = 3;
+
+  // If true, |trace_duration_ms| should count also time in suspend. This
+  // is propagated from TraceConfig.prefer_suspend_clock_for_duration.
+  optional bool prefer_suspend_clock_for_duration = 122;
+
+  // Set by the service to indicate how long it waits after StopDataSource.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint32 stop_timeout_ms = 7;
+
+  // Set by the service to indicate whether this tracing session has extra
+  // guardrails.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional bool enable_extra_guardrails = 6;
+
+  // Set by the service to indicate which user initiated this trace.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional SessionInitiator session_initiator = 8;
+
+  // Set by the service to indicate which tracing session the data source
+  // belongs to. The intended use case for this is checking if two data sources,
+  // one of which produces metadata for the other one, belong to the same trace
+  // session and hence should be linked together.
+  // This field was introduced in Aug 2018 after Android P.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint64 tracing_session_id = 4;
+
+  // Keeep the lower IDs (up to 99) for fields that are *not* specific to
+  // data-sources and needs to be processed by the traced daemon.
+
+  // All data source config fields must be marked as [lazy=true]. This prevents
+  // the proto-to-cpp generator from recursing into those when generating the
+  // cpp classes and polluting tracing/core with data-source-specific classes.
+  // Instead they are treated as opaque strings containing raw proto bytes.
+
+  // Data source name: linux.ftrace
+  optional FtraceConfig ftrace_config = 100 [lazy = true];
+  // Data source name: linux.inode_file_map
+  optional InodeFileConfig inode_file_config = 102 [lazy = true];
+  // Data source name: linux.process_stats
+  optional ProcessStatsConfig process_stats_config = 103 [lazy = true];
+  // Data source name: linux.sys_stats
+  optional SysStatsConfig sys_stats_config = 104 [lazy = true];
+  // Data source name: android.heapprofd
+  // Introduced in Android 10.
+  optional HeapprofdConfig heapprofd_config = 105 [lazy = true];
+  // Data source name: android.java_hprof
+  // Introduced in Android 11.
+  optional JavaHprofConfig java_hprof_config = 110 [lazy = true];
+  // Data source name: android.power
+  optional AndroidPowerConfig android_power_config = 106 [lazy = true];
+  // Data source name: android.log
+  optional AndroidLogConfig android_log_config = 107 [lazy = true];
+  // TODO(fmayer): Add data source name for this.
+  optional GpuCounterConfig gpu_counter_config = 108 [lazy = true];
+  // Data source name: android.game_interventions
+  optional AndroidGameInterventionListConfig
+      android_game_intervention_list_config = 116 [lazy = true];
+  // Data source name: android.packages_list
+  optional PackagesListConfig packages_list_config = 109 [lazy = true];
+  // Data source name: linux.perf
+  optional PerfEventConfig perf_event_config = 111 [lazy = true];
+  // Data source name: vulkan.memory_tracker
+  optional VulkanMemoryConfig vulkan_memory_config = 112 [lazy = true];
+  // Data source name: track_event
+  optional TrackEventConfig track_event_config = 113 [lazy = true];
+  // Data source name: android.polled_state
+  optional AndroidPolledStateConfig android_polled_state_config = 114
+      [lazy = true];
+  // Data source name: android.system_property
+  optional AndroidSystemPropertyConfig android_system_property_config = 118
+      [lazy = true];
+  // Data source name: android.statsd
+  optional StatsdTracingConfig statsd_tracing_config = 117 [lazy = true];
+  // Data source name: linux.system_info
+  optional SystemInfoConfig system_info_config = 119;
+
+  // Chrome is special as it doesn't use the perfetto IPC layer. We want to
+  // avoid proto serialization and de-serialization there because that would
+  // just add extra hops on top of the Mojo ser/des. Instead we auto-generate a
+  // C++ class for it so it can pass around plain C++ objets.
+  optional ChromeConfig chrome_config = 101;
+
+  // Data source name: code.v8.dev
+  optional V8Config v8_config = 127 [lazy = true];
+
+  // If an interceptor is specified here, packets for this data source will be
+  // rerouted to the interceptor instead of the main trace buffer. This can be
+  // used, for example, to write trace data into ETW or for logging trace points
+  // to the console.
+  //
+  // Note that interceptors are only supported by data sources registered
+  // through the Perfetto SDK API. Data sources that don't use that API (e.g.,
+  // traced_probes) may not support interception.
+  optional InterceptorConfig interceptor_config = 115;
+
+  // Data source name: android.network_packets.
+  // Introduced in Android 14 (U).
+  optional NetworkPacketTraceConfig network_packet_trace_config = 120
+      [lazy = true];
+
+  // Data source name: android.surfaceflinger.layers
+  optional SurfaceFlingerLayersConfig surfaceflinger_layers_config = 121
+      [lazy = true];
+
+  // Data source name: android.surfaceflinger.transactions
+  optional SurfaceFlingerTransactionsConfig surfaceflinger_transactions_config =
+      123 [lazy = true];
+
+  // Data source name: android.sdk_sysprop_guard
+  // Introduced in Android 14 (U) QPR1.
+  optional AndroidSdkSyspropGuardConfig android_sdk_sysprop_guard_config = 124
+      [lazy = true];
+
+  // Data source name: windows.etw
+  optional EtwConfig etw_config = 125 [lazy = true];
+
+  // Data source name: android.protolog
+  optional ProtoLogConfig protolog_config = 126 [lazy = true];
+
+  // Data source name: android.input.inputevent
+  optional AndroidInputEventConfig android_input_event_config = 128 [lazy = true];
+
+  // This is a fallback mechanism to send a free-form text config to the
+  // producer. In theory this should never be needed. All the code that
+  // is part of the platform (i.e. traced service) is supposed to *not* truncate
+  // the trace config proto and propagate unknown fields. However, if anything
+  // in the pipeline (client or backend) ends up breaking this forward compat
+  // plan, this field will become the escape hatch to allow future data sources
+  // to get some meaningful configuration.
+  optional string legacy_config = 1000;
+
+  // This field is only used for testing.
+  optional TestConfig for_testing = 1001;
+
+  // Was |for_testing|. Caused more problems then found.
+  reserved 268435455;
+}
diff --git a/src/libtracing/protos/perfetto/config/etw/etw_config.proto b/src/libtracing/protos/perfetto/config/etw/etw_config.proto
new file mode 100644
index 000000000..ee0abc88e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/etw/etw_config.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Proto definition based on the struct _EVENT_TRACE_PROPERTIES definition
+// See: https://learn.microsoft.com/en-us/windows/win32/api/evntrace/
+// ns-evntrace-event_trace_properties
+message EtwConfig {
+  // The KernelFlag represent list of kernel flags that we are intrested in.
+  // To get a more extensive list run 'xperf -providers k'.
+  enum KernelFlag {
+    CSWITCH = 0;
+    DISPATCHER = 1;
+  }
+
+  // The kernel_flags determines the flags that will be used by the etw tracing
+  // session. These kernel flags have been built to expose the useful events
+  // captured from the kernel mode only.
+  repeated KernelFlag kernel_flags = 1;
+}
diff --git a/src/libtracing/protos/perfetto/config/ftrace/ftrace_config.proto b/src/libtracing/protos/perfetto/config/ftrace/ftrace_config.proto
new file mode 100644
index 000000000..187229019
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/ftrace/ftrace_config.proto
@@ -0,0 +1,236 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Next id: 28
+message FtraceConfig {
+  // Ftrace events to record, example: "sched/sched_switch".
+  repeated string ftrace_events = 1;
+  // Android-specific event categories:
+  repeated string atrace_categories = 2;
+  repeated string atrace_apps = 3;
+
+  // Size of each per-cpu kernel ftrace ring buffer.
+  // Not guaranteed if there are multiple concurrent tracing sessions, as the
+  // buffers cannot be resized without pausing recording in the kernel.
+  optional uint32 buffer_size_kb = 10;
+
+  // If set, specifies how often the tracing daemon reads from the kernel ring
+  // buffer. Not guaranteed if there are multiple concurrent tracing sessions.
+  // Leave unset unless you're fine-tuning a local config.
+  optional uint32 drain_period_ms = 11;
+
+  // If set, the tracing daemon will read kernel ring buffers as soon as
+  // they're filled past this percentage of occupancy. In other words, a value
+  // of 50 means that a read pass is triggered as soon as any per-cpu buffer is
+  // half-full. Not guaranteed if there are multiple concurrent tracing
+  // sessions.
+  // Currently does nothing on Linux kernels below v6.1.
+  // Introduced in: perfetto v43.
+  optional uint32 drain_buffer_percent = 26;
+
+  // Configuration for compact encoding of scheduler events. When enabled (and
+  // recording the relevant ftrace events), specific high-volume events are
+  // encoded in a denser format than normal.
+  message CompactSchedConfig {
+    // If true, and sched_switch or sched_waking ftrace events are enabled,
+    // record those events in the compact format.
+    //
+    // If the field is unset, the default is:
+    // * perfetto v42.0+: enabled
+    // * before: disabled
+    optional bool enabled = 1;
+  }
+  optional CompactSchedConfig compact_sched = 12;
+
+  // Optional filter for "ftrace/print" events.
+  //
+  // The filter consists of multiple rules. As soon as a rule matches (the rules
+  // are processed in order), its `allow` field will be used as the outcome: if
+  // `allow` is true, the event will be included in the trace, otherwise it will
+  // be discarded. If an event does not match any rule, it will be allowed by
+  // default (a rule with an empty prefix and allow=false, disallows everything
+  // by default).
+  message PrintFilter {
+    message Rule {
+      // Matches an atrace message of the form:
+      // <type>|pid|<prefix>...
+      message AtraceMessage {
+        optional string type = 1;
+        optional string prefix = 2;
+      }
+      oneof match {
+        // This rule matches if `prefix` matches exactly with the beginning of
+        // the "ftrace/print" "buf" field.
+        string prefix = 1;
+        // This rule matches if the "buf" field contains an atrace-style print
+        // message as specified in `atrace_msg`.
+        AtraceMessage atrace_msg = 3;
+      }
+      optional bool allow = 2;
+    }
+    repeated Rule rules = 1;
+  }
+  optional PrintFilter print_filter = 22;
+
+  // Enables symbol name resolution against /proc/kallsyms.
+  // It requires that either traced_probes is running as root or that
+  // kptr_restrict has been manually lowered.
+  // It does not disclose KASLR, symbol addresses are mangled.
+  optional bool symbolize_ksyms = 13;
+
+  // When symbolize_ksyms=true, determines whether the traced_probes daemon
+  // should keep the symbol map in memory (and reuse it for future tracing
+  // sessions) or clear it (saving memory) and re-create it on each tracing
+  // session (wasting cpu and wall time).
+  // The tradeoff is roughly:
+  //  KSYMS_RETAIN: pay a fixed ~1.2 MB cost after the first trace.
+  //  KSYMS_CLEANUP_ON_STOP: pay a ~300-500ms cost when starting each trace.
+  // Default behavior: KSYMS_CLEANUP_ON_STOP.
+  enum KsymsMemPolicy {
+    KSYMS_UNSPECIFIED = 0;
+    KSYMS_CLEANUP_ON_STOP = 1;
+    KSYMS_RETAIN = 2;
+  }
+  optional KsymsMemPolicy ksyms_mem_policy = 17;
+
+  // By default the kernel symbolizer is lazily initialized on a deferred task
+  // to reduce ftrace's time-to-start-recording. Unfortunately that makes
+  // ksyms integration tests hard. This flag forces the kernel symbolizer to be
+  // initialized synchronously on the data source start and hence avoiding
+  // timing races in tests.
+  // DEPRECATED in v28 / Android U. This is now the default behavior, setting it
+  // to true is a no-op.
+  optional bool initialize_ksyms_synchronously_for_testing = 14
+      [deprecated = true];
+
+  // When this boolean is true AND the ftrace_events contains "kmem/rss_stat",
+  // this option causes traced_probes to enable the "kmem/rss_stat_throttled"
+  // event instead if present, and fall back to "kmem/rss_stat" if not present.
+  // The historical context for this is the following:
+  // - Up to Android S (12), the rss_stat was internally throttled in its
+  //   kernel implementation.
+  // - A change introduced in the kernels after S has introduced a new
+  //   "rss_stat_throttled" making the original "rss_stat" event unthrottled
+  //   (hence very spammy).
+  // - Not all Android T/13 devices will receive a new kernel though, hence we
+  //   need to deal with both cases.
+  // For more context: go/rss-stat-throttled.
+  optional bool throttle_rss_stat = 15;
+
+  // If true, avoid enabling events that aren't statically known by
+  // traced_probes. Otherwise, the default is to emit such events as
+  // GenericFtraceEvent protos.
+  // Prefer to keep this flag at its default. This was added for Android
+  // tracing, where atrace categories and/or atrace HAL requested events can
+  // expand to events that aren't of interest to the tracing user.
+  // Introduced in: Android T.
+  optional bool disable_generic_events = 16;
+
+  // The subset of syscalls to record. To record all syscalls, leave this unset
+  // and add "ftrace_events: raw_syscalls/sys_{enter,exit}" to the config.
+  // * before perfetto v43, requires the config to also enable
+  //   raw_syscalls/sys_{enter,exit}.
+  // * perfetto v43+ does the right thing if you set only this field.
+  // Example: ["sys_read", "sys_open"].
+  // Introduced in: Android U.
+  repeated string syscall_events = 18;
+
+  // If true, enable the "function_graph" kernel tracer that emits events
+  // whenever a kernel function is entered and exited
+  // (funcgraph_entry/funcgraph_exit).
+  // Notes on use:
+  // * Requires |symbolize_ksyms| for function name resolution.
+  // * Use |function_filters| or |function_graph_roots| to constrain the traced
+  //   set of functions, otherwise the event bandwidth will be too high for
+  //   practical use.
+  // * The data source might be rejected if there is already a concurrent
+  //   ftrace data source that does not use function graph itself, as we do not
+  //   support switching kernel tracers mid-trace.
+  // * Requires a kernel compiled with CONFIG_FUNCTION_GRAPH_TRACER. This is
+  //   enabled if "cat /sys/kernel/tracing/available_tracers" includes
+  //   "function_graph".
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  optional bool enable_function_graph = 19;
+
+  // Constrains the set of functions traced when |enable_function_graph| is
+  // true. Supports globs, e.g. "sched*". You can specify multiple filters,
+  // in which case all matching functions will be traced. See kernel
+  // documentation on ftrace "set_ftrace_filter" file for more details.
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  repeated string function_filters = 20;
+
+  // If |enable_function_graph| is true, trace this set of functions *and* all
+  // of its callees. Supports globs. Can be set together with
+  // |function_filters|, in which case only callees matching the filter will be
+  // traced. If setting both, you most likely want all roots to also be
+  // included in |function_filters|.
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  repeated string function_graph_roots = 21;
+
+  // If true, does not clear ftrace buffers before the start of the program.
+  // This makes sense only if this is the first ftrace data source instance
+  // created after the daemon has been started. Can be useful for gathering boot
+  // traces, if ftrace has been separately configured (e.g. via kernel
+  // commandline).
+  optional bool preserve_ftrace_buffer = 23;
+
+  // If true, overrides the default timestamp clock and uses a raw hardware
+  // based monotonic clock for getting timestamps.
+  // * Introduced in: Android U.
+  optional bool use_monotonic_raw_clock = 24;
+
+  // If |instance_name| is not empty, then attempt to use that tracefs instance
+  // for event recording. Normally, this means
+  // `/sys/kernel/tracing/instances/$instance_name`.
+  //
+  // The name "hyp" is reserved.
+  //
+  // The instance must already exist, the tracing daemon *will not* create it
+  // for you as it typically doesn't have such permissions.
+  // Only a subset of features is guaranteed to work with non-default instances,
+  // at the time of writing:
+  //  * ftrace_events
+  //  * buffer_size_kb
+  optional string instance_name = 25;
+
+  // If true, |buffer_size_kb| is interpreted as a lower bound, allowing the
+  // implementation to choose a bigger buffer size.
+  //
+  // Most configs for perfetto v43+ should simply leave both fields unset.
+  //
+  // If you need a config compatible with a range of perfetto builds and you
+  // used to set a non-default buffer_size_kb, consider setting both fields.
+  // Example:
+  //   buffer_size_kb: 4096
+  //   buffer_size_lower_bound: true
+  // On older builds, the per-cpu buffers will be exactly 4 MB.
+  // On v43+, buffers will be at least 4 MB.
+  // In both cases, neither is guaranteed if there are other concurrent
+  // perfetto ftrace sessions, as the buffers cannot be resized without pausing
+  // the recording in the kernel.
+  // Introduced in: perfetto v43.
+  optional bool buffer_size_lower_bound = 27;
+}
diff --git a/src/libtracing/protos/perfetto/config/gpu/gpu_counter_config.proto b/src/libtracing/protos/perfetto/config/gpu/gpu_counter_config.proto
new file mode 100644
index 000000000..d51a997bf
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/gpu/gpu_counter_config.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message GpuCounterConfig {
+  // Desired sampling interval for counters.
+  optional uint64 counter_period_ns = 1;
+
+  // List of counters to be sampled. Counter IDs correspond to the ones
+  // described in GpuCounterSpec in the data source descriptor.
+  repeated uint32 counter_ids = 2;
+
+  // Sample counters by instrumenting command buffers.
+  optional bool instrumented_sampling = 3;
+
+  // Fix gpu clock rate during trace session.
+  optional bool fix_gpu_clock = 4;
+}
diff --git a/src/libtracing/protos/perfetto/config/gpu/vulkan_memory_config.proto b/src/libtracing/protos/perfetto/config/gpu/vulkan_memory_config.proto
new file mode 100644
index 000000000..c1959aef9
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/gpu/vulkan_memory_config.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message VulkanMemoryConfig {
+  // Tracking driver memory usage events
+  optional bool track_driver_memory_usage = 1;
+
+  // Tracking device memory usage events
+  optional bool track_device_memory_usage = 2;
+}
diff --git a/src/libtracing/protos/perfetto/config/inode_file/inode_file_config.proto b/src/libtracing/protos/perfetto/config/inode_file/inode_file_config.proto
new file mode 100644
index 000000000..d94e31909
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/inode_file/inode_file_config.proto
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message InodeFileConfig {
+  message MountPointMappingEntry {
+    optional string mountpoint = 1;
+    repeated string scan_roots = 2;
+  }
+
+  // How long to pause between batches.
+  optional uint32 scan_interval_ms = 1;
+
+  // How long to wait before the first scan in order to accumulate inodes.
+  optional uint32 scan_delay_ms = 2;
+
+  // How many inodes to scan in one batch.
+  optional uint32 scan_batch_size = 3;
+
+  // Do not scan for inodes not found in the static map.
+  optional bool do_not_scan = 4;
+
+  // If non-empty, only scan inodes corresponding to block devices named in
+  // this list.
+  repeated string scan_mount_points = 5;
+
+  // When encountering an inode belonging to a block device corresponding
+  // to one of the mount points in this map, scan its scan_roots instead.
+  repeated MountPointMappingEntry mount_point_mapping = 6;
+}
diff --git a/src/libtracing/protos/perfetto/config/interceptor_config.proto b/src/libtracing/protos/perfetto/config/interceptor_config.proto
new file mode 100644
index 000000000..9263bb587
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/interceptor_config.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/config/interceptors/console_config.proto";
+
+// Configuration for trace packet interception. Used for diverting trace data to
+// non-Perfetto sources (e.g., logging to the console, ETW) when using the
+// Perfetto SDK.
+message InterceptorConfig {
+  // Matches the name given to RegisterInterceptor().
+  optional string name = 1;
+
+  optional ConsoleConfig console_config = 100;
+}
diff --git a/src/libtracing/protos/perfetto/config/interceptors/console_config.proto b/src/libtracing/protos/perfetto/config/interceptors/console_config.proto
new file mode 100644
index 000000000..7f0189f08
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/interceptors/console_config.proto
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message ConsoleConfig {
+  enum Output {
+    OUTPUT_UNSPECIFIED = 0;
+    OUTPUT_STDOUT = 1;
+    OUTPUT_STDERR = 2;
+  }
+  optional Output output = 1;
+  optional bool enable_colors = 2;
+}
diff --git a/src/libtracing/protos/perfetto/config/perfetto_config.proto b/src/libtracing/protos/perfetto/config/perfetto_config.proto
new file mode 100644
index 000000000..2fd3c55ac
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/perfetto_config.proto
@@ -0,0 +1,4075 @@
+// AUTOGENERATED - DO NOT EDIT
+// ---------------------------
+// This file has been generated by
+// AOSP://external/perfetto/tools/gen_merged_protos
+// merging the perfetto config protos.
+// This fused proto is intended to be copied in:
+//  - Android tree, for statsd.
+//  - Google internal repos.
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+option go_package = "github.com/google/perfetto/perfetto_proto";
+
+// Begin of protos/perfetto/common/ftrace_descriptor.proto
+
+message FtraceDescriptor {
+  message AtraceCategory {
+    optional string name = 1;
+    optional string description = 2;
+  }
+
+  // Report the available atrace categories.
+  //
+  // Used by Traceur via `perfetto --query`.
+  repeated AtraceCategory atrace_categories = 1;
+}
+
+// End of protos/perfetto/common/ftrace_descriptor.proto
+
+// Begin of protos/perfetto/common/gpu_counter_descriptor.proto
+
+// Description of GPU counters.
+// This message is sent by a GPU counter producer to specify the counters
+// available in the hardware.
+message GpuCounterDescriptor {
+  // Logical groups for a counter.  This is used in the UI to present the
+  // related counters together.
+  enum GpuCounterGroup {
+    UNCLASSIFIED = 0;
+    SYSTEM = 1;
+    VERTICES = 2;
+    FRAGMENTS = 3;
+    PRIMITIVES = 4;
+    // Includes counters relating to caching and bandwidth.
+    MEMORY = 5;
+    COMPUTE = 6;
+  }
+
+  message GpuCounterSpec {
+    optional uint32 counter_id = 1;
+    optional string name = 2;
+    optional string description = 3;
+    // MeasureUnit unit (deprecated)
+    reserved 4;
+    oneof peak_value {
+      int64 int_peak_value = 5;
+      double double_peak_value = 6;
+    }
+    repeated MeasureUnit numerator_units = 7;
+    repeated MeasureUnit denominator_units = 8;
+    optional bool select_by_default = 9;
+    repeated GpuCounterGroup groups = 10;
+  }
+  repeated GpuCounterSpec specs = 1;
+
+  // Allow producer to group counters into block to represent counter islands.
+  // A capacity may be specified to indicate the number of counters that can be
+  // enable simultaneously in that block.
+  message GpuCounterBlock {
+    // required. Unique ID for the counter group.
+    optional uint32 block_id = 1;
+    // optional. Number of counters supported by the block. No limit if unset.
+    optional uint32 block_capacity = 2;
+    // optional. Name of block.
+    optional string name = 3;
+    // optional. Description for the block.
+    optional string description = 4;
+    // list of counters that are part of the block.
+    repeated uint32 counter_ids = 5;
+  }
+  repeated GpuCounterBlock blocks = 2;
+
+  // optional.  Minimum sampling period supported by the producer in
+  // nanoseconds.
+  optional uint64 min_sampling_period_ns = 3;
+
+  // optional.  Maximum sampling period supported by the producer in
+  // nanoseconds.
+  optional uint64 max_sampling_period_ns = 4;
+
+  // optional.  The producer supports counter sampling by instrumenting the
+  // command buffer.
+  optional bool supports_instrumented_sampling = 5;
+
+  // next id: 41
+  enum MeasureUnit {
+    NONE = 0;
+
+    BIT = 1;
+    KILOBIT = 2;
+    MEGABIT = 3;
+    GIGABIT = 4;
+    TERABIT = 5;
+    PETABIT = 6;
+
+    BYTE = 7;
+    KILOBYTE = 8;
+    MEGABYTE = 9;
+    GIGABYTE = 10;
+    TERABYTE = 11;
+    PETABYTE = 12;
+
+    HERTZ = 13;
+    KILOHERTZ = 14;
+    MEGAHERTZ = 15;
+    GIGAHERTZ = 16;
+    TERAHERTZ = 17;
+    PETAHERTZ = 18;
+
+    NANOSECOND = 19;
+    MICROSECOND = 20;
+    MILLISECOND = 21;
+    SECOND = 22;
+    MINUTE = 23;
+    HOUR = 24;
+
+    VERTEX = 25;
+    PIXEL = 26;
+    TRIANGLE = 27;
+    PRIMITIVE = 38;
+    FRAGMENT = 39;
+
+    MILLIWATT = 28;
+    WATT = 29;
+    KILOWATT = 30;
+
+    JOULE = 31;
+    VOLT = 32;
+    AMPERE = 33;
+
+    CELSIUS = 34;
+    FAHRENHEIT = 35;
+    KELVIN = 36;
+
+    // Values should be out of 100.
+    PERCENT = 37;
+
+    INSTRUCTION = 40;
+  }
+}
+
+// End of protos/perfetto/common/gpu_counter_descriptor.proto
+
+// Begin of protos/perfetto/common/track_event_descriptor.proto
+
+message TrackEventCategory {
+  optional string name = 1;
+  optional string description = 2;
+  repeated string tags = 3;
+}
+
+message TrackEventDescriptor {
+  repeated TrackEventCategory available_categories = 1;
+}
+
+// End of protos/perfetto/common/track_event_descriptor.proto
+
+// Begin of protos/perfetto/common/data_source_descriptor.proto
+
+// This message is sent from Producer(s) to the tracing Service when registering
+// to advertise their capabilities. It describes the structure of tracing
+// protos that will be produced by the data source and the supported filters.
+message DataSourceDescriptor {
+  // e.g., "linux.ftrace", "chromium.tracing"
+  optional string name = 1;
+
+  // When non-zero, this is a unique ID within the scope of the Producer for
+  // this data source (it is NOT globally unique). This is useful to
+  // differentiate between data sources with matching names when calling
+  // UpdateDataSource(). This field has been introduced in November 2021
+  // (v22, Android T) and is not supported on older versions.
+  optional uint64 id = 7;
+
+  // When true the data source is expected to ack the stop request through the
+  // NotifyDataSourceStopped() IPC. This field has been introduced after
+  // Android P in Jul 2018 and is not supported on older versions.
+  optional bool will_notify_on_stop = 2;
+
+  // When true the data source is expected to ack the start request through the
+  // NotifyDataSourceStarted() IPC. This field has been introduced after
+  // Android P in March 2019 and is not supported on older versions.
+  optional bool will_notify_on_start = 3;
+
+  // If true, opt into receiving the ClearIncrementalState() IPC. This should be
+  // set if the data source writes packets that refer to previous trace
+  // contents, and knows how to stop referring to the already-emitted data.
+  optional bool handles_incremental_state_clear = 4;
+
+  // If true, indicates that the data source does nothing upon Flush. This
+  // allows the service to reduce the flush-related IPC traffic and better deal
+  // with frozen producers (see go/perfetto-frozen). This is usually the case
+  // for data sources like 'track_event' that don't have access to the various
+  // thread task runners to post a flush task and rely purely on server-side
+  // scraping.
+  // Introduced in v39 / Android V.
+  optional bool no_flush = 9;
+
+  // Optional specification about available GPU counters.
+  optional GpuCounterDescriptor gpu_counter_descriptor = 5 [lazy = true];
+
+  optional TrackEventDescriptor track_event_descriptor = 6 [lazy = true];
+
+  optional FtraceDescriptor ftrace_descriptor = 8 [lazy = true];
+}
+
+// End of protos/perfetto/common/data_source_descriptor.proto
+
+// Begin of protos/perfetto/common/tracing_service_state.proto
+
+// Reports the state of the tracing service. Used to gather details about the
+// data sources connected.
+// See ConsumerPort::QueryServiceState().
+message TracingServiceState {
+  // Describes a producer process.
+  message Producer {
+    // Unique ID of the producer (monotonic counter).
+    optional int32 id = 1;
+
+    // Typically matches the process name.
+    optional string name = 2;
+
+    // Unix pid of the remote process. Supported only on Linux-based systems.
+    // Introduced in v24 / Android T.
+    optional int32 pid = 5;
+
+    // Unix uid of the remote process.
+    optional int32 uid = 3;
+
+    // The version of the client library used by the producer.
+    // This is a human readable string with and its format varies depending on
+    // the build system and the repo (standalone vs AOSP).
+    // This is intended for human debugging only.
+    optional string sdk_version = 4;
+  }
+
+  // Describes a data source registered by a producer. Data sources are listed
+  // regardless of the fact that they are being used or not.
+  message DataSource {
+    // Descriptor passed by the data source when calling RegisterDataSource().
+    optional DataSourceDescriptor ds_descriptor = 1;
+
+    // ID of the producer, as per Producer.id.
+    optional int32 producer_id = 2;
+  }
+
+  message TracingSession {
+    // The TracingSessionID.
+    optional uint64 id = 1;
+
+    // The Unix uid of the consumer that started the session.
+    // This is meaningful only if the caller is root. In all other cases only
+    // tracing sessions that match the caller UID will be displayed.
+    optional int32 consumer_uid = 2;
+
+    // Internal state of the tracing session.
+    // These strings are FYI only and subjected to change.
+    optional string state = 3;
+
+    // The unique_session_name as set in the trace config (might be empty).
+    optional string unique_session_name = 4;
+
+    // The number and size of each buffer.
+    repeated uint32 buffer_size_kb = 5;
+
+    // Duration, as specified in the TraceConfig.duration_ms.
+    optional uint32 duration_ms = 6;
+
+    // Number of data sources involved in the session.
+    optional uint32 num_data_sources = 7;
+
+    // Time when the session was started, in the CLOCK_REALTIME domain.
+    // Available only on Linux-based systems.
+    optional int64 start_realtime_ns = 8;
+
+    // The fields below have been introduced in v42.
+
+    // The bugreport_score, as set in TraceConfig.bugreport_score.
+    optional int32 bugreport_score = 9;
+
+    // As per TraceConfig.bugreport_filename.
+    optional string bugreport_filename = 10;
+
+    // If true, the session is in the STARTED state. If false the session is in
+    // any other state (see `state` field).
+    optional bool is_started = 11;
+  }
+
+  // Lists all the producers connected.
+  repeated Producer producers = 1;
+
+  // Lists the data sources available.
+  repeated DataSource data_sources = 2;
+
+  // Lists the tracing sessions active AND owned by a consumer that has the same
+  // UID of the caller (or all of them if the caller is root).
+  // Introduced in v24 / Android T.
+  repeated TracingSession tracing_sessions = 6;
+
+  // This is always set to true from v24 and beyond. This flag is only used to
+  // tell the difference between: (1) talking to a recent service which happens
+  // to have no tracing session active; (2) talking to an older version of the
+  // service which will never report any tracing session.
+  optional bool supports_tracing_sessions = 7;
+
+  // Total number of tracing sessions.
+  optional int32 num_sessions = 3;
+
+  // Number of tracing sessions in the started state. Always <= num_sessions.
+  optional int32 num_sessions_started = 4;
+
+  // The version of traced (the same returned by `traced --version`).
+  // This is a human readable string with and its format varies depending on
+  // the build system and the repo (standalone vs AOSP).
+  // This is intended for human debugging only.
+  optional string tracing_service_version = 5;
+}
+
+// End of protos/perfetto/common/tracing_service_state.proto
+
+// Begin of protos/perfetto/common/builtin_clock.proto
+
+enum BuiltinClock {
+  BUILTIN_CLOCK_UNKNOWN = 0;
+  BUILTIN_CLOCK_REALTIME = 1;
+  BUILTIN_CLOCK_REALTIME_COARSE = 2;
+  BUILTIN_CLOCK_MONOTONIC = 3;
+  BUILTIN_CLOCK_MONOTONIC_COARSE = 4;
+  BUILTIN_CLOCK_MONOTONIC_RAW = 5;
+  BUILTIN_CLOCK_BOOTTIME = 6;
+  BUILTIN_CLOCK_TSC = 9;
+  BUILTIN_CLOCK_MAX_ID = 63;
+
+  reserved 7, 8;
+}
+
+// End of protos/perfetto/common/builtin_clock.proto
+
+// Begin of protos/perfetto/config/android/android_game_intervention_list_config.proto
+
+// Data source that lists game modes and game interventions of games
+// on an Android device.
+message AndroidGameInterventionListConfig {
+  // If not empty, emit info about only the following list of package names
+  // (exact match, no regex). Otherwise, emit info about all packages.
+  repeated string package_name_filter = 1;
+}
+
+// End of protos/perfetto/config/android/android_game_intervention_list_config.proto
+
+// Begin of protos/perfetto/config/android/android_input_event_config.proto
+
+// Custom configuration for the "android.input.inputevent" data source.
+//
+// NOTE: Input traces can only be taken on debuggable (userdebug/eng) builds!
+//
+// Next ID: 5
+message AndroidInputEventConfig {
+
+    // Trace modes are tracing presets that are included in the system.
+    enum TraceMode {
+        // Preset mode for maximal tracing.
+        // WARNING: This will bypass all privacy measures on debuggable builds, and will record all
+        //          input events processed by the system, regardless of the context in which they
+        //          were processed. It should only be used for tracing on a local device or for
+        //          tests. It should NEVER be used for field tracing.
+        TRACE_MODE_TRACE_ALL = 0;
+        // Use the tracing rules defined in this config to specify what events to trace.
+        TRACE_MODE_USE_RULES = 1;
+    }
+
+    // The tracing mode to use. If unspecified, it will default to TRACE_MODE_USE_RULES.
+    optional TraceMode mode = 1;
+
+    // The level of tracing that should be applied to an event.
+    enum TraceLevel {
+        // Do not trace the input event.
+        TRACE_LEVEL_NONE = 0;
+        // Trace the event as a redacted event, where certain sensitive fields are omitted from
+        // the trace, including the coordinates of pointer events and the key/scan codes of key
+        // events.
+        TRACE_LEVEL_REDACTED = 1;
+        // Trace the complete event.
+        TRACE_LEVEL_COMPLETE = 2;
+    }
+
+    // A rule that specifies the TraceLevel for an event based on matching conditions.
+    // All matchers in the rule are optional. To trigger this rule, an event must match all
+    // of its specified matchers (i.e. the matchers function like a series of conditions connected
+    // by a logical 'AND' operator). A rule with no specified matchers will match all events.
+    // Next ID: 6
+    message TraceRule {
+        // The trace level to be used for events that trigger this rule.
+        // If unspecified, TRACE_LEVEL_NONE will be used by default.
+        optional TraceLevel trace_level = 1;
+
+        // --- Optional Matchers ---
+
+        // Package matchers
+        //
+        // Respectively matches if all or any of the target apps for this event are contained in
+        // the specified list of package names.
+        //
+        // Intended usage:
+        //   - Use match_all_packages to selectively allow tracing for the listed packages.
+        //   - Use match_any_packages to selectively deny tracing for certain packages.
+        //
+        // WARNING: Great care must be taken when designing rules for field tracing!
+        //          This is because each event is almost always sent to more than one app.
+        //              For example, when allowing tracing for a package that has a spy window
+        //          over the display (e.g. SystemUI) using match_any_packages, essentially all
+        //          input will be recorded on that display. This is because the events will be sent
+        //          to the spy as well as the foreground app, and regardless of what the foreground
+        //          app is, the event will end up being traced.
+        //              Alternatively, when attempting to block tracing for specific packages using
+        //          match_all_packages, no events will likely be blocked. This is because the event
+        //          will also be sent to other apps (such as, but not limited to, ones with spy
+        //          windows), so the matcher will not match unless all other targets are also
+        //          listed under the match_all_packages list.
+        repeated string match_all_packages = 2;
+        repeated string match_any_packages = 3;
+
+        // Matches if the event is secure, which means that at least one of the targets of
+        // this event is using the window flag FLAG_SECURE.
+        optional bool match_secure = 4;
+
+        // Matches if there was an active IME connection while this event was being processed.
+        optional bool match_ime_connection_active = 5;
+    }
+
+    // The list of rules to use to determine the trace level of events.
+    // Each event will be traced using the TraceLevel of the first rule that it triggers
+    // from this list. The rules are evaluated in the order in which they are specified.
+    // If an event does not match any of the rules, TRACE_LEVEL_NONE will be used by default.
+    repeated TraceRule rules = 2;
+
+    // --- Control flags ---
+
+    // Trace input events processed by the system as they are being dispatched
+    // to application windows. All trace rules will apply.
+    //   - If this flag is used without enabling trace_dispatcher_window_dispatch, it will
+    //     trace InputDispatcher's inbound events (which does not include events synthesized
+    //     within InputDispatcher) that match the rules.
+    //   - If used with trace_dispatcher_window_dispatch, all inbound and outbound events
+    //     matching the rules, including all events synthesized within InputDispatcher,
+    //     will be traced.
+    optional bool trace_dispatcher_input_events = 3;
+
+    // Trace details about which windows the system is sending each input event to.
+    // All trace rules will apply.
+    optional bool trace_dispatcher_window_dispatch = 4;
+}
+
+// End of protos/perfetto/config/android/android_input_event_config.proto
+
+// Begin of protos/perfetto/common/android_log_constants.proto
+
+// Values from NDK's android/log.h.
+enum AndroidLogId {
+  // MAIN.
+  LID_DEFAULT = 0;
+
+  LID_RADIO = 1;
+  LID_EVENTS = 2;
+  LID_SYSTEM = 3;
+  LID_CRASH = 4;
+  LID_STATS = 5;
+  LID_SECURITY = 6;
+  LID_KERNEL = 7;
+}
+
+enum AndroidLogPriority {
+  PRIO_UNSPECIFIED = 0;
+
+  // _DEFAULT, but should never be seen in logs.
+  PRIO_UNUSED = 1;
+
+  PRIO_VERBOSE = 2;
+  PRIO_DEBUG = 3;
+  PRIO_INFO = 4;
+  PRIO_WARN = 5;
+  PRIO_ERROR = 6;
+  PRIO_FATAL = 7;
+}
+
+// End of protos/perfetto/common/android_log_constants.proto
+
+// Begin of protos/perfetto/config/android/android_log_config.proto
+
+message AndroidLogConfig {
+  repeated AndroidLogId log_ids = 1;
+
+  // Was |poll_ms|, deprecated.
+  reserved 2;
+
+  // If set ignores all log messages whose prio is < the given value.
+  optional AndroidLogPriority min_prio = 3;
+
+  // If non-empty ignores all log messages whose tag doesn't match one of the
+  // specified values.
+  repeated string filter_tags = 4;
+}
+
+// End of protos/perfetto/config/android/android_log_config.proto
+
+// Begin of protos/perfetto/config/android/android_polled_state_config.proto
+
+// Data source that polls for display state. This should only be used for
+// backward-compatibility; AndroidSystemPropertyConfig should be preferred.
+message AndroidPolledStateConfig {
+  // Frequency of polling. If absent the state will be recorded once, at the
+  // start of the trace.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 poll_ms = 1;
+}
+
+// End of protos/perfetto/config/android/android_polled_state_config.proto
+
+// Begin of protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto
+
+// Data source that controls the system properties used to guard initialization
+// of track_event producers (i.e. Skia) in apps using HWUI, and certain
+// processes like SurfaceFlinger.
+//
+// This data source only tells Skia to initialized the Perfetto SDK and start
+// routing data to the Track Event system instead of ATrace. For those events
+// to actually show up in a trace, the track_event data source must be used as
+// well. The Perfetto SDK cannot be de-initialized, so some long-lived apps and
+// processes may need to be restarted for Skia to revert to using ATrace if
+// Track Events are no longer desired.
+//
+// In addition to switching Skia to use Perfetto's track_event data source,
+// this "guard" also controls Skia's "broad tracing", which removes Skia's
+// internal tracing constraints and allows the track_event config to specify
+// which categories should be traced. Filtering to the "skia.always" category
+// *tag* in a track_event config can be used to re-enable the standard
+// constraints typically used with ATrace.
+//
+// Data source name: android.sdk_sysprop_guard
+// Introduced in Android 14 (U) QPR1.
+// Next id: 4
+message AndroidSdkSyspropGuardConfig {
+  // If true, configures SurfaceFlinger to initialize Skia's Perfetto
+  // integration with the track_event data source in RenderEngine.
+  // If false or omitted, the simpler ATrace fallback is used.
+  //
+  // NOTE: once enabled, Skia will only revert to ATrace if SurfaceFlinger is
+  // restarted.
+  //
+  // Specifically this sets the following system properties:
+  //   - debug.tracing.ctl.renderengine.skia_tracing_enabled
+  //   - debug.tracing.ctl.renderengine.skia_use_perfetto_track_events
+  //
+  // Does not affect actual track_event data *collection*, which must be
+  // configured seperately.
+  optional bool surfaceflinger_skia_track_events = 1;
+
+  // If true, configures HWUI apps to initialize Skia's Perfetto integration
+  // with the track_event data source. hwui_package_name_filter
+  // can be used to control which apps are affected.
+  // If false or omitted, the simpler ATrace fallback is used.
+  //
+  // NOTE: once enabled, Skia will only revert to ATrace if the app is
+  // restarted.
+  //
+  // ATTENTION: affects ALL HWUI APPS if hwui_package_name_filter is not set!
+  // If filtering is NOT set, this controls these GLOBAL system properties:
+  //   - debug.tracing.ctl.hwui.skia_tracing_enabled
+  //   - debug.tracing.ctl.hwui.skia_use_perfetto_track_events
+  // If filtering IS set, this controls these APP-SPECIFIC system properties,
+  // for each package listed in the filter:
+  //   - debug.tracing.ctl.hwui.skia_tracing_enabled.<package.name>
+  //   - debug.tracing.ctl.hwui.skia_use_perfetto_track_events.<package.name>
+  //
+  // Does not affect actual track_event data *collection*, which must be
+  // configured seperately.
+  optional bool hwui_skia_track_events = 2;
+
+  // If non-empty, hwui_skia_track_events applies to only the packages listed.
+  // Otherwise, hwui_skia_track_events applies globally to all HWUI apps.
+  repeated string hwui_package_name_filter = 3;
+}
+
+// End of protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto
+
+// Begin of protos/perfetto/config/android/android_system_property_config.proto
+
+// Data source that polls for system properties.
+message AndroidSystemPropertyConfig {
+  // Frequency of polling. If absent the state will be recorded once, at the
+  // start of the trace.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 poll_ms = 1;
+
+  // Properties to poll. All property names must start with "debug.tracing.".
+  repeated string property_name = 2;
+}
+
+// End of protos/perfetto/config/android/android_system_property_config.proto
+
+// Begin of protos/perfetto/config/android/network_trace_config.proto
+
+// Network tracing data source that records details on all packets sent or
+// received by the network.
+message NetworkPacketTraceConfig {
+  // Polling frequency in milliseconds. Network tracing writes to a fixed size
+  // ring buffer. The polling interval should be such that the ring buffer is
+  // unlikely to fill in that interval (or that filling is an acceptable risk).
+  // The minimum polling rate is 100ms (values below this are ignored).
+  // Introduced in Android 14 (U).
+  optional uint32 poll_ms = 1;
+
+  // The aggregation_threshold is the number of packets at which an event will
+  // switch from per-packet details to aggregate details. For example, a value
+  // of 50 means that if a particular event (grouped by the unique combinations
+  // of metadata fields: {interface, direction, uid, etc}) has fewer than 50
+  // packets, the exact timestamp and length are recorded for each packet. If
+  // there were 50 or more packets in an event, it would only record the total
+  // duration, packets, and length. A value of zero or unspecified will always
+  /// record per-packet details. A value of 1 always records aggregate details.
+  optional uint32 aggregation_threshold = 2;
+
+  // Specifies the maximum number of packet contexts to intern at a time. This
+  // prevents the interning table from growing too large and controls whether
+  // interning is enabled or disabled (a value of zero disables interning and
+  // is the default). When a data sources interning table reaches this amount,
+  // packet contexts will be inlined into NetworkPacketEvents.
+  optional uint32 intern_limit = 3;
+
+  // The following fields specify whether certain fields should be dropped from
+  // the output. Dropping fields improves normalization results, reduces the
+  // size of the interning table, and slightly reduces event size.
+  optional bool drop_local_port = 4;
+  optional bool drop_remote_port = 5;
+  optional bool drop_tcp_flags = 6;
+}
+
+// End of protos/perfetto/config/android/network_trace_config.proto
+
+// Begin of protos/perfetto/config/android/packages_list_config.proto
+
+// Data source that lists details (such as version code) about packages on an
+// Android device.
+message PackagesListConfig {
+  // If not empty, emit info about only the following list of package names
+  // (exact match, no regex). Otherwise, emit info about all packages.
+  repeated string package_name_filter = 1;
+}
+
+// End of protos/perfetto/config/android/packages_list_config.proto
+
+// Begin of protos/perfetto/common/protolog_common.proto
+
+enum ProtoLogLevel {
+  PROTOLOG_LEVEL_UNDEFINED = 0;
+  PROTOLOG_LEVEL_DEBUG = 1;
+  PROTOLOG_LEVEL_VERBOSE = 2;
+  PROTOLOG_LEVEL_INFO = 3;
+  PROTOLOG_LEVEL_WARN = 4;
+  PROTOLOG_LEVEL_ERROR = 5;
+  PROTOLOG_LEVEL_WTF = 6;
+}
+// End of protos/perfetto/common/protolog_common.proto
+
+// Begin of protos/perfetto/config/android/protolog_config.proto
+
+// Custom configuration for the "android.protolog" data source.
+// ProtoLog is a logging mechanism that is intented to be more efficient than
+// logcat. This configures what logs to capture in the tracing instance.
+message ProtoLogConfig {
+  enum TracingMode {
+    // When using the DEFAULT tracing mode, only log groups and levels specified
+    // in the group_overrides are traced.
+    DEFAULT = 0;
+    // When using the ENABLE_ALL tracing mode, all log groups and levels are
+    // traced, unless specified in the group_overrides.
+    ENABLE_ALL = 1;
+  }
+
+  // Specified the configurations for each of the logging groups. If none is
+  // specified for a group the defaults will be used.
+  repeated ProtoLogGroup group_overrides = 1;
+  // Specified what tracing mode to use for the tracing instance.
+  optional TracingMode tracing_mode = 2;
+}
+
+message ProtoLogGroup {
+  // The ProtoLog group name this configuration entry applies to.
+  optional string group_name = 1;
+  // Specify the level from which to start capturing protologs.
+  // e.g. if ProtoLogLevel.WARN is specified only warning, errors and fatal log
+  // message will be traced.
+  optional ProtoLogLevel log_from = 2;
+  // When set to true we will collect the stacktrace for each protolog message
+  // in this group that we are tracing.
+  optional bool collect_stacktrace = 3;
+}
+
+// End of protos/perfetto/config/android/protolog_config.proto
+
+// Begin of protos/perfetto/config/android/surfaceflinger_layers_config.proto
+
+// Custom configuration for the "android.surfaceflinger.layers" data source.
+message SurfaceFlingerLayersConfig {
+  enum Mode {
+    MODE_UNSPECIFIED = 0;
+
+    // Trace layers snapshots. A snapshot is taken every time a layers change
+    // occurs.
+    MODE_ACTIVE = 1;
+
+    // Generate layers snapshots from the transactions kept in the
+    // SurfaceFlinger's internal ring buffer.
+    // The layers snapshots generation occurs when this data source is flushed.
+    MODE_GENERATED = 2;
+
+    // Trace a single layers snapshot.
+    MODE_DUMP = 3;
+
+    // Default mode (applied by SurfaceFlinger if no mode is specified).
+    // Same as MODE_GENERATED, but triggers the layers snapshots generation only when a bugreport
+    // is taken.
+    MODE_GENERATED_BUGREPORT_ONLY = 4;
+  }
+  optional Mode mode = 1;
+
+  enum TraceFlag {
+    TRACE_FLAG_UNSPECIFIED = 0;
+    TRACE_FLAG_INPUT = 0x02;
+    TRACE_FLAG_COMPOSITION = 0x04;
+    TRACE_FLAG_EXTRA = 0x08;
+    TRACE_FLAG_HWC = 0x10;
+    TRACE_FLAG_BUFFERS = 0x20;
+    TRACE_FLAG_VIRTUAL_DISPLAYS = 0x40;
+
+    // INPUT | COMPOSITION | EXTRA
+    TRACE_FLAG_ALL = 0x0e;
+  }
+  repeated TraceFlag trace_flags = 2;
+}
+
+// End of protos/perfetto/config/android/surfaceflinger_layers_config.proto
+
+// Begin of protos/perfetto/config/android/surfaceflinger_transactions_config.proto
+
+// Custom configuration for the "android.surfaceflinger.transactions" data
+// source.
+message SurfaceFlingerTransactionsConfig {
+  enum Mode {
+    MODE_UNSPECIFIED = 0;
+
+    // Default mode (applied by SurfaceFlinger if no mode is specified).
+    // SurfaceFlinger writes its internal ring buffer of transactions every time
+    // the data source is flushed. The ring buffer contains the SurfaceFlinger's
+    // initial state and the latest transactions.
+    MODE_CONTINUOUS = 1;
+
+    // SurfaceFlinger writes the initial state and then each incoming
+    // transaction until the data source is stopped.
+    MODE_ACTIVE = 2;
+  }
+  optional Mode mode = 1;
+}
+
+// End of protos/perfetto/config/android/surfaceflinger_transactions_config.proto
+
+// Begin of protos/perfetto/config/chrome/chrome_config.proto
+
+message ChromeConfig {
+  optional string trace_config = 1;
+
+  // When enabled, the data source should only fill in fields in the output that
+  // are not potentially privacy sensitive.
+  optional bool privacy_filtering_enabled = 2;
+
+  // Instead of emitting binary protobuf, convert the trace data to the legacy
+  // JSON format. Note that the trace data will still be returned as a series of
+  // TracePackets, but the embedded data will be JSON instead of serialized
+  // protobuf.
+  optional bool convert_to_legacy_json = 3;
+
+  // Priority of the tracing session client. A higher priority session may
+  // preempt a lower priority one in configurations where concurrent sessions
+  // aren't supported.
+  enum ClientPriority {
+    UNKNOWN = 0;
+    BACKGROUND = 1;
+    USER_INITIATED = 2;
+  }
+  optional ClientPriority client_priority = 4;
+
+  // Applicable only when using legacy JSON format.
+  // If |json_agent_label_filter| is not empty, only data pertaining to
+  // the specified tracing agent label (e.g. "traceEvents") will be returned.
+  optional string json_agent_label_filter = 5;
+}
+
+// End of protos/perfetto/config/chrome/chrome_config.proto
+
+// Begin of protos/perfetto/config/chrome/v8_config.proto
+
+message V8Config {
+  // Whether to log the actual content of scripts (e.g. content of the JS file
+  // that was compiled to generate code).
+  // ATTENTION: This could considerably increase the size of the resuling trace
+  //            file.
+  optional bool log_script_sources = 1;
+  // Whether to log the generated code for jitted functions (machine code or
+  // bytecode).
+  // ATTENTION: This could considerably increase the size of the resuling trace
+  //            file.
+  optional bool log_instructions = 2;
+}
+
+// End of protos/perfetto/config/chrome/v8_config.proto
+
+// Begin of protos/perfetto/config/etw/etw_config.proto
+
+// Proto definition based on the struct _EVENT_TRACE_PROPERTIES definition
+// See: https://learn.microsoft.com/en-us/windows/win32/api/evntrace/
+// ns-evntrace-event_trace_properties
+message EtwConfig {
+  // The KernelFlag represent list of kernel flags that we are intrested in.
+  // To get a more extensive list run 'xperf -providers k'.
+  enum KernelFlag {
+    CSWITCH = 0;
+    DISPATCHER = 1;
+  }
+
+  // The kernel_flags determines the flags that will be used by the etw tracing
+  // session. These kernel flags have been built to expose the useful events
+  // captured from the kernel mode only.
+  repeated KernelFlag kernel_flags = 1;
+}
+// End of protos/perfetto/config/etw/etw_config.proto
+
+// Begin of protos/perfetto/config/ftrace/ftrace_config.proto
+
+// Next id: 28
+message FtraceConfig {
+  // Ftrace events to record, example: "sched/sched_switch".
+  repeated string ftrace_events = 1;
+  // Android-specific event categories:
+  repeated string atrace_categories = 2;
+  repeated string atrace_apps = 3;
+
+  // Size of each per-cpu kernel ftrace ring buffer.
+  // Not guaranteed if there are multiple concurrent tracing sessions, as the
+  // buffers cannot be resized without pausing recording in the kernel.
+  optional uint32 buffer_size_kb = 10;
+
+  // If set, specifies how often the tracing daemon reads from the kernel ring
+  // buffer. Not guaranteed if there are multiple concurrent tracing sessions.
+  // Leave unset unless you're fine-tuning a local config.
+  optional uint32 drain_period_ms = 11;
+
+  // If set, the tracing daemon will read kernel ring buffers as soon as
+  // they're filled past this percentage of occupancy. In other words, a value
+  // of 50 means that a read pass is triggered as soon as any per-cpu buffer is
+  // half-full. Not guaranteed if there are multiple concurrent tracing
+  // sessions.
+  // Currently does nothing on Linux kernels below v6.1.
+  // Introduced in: perfetto v43.
+  optional uint32 drain_buffer_percent = 26;
+
+  // Configuration for compact encoding of scheduler events. When enabled (and
+  // recording the relevant ftrace events), specific high-volume events are
+  // encoded in a denser format than normal.
+  message CompactSchedConfig {
+    // If true, and sched_switch or sched_waking ftrace events are enabled,
+    // record those events in the compact format.
+    //
+    // If the field is unset, the default is:
+    // * perfetto v42.0+: enabled
+    // * before: disabled
+    optional bool enabled = 1;
+  }
+  optional CompactSchedConfig compact_sched = 12;
+
+  // Optional filter for "ftrace/print" events.
+  //
+  // The filter consists of multiple rules. As soon as a rule matches (the rules
+  // are processed in order), its `allow` field will be used as the outcome: if
+  // `allow` is true, the event will be included in the trace, otherwise it will
+  // be discarded. If an event does not match any rule, it will be allowed by
+  // default (a rule with an empty prefix and allow=false, disallows everything
+  // by default).
+  message PrintFilter {
+    message Rule {
+      // Matches an atrace message of the form:
+      // <type>|pid|<prefix>...
+      message AtraceMessage {
+        optional string type = 1;
+        optional string prefix = 2;
+      }
+      oneof match {
+        // This rule matches if `prefix` matches exactly with the beginning of
+        // the "ftrace/print" "buf" field.
+        string prefix = 1;
+        // This rule matches if the "buf" field contains an atrace-style print
+        // message as specified in `atrace_msg`.
+        AtraceMessage atrace_msg = 3;
+      }
+      optional bool allow = 2;
+    }
+    repeated Rule rules = 1;
+  }
+  optional PrintFilter print_filter = 22;
+
+  // Enables symbol name resolution against /proc/kallsyms.
+  // It requires that either traced_probes is running as root or that
+  // kptr_restrict has been manually lowered.
+  // It does not disclose KASLR, symbol addresses are mangled.
+  optional bool symbolize_ksyms = 13;
+
+  // When symbolize_ksyms=true, determines whether the traced_probes daemon
+  // should keep the symbol map in memory (and reuse it for future tracing
+  // sessions) or clear it (saving memory) and re-create it on each tracing
+  // session (wasting cpu and wall time).
+  // The tradeoff is roughly:
+  //  KSYMS_RETAIN: pay a fixed ~1.2 MB cost after the first trace.
+  //  KSYMS_CLEANUP_ON_STOP: pay a ~300-500ms cost when starting each trace.
+  // Default behavior: KSYMS_CLEANUP_ON_STOP.
+  enum KsymsMemPolicy {
+    KSYMS_UNSPECIFIED = 0;
+    KSYMS_CLEANUP_ON_STOP = 1;
+    KSYMS_RETAIN = 2;
+  }
+  optional KsymsMemPolicy ksyms_mem_policy = 17;
+
+  // By default the kernel symbolizer is lazily initialized on a deferred task
+  // to reduce ftrace's time-to-start-recording. Unfortunately that makes
+  // ksyms integration tests hard. This flag forces the kernel symbolizer to be
+  // initialized synchronously on the data source start and hence avoiding
+  // timing races in tests.
+  // DEPRECATED in v28 / Android U. This is now the default behavior, setting it
+  // to true is a no-op.
+  optional bool initialize_ksyms_synchronously_for_testing = 14
+      [deprecated = true];
+
+  // When this boolean is true AND the ftrace_events contains "kmem/rss_stat",
+  // this option causes traced_probes to enable the "kmem/rss_stat_throttled"
+  // event instead if present, and fall back to "kmem/rss_stat" if not present.
+  // The historical context for this is the following:
+  // - Up to Android S (12), the rss_stat was internally throttled in its
+  //   kernel implementation.
+  // - A change introduced in the kernels after S has introduced a new
+  //   "rss_stat_throttled" making the original "rss_stat" event unthrottled
+  //   (hence very spammy).
+  // - Not all Android T/13 devices will receive a new kernel though, hence we
+  //   need to deal with both cases.
+  // For more context: go/rss-stat-throttled.
+  optional bool throttle_rss_stat = 15;
+
+  // If true, avoid enabling events that aren't statically known by
+  // traced_probes. Otherwise, the default is to emit such events as
+  // GenericFtraceEvent protos.
+  // Prefer to keep this flag at its default. This was added for Android
+  // tracing, where atrace categories and/or atrace HAL requested events can
+  // expand to events that aren't of interest to the tracing user.
+  // Introduced in: Android T.
+  optional bool disable_generic_events = 16;
+
+  // The subset of syscalls to record. To record all syscalls, leave this unset
+  // and add "ftrace_events: raw_syscalls/sys_{enter,exit}" to the config.
+  // * before perfetto v43, requires the config to also enable
+  //   raw_syscalls/sys_{enter,exit}.
+  // * perfetto v43+ does the right thing if you set only this field.
+  // Example: ["sys_read", "sys_open"].
+  // Introduced in: Android U.
+  repeated string syscall_events = 18;
+
+  // If true, enable the "function_graph" kernel tracer that emits events
+  // whenever a kernel function is entered and exited
+  // (funcgraph_entry/funcgraph_exit).
+  // Notes on use:
+  // * Requires |symbolize_ksyms| for function name resolution.
+  // * Use |function_filters| or |function_graph_roots| to constrain the traced
+  //   set of functions, otherwise the event bandwidth will be too high for
+  //   practical use.
+  // * The data source might be rejected if there is already a concurrent
+  //   ftrace data source that does not use function graph itself, as we do not
+  //   support switching kernel tracers mid-trace.
+  // * Requires a kernel compiled with CONFIG_FUNCTION_GRAPH_TRACER. This is
+  //   enabled if "cat /sys/kernel/tracing/available_tracers" includes
+  //   "function_graph".
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  optional bool enable_function_graph = 19;
+
+  // Constrains the set of functions traced when |enable_function_graph| is
+  // true. Supports globs, e.g. "sched*". You can specify multiple filters,
+  // in which case all matching functions will be traced. See kernel
+  // documentation on ftrace "set_ftrace_filter" file for more details.
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  repeated string function_filters = 20;
+
+  // If |enable_function_graph| is true, trace this set of functions *and* all
+  // of its callees. Supports globs. Can be set together with
+  // |function_filters|, in which case only callees matching the filter will be
+  // traced. If setting both, you most likely want all roots to also be
+  // included in |function_filters|.
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  repeated string function_graph_roots = 21;
+
+  // If true, does not clear ftrace buffers before the start of the program.
+  // This makes sense only if this is the first ftrace data source instance
+  // created after the daemon has been started. Can be useful for gathering boot
+  // traces, if ftrace has been separately configured (e.g. via kernel
+  // commandline).
+  optional bool preserve_ftrace_buffer = 23;
+
+  // If true, overrides the default timestamp clock and uses a raw hardware
+  // based monotonic clock for getting timestamps.
+  // * Introduced in: Android U.
+  optional bool use_monotonic_raw_clock = 24;
+
+  // If |instance_name| is not empty, then attempt to use that tracefs instance
+  // for event recording. Normally, this means
+  // `/sys/kernel/tracing/instances/$instance_name`.
+  //
+  // The name "hyp" is reserved.
+  //
+  // The instance must already exist, the tracing daemon *will not* create it
+  // for you as it typically doesn't have such permissions.
+  // Only a subset of features is guaranteed to work with non-default instances,
+  // at the time of writing:
+  //  * ftrace_events
+  //  * buffer_size_kb
+  optional string instance_name = 25;
+
+  // If true, |buffer_size_kb| is interpreted as a lower bound, allowing the
+  // implementation to choose a bigger buffer size.
+  //
+  // Most configs for perfetto v43+ should simply leave both fields unset.
+  //
+  // If you need a config compatible with a range of perfetto builds and you
+  // used to set a non-default buffer_size_kb, consider setting both fields.
+  // Example:
+  //   buffer_size_kb: 4096
+  //   buffer_size_lower_bound: true
+  // On older builds, the per-cpu buffers will be exactly 4 MB.
+  // On v43+, buffers will be at least 4 MB.
+  // In both cases, neither is guaranteed if there are other concurrent
+  // perfetto ftrace sessions, as the buffers cannot be resized without pausing
+  // the recording in the kernel.
+  // Introduced in: perfetto v43.
+  optional bool buffer_size_lower_bound = 27;
+}
+
+// End of protos/perfetto/config/ftrace/ftrace_config.proto
+
+// Begin of protos/perfetto/config/gpu/gpu_counter_config.proto
+
+message GpuCounterConfig {
+  // Desired sampling interval for counters.
+  optional uint64 counter_period_ns = 1;
+
+  // List of counters to be sampled. Counter IDs correspond to the ones
+  // described in GpuCounterSpec in the data source descriptor.
+  repeated uint32 counter_ids = 2;
+
+  // Sample counters by instrumenting command buffers.
+  optional bool instrumented_sampling = 3;
+
+  // Fix gpu clock rate during trace session.
+  optional bool fix_gpu_clock = 4;
+}
+
+// End of protos/perfetto/config/gpu/gpu_counter_config.proto
+
+// Begin of protos/perfetto/config/gpu/vulkan_memory_config.proto
+
+message VulkanMemoryConfig {
+  // Tracking driver memory usage events
+  optional bool track_driver_memory_usage = 1;
+
+  // Tracking device memory usage events
+  optional bool track_device_memory_usage = 2;
+}
+
+// End of protos/perfetto/config/gpu/vulkan_memory_config.proto
+
+// Begin of protos/perfetto/config/inode_file/inode_file_config.proto
+
+message InodeFileConfig {
+  message MountPointMappingEntry {
+    optional string mountpoint = 1;
+    repeated string scan_roots = 2;
+  }
+
+  // How long to pause between batches.
+  optional uint32 scan_interval_ms = 1;
+
+  // How long to wait before the first scan in order to accumulate inodes.
+  optional uint32 scan_delay_ms = 2;
+
+  // How many inodes to scan in one batch.
+  optional uint32 scan_batch_size = 3;
+
+  // Do not scan for inodes not found in the static map.
+  optional bool do_not_scan = 4;
+
+  // If non-empty, only scan inodes corresponding to block devices named in
+  // this list.
+  repeated string scan_mount_points = 5;
+
+  // When encountering an inode belonging to a block device corresponding
+  // to one of the mount points in this map, scan its scan_roots instead.
+  repeated MountPointMappingEntry mount_point_mapping = 6;
+}
+
+// End of protos/perfetto/config/inode_file/inode_file_config.proto
+
+// Begin of protos/perfetto/config/interceptors/console_config.proto
+
+message ConsoleConfig {
+  enum Output {
+    OUTPUT_UNSPECIFIED = 0;
+    OUTPUT_STDOUT = 1;
+    OUTPUT_STDERR = 2;
+  }
+  optional Output output = 1;
+  optional bool enable_colors = 2;
+}
+
+// End of protos/perfetto/config/interceptors/console_config.proto
+
+// Begin of protos/perfetto/config/interceptor_config.proto
+
+// Configuration for trace packet interception. Used for diverting trace data to
+// non-Perfetto sources (e.g., logging to the console, ETW) when using the
+// Perfetto SDK.
+message InterceptorConfig {
+  // Matches the name given to RegisterInterceptor().
+  optional string name = 1;
+
+  optional ConsoleConfig console_config = 100;
+}
+
+// End of protos/perfetto/config/interceptor_config.proto
+
+// Begin of protos/perfetto/config/power/android_power_config.proto
+
+message AndroidPowerConfig {
+  enum BatteryCounters {
+    BATTERY_COUNTER_UNSPECIFIED = 0;
+
+    // Coulomb counter.
+    BATTERY_COUNTER_CHARGE = 1;
+
+    // Charge (%).
+    BATTERY_COUNTER_CAPACITY_PERCENT = 2;
+
+    // Instantaneous current.
+    BATTERY_COUNTER_CURRENT = 3;
+
+    // Avg current.
+    BATTERY_COUNTER_CURRENT_AVG = 4;
+
+    // Instantaneous voltage.
+    BATTERY_COUNTER_VOLTAGE = 5;
+  }
+  optional uint32 battery_poll_ms = 1;
+  repeated BatteryCounters battery_counters = 2;
+
+  // Where available enables per-power-rail measurements.
+  optional bool collect_power_rails = 3;
+
+  // Provides a breakdown of energy estimation for various subsystem (e.g. GPU).
+  // Available from Android S.
+  optional bool collect_energy_estimation_breakdown = 4;
+
+  // Provides a breakdown of time in state for various subsystems.
+  // Available from Android U.
+  optional bool collect_entity_state_residency = 5;
+}
+
+// End of protos/perfetto/config/power/android_power_config.proto
+
+// Begin of protos/perfetto/config/process_stats/process_stats_config.proto
+
+message ProcessStatsConfig {
+  enum Quirks {
+    QUIRKS_UNSPECIFIED = 0;
+
+    // This has been deprecated and ignored as per 2018-05-01. Full scan at
+    // startup is now disabled by default and can be re-enabled using the
+    // |scan_all_processes_on_start| arg.
+    DISABLE_INITIAL_DUMP = 1 [deprecated = true];
+
+    DISABLE_ON_DEMAND = 2;
+  }
+  repeated Quirks quirks = 1;
+
+  // If enabled all processes will be scanned and dumped when the trace starts.
+  optional bool scan_all_processes_on_start = 2;
+
+  // If enabled thread names are also recoded (this is redundant if sched_switch
+  // is enabled).
+  optional bool record_thread_names = 3;
+
+  // If > 0 samples counters (see process_stats.proto) from
+  // /proc/pid/status and oom_score_adj every X ms.
+  // It will also sample /proc/pid/smaps_rollup if scan_smaps_rollup = true.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 proc_stats_poll_ms = 4;
+
+  // id 5 never used
+
+  // This is required to be either = 0 or a multiple of |proc_stats_poll_ms|
+  // (default: |proc_stats_poll_ms|). If = 0, will be set to
+  // |proc_stats_poll_ms|. Non-multiples will be rounded down to the nearest
+  // multiple.
+  optional uint32 proc_stats_cache_ttl_ms = 6;
+
+  // Niche feature: If true this will resolve file descriptors for each process
+  // so these can be mapped to their actual device or file.
+  // Requires raw_syscalls/sys_{enter,exit} ftrace events to be enabled or
+  // new fds opened after initially scanning a process will not be
+  // recognized.
+  optional bool resolve_process_fds = 9;
+
+  // If true, output will include memory stats from /proc/pid/smaps_rollup.
+  optional bool scan_smaps_rollup = 10;
+
+  // If true: process descriptions will include process age (starttime in
+  // /proc/pid/stat).
+  // Introduced in: perfetto v44.
+  optional bool record_process_age = 11;
+
+  // If true and |proc_stats_poll_ms| is true, process stats will include time
+  // spent running in user/kernel mode (utime/stime in /proc/pid/stat).
+  // Introduced in: perfetto v44.
+  optional bool record_process_runtime = 12;
+
+  // record_thread_time_in_state
+  reserved 7;
+  // thread_time_in_state_cache_size
+  reserved 8;
+}
+
+// End of protos/perfetto/config/process_stats/process_stats_config.proto
+
+// Begin of protos/perfetto/config/profiling/heapprofd_config.proto
+
+// Configuration for go/heapprofd.
+// Next id: 28
+message HeapprofdConfig {
+  message ContinuousDumpConfig {
+    // ms to wait before first dump.
+    optional uint32 dump_phase_ms = 5;
+    // ms to wait between following dumps.
+    optional uint32 dump_interval_ms = 6;
+  }
+
+  // Sampling rate for all heaps not specified via heap_sampling_intervals.
+  //
+  // These are:
+  // * All heaps if heap_sampling_intervals is empty.
+  // * Those profiled due to all_heaps and not named in heaps if
+  //   heap_sampling_intervals is not empty.
+  // * The implicit libc.malloc heap if heaps is empty.
+  //
+  // Set to 1 for perfect accuracy.
+  // Otherwise, sample every sample_interval_bytes on average.
+  //
+  // See
+  // https://perfetto.dev/docs/data-sources/native-heap-profiler#sampling-interval
+  // for more details.
+  //
+  // BUGS
+  // Before Android 12, setting this to 0 would crash the target process.
+  //
+  // N.B. This must be explicitly set to a non-zero value for all heaps (with
+  // this field or with heap_sampling_intervals), otherwise the producer will
+  // not start.
+  optional uint64 sampling_interval_bytes = 1;
+
+  // If less than the given numbers of bytes are left free in the shared
+  // memory buffer, increase sampling interval by a factor of two.
+  // Adaptive sampling is disabled when set to 0.
+  optional uint64 adaptive_sampling_shmem_threshold = 24;
+  // Stop doubling the sampling_interval once the sampling interval has reached
+  // this value.
+  optional uint64 adaptive_sampling_max_sampling_interval_bytes = 25;
+
+  // E.g. surfaceflinger, com.android.phone
+  // This input is normalized in the following way: if it contains slashes,
+  // everything up to the last slash is discarded. If it contains "@",
+  // everything after the first @ is discared.
+  // E.g. /system/bin/surfaceflinger@1.0 normalizes to surfaceflinger.
+  // This transformation is also applied to the processes' command lines when
+  // matching.
+  repeated string process_cmdline = 2;
+
+  // For watermark based triggering or local debugging.
+  repeated uint64 pid = 4;
+
+  // Only profile target if it was installed by one of the packages given.
+  // Special values are:
+  // * @system: installed on the system partition
+  // * @product: installed on the product partition
+  // * @null: sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 26;
+
+  // Which heaps to sample, e.g. "libc.malloc". If left empty, only samples
+  // "malloc".
+  //
+  // Introduced in Android 12.
+  repeated string heaps = 20;
+
+  // Which heaps not to sample, e.g. "libc.malloc". This is useful when used in
+  // combination with all_heaps;
+  //
+  // Introduced in Android 12.
+  repeated string exclude_heaps = 27;
+
+  optional bool stream_allocations = 23;
+
+  // If given, needs to be the same length as heaps and gives the sampling
+  // interval for the respective entry in heaps.
+  //
+  // Otherwise, sampling_interval_bytes is used.
+  //
+  // It is recommended to set sampling_interval_bytes to a reasonable default
+  // value when using this, as a value of 0 for sampling_interval_bytes will
+  // crash the target process before Android 12.
+  //
+  // Introduced in Android 12.
+  //
+  // All values must be non-zero or the producer will not start.
+  repeated uint64 heap_sampling_intervals = 22;
+
+  // Sample all heaps registered by target process. Introduced in Android 12.
+  optional bool all_heaps = 21;
+
+  // Profile all processes eligible for profiling on the system.
+  // See
+  // https://perfetto.dev/docs/data-sources/native-heap-profiler#heapprofd-targets
+  // for which processes are eligible.
+  //
+  // On unmodified userdebug builds, this will lead to system crashes. Zygote
+  // will crash when trying to launch a new process as it will have an
+  // unexpected open socket to heapprofd.
+  //
+  // heapprofd will likely be overloaded by the amount of data for low
+  // sampling intervals.
+  optional bool all = 5;
+
+  // Do not profile processes whose anon RSS + swap < given value.
+  // Introduced in Android 11.
+  optional uint32 min_anonymous_memory_kb = 15;
+
+  // Stop profile if heapprofd memory usage goes beyond the given value.
+  // Introduced in Android 11.
+  optional uint32 max_heapprofd_memory_kb = 16;
+
+  // Stop profile if heapprofd CPU time since start of this data-source
+  // goes beyond given value.
+  // Introduced in Android 11.
+  optional uint64 max_heapprofd_cpu_secs = 17;
+
+  // Do not emit function names for mappings starting with this prefix.
+  // E.g. /system to not emit symbols for any system libraries.
+  repeated string skip_symbol_prefix = 7;
+
+  // Dump at a predefined interval.
+  optional ContinuousDumpConfig continuous_dump_config = 6;
+
+  // Size of the shared memory buffer between the profiled processes and
+  // heapprofd. Defaults to 8 MiB. If larger than 500 MiB, truncated to 500
+  // MiB.
+  //
+  // Needs to be:
+  // * at least 8192,
+  // * a power of two,
+  // * a multiple of 4096.
+  optional uint64 shmem_size_bytes = 8;
+
+  // When the shmem buffer is full, block the client instead of ending the
+  // trace. Use with caution as this will significantly slow down the target
+  // process.
+  optional bool block_client = 9;
+
+  // If set, stop the trace session after blocking the client for this
+  // timeout. Needs to be larger than 100 us, otherwise no retries are done.
+  // Introduced in Android 11.
+  optional uint32 block_client_timeout_us = 14;
+
+  // Do not profile processes from startup, only match already running
+  // processes.
+  //
+  // Can not be set at the same time as no_running.
+  // Introduced in Android 11.
+  optional bool no_startup = 10;
+
+  // Do not profile running processes. Only match processes on startup.
+  //
+  // Can not be set at the same time as no_startup.
+  // Introduced in Android 11.
+  optional bool no_running = 11;
+
+  // deprecated idle_allocations.
+  reserved 12;
+
+  // Cause heapprofd to emit a single dump at the end, showing the memory usage
+  // at the point in time when the sampled heap usage of the process was at its
+  // maximum. This causes ProfilePacket.HeapSample.self_max to be set, and
+  // self_allocated and self_freed to not be set.
+  // Introduced in Android 11.
+  optional bool dump_at_max = 13;
+
+  // FEATURE FLAGS. THERE BE DRAGONS.
+
+  // Escape hatch if the session is being torn down because of a forked child
+  // that shares memory space, but is not correctly identified as a vforked
+  // child.
+  // Introduced in Android 11.
+  optional bool disable_fork_teardown = 18;
+
+  // We try to automatically detect when a target applicatation vforks but then
+  // does a memory allocation (or free). This auto-detection can be disabled
+  // with this.
+  // Introduced in Android 11.
+  optional bool disable_vfork_detection = 19;
+}
+
+// End of protos/perfetto/config/profiling/heapprofd_config.proto
+
+// Begin of protos/perfetto/config/profiling/java_hprof_config.proto
+
+// Configuration for managed app heap graph snapshots.
+message JavaHprofConfig {
+  // If dump_interval_ms != 0, the following configuration is used.
+  message ContinuousDumpConfig {
+    // ms to wait before first continuous dump.
+    // A dump is always created at the beginning of the trace.
+    optional uint32 dump_phase_ms = 1;
+    // ms to wait between following dumps.
+    optional uint32 dump_interval_ms = 2;
+    // If true, scans all the processes to find `process_cmdline` and filter by
+    // `min_anonymous_memory_kb` only at data source start. Default on Android
+    // S-.
+    //
+    // If false, rescans all the processes to find on every dump. Default on
+    // Android T+.
+    optional bool scan_pids_only_on_start = 3;
+  }
+
+  // Command line allowlist, matched against the /proc/<pid>/cmdline (not the
+  // comm string). The semantics of this field were changed since its original
+  // introduction.
+  //
+  // On Android T+ (13+), this field can specify a single wildcard (*), and
+  // the profiler will attempt to match it in two possible ways:
+  // * if the pattern starts with a '/', then it is matched against the first
+  //   segment of the cmdline (i.e. argv0). For example "/bin/e*" would match
+  //   "/bin/echo".
+  // * otherwise the pattern is matched against the part of argv0
+  //   corresponding to the binary name (this is unrelated to /proc/pid/exe).
+  //   For example "echo" would match "/bin/echo".
+  //
+  // On Android S (12) and below, both this pattern and /proc/pid/cmdline get
+  // normalized prior to an exact string comparison. Normalization is as
+  // follows: (1) trim everything beyond the first null or "@" byte; (2) if
+  // the string contains forward slashes, trim everything up to and including
+  // the last one.
+  //
+  // Implementation note: in either case, at most 511 characters of cmdline
+  // are considered.
+  repeated string process_cmdline = 1;
+
+  // For watermark based triggering or local debugging.
+  repeated uint64 pid = 2;
+
+  // Only profile target if it was installed by one of the packages given.
+  // Special values are:
+  // * @system: installed on the system partition
+  // * @product: installed on the product partition
+  // * @null: sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 7;
+
+  // Dump at a predefined interval.
+  optional ContinuousDumpConfig continuous_dump_config = 3;
+
+  // Do not profile processes whose anon RSS + swap < given value.
+  optional uint32 min_anonymous_memory_kb = 4;
+
+  // Include the process' /proc/self/smaps.
+  // This only shows maps that:
+  // * start with /system
+  // * start with /vendor
+  // * start with /data/app
+  // * contain "extracted in memory from Y", where Y matches any of the above
+  optional bool dump_smaps = 5;
+
+  // Exclude objects of the following types from the profile. This can be
+  // useful if lots of uninteresting objects, e.g. "sun.misc.Cleaner".
+  repeated string ignored_types = 6;
+}
+
+// End of protos/perfetto/config/profiling/java_hprof_config.proto
+
+// Begin of protos/perfetto/common/perf_events.proto
+
+// Next id: 12
+message PerfEvents {
+  // What event to sample on, and how often. Commented from the perspective of
+  // its use in |PerfEventConfig|.
+  message Timebase {
+    // How often the per-cpu sampling will occur. Not guaranteed to be honored
+    // as the kernel can throttle the sampling rate if it's too high.
+    // If unset, an implementation-defined default is used.
+    oneof interval {
+      // Per-cpu sampling frequency in Hz, as requested from the kernel. Not the
+      // same as 1/period.
+      // Details: the actual sampling will still be based on a period, but the
+      // kernel will dynamically adjust it based on the observed event rate, to
+      // approximate this frequency. Works best with steady-rate events like
+      // timers.
+      uint64 frequency = 2;
+
+      // Per-cpu sampling will occur every |period| counts of |event|.
+      // Prefer |frequency| by default, as it's easier to oversample with a
+      // fixed period.
+      uint64 period = 1;
+    }
+
+    // Counting event to use as a timebase for the sampling.
+    // If unset, implies the CPU timer (SW_CPU_CLOCK) as the event,
+    // which is what you usually want.
+    // See common/perf_events.proto for the definitions.
+    oneof event {
+      Counter counter = 4;
+      Tracepoint tracepoint = 3;
+      RawEvent raw_event = 5;
+    }
+
+    // If set, samples will be timestamped with the given clock.
+    // If unset, the clock is chosen by the implementation.
+    // For software events, prefer PERF_CLOCK_BOOTTIME. However it cannot be
+    // used for hardware events (due to interrupt safety), for which the
+    // recommendation is to use one of the monotonic clocks.
+    optional PerfClock timestamp_clock = 11;
+
+    // Optional arbitrary name for the event, to identify it in the parsed
+    // trace. Does *not* affect the profiling itself. If unset, the trace
+    // parser will choose a suitable name.
+    optional string name = 10;
+  }
+
+  // Builtin counter names from the uapi header. Commented with their perf tool
+  // aliases.
+  // TODO(rsavitski): consider generating enums for cache events (should be
+  // finite), and generally make this list as extensive as possible. Excluding
+  // things like dynamic PMUs since those don't fit into a static enum.
+  // Next id: 21
+  enum Counter {
+    UNKNOWN_COUNTER = 0;
+
+    // cpu-clock
+    SW_CPU_CLOCK = 1;
+    // page-faults, faults
+    SW_PAGE_FAULTS = 2;
+    // task-clock
+    SW_TASK_CLOCK = 3;
+    // context-switches, cs
+    SW_CONTEXT_SWITCHES = 4;
+    // cpu-migrations, migrations
+    SW_CPU_MIGRATIONS = 5;
+    // minor-faults
+    SW_PAGE_FAULTS_MIN = 6;
+    // major-faults
+    SW_PAGE_FAULTS_MAJ = 7;
+    // alignment-faults
+    SW_ALIGNMENT_FAULTS = 8;
+    // emulation-faults
+    SW_EMULATION_FAULTS = 9;
+    // dummy
+    SW_DUMMY = 20;
+
+    // cpu-cycles, cycles
+    HW_CPU_CYCLES = 10;
+    // instructions
+    HW_INSTRUCTIONS = 11;
+    // cache-references
+    HW_CACHE_REFERENCES = 12;
+    // cache-misses
+    HW_CACHE_MISSES = 13;
+    // branch-instructions, branches
+    HW_BRANCH_INSTRUCTIONS = 14;
+    // branch-misses
+    HW_BRANCH_MISSES = 15;
+    // bus-cycles
+    HW_BUS_CYCLES = 16;
+    // stalled-cycles-frontend, idle-cycles-frontend
+    HW_STALLED_CYCLES_FRONTEND = 17;
+    // stalled-cycles-backend, idle-cycles-backend
+    HW_STALLED_CYCLES_BACKEND = 18;
+    // ref-cycles
+    HW_REF_CPU_CYCLES = 19;
+  }
+
+  message Tracepoint {
+    // Group and name for the tracepoint, acceptable forms:
+    // * "sched/sched_switch"
+    // * "sched:sched_switch"
+    optional string name = 1;
+
+    // Optional field-level filter for the tracepoint. Only events matching this
+    // filter will be counted (and therefore contribute to the sampling period).
+    // Example: "prev_pid >= 42 && next_pid == 0".
+    // For full syntax, see kernel documentation on "Event filtering":
+    // https://www.kernel.org/doc/Documentation/trace/events.txt
+    optional string filter = 2;
+  }
+
+  // Syscall-level description of the event, propagated to the perf_event_attr
+  // struct. Primarily for local use-cases, since the event availability and
+  // encoding is hardware-specific.
+  message RawEvent {
+    optional uint32 type = 1;
+    optional uint64 config = 2;
+    optional uint64 config1 = 3;
+    optional uint64 config2 = 4;
+  }
+
+  // Subset of clocks that is supported by perf timestamping.
+  // CLOCK_TAI is excluded since it's not expected to be used in practice, but
+  // would require additions to the trace clock synchronisation logic.
+  enum PerfClock {
+    UNKNOWN_PERF_CLOCK = 0;
+    PERF_CLOCK_REALTIME = 1;
+    PERF_CLOCK_MONOTONIC = 2;
+    PERF_CLOCK_MONOTONIC_RAW = 3;
+    PERF_CLOCK_BOOTTIME = 4;
+  }
+}
+
+// End of protos/perfetto/common/perf_events.proto
+
+// Begin of protos/perfetto/config/profiling/perf_event_config.proto
+
+// Configuration for the traced_perf profiler.
+//
+// Example config for basic cpu profiling:
+//   perf_event_config {
+//     timebase {
+//       frequency: 80
+//     }
+//     callstack_sampling {
+//       scope {
+//         target_cmdline: "surfaceflinger"
+//         target_cmdline: "system_server"
+//       }
+//       kernel_frames: true
+//     }
+//   }
+//
+// Next id: 19
+message PerfEventConfig {
+  // What event to sample on, and how often.
+  // Defined in common/perf_events.proto.
+  optional PerfEvents.Timebase timebase = 15;
+
+  // If set, the profiler will sample userspace processes' callstacks at the
+  // interval specified by the |timebase|.
+  // If unset, the profiler will record only the event counts.
+  optional CallstackSampling callstack_sampling = 16;
+
+  //
+  // Kernel <-> userspace ring buffer options:
+  //
+
+  // How often the per-cpu ring buffers are read by the producer.
+  // If unset, an implementation-defined default is used.
+  optional uint32 ring_buffer_read_period_ms = 8;
+
+  // Size (in 4k pages) of each per-cpu ring buffer that is filled by the
+  // kernel. If set, must be a power of two.
+  // If unset, an implementation-defined default is used.
+  optional uint32 ring_buffer_pages = 3;
+
+  //
+  // Daemon's resource usage limits:
+  //
+
+  // Drop samples if the heap memory held by the samples in the unwinder queue
+  // is above the given limit. This counts the memory across all concurrent data
+  // sources (not just this one's), and there is no fairness guarantee - the
+  // whole quota might be used up by a concurrent source.
+  optional uint64 max_enqueued_footprint_kb = 17;
+
+  // Stop the data source if traced_perf's combined {RssAnon + Swap} memory
+  // footprint exceeds this value.
+  optional uint32 max_daemon_memory_kb = 13;
+
+  //
+  // Uncommon options:
+  //
+
+  // Timeout for the remote /proc/<pid>/{maps,mem} file descriptors for a
+  // sampled process. This is primarily for Android, where this lookup is
+  // asynchronous. As long as the producer is waiting, the associated samples
+  // will be kept enqueued (putting pressure on the capacity of the shared
+  // unwinding queue). Once a lookup for a process expires, all associated
+  // samples are discarded. However, if the lookup still succeeds after the
+  // timeout, future samples will be handled normally.
+  // If unset, an implementation-defined default is used.
+  optional uint32 remote_descriptor_timeout_ms = 9;
+
+  // Optional period for clearing state cached by the unwinder. This is a heavy
+  // operation that is only necessary for traces that target a wide set of
+  // processes, and require the memory footprint to be reset periodically.
+  // If unset, the cached state will not be cleared.
+  optional uint32 unwind_state_clear_period_ms = 10;
+
+  // If set, only profile target if it was installed by a package with one of
+  // these names. Special values:
+  // * "@system": installed on the system partition
+  // * "@product": installed on the product partition
+  // * "@null": sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 18;
+
+  //
+  // Deprecated (superseded by options above):
+  //
+  // Do not set *any* of these fields in new configs.
+  //
+
+  // Note: legacy configs had to set |all_cpus| to true to pass parsing.
+  // We rely on this to detect such configs.
+  optional bool all_cpus = 1;
+  optional uint32 sampling_frequency = 2;
+  optional bool kernel_frames = 12;
+  repeated int32 target_pid = 4;
+  repeated string target_cmdline = 5;
+  repeated int32 exclude_pid = 6;
+  repeated string exclude_cmdline = 7;
+  optional uint32 additional_cmdline_count = 11;
+  // previously |tracepoint|
+  reserved 14;
+
+  //
+  // Sub-messages (nested for generated code namespacing).
+  //
+
+  message CallstackSampling {
+    // Defines a set of processes for which samples are retained/skipped. If
+    // unset, all samples are kept, but beware that it will be very heavy on the
+    // stack unwinder, which might start dropping samples due to overload.
+    optional Scope scope = 1;
+
+    // If true, callstacks will include the kernel-space frames. Such frames can
+    // be identified by a magical "kernel" string as their mapping name.
+    // Requires traced_perf to be running as root, or kptr_restrict to have been
+    // manually unrestricted. On Android, the platform should do the right thing
+    // on debug builds.
+    // This does *not* disclose KASLR, as only the function names are emitted.
+    optional bool kernel_frames = 2;
+
+    // Whether to record and unwind userspace callstacks. If unset, defaults to
+    // including userspace (UNWIND_DWARF) both for backwards compatibility and
+    // as the most common default (this defaulting is only applicable if the
+    // outer CallstackSampling message is explicitly set).
+    optional UnwindMode user_frames = 3;
+  }
+
+  message Scope {
+    // Process ID (TGID) allowlist. If this list is not empty, only matching
+    // samples will be retained. If multiple allow/deny-lists are
+    // specified by the config, then all of them are evaluated for each sampled
+    // process.
+    repeated int32 target_pid = 1;
+
+    // Command line allowlist, matched against the /proc/<pid>/cmdline (not the
+    // comm string). The semantics of this field were changed since its original
+    // introduction.
+    //
+    // On Android T+ (13+), this field can specify a single wildcard (*), and
+    // the profiler will attempt to match it in two possible ways:
+    // * if the pattern starts with a '/', then it is matched against the first
+    //   segment of the cmdline (i.e. argv0). For example "/bin/e*" would match
+    //   "/bin/echo".
+    // * otherwise the pattern is matched against the part of argv0
+    //   corresponding to the binary name (this is unrelated to /proc/pid/exe).
+    //   For example "echo" would match "/bin/echo".
+    //
+    // On Android S (12) and below, both this pattern and /proc/pid/cmdline get
+    // normalized prior to an exact string comparison. Normalization is as
+    // follows: (1) trim everything beyond the first null or "@" byte; (2) if
+    // the string contains forward slashes, trim everything up to and including
+    // the last one.
+    //
+    // Implementation note: in either case, at most 511 characters of cmdline
+    // are considered.
+    repeated string target_cmdline = 2;
+
+    // List of excluded pids.
+    repeated int32 exclude_pid = 3;
+
+    // List of excluded cmdlines. See description of |target_cmdline| for how
+    // this is handled.
+    repeated string exclude_cmdline = 4;
+
+    // Niche features for systemwide callstacks:
+
+    // Number of additional command lines to sample. Only those which are
+    // neither explicitly included nor excluded will be considered. Processes
+    // are accepted on a first come, first served basis.
+    optional uint32 additional_cmdline_count = 5;
+
+    // If set to N, all encountered processes will be put into one of the N
+    // possible bins, and only one randomly-chosen bin will be selected for
+    // unwinding. The binning is simply "pid % N", under the assumption that
+    // low-order bits of pids are roughly uniformly distributed. Other explicit
+    // inclusions/exclusions in this |Scope| message are still respected.
+    //
+    // The profiler will report the chosen shard in PerfSampleDefaults, and the
+    // values will be queryable in trace processor under the "stats" table as
+    // "perf_process_shard_count" and "perf_chosen_process_shard".
+    //
+    // NB: all data sources in a config that set |process_shard_count| must set
+    // it to the same value. The profiler will choose one bin for all those data
+    // sources.
+    optional uint32 process_shard_count = 6;
+  }
+
+  // Userspace unwinding mode. A possible future addition is kernel-unwound
+  // callchains for frame pointer based systems.
+  enum UnwindMode {
+    UNWIND_UNKNOWN = 0;
+    // Do not unwind userspace:
+    UNWIND_SKIP = 1;
+    // Use libunwindstack (default):
+    UNWIND_DWARF = 2;
+  }
+}
+
+// End of protos/perfetto/config/profiling/perf_event_config.proto
+
+// Begin of protos/perfetto/config/statsd/atom_ids.proto
+
+// This enum is obtained by post-processing
+// AOSP/frameworks/proto_logging/stats/atoms.proto through
+// AOSP/external/perfetto/tools/update-statsd-descriptor, which extracts one
+// enum value for each proto field defined in the upstream atoms.proto.
+enum AtomId {
+  ATOM_UNSPECIFIED = 0;
+  ATOM_BLE_SCAN_STATE_CHANGED = 2;
+  ATOM_PROCESS_STATE_CHANGED = 3;
+  ATOM_BLE_SCAN_RESULT_RECEIVED = 4;
+  ATOM_SENSOR_STATE_CHANGED = 5;
+  ATOM_GPS_SCAN_STATE_CHANGED = 6;
+  ATOM_SYNC_STATE_CHANGED = 7;
+  ATOM_SCHEDULED_JOB_STATE_CHANGED = 8;
+  ATOM_SCREEN_BRIGHTNESS_CHANGED = 9;
+  ATOM_WAKELOCK_STATE_CHANGED = 10;
+  ATOM_LONG_PARTIAL_WAKELOCK_STATE_CHANGED = 11;
+  ATOM_MOBILE_RADIO_POWER_STATE_CHANGED = 12;
+  ATOM_WIFI_RADIO_POWER_STATE_CHANGED = 13;
+  ATOM_ACTIVITY_MANAGER_SLEEP_STATE_CHANGED = 14;
+  ATOM_MEMORY_FACTOR_STATE_CHANGED = 15;
+  ATOM_EXCESSIVE_CPU_USAGE_REPORTED = 16;
+  ATOM_CACHED_KILL_REPORTED = 17;
+  ATOM_PROCESS_MEMORY_STAT_REPORTED = 18;
+  ATOM_LAUNCHER_EVENT = 19;
+  ATOM_BATTERY_SAVER_MODE_STATE_CHANGED = 20;
+  ATOM_DEVICE_IDLE_MODE_STATE_CHANGED = 21;
+  ATOM_DEVICE_IDLING_MODE_STATE_CHANGED = 22;
+  ATOM_AUDIO_STATE_CHANGED = 23;
+  ATOM_MEDIA_CODEC_STATE_CHANGED = 24;
+  ATOM_CAMERA_STATE_CHANGED = 25;
+  ATOM_FLASHLIGHT_STATE_CHANGED = 26;
+  ATOM_UID_PROCESS_STATE_CHANGED = 27;
+  ATOM_PROCESS_LIFE_CYCLE_STATE_CHANGED = 28;
+  ATOM_SCREEN_STATE_CHANGED = 29;
+  ATOM_BATTERY_LEVEL_CHANGED = 30;
+  ATOM_CHARGING_STATE_CHANGED = 31;
+  ATOM_PLUGGED_STATE_CHANGED = 32;
+  ATOM_INTERACTIVE_STATE_CHANGED = 33;
+  ATOM_TOUCH_EVENT_REPORTED = 34;
+  ATOM_WAKEUP_ALARM_OCCURRED = 35;
+  ATOM_KERNEL_WAKEUP_REPORTED = 36;
+  ATOM_WIFI_LOCK_STATE_CHANGED = 37;
+  ATOM_WIFI_SIGNAL_STRENGTH_CHANGED = 38;
+  ATOM_WIFI_SCAN_STATE_CHANGED = 39;
+  ATOM_PHONE_SIGNAL_STRENGTH_CHANGED = 40;
+  ATOM_SETTING_CHANGED = 41;
+  ATOM_ACTIVITY_FOREGROUND_STATE_CHANGED = 42;
+  ATOM_ISOLATED_UID_CHANGED = 43;
+  ATOM_PACKET_WAKEUP_OCCURRED = 44;
+  ATOM_WALL_CLOCK_TIME_SHIFTED = 45;
+  ATOM_ANOMALY_DETECTED = 46;
+  ATOM_APP_BREADCRUMB_REPORTED = 47;
+  ATOM_APP_START_OCCURRED = 48;
+  ATOM_APP_START_CANCELED = 49;
+  ATOM_APP_START_FULLY_DRAWN = 50;
+  ATOM_LMK_KILL_OCCURRED = 51;
+  ATOM_PICTURE_IN_PICTURE_STATE_CHANGED = 52;
+  ATOM_WIFI_MULTICAST_LOCK_STATE_CHANGED = 53;
+  ATOM_LMK_STATE_CHANGED = 54;
+  ATOM_APP_START_MEMORY_STATE_CAPTURED = 55;
+  ATOM_SHUTDOWN_SEQUENCE_REPORTED = 56;
+  ATOM_BOOT_SEQUENCE_REPORTED = 57;
+  ATOM_DAVEY_OCCURRED = 58;
+  ATOM_OVERLAY_STATE_CHANGED = 59;
+  ATOM_FOREGROUND_SERVICE_STATE_CHANGED = 60;
+  ATOM_CALL_STATE_CHANGED = 61;
+  ATOM_KEYGUARD_STATE_CHANGED = 62;
+  ATOM_KEYGUARD_BOUNCER_STATE_CHANGED = 63;
+  ATOM_KEYGUARD_BOUNCER_PASSWORD_ENTERED = 64;
+  ATOM_APP_DIED = 65;
+  ATOM_RESOURCE_CONFIGURATION_CHANGED = 66;
+  ATOM_BLUETOOTH_ENABLED_STATE_CHANGED = 67;
+  ATOM_BLUETOOTH_CONNECTION_STATE_CHANGED = 68;
+  ATOM_GPS_SIGNAL_QUALITY_CHANGED = 69;
+  ATOM_USB_CONNECTOR_STATE_CHANGED = 70;
+  ATOM_SPEAKER_IMPEDANCE_REPORTED = 71;
+  ATOM_HARDWARE_FAILED = 72;
+  ATOM_PHYSICAL_DROP_DETECTED = 73;
+  ATOM_CHARGE_CYCLES_REPORTED = 74;
+  ATOM_MOBILE_CONNECTION_STATE_CHANGED = 75;
+  ATOM_MOBILE_RADIO_TECHNOLOGY_CHANGED = 76;
+  ATOM_USB_DEVICE_ATTACHED = 77;
+  ATOM_APP_CRASH_OCCURRED = 78;
+  ATOM_ANR_OCCURRED = 79;
+  ATOM_WTF_OCCURRED = 80;
+  ATOM_LOW_MEM_REPORTED = 81;
+  ATOM_GENERIC_ATOM = 82;
+  ATOM_VIBRATOR_STATE_CHANGED = 84;
+  ATOM_DEFERRED_JOB_STATS_REPORTED = 85;
+  ATOM_THERMAL_THROTTLING = 86;
+  ATOM_BIOMETRIC_ACQUIRED = 87;
+  ATOM_BIOMETRIC_AUTHENTICATED = 88;
+  ATOM_BIOMETRIC_ERROR_OCCURRED = 89;
+  ATOM_UI_EVENT_REPORTED = 90;
+  ATOM_BATTERY_HEALTH_SNAPSHOT = 91;
+  ATOM_SLOW_IO = 92;
+  ATOM_BATTERY_CAUSED_SHUTDOWN = 93;
+  ATOM_PHONE_SERVICE_STATE_CHANGED = 94;
+  ATOM_PHONE_STATE_CHANGED = 95;
+  ATOM_USER_RESTRICTION_CHANGED = 96;
+  ATOM_SETTINGS_UI_CHANGED = 97;
+  ATOM_CONNECTIVITY_STATE_CHANGED = 98;
+  ATOM_SERVICE_STATE_CHANGED = 99;
+  ATOM_SERVICE_LAUNCH_REPORTED = 100;
+  ATOM_FLAG_FLIP_UPDATE_OCCURRED = 101;
+  ATOM_BINARY_PUSH_STATE_CHANGED = 102;
+  ATOM_DEVICE_POLICY_EVENT = 103;
+  ATOM_DOCS_UI_FILE_OP_CANCELED = 104;
+  ATOM_DOCS_UI_FILE_OP_COPY_MOVE_MODE_REPORTED = 105;
+  ATOM_DOCS_UI_FILE_OP_FAILURE = 106;
+  ATOM_DOCS_UI_PROVIDER_FILE_OP = 107;
+  ATOM_DOCS_UI_INVALID_SCOPED_ACCESS_REQUEST = 108;
+  ATOM_DOCS_UI_LAUNCH_REPORTED = 109;
+  ATOM_DOCS_UI_ROOT_VISITED = 110;
+  ATOM_DOCS_UI_STARTUP_MS = 111;
+  ATOM_DOCS_UI_USER_ACTION_REPORTED = 112;
+  ATOM_WIFI_ENABLED_STATE_CHANGED = 113;
+  ATOM_WIFI_RUNNING_STATE_CHANGED = 114;
+  ATOM_APP_COMPACTED = 115;
+  ATOM_NETWORK_DNS_EVENT_REPORTED = 116;
+  ATOM_DOCS_UI_PICKER_LAUNCHED_FROM_REPORTED = 117;
+  ATOM_DOCS_UI_PICK_RESULT_REPORTED = 118;
+  ATOM_DOCS_UI_SEARCH_MODE_REPORTED = 119;
+  ATOM_DOCS_UI_SEARCH_TYPE_REPORTED = 120;
+  ATOM_DATA_STALL_EVENT = 121;
+  ATOM_RESCUE_PARTY_RESET_REPORTED = 122;
+  ATOM_SIGNED_CONFIG_REPORTED = 123;
+  ATOM_GNSS_NI_EVENT_REPORTED = 124;
+  ATOM_BLUETOOTH_LINK_LAYER_CONNECTION_EVENT = 125;
+  ATOM_BLUETOOTH_ACL_CONNECTION_STATE_CHANGED = 126;
+  ATOM_BLUETOOTH_SCO_CONNECTION_STATE_CHANGED = 127;
+  ATOM_APP_DOWNGRADED = 128;
+  ATOM_APP_OPTIMIZED_AFTER_DOWNGRADED = 129;
+  ATOM_LOW_STORAGE_STATE_CHANGED = 130;
+  ATOM_GNSS_NFW_NOTIFICATION_REPORTED = 131;
+  ATOM_GNSS_CONFIGURATION_REPORTED = 132;
+  ATOM_USB_PORT_OVERHEAT_EVENT_REPORTED = 133;
+  ATOM_NFC_ERROR_OCCURRED = 134;
+  ATOM_NFC_STATE_CHANGED = 135;
+  ATOM_NFC_BEAM_OCCURRED = 136;
+  ATOM_NFC_CARDEMULATION_OCCURRED = 137;
+  ATOM_NFC_TAG_OCCURRED = 138;
+  ATOM_NFC_HCE_TRANSACTION_OCCURRED = 139;
+  ATOM_SE_STATE_CHANGED = 140;
+  ATOM_SE_OMAPI_REPORTED = 141;
+  ATOM_BROADCAST_DISPATCH_LATENCY_REPORTED = 142;
+  ATOM_ATTENTION_MANAGER_SERVICE_RESULT_REPORTED = 143;
+  ATOM_ADB_CONNECTION_CHANGED = 144;
+  ATOM_SPEECH_DSP_STAT_REPORTED = 145;
+  ATOM_USB_CONTAMINANT_REPORTED = 146;
+  ATOM_WATCHDOG_ROLLBACK_OCCURRED = 147;
+  ATOM_BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED = 148;
+  ATOM_BUBBLE_UI_CHANGED = 149;
+  ATOM_SCHEDULED_JOB_CONSTRAINT_CHANGED = 150;
+  ATOM_BLUETOOTH_ACTIVE_DEVICE_CHANGED = 151;
+  ATOM_BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED = 152;
+  ATOM_BLUETOOTH_A2DP_CODEC_CONFIG_CHANGED = 153;
+  ATOM_BLUETOOTH_A2DP_CODEC_CAPABILITY_CHANGED = 154;
+  ATOM_BLUETOOTH_A2DP_AUDIO_UNDERRUN_REPORTED = 155;
+  ATOM_BLUETOOTH_A2DP_AUDIO_OVERRUN_REPORTED = 156;
+  ATOM_BLUETOOTH_DEVICE_RSSI_REPORTED = 157;
+  ATOM_BLUETOOTH_DEVICE_FAILED_CONTACT_COUNTER_REPORTED = 158;
+  ATOM_BLUETOOTH_DEVICE_TX_POWER_LEVEL_REPORTED = 159;
+  ATOM_BLUETOOTH_HCI_TIMEOUT_REPORTED = 160;
+  ATOM_BLUETOOTH_QUALITY_REPORT_REPORTED = 161;
+  ATOM_BLUETOOTH_DEVICE_INFO_REPORTED = 162;
+  ATOM_BLUETOOTH_REMOTE_VERSION_INFO_REPORTED = 163;
+  ATOM_BLUETOOTH_SDP_ATTRIBUTE_REPORTED = 164;
+  ATOM_BLUETOOTH_BOND_STATE_CHANGED = 165;
+  ATOM_BLUETOOTH_CLASSIC_PAIRING_EVENT_REPORTED = 166;
+  ATOM_BLUETOOTH_SMP_PAIRING_EVENT_REPORTED = 167;
+  ATOM_SCREEN_TIMEOUT_EXTENSION_REPORTED = 168;
+  ATOM_PROCESS_START_TIME = 169;
+  ATOM_PERMISSION_GRANT_REQUEST_RESULT_REPORTED = 170;
+  ATOM_BLUETOOTH_SOCKET_CONNECTION_STATE_CHANGED = 171;
+  ATOM_DEVICE_IDENTIFIER_ACCESS_DENIED = 172;
+  ATOM_BUBBLE_DEVELOPER_ERROR_REPORTED = 173;
+  ATOM_ASSIST_GESTURE_STAGE_REPORTED = 174;
+  ATOM_ASSIST_GESTURE_FEEDBACK_REPORTED = 175;
+  ATOM_ASSIST_GESTURE_PROGRESS_REPORTED = 176;
+  ATOM_TOUCH_GESTURE_CLASSIFIED = 177;
+  ATOM_HIDDEN_API_USED = 178;
+  ATOM_STYLE_UI_CHANGED = 179;
+  ATOM_PRIVACY_INDICATORS_INTERACTED = 180;
+  ATOM_APP_INSTALL_ON_EXTERNAL_STORAGE_REPORTED = 181;
+  ATOM_NETWORK_STACK_REPORTED = 182;
+  ATOM_APP_MOVED_STORAGE_REPORTED = 183;
+  ATOM_BIOMETRIC_ENROLLED = 184;
+  ATOM_SYSTEM_SERVER_WATCHDOG_OCCURRED = 185;
+  ATOM_TOMB_STONE_OCCURRED = 186;
+  ATOM_BLUETOOTH_CLASS_OF_DEVICE_REPORTED = 187;
+  ATOM_INTELLIGENCE_EVENT_REPORTED = 188;
+  ATOM_THERMAL_THROTTLING_SEVERITY_STATE_CHANGED = 189;
+  ATOM_ROLE_REQUEST_RESULT_REPORTED = 190;
+  ATOM_MEDIAMETRICS_AUDIOPOLICY_REPORTED = 191;
+  ATOM_MEDIAMETRICS_AUDIORECORD_REPORTED = 192;
+  ATOM_MEDIAMETRICS_AUDIOTHREAD_REPORTED = 193;
+  ATOM_MEDIAMETRICS_AUDIOTRACK_REPORTED = 194;
+  ATOM_MEDIAMETRICS_CODEC_REPORTED = 195;
+  ATOM_MEDIAMETRICS_DRM_WIDEVINE_REPORTED = 196;
+  ATOM_MEDIAMETRICS_EXTRACTOR_REPORTED = 197;
+  ATOM_MEDIAMETRICS_MEDIADRM_REPORTED = 198;
+  ATOM_MEDIAMETRICS_NUPLAYER_REPORTED = 199;
+  ATOM_MEDIAMETRICS_RECORDER_REPORTED = 200;
+  ATOM_MEDIAMETRICS_DRMMANAGER_REPORTED = 201;
+  ATOM_CAR_POWER_STATE_CHANGED = 203;
+  ATOM_GARAGE_MODE_INFO = 204;
+  ATOM_TEST_ATOM_REPORTED = 205;
+  ATOM_CONTENT_CAPTURE_CALLER_MISMATCH_REPORTED = 206;
+  ATOM_CONTENT_CAPTURE_SERVICE_EVENTS = 207;
+  ATOM_CONTENT_CAPTURE_SESSION_EVENTS = 208;
+  ATOM_CONTENT_CAPTURE_FLUSHED = 209;
+  ATOM_LOCATION_MANAGER_API_USAGE_REPORTED = 210;
+  ATOM_REVIEW_PERMISSIONS_FRAGMENT_RESULT_REPORTED = 211;
+  ATOM_RUNTIME_PERMISSIONS_UPGRADE_RESULT = 212;
+  ATOM_GRANT_PERMISSIONS_ACTIVITY_BUTTON_ACTIONS = 213;
+  ATOM_LOCATION_ACCESS_CHECK_NOTIFICATION_ACTION = 214;
+  ATOM_APP_PERMISSION_FRAGMENT_ACTION_REPORTED = 215;
+  ATOM_APP_PERMISSION_FRAGMENT_VIEWED = 216;
+  ATOM_APP_PERMISSIONS_FRAGMENT_VIEWED = 217;
+  ATOM_PERMISSION_APPS_FRAGMENT_VIEWED = 218;
+  ATOM_TEXT_SELECTION_EVENT = 219;
+  ATOM_TEXT_LINKIFY_EVENT = 220;
+  ATOM_CONVERSATION_ACTIONS_EVENT = 221;
+  ATOM_LANGUAGE_DETECTION_EVENT = 222;
+  ATOM_EXCLUSION_RECT_STATE_CHANGED = 223;
+  ATOM_BACK_GESTURE_REPORTED_REPORTED = 224;
+  ATOM_UPDATE_ENGINE_UPDATE_ATTEMPT_REPORTED = 225;
+  ATOM_UPDATE_ENGINE_SUCCESSFUL_UPDATE_REPORTED = 226;
+  ATOM_CAMERA_ACTION_EVENT = 227;
+  ATOM_APP_COMPATIBILITY_CHANGE_REPORTED = 228;
+  ATOM_PERFETTO_UPLOADED = 229;
+  ATOM_VMS_CLIENT_CONNECTION_STATE_CHANGED = 230;
+  ATOM_MEDIA_PROVIDER_SCAN_OCCURRED = 233;
+  ATOM_MEDIA_CONTENT_DELETED = 234;
+  ATOM_MEDIA_PROVIDER_PERMISSION_REQUESTED = 235;
+  ATOM_MEDIA_PROVIDER_SCHEMA_CHANGED = 236;
+  ATOM_MEDIA_PROVIDER_IDLE_MAINTENANCE_FINISHED = 237;
+  ATOM_REBOOT_ESCROW_RECOVERY_REPORTED = 238;
+  ATOM_BOOT_TIME_EVENT_DURATION_REPORTED = 239;
+  ATOM_BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED = 240;
+  ATOM_BOOT_TIME_EVENT_UTC_TIME_REPORTED = 241;
+  ATOM_BOOT_TIME_EVENT_ERROR_CODE_REPORTED = 242;
+  ATOM_USERSPACE_REBOOT_REPORTED = 243;
+  ATOM_NOTIFICATION_REPORTED = 244;
+  ATOM_NOTIFICATION_PANEL_REPORTED = 245;
+  ATOM_NOTIFICATION_CHANNEL_MODIFIED = 246;
+  ATOM_INTEGRITY_CHECK_RESULT_REPORTED = 247;
+  ATOM_INTEGRITY_RULES_PUSHED = 248;
+  ATOM_CB_MESSAGE_REPORTED = 249;
+  ATOM_CB_MESSAGE_ERROR = 250;
+  ATOM_WIFI_HEALTH_STAT_REPORTED = 251;
+  ATOM_WIFI_FAILURE_STAT_REPORTED = 252;
+  ATOM_WIFI_CONNECTION_RESULT_REPORTED = 253;
+  ATOM_APP_FREEZE_CHANGED = 254;
+  ATOM_SNAPSHOT_MERGE_REPORTED = 255;
+  ATOM_FOREGROUND_SERVICE_APP_OP_SESSION_ENDED = 256;
+  ATOM_DISPLAY_JANK_REPORTED = 257;
+  ATOM_APP_STANDBY_BUCKET_CHANGED = 258;
+  ATOM_SHARESHEET_STARTED = 259;
+  ATOM_RANKING_SELECTED = 260;
+  ATOM_TVSETTINGS_UI_INTERACTED = 261;
+  ATOM_LAUNCHER_SNAPSHOT = 262;
+  ATOM_PACKAGE_INSTALLER_V2_REPORTED = 263;
+  ATOM_USER_LIFECYCLE_JOURNEY_REPORTED = 264;
+  ATOM_USER_LIFECYCLE_EVENT_OCCURRED = 265;
+  ATOM_ACCESSIBILITY_SHORTCUT_REPORTED = 266;
+  ATOM_ACCESSIBILITY_SERVICE_REPORTED = 267;
+  ATOM_DOCS_UI_DRAG_AND_DROP_REPORTED = 268;
+  ATOM_APP_USAGE_EVENT_OCCURRED = 269;
+  ATOM_AUTO_REVOKE_NOTIFICATION_CLICKED = 270;
+  ATOM_AUTO_REVOKE_FRAGMENT_APP_VIEWED = 271;
+  ATOM_AUTO_REVOKED_APP_INTERACTION = 272;
+  ATOM_APP_PERMISSION_GROUPS_FRAGMENT_AUTO_REVOKE_ACTION = 273;
+  ATOM_EVS_USAGE_STATS_REPORTED = 274;
+  ATOM_AUDIO_POWER_USAGE_DATA_REPORTED = 275;
+  ATOM_TV_TUNER_STATE_CHANGED = 276;
+  ATOM_MEDIAOUTPUT_OP_SWITCH_REPORTED = 277;
+  ATOM_CB_MESSAGE_FILTERED = 278;
+  ATOM_TV_TUNER_DVR_STATUS = 279;
+  ATOM_TV_CAS_SESSION_OPEN_STATUS = 280;
+  ATOM_ASSISTANT_INVOCATION_REPORTED = 281;
+  ATOM_DISPLAY_WAKE_REPORTED = 282;
+  ATOM_CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED = 283;
+  ATOM_CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED = 284;
+  ATOM_CAR_USER_HAL_POST_SWITCH_RESPONSE_REPORTED = 285;
+  ATOM_CAR_USER_HAL_INITIAL_USER_INFO_REQUEST_REPORTED = 286;
+  ATOM_CAR_USER_HAL_INITIAL_USER_INFO_RESPONSE_REPORTED = 287;
+  ATOM_CAR_USER_HAL_USER_ASSOCIATION_REQUEST_REPORTED = 288;
+  ATOM_CAR_USER_HAL_SET_USER_ASSOCIATION_RESPONSE_REPORTED = 289;
+  ATOM_NETWORK_IP_PROVISIONING_REPORTED = 290;
+  ATOM_NETWORK_DHCP_RENEW_REPORTED = 291;
+  ATOM_NETWORK_VALIDATION_REPORTED = 292;
+  ATOM_NETWORK_STACK_QUIRK_REPORTED = 293;
+  ATOM_MEDIAMETRICS_AUDIORECORDDEVICEUSAGE_REPORTED = 294;
+  ATOM_MEDIAMETRICS_AUDIOTHREADDEVICEUSAGE_REPORTED = 295;
+  ATOM_MEDIAMETRICS_AUDIOTRACKDEVICEUSAGE_REPORTED = 296;
+  ATOM_MEDIAMETRICS_AUDIODEVICECONNECTION_REPORTED = 297;
+  ATOM_BLOB_COMMITTED = 298;
+  ATOM_BLOB_LEASED = 299;
+  ATOM_BLOB_OPENED = 300;
+  ATOM_CONTACTS_PROVIDER_STATUS_REPORTED = 301;
+  ATOM_KEYSTORE_KEY_EVENT_REPORTED = 302;
+  ATOM_NETWORK_TETHERING_REPORTED = 303;
+  ATOM_IME_TOUCH_REPORTED = 304;
+  ATOM_UI_INTERACTION_FRAME_INFO_REPORTED = 305;
+  ATOM_UI_ACTION_LATENCY_REPORTED = 306;
+  ATOM_WIFI_DISCONNECT_REPORTED = 307;
+  ATOM_WIFI_CONNECTION_STATE_CHANGED = 308;
+  ATOM_HDMI_CEC_ACTIVE_SOURCE_CHANGED = 309;
+  ATOM_HDMI_CEC_MESSAGE_REPORTED = 310;
+  ATOM_AIRPLANE_MODE = 311;
+  ATOM_MODEM_RESTART = 312;
+  ATOM_CARRIER_ID_MISMATCH_REPORTED = 313;
+  ATOM_CARRIER_ID_TABLE_UPDATED = 314;
+  ATOM_DATA_STALL_RECOVERY_REPORTED = 315;
+  ATOM_MEDIAMETRICS_MEDIAPARSER_REPORTED = 316;
+  ATOM_TLS_HANDSHAKE_REPORTED = 317;
+  ATOM_TEXT_CLASSIFIER_API_USAGE_REPORTED = 318;
+  ATOM_CAR_WATCHDOG_KILL_STATS_REPORTED = 319;
+  ATOM_MEDIAMETRICS_PLAYBACK_REPORTED = 320;
+  ATOM_MEDIA_NETWORK_INFO_CHANGED = 321;
+  ATOM_MEDIA_PLAYBACK_STATE_CHANGED = 322;
+  ATOM_MEDIA_PLAYBACK_ERROR_REPORTED = 323;
+  ATOM_MEDIA_PLAYBACK_TRACK_CHANGED = 324;
+  ATOM_WIFI_SCAN_REPORTED = 325;
+  ATOM_WIFI_PNO_SCAN_REPORTED = 326;
+  ATOM_TIF_TUNE_CHANGED = 327;
+  ATOM_AUTO_ROTATE_REPORTED = 328;
+  ATOM_PERFETTO_TRIGGER = 329;
+  ATOM_TRANSCODING_DATA = 330;
+  ATOM_IMS_SERVICE_ENTITLEMENT_UPDATED = 331;
+  ATOM_DEVICE_ROTATED = 333;
+  ATOM_SIM_SPECIFIC_SETTINGS_RESTORED = 334;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_REPORTED = 335;
+  ATOM_PIN_STORAGE_EVENT = 336;
+  ATOM_FACE_DOWN_REPORTED = 337;
+  ATOM_BLUETOOTH_HAL_CRASH_REASON_REPORTED = 338;
+  ATOM_REBOOT_ESCROW_PREPARATION_REPORTED = 339;
+  ATOM_REBOOT_ESCROW_LSKF_CAPTURE_REPORTED = 340;
+  ATOM_REBOOT_ESCROW_REBOOT_REPORTED = 341;
+  ATOM_BINDER_LATENCY_REPORTED = 342;
+  ATOM_MEDIAMETRICS_AAUDIOSTREAM_REPORTED = 343;
+  ATOM_MEDIA_TRANSCODING_SESSION_ENDED = 344;
+  ATOM_MAGNIFICATION_USAGE_REPORTED = 345;
+  ATOM_MAGNIFICATION_MODE_WITH_IME_ON_REPORTED = 346;
+  ATOM_APP_SEARCH_CALL_STATS_REPORTED = 347;
+  ATOM_APP_SEARCH_PUT_DOCUMENT_STATS_REPORTED = 348;
+  ATOM_DEVICE_CONTROL_CHANGED = 349;
+  ATOM_DEVICE_STATE_CHANGED = 350;
+  ATOM_INPUTDEVICE_REGISTERED = 351;
+  ATOM_SMARTSPACE_CARD_REPORTED = 352;
+  ATOM_AUTH_PROMPT_AUTHENTICATE_INVOKED = 353;
+  ATOM_AUTH_MANAGER_CAN_AUTHENTICATE_INVOKED = 354;
+  ATOM_AUTH_ENROLL_ACTION_INVOKED = 355;
+  ATOM_AUTH_DEPRECATED_API_USED = 356;
+  ATOM_UNATTENDED_REBOOT_OCCURRED = 357;
+  ATOM_LONG_REBOOT_BLOCKING_REPORTED = 358;
+  ATOM_LOCATION_TIME_ZONE_PROVIDER_STATE_CHANGED = 359;
+  ATOM_FDTRACK_EVENT_OCCURRED = 364;
+  ATOM_TIMEOUT_AUTO_EXTENDED_REPORTED = 365;
+  ATOM_ALARM_BATCH_DELIVERED = 367;
+  ATOM_ALARM_SCHEDULED = 368;
+  ATOM_CAR_WATCHDOG_IO_OVERUSE_STATS_REPORTED = 369;
+  ATOM_USER_LEVEL_HIBERNATION_STATE_CHANGED = 370;
+  ATOM_APP_SEARCH_INITIALIZE_STATS_REPORTED = 371;
+  ATOM_APP_SEARCH_QUERY_STATS_REPORTED = 372;
+  ATOM_APP_PROCESS_DIED = 373;
+  ATOM_NETWORK_IP_REACHABILITY_MONITOR_REPORTED = 374;
+  ATOM_SLOW_INPUT_EVENT_REPORTED = 375;
+  ATOM_ANR_OCCURRED_PROCESSING_STARTED = 376;
+  ATOM_APP_SEARCH_REMOVE_STATS_REPORTED = 377;
+  ATOM_MEDIA_CODEC_REPORTED = 378;
+  ATOM_PERMISSION_USAGE_FRAGMENT_INTERACTION = 379;
+  ATOM_PERMISSION_DETAILS_INTERACTION = 380;
+  ATOM_PRIVACY_SENSOR_TOGGLE_INTERACTION = 381;
+  ATOM_PRIVACY_TOGGLE_DIALOG_INTERACTION = 382;
+  ATOM_APP_SEARCH_OPTIMIZE_STATS_REPORTED = 383;
+  ATOM_NON_A11Y_TOOL_SERVICE_WARNING_REPORT = 384;
+  ATOM_APP_SEARCH_SET_SCHEMA_STATS_REPORTED = 385;
+  ATOM_APP_COMPAT_STATE_CHANGED = 386;
+  ATOM_SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED = 387;
+  ATOM_SPLITSCREEN_UI_CHANGED = 388;
+  ATOM_NETWORK_DNS_HANDSHAKE_REPORTED = 389;
+  ATOM_BLUETOOTH_CODE_PATH_COUNTER = 390;
+  ATOM_BLUETOOTH_LE_BATCH_SCAN_REPORT_DELAY = 392;
+  ATOM_ACCESSIBILITY_FLOATING_MENU_UI_CHANGED = 393;
+  ATOM_NEURALNETWORKS_COMPILATION_COMPLETED = 394;
+  ATOM_NEURALNETWORKS_EXECUTION_COMPLETED = 395;
+  ATOM_NEURALNETWORKS_COMPILATION_FAILED = 396;
+  ATOM_NEURALNETWORKS_EXECUTION_FAILED = 397;
+  ATOM_CONTEXT_HUB_BOOTED = 398;
+  ATOM_CONTEXT_HUB_RESTARTED = 399;
+  ATOM_CONTEXT_HUB_LOADED_NANOAPP_SNAPSHOT_REPORTED = 400;
+  ATOM_CHRE_CODE_DOWNLOAD_TRANSACTED = 401;
+  ATOM_UWB_SESSION_INITED = 402;
+  ATOM_UWB_SESSION_CLOSED = 403;
+  ATOM_UWB_FIRST_RANGING_RECEIVED = 404;
+  ATOM_UWB_RANGING_MEASUREMENT_RECEIVED = 405;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_WORK_SCHEDULED = 406;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_WORK_COMPLETED = 407;
+  ATOM_CLIPBOARD_CLEARED = 408;
+  ATOM_VM_CREATION_REQUESTED = 409;
+  ATOM_NEARBY_DEVICE_SCAN_STATE_CHANGED = 410;
+  ATOM_CAMERA_COMPAT_CONTROL_EVENT_REPORTED = 411;
+  ATOM_APPLICATION_LOCALES_CHANGED = 412;
+  ATOM_MEDIAMETRICS_AUDIOTRACKSTATUS_REPORTED = 413;
+  ATOM_FOLD_STATE_DURATION_REPORTED = 414;
+  ATOM_LOCATION_TIME_ZONE_PROVIDER_CONTROLLER_STATE_CHANGED = 415;
+  ATOM_DISPLAY_HBM_STATE_CHANGED = 416;
+  ATOM_DISPLAY_HBM_BRIGHTNESS_CHANGED = 417;
+  ATOM_PERSISTENT_URI_PERMISSIONS_FLUSHED = 418;
+  ATOM_EARLY_BOOT_COMP_OS_ARTIFACTS_CHECK_REPORTED = 419;
+  ATOM_VBMETA_DIGEST_REPORTED = 420;
+  ATOM_APEX_INFO_GATHERED = 421;
+  ATOM_PVM_INFO_GATHERED = 422;
+  ATOM_WEAR_SETTINGS_UI_INTERACTED = 423;
+  ATOM_TRACING_SERVICE_REPORT_EVENT = 424;
+  ATOM_MEDIAMETRICS_AUDIORECORDSTATUS_REPORTED = 425;
+  ATOM_LAUNCHER_LATENCY = 426;
+  ATOM_DROPBOX_ENTRY_DROPPED = 427;
+  ATOM_WIFI_P2P_CONNECTION_REPORTED = 428;
+  ATOM_GAME_STATE_CHANGED = 429;
+  ATOM_HOTWORD_DETECTOR_CREATE_REQUESTED = 430;
+  ATOM_HOTWORD_DETECTION_SERVICE_INIT_RESULT_REPORTED = 431;
+  ATOM_HOTWORD_DETECTION_SERVICE_RESTARTED = 432;
+  ATOM_HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED = 433;
+  ATOM_HOTWORD_DETECTOR_EVENTS = 434;
+  ATOM_AD_SERVICES_API_CALLED = 435;
+  ATOM_AD_SERVICES_MESUREMENT_REPORTS_UPLOADED = 436;
+  ATOM_BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED = 437;
+  ATOM_CONTACTS_INDEXER_UPDATE_STATS_REPORTED = 440;
+  ATOM_APP_BACKGROUND_RESTRICTIONS_INFO = 441;
+  ATOM_MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED = 442;
+  ATOM_MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED = 443;
+  ATOM_PERMISSION_REMINDER_NOTIFICATION_INTERACTED = 444;
+  ATOM_RECENT_PERMISSION_DECISIONS_INTERACTED = 445;
+  ATOM_GNSS_PSDS_DOWNLOAD_REPORTED = 446;
+  ATOM_LE_AUDIO_CONNECTION_SESSION_REPORTED = 447;
+  ATOM_LE_AUDIO_BROADCAST_SESSION_REPORTED = 448;
+  ATOM_DREAM_UI_EVENT_REPORTED = 449;
+  ATOM_TASK_MANAGER_EVENT_REPORTED = 450;
+  ATOM_CDM_ASSOCIATION_ACTION = 451;
+  ATOM_MAGNIFICATION_TRIPLE_TAP_AND_HOLD_ACTIVATED_SESSION_REPORTED = 452;
+  ATOM_MAGNIFICATION_FOLLOW_TYPING_FOCUS_ACTIVATED_SESSION_REPORTED = 453;
+  ATOM_ACCESSIBILITY_TEXT_READING_OPTIONS_CHANGED = 454;
+  ATOM_WIFI_SETUP_FAILURE_CRASH_REPORTED = 455;
+  ATOM_UWB_DEVICE_ERROR_REPORTED = 456;
+  ATOM_ISOLATED_COMPILATION_SCHEDULED = 457;
+  ATOM_ISOLATED_COMPILATION_ENDED = 458;
+  ATOM_ONS_OPPORTUNISTIC_ESIM_PROVISIONING_COMPLETE = 459;
+  ATOM_SYSTEM_SERVER_PRE_WATCHDOG_OCCURRED = 460;
+  ATOM_TELEPHONY_ANOMALY_DETECTED = 461;
+  ATOM_LETTERBOX_POSITION_CHANGED = 462;
+  ATOM_REMOTE_KEY_PROVISIONING_ATTEMPT = 463;
+  ATOM_REMOTE_KEY_PROVISIONING_NETWORK_INFO = 464;
+  ATOM_REMOTE_KEY_PROVISIONING_TIMING = 465;
+  ATOM_MEDIAOUTPUT_OP_INTERACTION_REPORT = 466;
+  ATOM_SYNC_EXEMPTION_OCCURRED = 468;
+  ATOM_AUTOFILL_PRESENTATION_EVENT_REPORTED = 469;
+  ATOM_DOCK_STATE_CHANGED = 470;
+  ATOM_SAFETY_SOURCE_STATE_COLLECTED = 471;
+  ATOM_SAFETY_CENTER_SYSTEM_EVENT_REPORTED = 472;
+  ATOM_SAFETY_CENTER_INTERACTION_REPORTED = 473;
+  ATOM_SETTINGS_PROVIDER_SETTING_CHANGED = 474;
+  ATOM_BROADCAST_DELIVERY_EVENT_REPORTED = 475;
+  ATOM_SERVICE_REQUEST_EVENT_REPORTED = 476;
+  ATOM_PROVIDER_ACQUISITION_EVENT_REPORTED = 477;
+  ATOM_BLUETOOTH_DEVICE_NAME_REPORTED = 478;
+  ATOM_CB_CONFIG_UPDATED = 479;
+  ATOM_CB_MODULE_ERROR_REPORTED = 480;
+  ATOM_CB_SERVICE_FEATURE_CHANGED = 481;
+  ATOM_CB_RECEIVER_FEATURE_CHANGED = 482;
+  ATOM_JSSCRIPTENGINE_LATENCY_REPORTED = 483;
+  ATOM_PRIVACY_SIGNAL_NOTIFICATION_INTERACTION = 484;
+  ATOM_PRIVACY_SIGNAL_ISSUE_CARD_INTERACTION = 485;
+  ATOM_PRIVACY_SIGNALS_JOB_FAILURE = 486;
+  ATOM_VIBRATION_REPORTED = 487;
+  ATOM_UWB_RANGING_START = 489;
+  ATOM_MOBILE_DATA_DOWNLOAD_FILE_GROUP_STATUS_REPORTED = 490;
+  ATOM_APP_COMPACTED_V2 = 491;
+  ATOM_AD_SERVICES_SETTINGS_USAGE_REPORTED = 493;
+  ATOM_DISPLAY_BRIGHTNESS_CHANGED = 494;
+  ATOM_ACTIVITY_ACTION_BLOCKED = 495;
+  ATOM_BACKGROUND_FETCH_PROCESS_REPORTED = 496;
+  ATOM_UPDATE_CUSTOM_AUDIENCE_PROCESS_REPORTED = 497;
+  ATOM_RUN_AD_BIDDING_PROCESS_REPORTED = 498;
+  ATOM_RUN_AD_SCORING_PROCESS_REPORTED = 499;
+  ATOM_RUN_AD_SELECTION_PROCESS_REPORTED = 500;
+  ATOM_RUN_AD_BIDDING_PER_CA_PROCESS_REPORTED = 501;
+  ATOM_MOBILE_DATA_DOWNLOAD_DOWNLOAD_RESULT_REPORTED = 502;
+  ATOM_MOBILE_DATA_DOWNLOAD_FILE_GROUP_STORAGE_STATS_REPORTED = 503;
+  ATOM_NETWORK_DNS_SERVER_SUPPORT_REPORTED = 504;
+  ATOM_VM_BOOTED = 505;
+  ATOM_VM_EXITED = 506;
+  ATOM_AMBIENT_BRIGHTNESS_STATS_REPORTED = 507;
+  ATOM_MEDIAMETRICS_SPATIALIZERCAPABILITIES_REPORTED = 508;
+  ATOM_MEDIAMETRICS_SPATIALIZERDEVICEENABLED_REPORTED = 509;
+  ATOM_MEDIAMETRICS_HEADTRACKERDEVICEENABLED_REPORTED = 510;
+  ATOM_MEDIAMETRICS_HEADTRACKERDEVICESUPPORTED_REPORTED = 511;
+  ATOM_AD_SERVICES_MEASUREMENT_REGISTRATIONS = 512;
+  ATOM_HEARING_AID_INFO_REPORTED = 513;
+  ATOM_DEVICE_WIDE_JOB_CONSTRAINT_CHANGED = 514;
+  ATOM_AMBIENT_MODE_CHANGED = 515;
+  ATOM_ANR_LATENCY_REPORTED = 516;
+  ATOM_RESOURCE_API_INFO = 517;
+  ATOM_SYSTEM_DEFAULT_NETWORK_CHANGED = 518;
+  ATOM_IWLAN_SETUP_DATA_CALL_RESULT_REPORTED = 519;
+  ATOM_IWLAN_PDN_DISCONNECTED_REASON_REPORTED = 520;
+  ATOM_AIRPLANE_MODE_SESSION_REPORTED = 521;
+  ATOM_VM_CPU_STATUS_REPORTED = 522;
+  ATOM_VM_MEM_STATUS_REPORTED = 523;
+  ATOM_PACKAGE_INSTALLATION_SESSION_REPORTED = 524;
+  ATOM_DEFAULT_NETWORK_REMATCH_INFO = 525;
+  ATOM_NETWORK_SELECTION_PERFORMANCE = 526;
+  ATOM_NETWORK_NSD_REPORTED = 527;
+  ATOM_BLUETOOTH_DISCONNECTION_REASON_REPORTED = 529;
+  ATOM_BLUETOOTH_LOCAL_VERSIONS_REPORTED = 530;
+  ATOM_BLUETOOTH_REMOTE_SUPPORTED_FEATURES_REPORTED = 531;
+  ATOM_BLUETOOTH_LOCAL_SUPPORTED_FEATURES_REPORTED = 532;
+  ATOM_BLUETOOTH_GATT_APP_INFO = 533;
+  ATOM_BRIGHTNESS_CONFIGURATION_UPDATED = 534;
+  ATOM_AD_SERVICES_GET_TOPICS_REPORTED = 535;
+  ATOM_AD_SERVICES_EPOCH_COMPUTATION_GET_TOP_TOPICS_REPORTED = 536;
+  ATOM_AD_SERVICES_EPOCH_COMPUTATION_CLASSIFIER_REPORTED = 537;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_LAUNCHED = 538;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_FINISHED = 539;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_CONNECTION_REPORTED = 540;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_DEVICE_SCAN_TRIGGERED = 541;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_FIRST_DEVICE_SCAN_LATENCY = 542;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_CONNECT_DEVICE_LATENCY = 543;
+  ATOM_PACKAGE_MANAGER_SNAPSHOT_REPORTED = 544;
+  ATOM_PACKAGE_MANAGER_APPS_FILTER_CACHE_BUILD_REPORTED = 545;
+  ATOM_PACKAGE_MANAGER_APPS_FILTER_CACHE_UPDATE_REPORTED = 546;
+  ATOM_LAUNCHER_IMPRESSION_EVENT = 547;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_ALL_DEVICES_SCAN_LATENCY = 549;
+  ATOM_WS_WATCH_FACE_EDITED = 551;
+  ATOM_WS_WATCH_FACE_FAVORITE_ACTION_REPORTED = 552;
+  ATOM_WS_WATCH_FACE_SET_ACTION_REPORTED = 553;
+  ATOM_PACKAGE_UNINSTALLATION_REPORTED = 554;
+  ATOM_GAME_MODE_CHANGED = 555;
+  ATOM_GAME_MODE_CONFIGURATION_CHANGED = 556;
+  ATOM_BEDTIME_MODE_STATE_CHANGED = 557;
+  ATOM_NETWORK_SLICE_SESSION_ENDED = 558;
+  ATOM_NETWORK_SLICE_DAILY_DATA_USAGE_REPORTED = 559;
+  ATOM_NFC_TAG_TYPE_OCCURRED = 560;
+  ATOM_NFC_AID_CONFLICT_OCCURRED = 561;
+  ATOM_NFC_READER_CONFLICT_OCCURRED = 562;
+  ATOM_WS_TILE_LIST_CHANGED = 563;
+  ATOM_GET_TYPE_ACCESSED_WITHOUT_PERMISSION = 564;
+  ATOM_MOBILE_BUNDLED_APP_INFO_GATHERED = 566;
+  ATOM_WS_WATCH_FACE_COMPLICATION_SET_CHANGED = 567;
+  ATOM_MEDIA_DRM_CREATED = 568;
+  ATOM_MEDIA_DRM_ERRORED = 569;
+  ATOM_MEDIA_DRM_SESSION_OPENED = 570;
+  ATOM_MEDIA_DRM_SESSION_CLOSED = 571;
+  ATOM_USER_SELECTED_RESOLUTION = 572;
+  ATOM_UNSAFE_INTENT_EVENT_REPORTED = 573;
+  ATOM_PERFORMANCE_HINT_SESSION_REPORTED = 574;
+  ATOM_MEDIAMETRICS_MIDI_DEVICE_CLOSE_REPORTED = 576;
+  ATOM_BIOMETRIC_TOUCH_REPORTED = 577;
+  ATOM_HOTWORD_AUDIO_EGRESS_EVENT_REPORTED = 578;
+  ATOM_APP_SEARCH_SCHEMA_MIGRATION_STATS_REPORTED = 579;
+  ATOM_LOCATION_ENABLED_STATE_CHANGED = 580;
+  ATOM_IME_REQUEST_FINISHED = 581;
+  ATOM_USB_COMPLIANCE_WARNINGS_REPORTED = 582;
+  ATOM_APP_SUPPORTED_LOCALES_CHANGED = 583;
+  ATOM_GRAMMATICAL_INFLECTION_CHANGED = 584;
+  ATOM_MEDIA_PROVIDER_VOLUME_RECOVERY_REPORTED = 586;
+  ATOM_BIOMETRIC_PROPERTIES_COLLECTED = 587;
+  ATOM_KERNEL_WAKEUP_ATTRIBUTED = 588;
+  ATOM_SCREEN_STATE_CHANGED_V2 = 589;
+  ATOM_WS_BACKUP_ACTION_REPORTED = 590;
+  ATOM_WS_RESTORE_ACTION_REPORTED = 591;
+  ATOM_DEVICE_LOG_ACCESS_EVENT_REPORTED = 592;
+  ATOM_MEDIA_SESSION_UPDATED = 594;
+  ATOM_WEAR_OOBE_STATE_CHANGED = 595;
+  ATOM_WS_NOTIFICATION_UPDATED = 596;
+  ATOM_NETWORK_VALIDATION_FAILURE_STATS_DAILY_REPORTED = 601;
+  ATOM_WS_COMPLICATION_TAPPED = 602;
+  ATOM_WS_WEAR_TIME_SESSION = 610;
+  ATOM_WIFI_BYTES_TRANSFER = 10000;
+  ATOM_WIFI_BYTES_TRANSFER_BY_FG_BG = 10001;
+  ATOM_MOBILE_BYTES_TRANSFER = 10002;
+  ATOM_MOBILE_BYTES_TRANSFER_BY_FG_BG = 10003;
+  ATOM_BLUETOOTH_BYTES_TRANSFER = 10006;
+  ATOM_KERNEL_WAKELOCK = 10004;
+  ATOM_SUBSYSTEM_SLEEP_STATE = 10005;
+  ATOM_CPU_TIME_PER_UID = 10009;
+  ATOM_CPU_TIME_PER_UID_FREQ = 10010;
+  ATOM_WIFI_ACTIVITY_INFO = 10011;
+  ATOM_MODEM_ACTIVITY_INFO = 10012;
+  ATOM_BLUETOOTH_ACTIVITY_INFO = 10007;
+  ATOM_PROCESS_MEMORY_STATE = 10013;
+  ATOM_SYSTEM_ELAPSED_REALTIME = 10014;
+  ATOM_SYSTEM_UPTIME = 10015;
+  ATOM_CPU_ACTIVE_TIME = 10016;
+  ATOM_CPU_CLUSTER_TIME = 10017;
+  ATOM_DISK_SPACE = 10018;
+  ATOM_REMAINING_BATTERY_CAPACITY = 10019;
+  ATOM_FULL_BATTERY_CAPACITY = 10020;
+  ATOM_TEMPERATURE = 10021;
+  ATOM_BINDER_CALLS = 10022;
+  ATOM_BINDER_CALLS_EXCEPTIONS = 10023;
+  ATOM_LOOPER_STATS = 10024;
+  ATOM_DISK_STATS = 10025;
+  ATOM_DIRECTORY_USAGE = 10026;
+  ATOM_APP_SIZE = 10027;
+  ATOM_CATEGORY_SIZE = 10028;
+  ATOM_PROC_STATS = 10029;
+  ATOM_BATTERY_VOLTAGE = 10030;
+  ATOM_NUM_FINGERPRINTS_ENROLLED = 10031;
+  ATOM_DISK_IO = 10032;
+  ATOM_POWER_PROFILE = 10033;
+  ATOM_PROC_STATS_PKG_PROC = 10034;
+  ATOM_PROCESS_CPU_TIME = 10035;
+  ATOM_CPU_TIME_PER_THREAD_FREQ = 10037;
+  ATOM_ON_DEVICE_POWER_MEASUREMENT = 10038;
+  ATOM_DEVICE_CALCULATED_POWER_USE = 10039;
+  ATOM_PROCESS_MEMORY_HIGH_WATER_MARK = 10042;
+  ATOM_BATTERY_LEVEL = 10043;
+  ATOM_BUILD_INFORMATION = 10044;
+  ATOM_BATTERY_CYCLE_COUNT = 10045;
+  ATOM_DEBUG_ELAPSED_CLOCK = 10046;
+  ATOM_DEBUG_FAILING_ELAPSED_CLOCK = 10047;
+  ATOM_NUM_FACES_ENROLLED = 10048;
+  ATOM_ROLE_HOLDER = 10049;
+  ATOM_DANGEROUS_PERMISSION_STATE = 10050;
+  ATOM_TRAIN_INFO = 10051;
+  ATOM_TIME_ZONE_DATA_INFO = 10052;
+  ATOM_EXTERNAL_STORAGE_INFO = 10053;
+  ATOM_GPU_STATS_GLOBAL_INFO = 10054;
+  ATOM_GPU_STATS_APP_INFO = 10055;
+  ATOM_SYSTEM_ION_HEAP_SIZE = 10056;
+  ATOM_APPS_ON_EXTERNAL_STORAGE_INFO = 10057;
+  ATOM_FACE_SETTINGS = 10058;
+  ATOM_COOLING_DEVICE = 10059;
+  ATOM_APP_OPS = 10060;
+  ATOM_PROCESS_SYSTEM_ION_HEAP_SIZE = 10061;
+  ATOM_SURFACEFLINGER_STATS_GLOBAL_INFO = 10062;
+  ATOM_SURFACEFLINGER_STATS_LAYER_INFO = 10063;
+  ATOM_PROCESS_MEMORY_SNAPSHOT = 10064;
+  ATOM_VMS_CLIENT_STATS = 10065;
+  ATOM_NOTIFICATION_REMOTE_VIEWS = 10066;
+  ATOM_DANGEROUS_PERMISSION_STATE_SAMPLED = 10067;
+  ATOM_GRAPHICS_STATS = 10068;
+  ATOM_RUNTIME_APP_OP_ACCESS = 10069;
+  ATOM_ION_HEAP_SIZE = 10070;
+  ATOM_PACKAGE_NOTIFICATION_PREFERENCES = 10071;
+  ATOM_PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES = 10072;
+  ATOM_PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES = 10073;
+  ATOM_GNSS_STATS = 10074;
+  ATOM_ATTRIBUTED_APP_OPS = 10075;
+  ATOM_VOICE_CALL_SESSION = 10076;
+  ATOM_VOICE_CALL_RAT_USAGE = 10077;
+  ATOM_SIM_SLOT_STATE = 10078;
+  ATOM_SUPPORTED_RADIO_ACCESS_FAMILY = 10079;
+  ATOM_SETTING_SNAPSHOT = 10080;
+  ATOM_BLOB_INFO = 10081;
+  ATOM_DATA_USAGE_BYTES_TRANSFER = 10082;
+  ATOM_BYTES_TRANSFER_BY_TAG_AND_METERED = 10083;
+  ATOM_DND_MODE_RULE = 10084;
+  ATOM_GENERAL_EXTERNAL_STORAGE_ACCESS_STATS = 10085;
+  ATOM_INCOMING_SMS = 10086;
+  ATOM_OUTGOING_SMS = 10087;
+  ATOM_CARRIER_ID_TABLE_VERSION = 10088;
+  ATOM_DATA_CALL_SESSION = 10089;
+  ATOM_CELLULAR_SERVICE_STATE = 10090;
+  ATOM_CELLULAR_DATA_SERVICE_SWITCH = 10091;
+  ATOM_SYSTEM_MEMORY = 10092;
+  ATOM_IMS_REGISTRATION_TERMINATION = 10093;
+  ATOM_IMS_REGISTRATION_STATS = 10094;
+  ATOM_CPU_TIME_PER_CLUSTER_FREQ = 10095;
+  ATOM_CPU_CYCLES_PER_UID_CLUSTER = 10096;
+  ATOM_DEVICE_ROTATED_DATA = 10097;
+  ATOM_CPU_CYCLES_PER_THREAD_GROUP_CLUSTER = 10098;
+  ATOM_MEDIA_DRM_ACTIVITY_INFO = 10099;
+  ATOM_OEM_MANAGED_BYTES_TRANSFER = 10100;
+  ATOM_GNSS_POWER_STATS = 10101;
+  ATOM_TIME_ZONE_DETECTOR_STATE = 10102;
+  ATOM_KEYSTORE2_STORAGE_STATS = 10103;
+  ATOM_RKP_POOL_STATS = 10104;
+  ATOM_PROCESS_DMABUF_MEMORY = 10105;
+  ATOM_PENDING_ALARM_INFO = 10106;
+  ATOM_USER_LEVEL_HIBERNATED_APPS = 10107;
+  ATOM_LAUNCHER_LAYOUT_SNAPSHOT = 10108;
+  ATOM_GLOBAL_HIBERNATED_APPS = 10109;
+  ATOM_INPUT_EVENT_LATENCY_SKETCH = 10110;
+  ATOM_BATTERY_USAGE_STATS_BEFORE_RESET = 10111;
+  ATOM_BATTERY_USAGE_STATS_SINCE_RESET = 10112;
+  ATOM_BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL = 10113;
+  ATOM_INSTALLED_INCREMENTAL_PACKAGE = 10114;
+  ATOM_TELEPHONY_NETWORK_REQUESTS = 10115;
+  ATOM_APP_SEARCH_STORAGE_INFO = 10116;
+  ATOM_VMSTAT = 10117;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO = 10118;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO = 10119;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO = 10120;
+  ATOM_KEYSTORE2_ATOM_WITH_OVERFLOW = 10121;
+  ATOM_KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO = 10122;
+  ATOM_KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO = 10123;
+  ATOM_RKP_ERROR_STATS = 10124;
+  ATOM_KEYSTORE2_CRASH_STATS = 10125;
+  ATOM_VENDOR_APEX_INFO = 10126;
+  ATOM_ACCESSIBILITY_SHORTCUT_STATS = 10127;
+  ATOM_ACCESSIBILITY_FLOATING_MENU_STATS = 10128;
+  ATOM_DATA_USAGE_BYTES_TRANSFER_V2 = 10129;
+  ATOM_MEDIA_CAPABILITIES = 10130;
+  ATOM_CAR_WATCHDOG_SYSTEM_IO_USAGE_SUMMARY = 10131;
+  ATOM_CAR_WATCHDOG_UID_IO_USAGE_SUMMARY = 10132;
+  ATOM_IMS_REGISTRATION_FEATURE_TAG_STATS = 10133;
+  ATOM_RCS_CLIENT_PROVISIONING_STATS = 10134;
+  ATOM_RCS_ACS_PROVISIONING_STATS = 10135;
+  ATOM_SIP_DELEGATE_STATS = 10136;
+  ATOM_SIP_TRANSPORT_FEATURE_TAG_STATS = 10137;
+  ATOM_SIP_MESSAGE_RESPONSE = 10138;
+  ATOM_SIP_TRANSPORT_SESSION = 10139;
+  ATOM_IMS_DEDICATED_BEARER_LISTENER_EVENT = 10140;
+  ATOM_IMS_DEDICATED_BEARER_EVENT = 10141;
+  ATOM_IMS_REGISTRATION_SERVICE_DESC_STATS = 10142;
+  ATOM_UCE_EVENT_STATS = 10143;
+  ATOM_PRESENCE_NOTIFY_EVENT = 10144;
+  ATOM_GBA_EVENT = 10145;
+  ATOM_PER_SIM_STATUS = 10146;
+  ATOM_GPU_WORK_PER_UID = 10147;
+  ATOM_PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE = 10148;
+  ATOM_SIGNED_PARTITION_INFO = 10149;
+  ATOM_PINNED_FILE_SIZES_PER_PACKAGE = 10150;
+  ATOM_PENDING_INTENTS_PER_PACKAGE = 10151;
+  ATOM_USER_INFO = 10152;
+  ATOM_TELEPHONY_NETWORK_REQUESTS_V2 = 10153;
+  ATOM_DEVICE_TELEPHONY_PROPERTIES = 10154;
+  ATOM_REMOTE_KEY_PROVISIONING_ERROR_COUNTS = 10155;
+  ATOM_SAFETY_STATE = 10156;
+  ATOM_INCOMING_MMS = 10157;
+  ATOM_OUTGOING_MMS = 10158;
+  ATOM_MULTI_USER_INFO = 10160;
+  ATOM_NETWORK_BPF_MAP_INFO = 10161;
+  ATOM_OUTGOING_SHORT_CODE_SMS = 10162;
+  ATOM_CONNECTIVITY_STATE_SAMPLE = 10163;
+  ATOM_NETWORK_SELECTION_REMATCH_REASONS_INFO = 10164;
+  ATOM_GAME_MODE_INFO = 10165;
+  ATOM_GAME_MODE_CONFIGURATION = 10166;
+  ATOM_GAME_MODE_LISTENER = 10167;
+  ATOM_NETWORK_SLICE_REQUEST_COUNT = 10168;
+  ATOM_WS_TILE_SNAPSHOT = 10169;
+  ATOM_WS_ACTIVE_WATCH_FACE_COMPLICATION_SET_SNAPSHOT = 10170;
+  ATOM_PROCESS_STATE = 10171;
+  ATOM_PROCESS_ASSOCIATION = 10172;
+  ATOM_ADPF_SYSTEM_COMPONENT_INFO = 10173;
+  ATOM_NOTIFICATION_MEMORY_USE = 10174;
+  ATOM_HDR_CAPABILITIES = 10175;
+  ATOM_WS_FAVOURITE_WATCH_FACE_LIST_SNAPSHOT = 10176;
+  ATOM_WIFI_AWARE_NDP_REPORTED = 638;
+  ATOM_WIFI_AWARE_ATTACH_REPORTED = 639;
+  ATOM_WIFI_SELF_RECOVERY_TRIGGERED = 661;
+  ATOM_SOFT_AP_STARTED = 680;
+  ATOM_SOFT_AP_STOPPED = 681;
+  ATOM_WIFI_LOCK_RELEASED = 687;
+  ATOM_WIFI_LOCK_DEACTIVATED = 688;
+  ATOM_WIFI_CONFIG_SAVED = 689;
+  ATOM_WIFI_AWARE_RESOURCE_USING_CHANGED = 690;
+  ATOM_WIFI_AWARE_HAL_API_CALLED = 691;
+  ATOM_WIFI_LOCAL_ONLY_REQUEST_RECEIVED = 692;
+  ATOM_WIFI_LOCAL_ONLY_REQUEST_SCAN_TRIGGERED = 693;
+  ATOM_WIFI_THREAD_TASK_EXECUTED = 694;
+  ATOM_WIFI_STATE_CHANGED = 700;
+  ATOM_WIFI_AWARE_CAPABILITIES = 10190;
+  ATOM_WIFI_MODULE_INFO = 10193;
+  ATOM_SETTINGS_SPA_REPORTED = 622;
+  ATOM_EXPRESS_EVENT_REPORTED = 528;
+  ATOM_EXPRESS_HISTOGRAM_SAMPLE_REPORTED = 593;
+  ATOM_EXPRESS_UID_EVENT_REPORTED = 644;
+  ATOM_EXPRESS_UID_HISTOGRAM_SAMPLE_REPORTED = 658;
+  ATOM_PERMISSION_RATIONALE_DIALOG_VIEWED = 645;
+  ATOM_PERMISSION_RATIONALE_DIALOG_ACTION_REPORTED = 646;
+  ATOM_APP_DATA_SHARING_UPDATES_NOTIFICATION_INTERACTION = 647;
+  ATOM_APP_DATA_SHARING_UPDATES_FRAGMENT_VIEWED = 648;
+  ATOM_APP_DATA_SHARING_UPDATES_FRAGMENT_ACTION_REPORTED = 649;
+  ATOM_WS_INCOMING_CALL_ACTION_REPORTED = 626;
+  ATOM_WS_CALL_DISCONNECTION_REPORTED = 627;
+  ATOM_WS_CALL_DURATION_REPORTED = 628;
+  ATOM_WS_CALL_USER_EXPERIENCE_LATENCY_REPORTED = 629;
+  ATOM_WS_CALL_INTERACTION_REPORTED = 630;
+  ATOM_FULL_SCREEN_INTENT_LAUNCHED = 631;
+  ATOM_BAL_ALLOWED = 632;
+  ATOM_IN_TASK_ACTIVITY_STARTED = 685;
+  ATOM_CACHED_APPS_HIGH_WATERMARK = 10189;
+  ATOM_ODREFRESH_REPORTED = 366;
+  ATOM_ODSIGN_REPORTED = 548;
+  ATOM_ART_DATUM_REPORTED = 332;
+  ATOM_ART_DEVICE_DATUM_REPORTED = 550;
+  ATOM_ART_DATUM_DELTA_REPORTED = 565;
+  ATOM_BACKGROUND_DEXOPT_JOB_ENDED = 467;
+  ATOM_WEAR_ADAPTIVE_SUSPEND_STATS_REPORTED = 619;
+  ATOM_WEAR_POWER_ANOMALY_SERVICE_OPERATIONAL_STATS_REPORTED = 620;
+  ATOM_WEAR_POWER_ANOMALY_SERVICE_EVENT_STATS_REPORTED = 621;
+  ATOM_EMERGENCY_STATE_CHANGED = 633;
+  ATOM_DND_STATE_CHANGED = 657;
+  ATOM_MTE_STATE = 10181;
+  ATOM_AD_SERVICES_BACK_COMPAT_GET_TOPICS_REPORTED = 598;
+  ATOM_AD_SERVICES_BACK_COMPAT_EPOCH_COMPUTATION_CLASSIFIER_REPORTED = 599;
+  ATOM_AD_SERVICES_MEASUREMENT_DEBUG_KEYS = 640;
+  ATOM_AD_SERVICES_ERROR_REPORTED = 662;
+  ATOM_AD_SERVICES_BACKGROUND_JOBS_EXECUTION_REPORTED = 663;
+  ATOM_AD_SERVICES_MEASUREMENT_DELAYED_SOURCE_REGISTRATION = 673;
+  ATOM_AD_SERVICES_MEASUREMENT_ATTRIBUTION = 674;
+  ATOM_AD_SERVICES_MEASUREMENT_JOBS = 675;
+  ATOM_AD_SERVICES_MEASUREMENT_WIPEOUT = 676;
+  ATOM_AD_SERVICES_CONSENT_MIGRATED = 702;
+  ATOM_RKPD_POOL_STATS = 664;
+  ATOM_RKPD_CLIENT_OPERATION = 665;
+  ATOM_AUTOFILL_UI_EVENT_REPORTED = 603;
+  ATOM_AUTOFILL_FILL_REQUEST_REPORTED = 604;
+  ATOM_AUTOFILL_FILL_RESPONSE_REPORTED = 605;
+  ATOM_AUTOFILL_SAVE_EVENT_REPORTED = 606;
+  ATOM_AUTOFILL_SESSION_COMMITTED = 607;
+  ATOM_AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED = 659;
+  ATOM_TEST_EXTENSION_ATOM_REPORTED = 660;
+  ATOM_TEST_RESTRICTED_ATOM_REPORTED = 672;
+  ATOM_STATS_SOCKET_LOSS_REPORTED = 752;
+  ATOM_PLUGIN_INITIALIZED = 655;
+  ATOM_TV_LOW_POWER_STANDBY_POLICY = 679;
+  ATOM_LOCKSCREEN_SHORTCUT_SELECTED = 611;
+  ATOM_LOCKSCREEN_SHORTCUT_TRIGGERED = 612;
+  ATOM_EMERGENCY_NUMBERS_INFO = 10180;
+  ATOM_QUALIFIED_RAT_LIST_CHANGED = 634;
+  ATOM_QNS_IMS_CALL_DROP_STATS = 635;
+  ATOM_QNS_FALLBACK_RESTRICTION_CHANGED = 636;
+  ATOM_QNS_RAT_PREFERENCE_MISMATCH_INFO = 10177;
+  ATOM_QNS_HANDOVER_TIME_MILLIS = 10178;
+  ATOM_QNS_HANDOVER_PINGPONG = 10179;
+  ATOM_SATELLITE_CONTROLLER = 10182;
+  ATOM_SATELLITE_SESSION = 10183;
+  ATOM_SATELLITE_INCOMING_DATAGRAM = 10184;
+  ATOM_SATELLITE_OUTGOING_DATAGRAM = 10185;
+  ATOM_SATELLITE_PROVISION = 10186;
+  ATOM_SATELLITE_SOS_MESSAGE_RECOMMENDER = 10187;
+  ATOM_IKE_SESSION_TERMINATED = 678;
+  ATOM_IKE_LIVENESS_CHECK_SESSION_VALIDATED = 760;
+  ATOM_BLUETOOTH_HASHED_DEVICE_NAME_REPORTED = 613;
+  ATOM_BLUETOOTH_L2CAP_COC_CLIENT_CONNECTION = 614;
+  ATOM_BLUETOOTH_L2CAP_COC_SERVER_CONNECTION = 615;
+  ATOM_BLUETOOTH_LE_SESSION_CONNECTED = 656;
+  ATOM_RESTRICTED_BLUETOOTH_DEVICE_NAME_REPORTED = 666;
+  ATOM_BLUETOOTH_PROFILE_CONNECTION_ATTEMPTED = 696;
+  ATOM_HEALTH_CONNECT_UI_IMPRESSION = 623;
+  ATOM_HEALTH_CONNECT_UI_INTERACTION = 624;
+  ATOM_HEALTH_CONNECT_APP_OPENED_REPORTED = 625;
+  ATOM_HEALTH_CONNECT_API_CALLED = 616;
+  ATOM_HEALTH_CONNECT_USAGE_STATS = 617;
+  ATOM_HEALTH_CONNECT_STORAGE_STATS = 618;
+  ATOM_HEALTH_CONNECT_API_INVOKED = 643;
+  ATOM_EXERCISE_ROUTE_API_CALLED = 654;
+  ATOM_ATOM_9999 = 9999;
+  ATOM_ATOM_99999 = 99999;
+  ATOM_THREADNETWORK_TELEMETRY_DATA_REPORTED = 738;
+  ATOM_THREADNETWORK_TOPO_ENTRY_REPEATED = 739;
+  ATOM_THREADNETWORK_DEVICE_INFO_REPORTED = 740;
+  ATOM_EMERGENCY_NUMBER_DIALED = 637;
+  ATOM_SANDBOX_API_CALLED = 488;
+  ATOM_SANDBOX_ACTIVITY_EVENT_OCCURRED = 735;
+  ATOM_SANDBOX_SDK_STORAGE = 10159;
+  ATOM_CRONET_ENGINE_CREATED = 703;
+  ATOM_CRONET_TRAFFIC_REPORTED = 704;
+  ATOM_CRONET_ENGINE_BUILDER_INITIALIZED = 762;
+  ATOM_CRONET_HTTP_FLAGS_INITIALIZED = 763;
+  ATOM_CRONET_INITIALIZED = 764;
+  ATOM_DAILY_KEEPALIVE_INFO_REPORTED = 650;
+  ATOM_IP_CLIENT_RA_INFO_REPORTED = 778;
+  ATOM_APF_SESSION_INFO_REPORTED = 777;
+  ATOM_CREDENTIAL_MANAGER_API_CALLED = 585;
+  ATOM_CREDENTIAL_MANAGER_INIT_PHASE_REPORTED = 651;
+  ATOM_CREDENTIAL_MANAGER_CANDIDATE_PHASE_REPORTED = 652;
+  ATOM_CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED = 653;
+  ATOM_CREDENTIAL_MANAGER_TOTAL_REPORTED = 667;
+  ATOM_CREDENTIAL_MANAGER_FINALNOUID_REPORTED = 668;
+  ATOM_CREDENTIAL_MANAGER_GET_REPORTED = 669;
+  ATOM_CREDENTIAL_MANAGER_AUTH_CLICK_REPORTED = 670;
+  ATOM_CREDENTIAL_MANAGER_APIV2_CALLED = 671;
+  ATOM_UWB_ACTIVITY_INFO = 10188;
+  ATOM_MEDIA_ACTION_REPORTED = 608;
+  ATOM_MEDIA_CONTROLS_LAUNCHED = 609;
+  ATOM_MEDIA_CODEC_RECLAIM_REQUEST_COMPLETED = 600;
+  ATOM_MEDIA_CODEC_STARTED = 641;
+  ATOM_MEDIA_CODEC_STOPPED = 642;
+  ATOM_MEDIA_CODEC_RENDERED = 684;
+}
+// End of protos/perfetto/config/statsd/atom_ids.proto
+
+// Begin of protos/perfetto/config/statsd/statsd_tracing_config.proto
+
+// This file is named 'statsd_tracing_config.proto' rather than
+// 'statsd_config.proto' (which would be more consistent with the other
+// config protos) so it doesn't show up and confuse folks looking for
+// the existing statsd_config.proto for configuring statsd itself.
+// Same for the config proto itself.
+message StatsdTracingConfig {
+  // This is for the common case of the atom id being known in the enum AtomId.
+  repeated AtomId push_atom_id = 1;
+
+  // Escape hatch for Atom IDs that are not yet in the AtomId enum
+  // (e.g. non-upstream atoms that don't exist in AOSP).
+  repeated int32 raw_push_atom_id = 2;
+  repeated StatsdPullAtomConfig pull_config = 3;
+}
+
+message StatsdPullAtomConfig {
+  repeated AtomId pull_atom_id = 1;
+  repeated int32 raw_pull_atom_id = 2;
+
+  optional int32 pull_frequency_ms = 3;
+  repeated string packages = 4;
+}
+
+// End of protos/perfetto/config/statsd/statsd_tracing_config.proto
+
+// Begin of protos/perfetto/common/sys_stats_counters.proto
+
+// When editing entries here remember also to update "sys_stats_counters.h" with
+// the corresponding string definitions for the actual /proc files parser.
+
+// Counter definitions for Linux's /proc/meminfo.
+enum MeminfoCounters {
+  MEMINFO_UNSPECIFIED = 0;
+  MEMINFO_MEM_TOTAL = 1;
+  MEMINFO_MEM_FREE = 2;
+  MEMINFO_MEM_AVAILABLE = 3;
+  MEMINFO_BUFFERS = 4;
+  MEMINFO_CACHED = 5;
+  MEMINFO_SWAP_CACHED = 6;
+  MEMINFO_ACTIVE = 7;
+  MEMINFO_INACTIVE = 8;
+  MEMINFO_ACTIVE_ANON = 9;
+  MEMINFO_INACTIVE_ANON = 10;
+  MEMINFO_ACTIVE_FILE = 11;
+  MEMINFO_INACTIVE_FILE = 12;
+  MEMINFO_UNEVICTABLE = 13;
+  MEMINFO_MLOCKED = 14;
+  MEMINFO_SWAP_TOTAL = 15;
+  MEMINFO_SWAP_FREE = 16;
+  MEMINFO_DIRTY = 17;
+  MEMINFO_WRITEBACK = 18;
+  MEMINFO_ANON_PAGES = 19;
+  MEMINFO_MAPPED = 20;
+  MEMINFO_SHMEM = 21;
+  MEMINFO_SLAB = 22;
+  MEMINFO_SLAB_RECLAIMABLE = 23;
+  MEMINFO_SLAB_UNRECLAIMABLE = 24;
+  MEMINFO_KERNEL_STACK = 25;
+  MEMINFO_PAGE_TABLES = 26;
+  MEMINFO_COMMIT_LIMIT = 27;
+  MEMINFO_COMMITED_AS = 28;
+  MEMINFO_VMALLOC_TOTAL = 29;
+  MEMINFO_VMALLOC_USED = 30;
+  MEMINFO_VMALLOC_CHUNK = 31;
+  MEMINFO_CMA_TOTAL = 32;
+  MEMINFO_CMA_FREE = 33;
+}
+
+// Counter definitions for Linux's /proc/vmstat.
+enum VmstatCounters {
+  VMSTAT_UNSPECIFIED = 0;
+  VMSTAT_NR_FREE_PAGES = 1;
+  VMSTAT_NR_ALLOC_BATCH = 2;
+  VMSTAT_NR_INACTIVE_ANON = 3;
+  VMSTAT_NR_ACTIVE_ANON = 4;
+  VMSTAT_NR_INACTIVE_FILE = 5;
+  VMSTAT_NR_ACTIVE_FILE = 6;
+  VMSTAT_NR_UNEVICTABLE = 7;
+  VMSTAT_NR_MLOCK = 8;
+  VMSTAT_NR_ANON_PAGES = 9;
+  VMSTAT_NR_MAPPED = 10;
+  VMSTAT_NR_FILE_PAGES = 11;
+  VMSTAT_NR_DIRTY = 12;
+  VMSTAT_NR_WRITEBACK = 13;
+  VMSTAT_NR_SLAB_RECLAIMABLE = 14;
+  VMSTAT_NR_SLAB_UNRECLAIMABLE = 15;
+  VMSTAT_NR_PAGE_TABLE_PAGES = 16;
+  VMSTAT_NR_KERNEL_STACK = 17;
+  VMSTAT_NR_OVERHEAD = 18;
+  VMSTAT_NR_UNSTABLE = 19;
+  VMSTAT_NR_BOUNCE = 20;
+  VMSTAT_NR_VMSCAN_WRITE = 21;
+  VMSTAT_NR_VMSCAN_IMMEDIATE_RECLAIM = 22;
+  VMSTAT_NR_WRITEBACK_TEMP = 23;
+  VMSTAT_NR_ISOLATED_ANON = 24;
+  VMSTAT_NR_ISOLATED_FILE = 25;
+  VMSTAT_NR_SHMEM = 26;
+  VMSTAT_NR_DIRTIED = 27;
+  VMSTAT_NR_WRITTEN = 28;
+  VMSTAT_NR_PAGES_SCANNED = 29;
+  VMSTAT_WORKINGSET_REFAULT = 30;
+  VMSTAT_WORKINGSET_ACTIVATE = 31;
+  VMSTAT_WORKINGSET_NODERECLAIM = 32;
+  VMSTAT_NR_ANON_TRANSPARENT_HUGEPAGES = 33;
+  VMSTAT_NR_FREE_CMA = 34;
+  VMSTAT_NR_SWAPCACHE = 35;
+  VMSTAT_NR_DIRTY_THRESHOLD = 36;
+  VMSTAT_NR_DIRTY_BACKGROUND_THRESHOLD = 37;
+  VMSTAT_PGPGIN = 38;
+  VMSTAT_PGPGOUT = 39;
+  VMSTAT_PGPGOUTCLEAN = 40;
+  VMSTAT_PSWPIN = 41;
+  VMSTAT_PSWPOUT = 42;
+  VMSTAT_PGALLOC_DMA = 43;
+  VMSTAT_PGALLOC_NORMAL = 44;
+  VMSTAT_PGALLOC_MOVABLE = 45;
+  VMSTAT_PGFREE = 46;
+  VMSTAT_PGACTIVATE = 47;
+  VMSTAT_PGDEACTIVATE = 48;
+  VMSTAT_PGFAULT = 49;
+  VMSTAT_PGMAJFAULT = 50;
+  VMSTAT_PGREFILL_DMA = 51;
+  VMSTAT_PGREFILL_NORMAL = 52;
+  VMSTAT_PGREFILL_MOVABLE = 53;
+  VMSTAT_PGSTEAL_KSWAPD_DMA = 54;
+  VMSTAT_PGSTEAL_KSWAPD_NORMAL = 55;
+  VMSTAT_PGSTEAL_KSWAPD_MOVABLE = 56;
+  VMSTAT_PGSTEAL_DIRECT_DMA = 57;
+  VMSTAT_PGSTEAL_DIRECT_NORMAL = 58;
+  VMSTAT_PGSTEAL_DIRECT_MOVABLE = 59;
+  VMSTAT_PGSCAN_KSWAPD_DMA = 60;
+  VMSTAT_PGSCAN_KSWAPD_NORMAL = 61;
+  VMSTAT_PGSCAN_KSWAPD_MOVABLE = 62;
+  VMSTAT_PGSCAN_DIRECT_DMA = 63;
+  VMSTAT_PGSCAN_DIRECT_NORMAL = 64;
+  VMSTAT_PGSCAN_DIRECT_MOVABLE = 65;
+  VMSTAT_PGSCAN_DIRECT_THROTTLE = 66;
+  VMSTAT_PGINODESTEAL = 67;
+  VMSTAT_SLABS_SCANNED = 68;
+  VMSTAT_KSWAPD_INODESTEAL = 69;
+  VMSTAT_KSWAPD_LOW_WMARK_HIT_QUICKLY = 70;
+  VMSTAT_KSWAPD_HIGH_WMARK_HIT_QUICKLY = 71;
+  VMSTAT_PAGEOUTRUN = 72;
+  VMSTAT_ALLOCSTALL = 73;
+  VMSTAT_PGROTATED = 74;
+  VMSTAT_DROP_PAGECACHE = 75;
+  VMSTAT_DROP_SLAB = 76;
+  VMSTAT_PGMIGRATE_SUCCESS = 77;
+  VMSTAT_PGMIGRATE_FAIL = 78;
+  VMSTAT_COMPACT_MIGRATE_SCANNED = 79;
+  VMSTAT_COMPACT_FREE_SCANNED = 80;
+  VMSTAT_COMPACT_ISOLATED = 81;
+  VMSTAT_COMPACT_STALL = 82;
+  VMSTAT_COMPACT_FAIL = 83;
+  VMSTAT_COMPACT_SUCCESS = 84;
+  VMSTAT_COMPACT_DAEMON_WAKE = 85;
+  VMSTAT_UNEVICTABLE_PGS_CULLED = 86;
+  VMSTAT_UNEVICTABLE_PGS_SCANNED = 87;
+  VMSTAT_UNEVICTABLE_PGS_RESCUED = 88;
+  VMSTAT_UNEVICTABLE_PGS_MLOCKED = 89;
+  VMSTAT_UNEVICTABLE_PGS_MUNLOCKED = 90;
+  VMSTAT_UNEVICTABLE_PGS_CLEARED = 91;
+  VMSTAT_UNEVICTABLE_PGS_STRANDED = 92;
+  VMSTAT_NR_ZSPAGES = 93;
+  VMSTAT_NR_ION_HEAP = 94;
+  VMSTAT_NR_GPU_HEAP = 95;
+  VMSTAT_ALLOCSTALL_DMA = 96;
+  VMSTAT_ALLOCSTALL_MOVABLE = 97;
+  VMSTAT_ALLOCSTALL_NORMAL = 98;
+  VMSTAT_COMPACT_DAEMON_FREE_SCANNED = 99;
+  VMSTAT_COMPACT_DAEMON_MIGRATE_SCANNED = 100;
+  VMSTAT_NR_FASTRPC = 101;
+  VMSTAT_NR_INDIRECTLY_RECLAIMABLE = 102;
+  VMSTAT_NR_ION_HEAP_POOL = 103;
+  VMSTAT_NR_KERNEL_MISC_RECLAIMABLE = 104;
+  VMSTAT_NR_SHADOW_CALL_STACK_BYTES = 105;
+  VMSTAT_NR_SHMEM_HUGEPAGES = 106;
+  VMSTAT_NR_SHMEM_PMDMAPPED = 107;
+  VMSTAT_NR_UNRECLAIMABLE_PAGES = 108;
+  VMSTAT_NR_ZONE_ACTIVE_ANON = 109;
+  VMSTAT_NR_ZONE_ACTIVE_FILE = 110;
+  VMSTAT_NR_ZONE_INACTIVE_ANON = 111;
+  VMSTAT_NR_ZONE_INACTIVE_FILE = 112;
+  VMSTAT_NR_ZONE_UNEVICTABLE = 113;
+  VMSTAT_NR_ZONE_WRITE_PENDING = 114;
+  VMSTAT_OOM_KILL = 115;
+  VMSTAT_PGLAZYFREE = 116;
+  VMSTAT_PGLAZYFREED = 117;
+  VMSTAT_PGREFILL = 118;
+  VMSTAT_PGSCAN_DIRECT = 119;
+  VMSTAT_PGSCAN_KSWAPD = 120;
+  VMSTAT_PGSKIP_DMA = 121;
+  VMSTAT_PGSKIP_MOVABLE = 122;
+  VMSTAT_PGSKIP_NORMAL = 123;
+  VMSTAT_PGSTEAL_DIRECT = 124;
+  VMSTAT_PGSTEAL_KSWAPD = 125;
+  VMSTAT_SWAP_RA = 126;
+  VMSTAT_SWAP_RA_HIT = 127;
+  VMSTAT_WORKINGSET_RESTORE = 128;
+  VMSTAT_ALLOCSTALL_DEVICE = 129;
+  VMSTAT_ALLOCSTALL_DMA32 = 130;
+  VMSTAT_BALLOON_DEFLATE = 131;
+  VMSTAT_BALLOON_INFLATE = 132;
+  VMSTAT_BALLOON_MIGRATE = 133;
+  VMSTAT_CMA_ALLOC_FAIL = 134;
+  VMSTAT_CMA_ALLOC_SUCCESS = 135;
+  VMSTAT_NR_FILE_HUGEPAGES = 136;
+  VMSTAT_NR_FILE_PMDMAPPED = 137;
+  VMSTAT_NR_FOLL_PIN_ACQUIRED = 138;
+  VMSTAT_NR_FOLL_PIN_RELEASED = 139;
+  VMSTAT_NR_SEC_PAGE_TABLE_PAGES = 140;
+  VMSTAT_NR_SHADOW_CALL_STACK = 141;
+  VMSTAT_NR_SWAPCACHED = 142;
+  VMSTAT_NR_THROTTLED_WRITTEN = 143;
+  VMSTAT_PGALLOC_DEVICE = 144;
+  VMSTAT_PGALLOC_DMA32 = 145;
+  VMSTAT_PGDEMOTE_DIRECT = 146;
+  VMSTAT_PGDEMOTE_KSWAPD = 147;
+  VMSTAT_PGREUSE = 148;
+  VMSTAT_PGSCAN_ANON = 149;
+  VMSTAT_PGSCAN_FILE = 150;
+  VMSTAT_PGSKIP_DEVICE = 151;
+  VMSTAT_PGSKIP_DMA32 = 152;
+  VMSTAT_PGSTEAL_ANON = 153;
+  VMSTAT_PGSTEAL_FILE = 154;
+  VMSTAT_THP_COLLAPSE_ALLOC = 155;
+  VMSTAT_THP_COLLAPSE_ALLOC_FAILED = 156;
+  VMSTAT_THP_DEFERRED_SPLIT_PAGE = 157;
+  VMSTAT_THP_FAULT_ALLOC = 158;
+  VMSTAT_THP_FAULT_FALLBACK = 159;
+  VMSTAT_THP_FAULT_FALLBACK_CHARGE = 160;
+  VMSTAT_THP_FILE_ALLOC = 161;
+  VMSTAT_THP_FILE_FALLBACK = 162;
+  VMSTAT_THP_FILE_FALLBACK_CHARGE = 163;
+  VMSTAT_THP_FILE_MAPPED = 164;
+  VMSTAT_THP_MIGRATION_FAIL = 165;
+  VMSTAT_THP_MIGRATION_SPLIT = 166;
+  VMSTAT_THP_MIGRATION_SUCCESS = 167;
+  VMSTAT_THP_SCAN_EXCEED_NONE_PTE = 168;
+  VMSTAT_THP_SCAN_EXCEED_SHARE_PTE = 169;
+  VMSTAT_THP_SCAN_EXCEED_SWAP_PTE = 170;
+  VMSTAT_THP_SPLIT_PAGE = 171;
+  VMSTAT_THP_SPLIT_PAGE_FAILED = 172;
+  VMSTAT_THP_SPLIT_PMD = 173;
+  VMSTAT_THP_SWPOUT = 174;
+  VMSTAT_THP_SWPOUT_FALLBACK = 175;
+  VMSTAT_THP_ZERO_PAGE_ALLOC = 176;
+  VMSTAT_THP_ZERO_PAGE_ALLOC_FAILED = 177;
+  VMSTAT_VMA_LOCK_ABORT = 178;
+  VMSTAT_VMA_LOCK_MISS = 179;
+  VMSTAT_VMA_LOCK_RETRY = 180;
+  VMSTAT_VMA_LOCK_SUCCESS = 181;
+  VMSTAT_WORKINGSET_ACTIVATE_ANON = 182;
+  VMSTAT_WORKINGSET_ACTIVATE_FILE = 183;
+  VMSTAT_WORKINGSET_NODES = 184;
+  VMSTAT_WORKINGSET_REFAULT_ANON = 185;
+  VMSTAT_WORKINGSET_REFAULT_FILE = 186;
+  VMSTAT_WORKINGSET_RESTORE_ANON = 187;
+  VMSTAT_WORKINGSET_RESTORE_FILE = 188;
+}
+
+// End of protos/perfetto/common/sys_stats_counters.proto
+
+// Begin of protos/perfetto/config/sys_stats/sys_stats_config.proto
+
+// This file defines the configuration for the Linux /proc poller data source,
+// which injects counters in the trace.
+// Counters that are needed in the trace must be explicitly listed in the
+// *_counters fields. This is to avoid spamming the trace with all counters
+// at all times.
+// The sampling rate is configurable. All polling rates (*_period_ms) need
+// to be integer multiples of each other.
+// OK:     [10ms, 10ms, 10ms],  [10ms, 20ms, 10ms],  [10ms, 20ms, 60ms]
+// Not OK: [10ms, 10ms, 11ms],  [10ms, 15ms, 20ms]
+message SysStatsConfig {
+  // Polls /proc/meminfo every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 0.3 ms [read] + 0.07 ms [parse + trace injection]
+  optional uint32 meminfo_period_ms = 1;
+
+  // If empty all known counters are reported. Otherwise, only the counters
+  // specified below are reported.
+  repeated MeminfoCounters meminfo_counters = 2;
+
+  // Polls /proc/vmstat every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 0.2 ms [read] + 0.3 ms [parse + trace injection]
+  optional uint32 vmstat_period_ms = 3;
+  repeated VmstatCounters vmstat_counters = 4;
+
+  // Pols /proc/stat every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 4.1 ms [read] + 1.9 ms [parse + trace injection]
+  optional uint32 stat_period_ms = 5;
+  enum StatCounters {
+    STAT_UNSPECIFIED = 0;
+    STAT_CPU_TIMES = 1;
+    STAT_IRQ_COUNTS = 2;
+    STAT_SOFTIRQ_COUNTS = 3;
+    STAT_FORK_COUNT = 4;
+  }
+  repeated StatCounters stat_counters = 6;
+
+  // Polls /sys/devfreq/*/curfreq every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // This option can be used to record unchanging values.
+  // Updates from frequency changes can come from ftrace/set_clock_rate.
+  optional uint32 devfreq_period_ms = 7;
+
+  // Polls /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_cur_freq every X ms.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 cpufreq_period_ms = 8;
+
+  // Polls /proc/buddyinfo every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 buddyinfo_period_ms = 9;
+
+  // Polls /proc/diskstats every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 diskstat_period_ms = 10;
+
+  // Polls /proc/pressure/* every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 psi_period_ms = 11;
+}
+
+// End of protos/perfetto/config/sys_stats/sys_stats_config.proto
+
+// Begin of protos/perfetto/config/system_info/system_info.proto
+
+// This data-source does a one-off recording of system information when
+// the trace starts.
+// Currently this includes:
+// - Values of
+// /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_frequencies This
+// datasource has no configuration options at present.
+message SystemInfoConfig {}
+
+// End of protos/perfetto/config/system_info/system_info.proto
+
+// Begin of protos/perfetto/config/test_config.proto
+
+// The configuration for a fake producer used in tests.
+message TestConfig {
+  message DummyFields {
+    optional uint32 field_uint32 = 1;
+    optional int32 field_int32 = 2;
+    optional uint64 field_uint64 = 3;
+    optional int64 field_int64 = 4;
+    optional fixed64 field_fixed64 = 5;
+    optional sfixed64 field_sfixed64 = 6;
+    optional fixed32 field_fixed32 = 7;
+    optional sfixed32 field_sfixed32 = 8;
+    optional double field_double = 9;
+    optional float field_float = 10;
+    optional sint64 field_sint64 = 11;
+    optional sint32 field_sint32 = 12;
+    optional string field_string = 13;
+    optional bytes field_bytes = 14;
+  }
+
+  // The number of messages the fake producer should send.
+  optional uint32 message_count = 1;
+
+  // The maximum number of messages which should be sent each second.
+  // The actual obserced speed may be lower if the producer is unable to
+  // work fast enough.
+  // If this is zero or unset, the producer will send as fast as possible.
+  optional uint32 max_messages_per_second = 2;
+
+  // The seed value for a simple multiplicative congruential pseudo-random
+  // number sequence.
+  optional uint32 seed = 3;
+
+  // The size of each message in bytes. Should be greater than or equal 5 to
+  // account for the number of bytes needed to encode the random number and a
+  // null byte for the string.
+  optional uint32 message_size = 4;
+
+  // Whether the producer should send a event batch when the data source is
+  // is initially registered.
+  optional bool send_batch_on_register = 5;
+
+  optional DummyFields dummy_fields = 6;
+}
+
+// End of protos/perfetto/config/test_config.proto
+
+// Begin of protos/perfetto/config/track_event/track_event_config.proto
+
+message TrackEventConfig {
+  // The following fields define the set of enabled trace categories. Each list
+  // item is a glob.
+  //
+  // To determine if category is enabled, it is checked against the filters in
+  // the following order:
+  //
+  //   1. Exact matches in enabled categories.
+  //   2. Exact matches in enabled tags.
+  //   3. Exact matches in disabled categories.
+  //   4. Exact matches in disabled tags.
+  //   5. Pattern matches in enabled categories.
+  //   6. Pattern matches in enabled tags.
+  //   7. Pattern matches in disabled categories.
+  //   8. Pattern matches in disabled tags.
+  //
+  // If none of the steps produced a match:
+  //  - In the C++ SDK (`perfetto::Category`), categories are enabled by
+  //  default.
+  //  - In the C SDK (`PerfettoTeCategory`), categories are disabled by default.
+  //
+  // Examples:
+  //
+  //  - To enable all non-slow/debug categories:
+  //
+  //       enabled_categories: "*"
+  //
+  //  - To enable specific categories:
+  //
+  //       disabled_categories: "*"
+  //       enabled_categories: "my_category"
+  //       enabled_categories: "my_category2"
+  //
+  //  - To enable only categories with a specific tag:
+  //
+  //       disabled_tags: "*"
+  //       enabled_tags: "my_tag"
+  //
+
+  // Default: []
+  repeated string disabled_categories = 1;
+
+  // Default: []
+  repeated string enabled_categories = 2;
+
+  // Default: ["slow", "debug"]
+  repeated string disabled_tags = 3;
+
+  // Default: []
+  repeated string enabled_tags = 4;
+
+  // Default: false (i.e. enabled by default)
+  optional bool disable_incremental_timestamps = 5;
+
+  // Allows to specify a custom unit different than the default (ns).
+  // Also affects thread timestamps if enable_thread_time_sampling = true.
+  // A multiplier of 1000 means that a timestamp = 3 should be interpreted as
+  // 3000 ns = 3 us.
+  // Default: 1 (if unset, it should be read as 1).
+  optional uint64 timestamp_unit_multiplier = 6;
+
+  // Default: false (i.e. debug_annotations is NOT filtered out by default)
+  // When true, any debug annotations provided as arguments to the
+  // TRACE_EVENT macros are not written into the trace. Typed arguments will
+  // still be emitted even if set to true.
+  optional bool filter_debug_annotations = 7;
+
+  // Default : false (i.e. disabled)
+  // When true, the SDK samples and emits the current thread time counter value
+  // for each event on the current thread's track. This value represents the
+  // total CPU time consumed by that thread since its creation. Note that if a
+  // thread is not scheduled by OS for some duration, that time won't be
+  // included in thread_time.
+  // Learn more : "CLOCK_THREAD_CPUTIME_ID" flag at
+  // https://linux.die.net/man/3/clock_gettime
+  optional bool enable_thread_time_sampling = 8;
+
+  // Default: false (i.e. dynamic event names are NOT filtered out by default)
+  // When true, event_names wrapped in perfetto::DynamicString will be filtered
+  // out.
+  optional bool filter_dynamic_event_names = 9;
+}
+
+// End of protos/perfetto/config/track_event/track_event_config.proto
+
+// Begin of protos/perfetto/config/data_source_config.proto
+
+// The configuration that is passed to each data source when starting tracing.
+// Next id: 129
+message DataSourceConfig {
+  enum SessionInitiator {
+    SESSION_INITIATOR_UNSPECIFIED = 0;
+    // This trace was initiated from a trusted system app has DUMP and
+    // USAGE_STATS permission. This system app is expected to not expose the
+    // trace to the user of the device.
+    // This is determined by checking the UID initiating the trace.
+    SESSION_INITIATOR_TRUSTED_SYSTEM = 1;
+  };
+  // Data source unique name, e.g., "linux.ftrace". This must match
+  // the name passed by the data source when it registers (see
+  // RegisterDataSource()).
+  optional string name = 1;
+
+  // The index of the logging buffer where TracePacket(s) will be stored.
+  // This field doesn't make a major difference for the Producer(s). The final
+  // logging buffers, in fact, are completely owned by the Service. We just ask
+  // the Producer to copy this number into the chunk headers it emits, so that
+  // the Service can quickly identify the buffer where to move the chunks into
+  // without expensive lookups on its fastpath.
+  optional uint32 target_buffer = 2;
+
+  // Set by the service to indicate the duration of the trace.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint32 trace_duration_ms = 3;
+
+  // If true, |trace_duration_ms| should count also time in suspend. This
+  // is propagated from TraceConfig.prefer_suspend_clock_for_duration.
+  optional bool prefer_suspend_clock_for_duration = 122;
+
+  // Set by the service to indicate how long it waits after StopDataSource.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint32 stop_timeout_ms = 7;
+
+  // Set by the service to indicate whether this tracing session has extra
+  // guardrails.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional bool enable_extra_guardrails = 6;
+
+  // Set by the service to indicate which user initiated this trace.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional SessionInitiator session_initiator = 8;
+
+  // Set by the service to indicate which tracing session the data source
+  // belongs to. The intended use case for this is checking if two data sources,
+  // one of which produces metadata for the other one, belong to the same trace
+  // session and hence should be linked together.
+  // This field was introduced in Aug 2018 after Android P.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint64 tracing_session_id = 4;
+
+  // Keeep the lower IDs (up to 99) for fields that are *not* specific to
+  // data-sources and needs to be processed by the traced daemon.
+
+  // All data source config fields must be marked as [lazy=true]. This prevents
+  // the proto-to-cpp generator from recursing into those when generating the
+  // cpp classes and polluting tracing/core with data-source-specific classes.
+  // Instead they are treated as opaque strings containing raw proto bytes.
+
+  // Data source name: linux.ftrace
+  optional FtraceConfig ftrace_config = 100 [lazy = true];
+  // Data source name: linux.inode_file_map
+  optional InodeFileConfig inode_file_config = 102 [lazy = true];
+  // Data source name: linux.process_stats
+  optional ProcessStatsConfig process_stats_config = 103 [lazy = true];
+  // Data source name: linux.sys_stats
+  optional SysStatsConfig sys_stats_config = 104 [lazy = true];
+  // Data source name: android.heapprofd
+  // Introduced in Android 10.
+  optional HeapprofdConfig heapprofd_config = 105 [lazy = true];
+  // Data source name: android.java_hprof
+  // Introduced in Android 11.
+  optional JavaHprofConfig java_hprof_config = 110 [lazy = true];
+  // Data source name: android.power
+  optional AndroidPowerConfig android_power_config = 106 [lazy = true];
+  // Data source name: android.log
+  optional AndroidLogConfig android_log_config = 107 [lazy = true];
+  // TODO(fmayer): Add data source name for this.
+  optional GpuCounterConfig gpu_counter_config = 108 [lazy = true];
+  // Data source name: android.game_interventions
+  optional AndroidGameInterventionListConfig
+      android_game_intervention_list_config = 116 [lazy = true];
+  // Data source name: android.packages_list
+  optional PackagesListConfig packages_list_config = 109 [lazy = true];
+  // Data source name: linux.perf
+  optional PerfEventConfig perf_event_config = 111 [lazy = true];
+  // Data source name: vulkan.memory_tracker
+  optional VulkanMemoryConfig vulkan_memory_config = 112 [lazy = true];
+  // Data source name: track_event
+  optional TrackEventConfig track_event_config = 113 [lazy = true];
+  // Data source name: android.polled_state
+  optional AndroidPolledStateConfig android_polled_state_config = 114
+      [lazy = true];
+  // Data source name: android.system_property
+  optional AndroidSystemPropertyConfig android_system_property_config = 118
+      [lazy = true];
+  // Data source name: android.statsd
+  optional StatsdTracingConfig statsd_tracing_config = 117 [lazy = true];
+  // Data source name: linux.system_info
+  optional SystemInfoConfig system_info_config = 119;
+
+  // Chrome is special as it doesn't use the perfetto IPC layer. We want to
+  // avoid proto serialization and de-serialization there because that would
+  // just add extra hops on top of the Mojo ser/des. Instead we auto-generate a
+  // C++ class for it so it can pass around plain C++ objets.
+  optional ChromeConfig chrome_config = 101;
+
+  // Data source name: code.v8.dev
+  optional V8Config v8_config = 127 [lazy = true];
+
+  // If an interceptor is specified here, packets for this data source will be
+  // rerouted to the interceptor instead of the main trace buffer. This can be
+  // used, for example, to write trace data into ETW or for logging trace points
+  // to the console.
+  //
+  // Note that interceptors are only supported by data sources registered
+  // through the Perfetto SDK API. Data sources that don't use that API (e.g.,
+  // traced_probes) may not support interception.
+  optional InterceptorConfig interceptor_config = 115;
+
+  // Data source name: android.network_packets.
+  // Introduced in Android 14 (U).
+  optional NetworkPacketTraceConfig network_packet_trace_config = 120
+      [lazy = true];
+
+  // Data source name: android.surfaceflinger.layers
+  optional SurfaceFlingerLayersConfig surfaceflinger_layers_config = 121
+      [lazy = true];
+
+  // Data source name: android.surfaceflinger.transactions
+  optional SurfaceFlingerTransactionsConfig surfaceflinger_transactions_config =
+      123 [lazy = true];
+
+  // Data source name: android.sdk_sysprop_guard
+  // Introduced in Android 14 (U) QPR1.
+  optional AndroidSdkSyspropGuardConfig android_sdk_sysprop_guard_config = 124
+      [lazy = true];
+
+  // Data source name: windows.etw
+  optional EtwConfig etw_config = 125 [lazy = true];
+
+  // Data source name: android.protolog
+  optional ProtoLogConfig protolog_config = 126 [lazy = true];
+
+  // Data source name: android.input.inputevent
+  optional AndroidInputEventConfig android_input_event_config = 128 [lazy = true];
+
+  // This is a fallback mechanism to send a free-form text config to the
+  // producer. In theory this should never be needed. All the code that
+  // is part of the platform (i.e. traced service) is supposed to *not* truncate
+  // the trace config proto and propagate unknown fields. However, if anything
+  // in the pipeline (client or backend) ends up breaking this forward compat
+  // plan, this field will become the escape hatch to allow future data sources
+  // to get some meaningful configuration.
+  optional string legacy_config = 1000;
+
+  // This field is only used for testing.
+  optional TestConfig for_testing = 1001;
+
+  // Was |for_testing|. Caused more problems then found.
+  reserved 268435455;
+}
+
+// End of protos/perfetto/config/data_source_config.proto
+
+// Begin of protos/perfetto/config/trace_config.proto
+
+// The overall config that is used when starting a new tracing session through
+// ProducerPort::StartTracing().
+// It contains the general config for the logging buffer(s) and the configs for
+// all the data source being enabled.
+//
+// Next id: 39.
+message TraceConfig {
+  message BufferConfig {
+    optional uint32 size_kb = 1;
+
+    // |page_size|, now deprecated.
+    reserved 2;
+
+    // |optimize_for|, now deprecated.
+    reserved 3;
+
+    enum FillPolicy {
+      UNSPECIFIED = 0;
+
+      // Default behavior. The buffer operates as a conventional ring buffer.
+      // If the writer is faster than the reader (or if the reader reads only
+      // after tracing is stopped) newly written packets will overwrite old
+      // packets.
+      RING_BUFFER = 1;
+
+      // Behaves like RING_BUFFER as long as there is space in the buffer or
+      // the reader catches up with the writer. As soon as the writer hits
+      // an unread chunk, it stops accepting new data in the buffer.
+      DISCARD = 2;
+    }
+    optional FillPolicy fill_policy = 4;
+
+    // When true the buffer is moved (rather than copied) onto the cloned
+    // session, and an empty buffer of the same size is allocated in the source
+    // tracing session. This feature will likely get deprecated in the future.
+    // It been introduced mainly to support the surfaceflinger snapshot dump
+    // for bugreports, where SF can dumps O(400MB) into the bugreport trace. In
+    // that case we don't want to retain another in-memory copy of the buffer.
+    optional bool transfer_on_clone = 5;
+
+    // Used in conjuction with transfer_on_clone. When true the buffer is
+    // cleared before issuing the Flush(reason=kTraceClone). This is to ensure
+    // that if the data source took too long to write the data in a previous
+    // clone-related flush, we don't end up with a mixture of leftovers from
+    // the previous write and new data.
+    optional bool clear_before_clone = 6;
+  }
+  repeated BufferConfig buffers = 1;
+
+  message DataSource {
+    // Filters and data-source specific config. It contains also the unique name
+    // of the data source, the one passed in the  DataSourceDescriptor when they
+    // register on the service.
+    optional protos.DataSourceConfig config = 1;
+
+    // Optional. If multiple producers (~processes) expose the same data source
+    // and either |producer_name_filter| or |producer_name_regex_filter| is set,
+    // the data source is enabled only for producers whose names match any of
+    // the filters.
+    // |producer_name_filter| has to be an exact match, while
+    // |producer_name_regex_filter| is a regular expression.
+    // This allows to enable a data source only for specific processes.
+    // The "repeated" fields have OR semantics: specifying a filter ["foo",
+    // "bar"] will enable data sources on both "foo" and "bar" (if they exist).
+    repeated string producer_name_filter = 2;
+    repeated string producer_name_regex_filter = 3;
+  }
+  repeated DataSource data_sources = 2;
+
+  // Config for disabling builtin data sources in the tracing service.
+  message BuiltinDataSource {
+    // Disable emitting clock timestamps into the trace.
+    optional bool disable_clock_snapshotting = 1;
+
+    // Disable echoing the original trace config in the trace.
+    optional bool disable_trace_config = 2;
+
+    // Disable emitting system info (build fingerprint, cpuinfo, etc).
+    optional bool disable_system_info = 3;
+
+    // Disable emitting events for data-source state changes (e.g. the marker
+    // for all data sources having ACKed the start of the trace).
+    optional bool disable_service_events = 4;
+
+    // The authoritative clock domain for the trace. Defaults to BOOTTIME. See
+    // also ClockSnapshot's primary_trace_clock. The configured value is written
+    // into the trace as part of the ClockSnapshots emitted by the service.
+    // Trace processor will attempt to translate packet/event timestamps from
+    // various data sources (and their chosen clock domains) to this domain
+    // during import. Added in Android R.
+    optional BuiltinClock primary_trace_clock = 5;
+
+    // Time interval in between snapshotting of sync markers, clock snapshots,
+    // stats, and other periodic service-emitted events. Note that the service
+    // only keeps track of the first and the most recent snapshot until
+    // ReadBuffers() is called.
+    optional uint32 snapshot_interval_ms = 6;
+
+    // Hints to the service that a suspend-aware (i.e. counting time in suspend)
+    // clock should be used for periodic snapshots of service-emitted events.
+    // This means, if a snapshot *should* have happened during suspend, it will
+    // happen immediately after the device resumes.
+    //
+    // Choosing a clock like this is done on best-effort basis; not all
+    // platforms (e.g. Windows) expose a clock which can be used for periodic
+    // tasks counting suspend. If such a clock is not available, the service
+    // falls back to the best-available alternative.
+    //
+    // Introduced in Android S.
+    // TODO(lalitm): deprecate this in T and make this the default if nothing
+    // crashes in S.
+    optional bool prefer_suspend_clock_for_snapshot = 7;
+
+    // Disables the reporting of per-trace-writer histograms in TraceStats.
+    optional bool disable_chunk_usage_histograms = 8;
+  }
+  optional BuiltinDataSource builtin_data_sources = 20;
+
+  // If specified, the trace will be stopped |duration_ms| after starting.
+  // This does *not* count the time the system is suspended, so we will run
+  // for duration_ms of system activity, not wall time.
+  //
+  // However in case of traces with triggers, see
+  // TriggerConfig.trigger_timeout_ms instead.
+  optional uint32 duration_ms = 3;
+
+  // If true, tries to use CLOCK_BOOTTIME for duration_ms rather than
+  // CLOCK_MONOTONIC (which doesn't count time in suspend). Supported only on
+  // Linux/Android, no-op on other platforms. This is used when dealing with
+  // long (e.g. 24h) traces, where suspend can inflate them to weeks of
+  // wall-time, making them more likely to hit device reboots (and hence loss).
+  // This option also changes consistently the semantic of
+  // TriggerConfig.stop_delay_ms.
+  optional bool prefer_suspend_clock_for_duration = 36;
+
+  // This is set when --dropbox is passed to the Perfetto command line client
+  // and enables guardrails that limit resource usage for traces requested
+  // by statsd.
+  optional bool enable_extra_guardrails = 4;
+
+  enum LockdownModeOperation {
+    LOCKDOWN_UNCHANGED = 0;
+    LOCKDOWN_CLEAR = 1;
+    LOCKDOWN_SET = 2;
+  }
+  // Reject producers that are not running under the same UID as the tracing
+  // service.
+  optional LockdownModeOperation lockdown_mode = 5;
+
+  message ProducerConfig {
+    // Identifies the producer for which this config is for.
+    optional string producer_name = 1;
+
+    // Specifies the preferred size of the shared memory buffer. If the size is
+    // larger than the max size, the max will be used. If it is smaller than
+    // the page size or doesn't fit pages evenly into it, it will fall back to
+    // the size specified by the producer or finally the default shared memory
+    // size.
+    optional uint32 shm_size_kb = 2;
+
+    // Specifies the preferred size of each page in the shared memory buffer.
+    // Must be an integer multiple of 4K.
+    optional uint32 page_size_kb = 3;
+  }
+
+  repeated ProducerConfig producers = 6;
+
+  // Contains statsd-specific metadata about an alert associated with the trace.
+  message StatsdMetadata {
+    // The identifier of the alert which triggered this trace.
+    optional int64 triggering_alert_id = 1;
+    // The uid which registered the triggering configuration with statsd.
+    optional int32 triggering_config_uid = 2;
+    // The identifier of the config which triggered the alert.
+    optional int64 triggering_config_id = 3;
+    // The identifier of the subscription which triggered this trace.
+    optional int64 triggering_subscription_id = 4;
+  }
+
+  // Statsd-specific metadata.
+  optional StatsdMetadata statsd_metadata = 7;
+
+  // When true && |output_path| is empty, the EnableTracing() request must
+  // provide a file descriptor. The service will then periodically read packets
+  // out of the trace buffer and store it into the passed file.
+  // If |output_path| is not empty no fd should be passed, the service
+  // will create a new file and write into that (see comment below).
+  optional bool write_into_file = 8;
+
+  // This must point to a non-existing file. If the file exists the service
+  // will NOT overwrite and will fail instead as a security precaution.
+  // On Android, when this is used with the system traced, the path must be
+  // within /data/misc/perfetto-traces/ or the trace will fail.
+  // This option has been introduced in Android R. Before R write_into_file
+  // can be used only with the "pass a file descriptor over IPC" mode.
+  optional string output_path = 29;
+
+  // Optional. If non-zero tunes the write period. A min value of 100ms is
+  // enforced (i.e. smaller values are ignored).
+  optional uint32 file_write_period_ms = 9;
+
+  // Optional. When non zero the periodic write stops once at most X bytes
+  // have been written into the file. Tracing is disabled when this limit is
+  // reached, even if |duration_ms| has not been reached yet.
+  optional uint64 max_file_size_bytes = 10;
+
+  // Contains flags which override the default values of the guardrails inside
+  // Perfetto.
+  message GuardrailOverrides {
+    // Override the default limit (in bytes) for uploading data to server within
+    // a 24 hour period.
+    // On R-, this override only affected userdebug builds. Since S, it also
+    // affects user builds.
+    // In 24Q3+ (V+), this override is a noop because upload guardrail logic
+    // was removed from Perfetto.
+    optional uint64 max_upload_per_day_bytes = 1 [deprecated = true];
+
+    // Overrides the guardrail for maximum trace buffer size.
+    // Available on U+
+    optional uint32 max_tracing_buffer_size_kb = 2;
+  }
+  optional GuardrailOverrides guardrail_overrides = 11;
+
+  // When true, data sources are not started until an explicit call to
+  // StartTracing() on the consumer port. This is to support early
+  // initialization and fast trace triggering. This can be used only when the
+  // Consumer explicitly triggers the StartTracing() method.
+  // This should not be used in a remote trace config via statsd, doing so will
+  // result in a hung trace session.
+  optional bool deferred_start = 12;
+
+  // When set, it periodically issues a Flush() to all data source, forcing them
+  // to commit their data into the tracing service. This can be used for
+  // quasi-real-time streaming mode and to guarantee some partial ordering of
+  // events in the trace in windows of X ms.
+  optional uint32 flush_period_ms = 13;
+
+  // Wait for this long for producers to acknowledge flush requests.
+  // Default 5s.
+  optional uint32 flush_timeout_ms = 14;
+
+  // Wait for this long for producers to acknowledge stop requests.
+  // Default 5s.
+  optional uint32 data_source_stop_timeout_ms = 23;
+
+  // |disable_clock_snapshotting| moved.
+  reserved 15;
+
+  // Android-only. If set, sends an intent to the Traceur system app when the
+  // trace ends to notify it about the trace readiness.
+  optional bool notify_traceur = 16;
+
+  // This field was introduced in Android S.
+  // Android-only. If set to a value > 0, marks the trace session as a candidate
+  // for being attached to a bugreport. This field effectively acts as a z-index
+  // for bugreports. When Android's dumpstate runs perfetto
+  // --save-for-bugreport, traced will pick the tracing session with the highest
+  // score (score <= 0 is ignored) and:
+  // On Android S, T:  will steal its contents, save the trace into
+  //     a known path and stop prematurely.
+  // On Android U+: will create a read-only snapshot and save that into a known
+  //     path, without stoppin the original tracing session.
+  // When this field is set the tracing session becomes eligible to be cloned
+  // by other UIDs.
+  optional int32 bugreport_score = 30;
+
+  // When set, defines name of the file that will be saved under
+  // /data/misc/perfetto-traces/bugreport/ when using --save-all-for-bugreport.
+  // If omitted, traces will be named systrace.pftrace, systrace_1.pftrace, etc,
+  // starting from the highest `bugreport_score`.
+  // Introduced in v42 / Android V.
+  optional string bugreport_filename = 38;
+
+  // Triggers allow producers to start or stop the tracing session when an event
+  // occurs.
+  //
+  // For example if we are tracing probabilistically, most traces will be
+  // uninteresting. Triggers allow us to keep only the interesting ones such as
+  // those traces during which the device temperature reached a certain
+  // threshold. In this case the producer can activate a trigger to keep
+  // (STOP_TRACING) the trace, otherwise it can also begin a trace
+  // (START_TRACING) because it knows something is about to happen.
+  message TriggerConfig {
+    enum TriggerMode {
+      UNSPECIFIED = 0;
+
+      // When this mode is chosen, data sources are not started until one of the
+      // |triggers| are received. This supports early initialization and fast
+      // starting of the tracing system. On triggering, the session will then
+      // record for |stop_delay_ms|. However if no trigger is seen
+      // after |trigger_timeout_ms| the session will be stopped and no data will
+      // be returned.
+      START_TRACING = 1;
+
+      // When this mode is chosen, the session will be started via the normal
+      // EnableTracing() & StartTracing(). If no trigger is ever seen
+      // the session will be stopped after |trigger_timeout_ms| and no data will
+      // be returned. However if triggered the trace will stop after
+      // |stop_delay_ms| and any data in the buffer will be returned to the
+      // consumer.
+      STOP_TRACING = 2;
+
+      // 3 was taken by CLONE_SNAPSHOT but that has been moved to 4.
+      // The early implementation of CLONE_SNAPSHOT had various bugs
+      // (b/290798988, b/290799105) and made it into Android U. The number
+      // change is to make sure nobody rolls out a config that hits the broken
+      // behaviour.
+      reserved 3;
+
+      // When this mode is chosen, this causes a snapshot of the current tracing
+      // session to be created after |stop_delay_ms| while the current tracing
+      // session continues undisturbed (% an extra flush). This mode can be
+      // used only when the tracing session is handled by the "perfetto" cmdline
+      // client (which is true in 90% of cases). Part of the business logic
+      // necessary for this behavior, and ensuing file handling, lives in
+      // perfetto_cmd.cc . On other consumers, this causes only a notification
+      // of the trigger through a CloneTriggerHit ObservableEvent. The custom
+      // consumer is supposed to call CloneSession() itself after the event.
+      // Use use_clone_snapshot_if_available=true when targeting older versions
+      // of perfetto.
+      CLONE_SNAPSHOT = 4;
+
+      // NOTE: CLONE_SNAPSHOT should be used only when we targeting Android V+
+      // (15+) / Perfetto v38+. A bug in older versions of the tracing service
+      // might cause indefinitely long tracing sessions (see b/274931668).
+    }
+    optional TriggerMode trigger_mode = 1;
+
+    // This flag is really a workaround for b/274931668. This is needed only
+    // when deploying configs to different versions of the tracing service.
+    // When this is set to true this has the same effect of setting trigger_mode
+    // to CLONE_SNAPSHOT on newer versions of the service. This boolean has been
+    // introduced to allow to have configs that use CLONE_SNAPSHOT on newer
+    // versions of Android and fall back to STOP_TRACING on older versions where
+    // CLONE_SNAPSHOT did not exist.
+    // When using this flag, trigger_mode must be set to STOP_TRACING.
+    optional bool use_clone_snapshot_if_available = 5;
+
+    // DEPRECATED, was use_clone_snapshot_if_available in U. See the comment
+    // around CLONE_SNAPSHOT.
+    reserved 4;
+
+    message Trigger {
+      // The producer must specify this name to activate the trigger.
+      optional string name = 1;
+
+      // An std::regex that will match the producer that can activate this
+      // trigger. This is optional. If unset any producers can activate this
+      // trigger.
+      optional string producer_name_regex = 2;
+
+      // After a trigger is received either in START_TRACING or STOP_TRACING
+      // mode then the trace will end |stop_delay_ms| after triggering.
+      // In CLONE_SNAPSHOT mode, this is the delay between the trigger and the
+      // snapshot.
+      // If |prefer_suspend_clock_for_duration| is set, the duration will be
+      // based on wall-clock, counting also time in suspend.
+      optional uint32 stop_delay_ms = 3;
+
+      // Limits the number of traces this trigger can start/stop in a rolling
+      // 24 hour window. If this field is unset or zero, no limit is applied and
+      // activiation of this trigger *always* starts/stops the trace.
+      optional uint32 max_per_24_h = 4;
+
+      // A value between 0 and 1 which encodes the probability of skipping a
+      // trigger with this name. This is useful for reducing the probability
+      // of high-frequency triggers from dominating trace finaization. If this
+      // field is unset or zero, the trigger will *never* be skipped. If this
+      // field is greater than or equal to 1, this trigger will *always* be
+      // skipped i.e. it will be as if this trigger was never included in the
+      // first place.
+      // This probability check is applied *before* any other limits. For
+      // example, if |max_per_24_h| is also set, first we will check if the
+      // probability bar is met and only then will we check the |max_per_24_h|
+      // limit.
+      optional double skip_probability = 5;
+    }
+    // A list of triggers which are related to this configuration. If ANY
+    // trigger is seen then an action will be performed based on |trigger_mode|.
+    repeated Trigger triggers = 2;
+
+    // Required and must be positive if a TriggerConfig is specified. This is
+    // how long this TraceConfig should wait for a trigger to arrive. After this
+    // period of time if no trigger is seen the TracingSession will be cleaned
+    // up.
+    optional uint32 trigger_timeout_ms = 3;
+  }
+  optional TriggerConfig trigger_config = 17;
+
+  // When this is non-empty the perfetto command line tool will ignore the rest
+  // of this TraceConfig and instead connect to the perfetto service as a
+  // producer and send these triggers, potentially stopping or starting traces
+  // that were previous configured to use a TriggerConfig.
+  repeated string activate_triggers = 18;
+
+  // Configuration for trace contents that reference earlier trace data. For
+  // example, a data source might intern strings, and emit packets containing
+  // {interned id : string} pairs. Future packets from that data source can then
+  // use the interned ids instead of duplicating the raw string contents. The
+  // trace parser will then need to use that interning table to fully interpret
+  // the rest of the trace.
+  message IncrementalStateConfig {
+    // If nonzero, notify eligible data sources to clear their incremental state
+    // periodically, with the given period. The notification is sent only to
+    // data sources that have |handles_incremental_state_clear| set in their
+    // DataSourceDescriptor. The notification requests that the data source
+    // stops referring to past trace contents. This is particularly useful when
+    // tracing in ring buffer mode, where it is not exceptional to overwrite old
+    // trace data.
+    //
+    // Warning: this time-based global clearing is likely to be removed in the
+    // future, to be replaced with a smarter way of sending the notifications
+    // only when necessary.
+    optional uint32 clear_period_ms = 1;
+  }
+  optional IncrementalStateConfig incremental_state_config = 21;
+
+  // Additional guardrail used by the Perfetto command line client.
+  // On user builds when --dropbox is set perfetto will refuse to trace unless
+  // this is also set.
+  // Added in Q.
+  optional bool allow_user_build_tracing = 19;
+
+  // If set the tracing service will ensure there is at most one tracing session
+  // with this key.
+  optional string unique_session_name = 22;
+
+  // Compress trace with the given method. Best effort.
+  enum CompressionType {
+    COMPRESSION_TYPE_UNSPECIFIED = 0;
+    COMPRESSION_TYPE_DEFLATE = 1;
+  }
+  optional CompressionType compression_type = 24;
+
+  // DEPRECATED, was compress_from_cli.
+  reserved 37;
+
+  // Android-only. Not for general use. If set, saves the trace into an
+  // incident. This field is read by perfetto_cmd, rather than the tracing
+  // service. This field must be set when passing the --upload flag to
+  // perfetto_cmd.
+  message IncidentReportConfig {
+    // In this message, either:
+    //  * all of |destination_package|, |destination_class| and |privacy_level|
+    //    must be set.
+    //  * |skip_incidentd| must be explicitly set to true.
+
+    optional string destination_package = 1;
+    optional string destination_class = 2;
+    // Level of filtering in the requested incident. See |Destination| in
+    // frameworks/base/core/proto/android/privacy.proto.
+    optional int32 privacy_level = 3;
+
+    // If true, then skips saving the trace to incidentd.
+    //
+    // This flag is useful in testing (e.g. Perfetto-statsd integration tests)
+    // or when we explicitly don't want traces to go to incidentd even when they
+    // usually would (e.g. configs deployed using statsd but only used for
+    // inclusion in bugreports using |bugreport_score|).
+    //
+    // The motivation for having this flag, instead of just not setting
+    // |incident_report_config|, is prevent accidents where
+    // |incident_report_config| is omitted by mistake.
+    optional bool skip_incidentd = 5;
+
+    // If true, do not write the trace into dropbox (i.e. incident only).
+    // Otherwise, write to both dropbox and incident.
+    // TODO(lalitm): remove this field as we no longer use Dropbox.
+    optional bool skip_dropbox = 4 [deprecated = true];
+  }
+  optional IncidentReportConfig incident_report_config = 25;
+
+  enum StatsdLogging {
+    STATSD_LOGGING_UNSPECIFIED = 0;
+    STATSD_LOGGING_ENABLED = 1;
+    STATSD_LOGGING_DISABLED = 2;
+  }
+
+  // Android-only. Not for general use. If specified, sets the logging to statsd
+  // of guardrails and checkpoints in the tracing service. perfetto_cmd sets
+  // this to enabled (if not explicitly set in the config) when specifying
+  // --upload.
+  optional StatsdLogging statsd_logging = 31;
+
+  // DEPRECATED. Was trace_uuid, use trace_uuid_msb and trace_uuid_lsb instead.
+  reserved 26;
+
+  // An identifier clients can use to tie this trace to other logging.
+  // DEPRECATED as per v32. See TracePacket.trace_uuid for the authoritative
+  // Trace UUID. If this field is set, the tracing service will respect the
+  // requested UUID (i.e. TracePacket.trace_uuid == this field) but only if
+  // gap-less snapshotting is not used.
+  optional int64 trace_uuid_msb = 27 [deprecated = true];
+  optional int64 trace_uuid_lsb = 28 [deprecated = true];
+
+  // When set applies a post-filter to the trace contents using the filter
+  // provided. The filter is applied at ReadBuffers() time and works both in the
+  // case of IPC readback and write_into_file. This filter can be generated
+  // using `tools/proto_filter -s schema.proto -F filter_out.bytes` or
+  // `-T filter_out.escaped_string` (for .pbtx). See go/trace-filtering for
+  // design.
+  //
+  // Introduced in Android S, but it was broken (b/195065199). Reintroduced in
+  // Android T with a different field number. Updated in Android U with a new
+  // bytecode version which supports string filtering.
+  message TraceFilter {
+    // =========================
+    // Filter bytecode.
+    // =========================
+
+    // The bytecode as implemented in Android T.
+    optional bytes bytecode = 1;
+
+    // The bytecode as implemented in Android U. Adds support for string
+    // filtering.
+    optional bytes bytecode_v2 = 2;
+
+    // =========================
+    // String filtering
+    // =========================
+
+    // The principles and terminology of string filtering is heavily inspired by
+    // iptables. A "rule" decide how strings should be filtered. Each rule
+    // contains a "policy" which indicates the algorithm to use for filtering.
+    // A "chain" is a list of rules which will be sequentially checked against
+    // each string.
+    //
+    // The first rule which applies to the string terminates filtering for that
+    // string. If no rules apply, the string is left unchanged.
+
+    // A policy specifies which algorithm should be used for filtering the
+    // string.
+    enum StringFilterPolicy {
+      SFP_UNSPECIFIED = 0;
+
+      // Tries to match the string field against |regex_pattern|. If it
+      // matches, all matching groups are "redacted" (i.e. replaced with a
+      // constant string) and filtering is terminated (i.e. no further rules are
+      // checked). If it doesn't match, the string is left unchanged and the
+      // next rule in chain is considered.
+      SFP_MATCH_REDACT_GROUPS = 1;
+
+      // Like |SFP_MATCH_REDACT_GROUPS| but tries to do some pre-work before
+      // checking the regex. Specifically, it tries to parse the string field as
+      // an atrace tracepoint and checks if the post-tgid field starts with
+      // |atrace_post_tgid_starts_with|. The regex matching is only performed if
+      // this check succeeds.
+      SFP_ATRACE_MATCH_REDACT_GROUPS = 2;
+
+      // Tries to match the string field against |regex_pattern|. If it
+      // matches, filtering is terminated (i.e. no further rules are checked).
+      // If it doesn't match, the string is left unchanged and the next rule in
+      // chain is considered.
+      SFP_MATCH_BREAK = 3;
+
+      // Like |SFP_MATCH_BREAK| but tries to do some pre-work before checking
+      // the regex. Specifically, it tries to parse the string field as an
+      // atrace tracepoint and checks if the post-tgid field starts with
+      // |atrace_post_tgid_starts_with|. The regex matching is only performed if
+      // this check succeeds.
+      SFP_ATRACE_MATCH_BREAK = 4;
+
+      // Tries to repeatedly search (i.e. find substrings of) the string field
+      // with |regex_pattern|. For each match, redacts any matching groups (i.e.
+      // replaced with a constant string). Once there are no further matches,
+      // filtering is terminated (i.e. no further rules are checked).
+      //
+      // Note that this is policy is a "search" policy not a "match" policy
+      // unlike the above policies:
+      //  * Match policies require matching the full string i.e. there is an
+      //    implicit leading `^` and trailing `$`.
+      //  * Search policies perform repeated partial matching of the string
+      //    e.g.
+      //      - String: `foo=aaa,bar=123,foo=bbb,baz=456`
+      //      - Pattern: `foo=(\d+)`
+      //      - Output: `foo=P6O,bar=123,foo=P6O,baz=456`
+      //    where P6O is the redaction string
+      //
+      // All of this is only performed after some pre-work where we try to parse
+      // the string field as an atrace tracepoint and check if the post-tgid
+      // field starts with |atrace_post_tgid_starts_with|.
+      //
+      // If there are no partial matches, the string is left unchanged and the
+      // next rule in chain is considered.
+      SFP_ATRACE_REPEATED_SEARCH_REDACT_GROUPS = 5;
+    }
+
+    // A rule specifies how strings should be filtered.
+    message StringFilterRule {
+      // The policy (i.e. algorithm) dictating how strings matching this rule
+      // should be handled.
+      optional StringFilterPolicy policy = 1;
+
+      // The regex pattern used to match against each string.
+      optional string regex_pattern = 2;
+
+      // The string which should appear after the tgid in atrace tracepoint
+      // strings.
+      optional string atrace_payload_starts_with = 3;
+    }
+
+    // A chain is a list of rules which string will be sequentially checked
+    // against.
+    message StringFilterChain {
+      repeated StringFilterRule rules = 1;
+    }
+    optional StringFilterChain string_filter_chain = 3;
+  }
+  // old field number for trace_filter
+  reserved 32;
+  optional TraceFilter trace_filter = 33;
+
+  // Android-only. Not for general use. If set, reports the trace to the
+  // Android framework. This field is read by perfetto_cmd, rather than the
+  // tracing service. This field must be set when passing the --upload flag to
+  // perfetto_cmd.
+  message AndroidReportConfig {
+    // In this message, either:
+    //  * |reporter_service_package| and |reporter_service_class| must be set.
+    //  * |skip_reporting| must be explicitly set to true.
+
+    optional string reporter_service_package = 1;
+    optional string reporter_service_class = 2;
+
+    // If true, then skips reporting the trace to Android framework.
+    //
+    // This flag is useful in testing (e.g. Perfetto-statsd integration tests)
+    // or when we explicitly don't want to report traces to the framework even
+    // when they usually would (e.g. configs deployed using statsd but only
+    // used for inclusion in bugreports using |bugreport_score|).
+    //
+    // The motivation for having this flag, instead of just not setting
+    // |framework_report_config|, is prevent accidents where
+    // |framework_report_config| is omitted by mistake.
+    optional bool skip_report = 3;
+
+    // If true, will direct the Android framework to read the data in trace
+    // file and pass it to the reporter class over a pipe instead of passing
+    // the file descriptor directly.
+    //
+    // This flag is needed because the Android test framework does not
+    // currently support priv-app helper apps (in terms of SELinux) and we
+    // really don't want to add an allow rule for untrusted_app to receive
+    // trace fds.
+    //
+    // Because of this, we instead will direct the framework to create a new
+    // pipe and pass this to the reporter process instead. As the pipe is
+    // created by the framework, we won't have any problems with SELinux
+    // (system_server is already allowed to pass pipe fds, even
+    // to untrusted apps).
+    //
+    // As the name suggests this option *MUST* only be used for testing.
+    // Note that the framework will reject (and drop) files which are too
+    // large both for simplicity and to be minimize the amount of data we
+    // pass to a non-priv app (note that the framework will still check
+    // manifest permissions even though SELinux permissions are worked around).
+    optional bool use_pipe_in_framework_for_testing = 4;
+  }
+  optional AndroidReportConfig android_report_config = 34;
+
+  // If set, delays the start of tracing by a random duration. The duration is
+  // chosen from a uniform distribution between the specified minimum and
+  // maximum.
+  // Note: this delay is implemented by perfetto_cmd *not* by traced so will
+  // not work if you communicate with traced directly over the consumer API.
+  // Introduced in Android T.
+  message CmdTraceStartDelay {
+    optional uint32 min_delay_ms = 1;
+    optional uint32 max_delay_ms = 2;
+  }
+  optional CmdTraceStartDelay cmd_trace_start_delay = 35;
+}
+
+// End of protos/perfetto/config/trace_config.proto
diff --git a/src/libtracing/protos/perfetto/config/power/android_power_config.proto b/src/libtracing/protos/perfetto/config/power/android_power_config.proto
new file mode 100644
index 000000000..3526e8614
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/power/android_power_config.proto
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidPowerConfig {
+  enum BatteryCounters {
+    BATTERY_COUNTER_UNSPECIFIED = 0;
+
+    // Coulomb counter.
+    BATTERY_COUNTER_CHARGE = 1;
+
+    // Charge (%).
+    BATTERY_COUNTER_CAPACITY_PERCENT = 2;
+
+    // Instantaneous current.
+    BATTERY_COUNTER_CURRENT = 3;
+
+    // Avg current.
+    BATTERY_COUNTER_CURRENT_AVG = 4;
+
+    // Instantaneous voltage.
+    BATTERY_COUNTER_VOLTAGE = 5;
+  }
+  optional uint32 battery_poll_ms = 1;
+  repeated BatteryCounters battery_counters = 2;
+
+  // Where available enables per-power-rail measurements.
+  optional bool collect_power_rails = 3;
+
+  // Provides a breakdown of energy estimation for various subsystem (e.g. GPU).
+  // Available from Android S.
+  optional bool collect_energy_estimation_breakdown = 4;
+
+  // Provides a breakdown of time in state for various subsystems.
+  // Available from Android U.
+  optional bool collect_entity_state_residency = 5;
+}
diff --git a/src/libtracing/protos/perfetto/config/process_stats/process_stats_config.proto b/src/libtracing/protos/perfetto/config/process_stats/process_stats_config.proto
new file mode 100644
index 000000000..a1c960ad5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/process_stats/process_stats_config.proto
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message ProcessStatsConfig {
+  enum Quirks {
+    QUIRKS_UNSPECIFIED = 0;
+
+    // This has been deprecated and ignored as per 2018-05-01. Full scan at
+    // startup is now disabled by default and can be re-enabled using the
+    // |scan_all_processes_on_start| arg.
+    DISABLE_INITIAL_DUMP = 1 [deprecated = true];
+
+    DISABLE_ON_DEMAND = 2;
+  }
+  repeated Quirks quirks = 1;
+
+  // If enabled all processes will be scanned and dumped when the trace starts.
+  optional bool scan_all_processes_on_start = 2;
+
+  // If enabled thread names are also recoded (this is redundant if sched_switch
+  // is enabled).
+  optional bool record_thread_names = 3;
+
+  // If > 0 samples counters (see process_stats.proto) from
+  // /proc/pid/status and oom_score_adj every X ms.
+  // It will also sample /proc/pid/smaps_rollup if scan_smaps_rollup = true.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 proc_stats_poll_ms = 4;
+
+  // id 5 never used
+
+  // This is required to be either = 0 or a multiple of |proc_stats_poll_ms|
+  // (default: |proc_stats_poll_ms|). If = 0, will be set to
+  // |proc_stats_poll_ms|. Non-multiples will be rounded down to the nearest
+  // multiple.
+  optional uint32 proc_stats_cache_ttl_ms = 6;
+
+  // Niche feature: If true this will resolve file descriptors for each process
+  // so these can be mapped to their actual device or file.
+  // Requires raw_syscalls/sys_{enter,exit} ftrace events to be enabled or
+  // new fds opened after initially scanning a process will not be
+  // recognized.
+  optional bool resolve_process_fds = 9;
+
+  // If true, output will include memory stats from /proc/pid/smaps_rollup.
+  optional bool scan_smaps_rollup = 10;
+
+  // If true: process descriptions will include process age (starttime in
+  // /proc/pid/stat).
+  // Introduced in: perfetto v44.
+  optional bool record_process_age = 11;
+
+  // If true and |proc_stats_poll_ms| is true, process stats will include time
+  // spent running in user/kernel mode (utime/stime in /proc/pid/stat).
+  // Introduced in: perfetto v44.
+  optional bool record_process_runtime = 12;
+
+  // record_thread_time_in_state
+  reserved 7;
+  // thread_time_in_state_cache_size
+  reserved 8;
+}
diff --git a/src/libtracing/protos/perfetto/config/profiling/heapprofd_config.proto b/src/libtracing/protos/perfetto/config/profiling/heapprofd_config.proto
new file mode 100644
index 000000000..bb0a70087
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/profiling/heapprofd_config.proto
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Configuration for go/heapprofd.
+// Next id: 28
+message HeapprofdConfig {
+  message ContinuousDumpConfig {
+    // ms to wait before first dump.
+    optional uint32 dump_phase_ms = 5;
+    // ms to wait between following dumps.
+    optional uint32 dump_interval_ms = 6;
+  }
+
+  // Sampling rate for all heaps not specified via heap_sampling_intervals.
+  //
+  // These are:
+  // * All heaps if heap_sampling_intervals is empty.
+  // * Those profiled due to all_heaps and not named in heaps if
+  //   heap_sampling_intervals is not empty.
+  // * The implicit libc.malloc heap if heaps is empty.
+  //
+  // Set to 1 for perfect accuracy.
+  // Otherwise, sample every sample_interval_bytes on average.
+  //
+  // See
+  // https://perfetto.dev/docs/data-sources/native-heap-profiler#sampling-interval
+  // for more details.
+  //
+  // BUGS
+  // Before Android 12, setting this to 0 would crash the target process.
+  //
+  // N.B. This must be explicitly set to a non-zero value for all heaps (with
+  // this field or with heap_sampling_intervals), otherwise the producer will
+  // not start.
+  optional uint64 sampling_interval_bytes = 1;
+
+  // If less than the given numbers of bytes are left free in the shared
+  // memory buffer, increase sampling interval by a factor of two.
+  // Adaptive sampling is disabled when set to 0.
+  optional uint64 adaptive_sampling_shmem_threshold = 24;
+  // Stop doubling the sampling_interval once the sampling interval has reached
+  // this value.
+  optional uint64 adaptive_sampling_max_sampling_interval_bytes = 25;
+
+  // E.g. surfaceflinger, com.android.phone
+  // This input is normalized in the following way: if it contains slashes,
+  // everything up to the last slash is discarded. If it contains "@",
+  // everything after the first @ is discared.
+  // E.g. /system/bin/surfaceflinger@1.0 normalizes to surfaceflinger.
+  // This transformation is also applied to the processes' command lines when
+  // matching.
+  repeated string process_cmdline = 2;
+
+  // For watermark based triggering or local debugging.
+  repeated uint64 pid = 4;
+
+  // Only profile target if it was installed by one of the packages given.
+  // Special values are:
+  // * @system: installed on the system partition
+  // * @product: installed on the product partition
+  // * @null: sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 26;
+
+  // Which heaps to sample, e.g. "libc.malloc". If left empty, only samples
+  // "malloc".
+  //
+  // Introduced in Android 12.
+  repeated string heaps = 20;
+
+  // Which heaps not to sample, e.g. "libc.malloc". This is useful when used in
+  // combination with all_heaps;
+  //
+  // Introduced in Android 12.
+  repeated string exclude_heaps = 27;
+
+  optional bool stream_allocations = 23;
+
+  // If given, needs to be the same length as heaps and gives the sampling
+  // interval for the respective entry in heaps.
+  //
+  // Otherwise, sampling_interval_bytes is used.
+  //
+  // It is recommended to set sampling_interval_bytes to a reasonable default
+  // value when using this, as a value of 0 for sampling_interval_bytes will
+  // crash the target process before Android 12.
+  //
+  // Introduced in Android 12.
+  //
+  // All values must be non-zero or the producer will not start.
+  repeated uint64 heap_sampling_intervals = 22;
+
+  // Sample all heaps registered by target process. Introduced in Android 12.
+  optional bool all_heaps = 21;
+
+  // Profile all processes eligible for profiling on the system.
+  // See
+  // https://perfetto.dev/docs/data-sources/native-heap-profiler#heapprofd-targets
+  // for which processes are eligible.
+  //
+  // On unmodified userdebug builds, this will lead to system crashes. Zygote
+  // will crash when trying to launch a new process as it will have an
+  // unexpected open socket to heapprofd.
+  //
+  // heapprofd will likely be overloaded by the amount of data for low
+  // sampling intervals.
+  optional bool all = 5;
+
+  // Do not profile processes whose anon RSS + swap < given value.
+  // Introduced in Android 11.
+  optional uint32 min_anonymous_memory_kb = 15;
+
+  // Stop profile if heapprofd memory usage goes beyond the given value.
+  // Introduced in Android 11.
+  optional uint32 max_heapprofd_memory_kb = 16;
+
+  // Stop profile if heapprofd CPU time since start of this data-source
+  // goes beyond given value.
+  // Introduced in Android 11.
+  optional uint64 max_heapprofd_cpu_secs = 17;
+
+  // Do not emit function names for mappings starting with this prefix.
+  // E.g. /system to not emit symbols for any system libraries.
+  repeated string skip_symbol_prefix = 7;
+
+  // Dump at a predefined interval.
+  optional ContinuousDumpConfig continuous_dump_config = 6;
+
+  // Size of the shared memory buffer between the profiled processes and
+  // heapprofd. Defaults to 8 MiB. If larger than 500 MiB, truncated to 500
+  // MiB.
+  //
+  // Needs to be:
+  // * at least 8192,
+  // * a power of two,
+  // * a multiple of 4096.
+  optional uint64 shmem_size_bytes = 8;
+
+  // When the shmem buffer is full, block the client instead of ending the
+  // trace. Use with caution as this will significantly slow down the target
+  // process.
+  optional bool block_client = 9;
+
+  // If set, stop the trace session after blocking the client for this
+  // timeout. Needs to be larger than 100 us, otherwise no retries are done.
+  // Introduced in Android 11.
+  optional uint32 block_client_timeout_us = 14;
+
+  // Do not profile processes from startup, only match already running
+  // processes.
+  //
+  // Can not be set at the same time as no_running.
+  // Introduced in Android 11.
+  optional bool no_startup = 10;
+
+  // Do not profile running processes. Only match processes on startup.
+  //
+  // Can not be set at the same time as no_startup.
+  // Introduced in Android 11.
+  optional bool no_running = 11;
+
+  // deprecated idle_allocations.
+  reserved 12;
+
+  // Cause heapprofd to emit a single dump at the end, showing the memory usage
+  // at the point in time when the sampled heap usage of the process was at its
+  // maximum. This causes ProfilePacket.HeapSample.self_max to be set, and
+  // self_allocated and self_freed to not be set.
+  // Introduced in Android 11.
+  optional bool dump_at_max = 13;
+
+  // FEATURE FLAGS. THERE BE DRAGONS.
+
+  // Escape hatch if the session is being torn down because of a forked child
+  // that shares memory space, but is not correctly identified as a vforked
+  // child.
+  // Introduced in Android 11.
+  optional bool disable_fork_teardown = 18;
+
+  // We try to automatically detect when a target applicatation vforks but then
+  // does a memory allocation (or free). This auto-detection can be disabled
+  // with this.
+  // Introduced in Android 11.
+  optional bool disable_vfork_detection = 19;
+}
diff --git a/src/libtracing/protos/perfetto/config/profiling/java_hprof_config.proto b/src/libtracing/protos/perfetto/config/profiling/java_hprof_config.proto
new file mode 100644
index 000000000..c1613963f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/profiling/java_hprof_config.proto
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Configuration for managed app heap graph snapshots.
+message JavaHprofConfig {
+  // If dump_interval_ms != 0, the following configuration is used.
+  message ContinuousDumpConfig {
+    // ms to wait before first continuous dump.
+    // A dump is always created at the beginning of the trace.
+    optional uint32 dump_phase_ms = 1;
+    // ms to wait between following dumps.
+    optional uint32 dump_interval_ms = 2;
+    // If true, scans all the processes to find `process_cmdline` and filter by
+    // `min_anonymous_memory_kb` only at data source start. Default on Android
+    // S-.
+    //
+    // If false, rescans all the processes to find on every dump. Default on
+    // Android T+.
+    optional bool scan_pids_only_on_start = 3;
+  }
+
+  // Command line allowlist, matched against the /proc/<pid>/cmdline (not the
+  // comm string). The semantics of this field were changed since its original
+  // introduction.
+  //
+  // On Android T+ (13+), this field can specify a single wildcard (*), and
+  // the profiler will attempt to match it in two possible ways:
+  // * if the pattern starts with a '/', then it is matched against the first
+  //   segment of the cmdline (i.e. argv0). For example "/bin/e*" would match
+  //   "/bin/echo".
+  // * otherwise the pattern is matched against the part of argv0
+  //   corresponding to the binary name (this is unrelated to /proc/pid/exe).
+  //   For example "echo" would match "/bin/echo".
+  //
+  // On Android S (12) and below, both this pattern and /proc/pid/cmdline get
+  // normalized prior to an exact string comparison. Normalization is as
+  // follows: (1) trim everything beyond the first null or "@" byte; (2) if
+  // the string contains forward slashes, trim everything up to and including
+  // the last one.
+  //
+  // Implementation note: in either case, at most 511 characters of cmdline
+  // are considered.
+  repeated string process_cmdline = 1;
+
+  // For watermark based triggering or local debugging.
+  repeated uint64 pid = 2;
+
+  // Only profile target if it was installed by one of the packages given.
+  // Special values are:
+  // * @system: installed on the system partition
+  // * @product: installed on the product partition
+  // * @null: sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 7;
+
+  // Dump at a predefined interval.
+  optional ContinuousDumpConfig continuous_dump_config = 3;
+
+  // Do not profile processes whose anon RSS + swap < given value.
+  optional uint32 min_anonymous_memory_kb = 4;
+
+  // Include the process' /proc/self/smaps.
+  // This only shows maps that:
+  // * start with /system
+  // * start with /vendor
+  // * start with /data/app
+  // * contain "extracted in memory from Y", where Y matches any of the above
+  optional bool dump_smaps = 5;
+
+  // Exclude objects of the following types from the profile. This can be
+  // useful if lots of uninteresting objects, e.g. "sun.misc.Cleaner".
+  repeated string ignored_types = 6;
+}
diff --git a/src/libtracing/protos/perfetto/config/profiling/perf_event_config.proto b/src/libtracing/protos/perfetto/config/profiling/perf_event_config.proto
new file mode 100644
index 000000000..3c9af8ae7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/profiling/perf_event_config.proto
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/perf_events.proto";
+
+package perfetto.protos;
+
+// Configuration for the traced_perf profiler.
+//
+// Example config for basic cpu profiling:
+//   perf_event_config {
+//     timebase {
+//       frequency: 80
+//     }
+//     callstack_sampling {
+//       scope {
+//         target_cmdline: "surfaceflinger"
+//         target_cmdline: "system_server"
+//       }
+//       kernel_frames: true
+//     }
+//   }
+//
+// Next id: 19
+message PerfEventConfig {
+  // What event to sample on, and how often.
+  // Defined in common/perf_events.proto.
+  optional PerfEvents.Timebase timebase = 15;
+
+  // If set, the profiler will sample userspace processes' callstacks at the
+  // interval specified by the |timebase|.
+  // If unset, the profiler will record only the event counts.
+  optional CallstackSampling callstack_sampling = 16;
+
+  //
+  // Kernel <-> userspace ring buffer options:
+  //
+
+  // How often the per-cpu ring buffers are read by the producer.
+  // If unset, an implementation-defined default is used.
+  optional uint32 ring_buffer_read_period_ms = 8;
+
+  // Size (in 4k pages) of each per-cpu ring buffer that is filled by the
+  // kernel. If set, must be a power of two.
+  // If unset, an implementation-defined default is used.
+  optional uint32 ring_buffer_pages = 3;
+
+  //
+  // Daemon's resource usage limits:
+  //
+
+  // Drop samples if the heap memory held by the samples in the unwinder queue
+  // is above the given limit. This counts the memory across all concurrent data
+  // sources (not just this one's), and there is no fairness guarantee - the
+  // whole quota might be used up by a concurrent source.
+  optional uint64 max_enqueued_footprint_kb = 17;
+
+  // Stop the data source if traced_perf's combined {RssAnon + Swap} memory
+  // footprint exceeds this value.
+  optional uint32 max_daemon_memory_kb = 13;
+
+  //
+  // Uncommon options:
+  //
+
+  // Timeout for the remote /proc/<pid>/{maps,mem} file descriptors for a
+  // sampled process. This is primarily for Android, where this lookup is
+  // asynchronous. As long as the producer is waiting, the associated samples
+  // will be kept enqueued (putting pressure on the capacity of the shared
+  // unwinding queue). Once a lookup for a process expires, all associated
+  // samples are discarded. However, if the lookup still succeeds after the
+  // timeout, future samples will be handled normally.
+  // If unset, an implementation-defined default is used.
+  optional uint32 remote_descriptor_timeout_ms = 9;
+
+  // Optional period for clearing state cached by the unwinder. This is a heavy
+  // operation that is only necessary for traces that target a wide set of
+  // processes, and require the memory footprint to be reset periodically.
+  // If unset, the cached state will not be cleared.
+  optional uint32 unwind_state_clear_period_ms = 10;
+
+  // If set, only profile target if it was installed by a package with one of
+  // these names. Special values:
+  // * "@system": installed on the system partition
+  // * "@product": installed on the product partition
+  // * "@null": sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 18;
+
+  //
+  // Deprecated (superseded by options above):
+  //
+  // Do not set *any* of these fields in new configs.
+  //
+
+  // Note: legacy configs had to set |all_cpus| to true to pass parsing.
+  // We rely on this to detect such configs.
+  optional bool all_cpus = 1;
+  optional uint32 sampling_frequency = 2;
+  optional bool kernel_frames = 12;
+  repeated int32 target_pid = 4;
+  repeated string target_cmdline = 5;
+  repeated int32 exclude_pid = 6;
+  repeated string exclude_cmdline = 7;
+  optional uint32 additional_cmdline_count = 11;
+  // previously |tracepoint|
+  reserved 14;
+
+  //
+  // Sub-messages (nested for generated code namespacing).
+  //
+
+  message CallstackSampling {
+    // Defines a set of processes for which samples are retained/skipped. If
+    // unset, all samples are kept, but beware that it will be very heavy on the
+    // stack unwinder, which might start dropping samples due to overload.
+    optional Scope scope = 1;
+
+    // If true, callstacks will include the kernel-space frames. Such frames can
+    // be identified by a magical "kernel" string as their mapping name.
+    // Requires traced_perf to be running as root, or kptr_restrict to have been
+    // manually unrestricted. On Android, the platform should do the right thing
+    // on debug builds.
+    // This does *not* disclose KASLR, as only the function names are emitted.
+    optional bool kernel_frames = 2;
+
+    // Whether to record and unwind userspace callstacks. If unset, defaults to
+    // including userspace (UNWIND_DWARF) both for backwards compatibility and
+    // as the most common default (this defaulting is only applicable if the
+    // outer CallstackSampling message is explicitly set).
+    optional UnwindMode user_frames = 3;
+  }
+
+  message Scope {
+    // Process ID (TGID) allowlist. If this list is not empty, only matching
+    // samples will be retained. If multiple allow/deny-lists are
+    // specified by the config, then all of them are evaluated for each sampled
+    // process.
+    repeated int32 target_pid = 1;
+
+    // Command line allowlist, matched against the /proc/<pid>/cmdline (not the
+    // comm string). The semantics of this field were changed since its original
+    // introduction.
+    //
+    // On Android T+ (13+), this field can specify a single wildcard (*), and
+    // the profiler will attempt to match it in two possible ways:
+    // * if the pattern starts with a '/', then it is matched against the first
+    //   segment of the cmdline (i.e. argv0). For example "/bin/e*" would match
+    //   "/bin/echo".
+    // * otherwise the pattern is matched against the part of argv0
+    //   corresponding to the binary name (this is unrelated to /proc/pid/exe).
+    //   For example "echo" would match "/bin/echo".
+    //
+    // On Android S (12) and below, both this pattern and /proc/pid/cmdline get
+    // normalized prior to an exact string comparison. Normalization is as
+    // follows: (1) trim everything beyond the first null or "@" byte; (2) if
+    // the string contains forward slashes, trim everything up to and including
+    // the last one.
+    //
+    // Implementation note: in either case, at most 511 characters of cmdline
+    // are considered.
+    repeated string target_cmdline = 2;
+
+    // List of excluded pids.
+    repeated int32 exclude_pid = 3;
+
+    // List of excluded cmdlines. See description of |target_cmdline| for how
+    // this is handled.
+    repeated string exclude_cmdline = 4;
+
+    // Niche features for systemwide callstacks:
+
+    // Number of additional command lines to sample. Only those which are
+    // neither explicitly included nor excluded will be considered. Processes
+    // are accepted on a first come, first served basis.
+    optional uint32 additional_cmdline_count = 5;
+
+    // If set to N, all encountered processes will be put into one of the N
+    // possible bins, and only one randomly-chosen bin will be selected for
+    // unwinding. The binning is simply "pid % N", under the assumption that
+    // low-order bits of pids are roughly uniformly distributed. Other explicit
+    // inclusions/exclusions in this |Scope| message are still respected.
+    //
+    // The profiler will report the chosen shard in PerfSampleDefaults, and the
+    // values will be queryable in trace processor under the "stats" table as
+    // "perf_process_shard_count" and "perf_chosen_process_shard".
+    //
+    // NB: all data sources in a config that set |process_shard_count| must set
+    // it to the same value. The profiler will choose one bin for all those data
+    // sources.
+    optional uint32 process_shard_count = 6;
+  }
+
+  // Userspace unwinding mode. A possible future addition is kernel-unwound
+  // callchains for frame pointer based systems.
+  enum UnwindMode {
+    UNWIND_UNKNOWN = 0;
+    // Do not unwind userspace:
+    UNWIND_SKIP = 1;
+    // Use libunwindstack (default):
+    UNWIND_DWARF = 2;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/config/statsd/atom_ids.proto b/src/libtracing/protos/perfetto/config/statsd/atom_ids.proto
new file mode 100644
index 000000000..ee8026e3b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/statsd/atom_ids.proto
@@ -0,0 +1,907 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This enum is obtained by post-processing
+// AOSP/frameworks/proto_logging/stats/atoms.proto through
+// AOSP/external/perfetto/tools/update-statsd-descriptor, which extracts one
+// enum value for each proto field defined in the upstream atoms.proto.
+enum AtomId {
+  ATOM_UNSPECIFIED = 0;
+  ATOM_BLE_SCAN_STATE_CHANGED = 2;
+  ATOM_PROCESS_STATE_CHANGED = 3;
+  ATOM_BLE_SCAN_RESULT_RECEIVED = 4;
+  ATOM_SENSOR_STATE_CHANGED = 5;
+  ATOM_GPS_SCAN_STATE_CHANGED = 6;
+  ATOM_SYNC_STATE_CHANGED = 7;
+  ATOM_SCHEDULED_JOB_STATE_CHANGED = 8;
+  ATOM_SCREEN_BRIGHTNESS_CHANGED = 9;
+  ATOM_WAKELOCK_STATE_CHANGED = 10;
+  ATOM_LONG_PARTIAL_WAKELOCK_STATE_CHANGED = 11;
+  ATOM_MOBILE_RADIO_POWER_STATE_CHANGED = 12;
+  ATOM_WIFI_RADIO_POWER_STATE_CHANGED = 13;
+  ATOM_ACTIVITY_MANAGER_SLEEP_STATE_CHANGED = 14;
+  ATOM_MEMORY_FACTOR_STATE_CHANGED = 15;
+  ATOM_EXCESSIVE_CPU_USAGE_REPORTED = 16;
+  ATOM_CACHED_KILL_REPORTED = 17;
+  ATOM_PROCESS_MEMORY_STAT_REPORTED = 18;
+  ATOM_LAUNCHER_EVENT = 19;
+  ATOM_BATTERY_SAVER_MODE_STATE_CHANGED = 20;
+  ATOM_DEVICE_IDLE_MODE_STATE_CHANGED = 21;
+  ATOM_DEVICE_IDLING_MODE_STATE_CHANGED = 22;
+  ATOM_AUDIO_STATE_CHANGED = 23;
+  ATOM_MEDIA_CODEC_STATE_CHANGED = 24;
+  ATOM_CAMERA_STATE_CHANGED = 25;
+  ATOM_FLASHLIGHT_STATE_CHANGED = 26;
+  ATOM_UID_PROCESS_STATE_CHANGED = 27;
+  ATOM_PROCESS_LIFE_CYCLE_STATE_CHANGED = 28;
+  ATOM_SCREEN_STATE_CHANGED = 29;
+  ATOM_BATTERY_LEVEL_CHANGED = 30;
+  ATOM_CHARGING_STATE_CHANGED = 31;
+  ATOM_PLUGGED_STATE_CHANGED = 32;
+  ATOM_INTERACTIVE_STATE_CHANGED = 33;
+  ATOM_TOUCH_EVENT_REPORTED = 34;
+  ATOM_WAKEUP_ALARM_OCCURRED = 35;
+  ATOM_KERNEL_WAKEUP_REPORTED = 36;
+  ATOM_WIFI_LOCK_STATE_CHANGED = 37;
+  ATOM_WIFI_SIGNAL_STRENGTH_CHANGED = 38;
+  ATOM_WIFI_SCAN_STATE_CHANGED = 39;
+  ATOM_PHONE_SIGNAL_STRENGTH_CHANGED = 40;
+  ATOM_SETTING_CHANGED = 41;
+  ATOM_ACTIVITY_FOREGROUND_STATE_CHANGED = 42;
+  ATOM_ISOLATED_UID_CHANGED = 43;
+  ATOM_PACKET_WAKEUP_OCCURRED = 44;
+  ATOM_WALL_CLOCK_TIME_SHIFTED = 45;
+  ATOM_ANOMALY_DETECTED = 46;
+  ATOM_APP_BREADCRUMB_REPORTED = 47;
+  ATOM_APP_START_OCCURRED = 48;
+  ATOM_APP_START_CANCELED = 49;
+  ATOM_APP_START_FULLY_DRAWN = 50;
+  ATOM_LMK_KILL_OCCURRED = 51;
+  ATOM_PICTURE_IN_PICTURE_STATE_CHANGED = 52;
+  ATOM_WIFI_MULTICAST_LOCK_STATE_CHANGED = 53;
+  ATOM_LMK_STATE_CHANGED = 54;
+  ATOM_APP_START_MEMORY_STATE_CAPTURED = 55;
+  ATOM_SHUTDOWN_SEQUENCE_REPORTED = 56;
+  ATOM_BOOT_SEQUENCE_REPORTED = 57;
+  ATOM_DAVEY_OCCURRED = 58;
+  ATOM_OVERLAY_STATE_CHANGED = 59;
+  ATOM_FOREGROUND_SERVICE_STATE_CHANGED = 60;
+  ATOM_CALL_STATE_CHANGED = 61;
+  ATOM_KEYGUARD_STATE_CHANGED = 62;
+  ATOM_KEYGUARD_BOUNCER_STATE_CHANGED = 63;
+  ATOM_KEYGUARD_BOUNCER_PASSWORD_ENTERED = 64;
+  ATOM_APP_DIED = 65;
+  ATOM_RESOURCE_CONFIGURATION_CHANGED = 66;
+  ATOM_BLUETOOTH_ENABLED_STATE_CHANGED = 67;
+  ATOM_BLUETOOTH_CONNECTION_STATE_CHANGED = 68;
+  ATOM_GPS_SIGNAL_QUALITY_CHANGED = 69;
+  ATOM_USB_CONNECTOR_STATE_CHANGED = 70;
+  ATOM_SPEAKER_IMPEDANCE_REPORTED = 71;
+  ATOM_HARDWARE_FAILED = 72;
+  ATOM_PHYSICAL_DROP_DETECTED = 73;
+  ATOM_CHARGE_CYCLES_REPORTED = 74;
+  ATOM_MOBILE_CONNECTION_STATE_CHANGED = 75;
+  ATOM_MOBILE_RADIO_TECHNOLOGY_CHANGED = 76;
+  ATOM_USB_DEVICE_ATTACHED = 77;
+  ATOM_APP_CRASH_OCCURRED = 78;
+  ATOM_ANR_OCCURRED = 79;
+  ATOM_WTF_OCCURRED = 80;
+  ATOM_LOW_MEM_REPORTED = 81;
+  ATOM_GENERIC_ATOM = 82;
+  ATOM_VIBRATOR_STATE_CHANGED = 84;
+  ATOM_DEFERRED_JOB_STATS_REPORTED = 85;
+  ATOM_THERMAL_THROTTLING = 86;
+  ATOM_BIOMETRIC_ACQUIRED = 87;
+  ATOM_BIOMETRIC_AUTHENTICATED = 88;
+  ATOM_BIOMETRIC_ERROR_OCCURRED = 89;
+  ATOM_UI_EVENT_REPORTED = 90;
+  ATOM_BATTERY_HEALTH_SNAPSHOT = 91;
+  ATOM_SLOW_IO = 92;
+  ATOM_BATTERY_CAUSED_SHUTDOWN = 93;
+  ATOM_PHONE_SERVICE_STATE_CHANGED = 94;
+  ATOM_PHONE_STATE_CHANGED = 95;
+  ATOM_USER_RESTRICTION_CHANGED = 96;
+  ATOM_SETTINGS_UI_CHANGED = 97;
+  ATOM_CONNECTIVITY_STATE_CHANGED = 98;
+  ATOM_SERVICE_STATE_CHANGED = 99;
+  ATOM_SERVICE_LAUNCH_REPORTED = 100;
+  ATOM_FLAG_FLIP_UPDATE_OCCURRED = 101;
+  ATOM_BINARY_PUSH_STATE_CHANGED = 102;
+  ATOM_DEVICE_POLICY_EVENT = 103;
+  ATOM_DOCS_UI_FILE_OP_CANCELED = 104;
+  ATOM_DOCS_UI_FILE_OP_COPY_MOVE_MODE_REPORTED = 105;
+  ATOM_DOCS_UI_FILE_OP_FAILURE = 106;
+  ATOM_DOCS_UI_PROVIDER_FILE_OP = 107;
+  ATOM_DOCS_UI_INVALID_SCOPED_ACCESS_REQUEST = 108;
+  ATOM_DOCS_UI_LAUNCH_REPORTED = 109;
+  ATOM_DOCS_UI_ROOT_VISITED = 110;
+  ATOM_DOCS_UI_STARTUP_MS = 111;
+  ATOM_DOCS_UI_USER_ACTION_REPORTED = 112;
+  ATOM_WIFI_ENABLED_STATE_CHANGED = 113;
+  ATOM_WIFI_RUNNING_STATE_CHANGED = 114;
+  ATOM_APP_COMPACTED = 115;
+  ATOM_NETWORK_DNS_EVENT_REPORTED = 116;
+  ATOM_DOCS_UI_PICKER_LAUNCHED_FROM_REPORTED = 117;
+  ATOM_DOCS_UI_PICK_RESULT_REPORTED = 118;
+  ATOM_DOCS_UI_SEARCH_MODE_REPORTED = 119;
+  ATOM_DOCS_UI_SEARCH_TYPE_REPORTED = 120;
+  ATOM_DATA_STALL_EVENT = 121;
+  ATOM_RESCUE_PARTY_RESET_REPORTED = 122;
+  ATOM_SIGNED_CONFIG_REPORTED = 123;
+  ATOM_GNSS_NI_EVENT_REPORTED = 124;
+  ATOM_BLUETOOTH_LINK_LAYER_CONNECTION_EVENT = 125;
+  ATOM_BLUETOOTH_ACL_CONNECTION_STATE_CHANGED = 126;
+  ATOM_BLUETOOTH_SCO_CONNECTION_STATE_CHANGED = 127;
+  ATOM_APP_DOWNGRADED = 128;
+  ATOM_APP_OPTIMIZED_AFTER_DOWNGRADED = 129;
+  ATOM_LOW_STORAGE_STATE_CHANGED = 130;
+  ATOM_GNSS_NFW_NOTIFICATION_REPORTED = 131;
+  ATOM_GNSS_CONFIGURATION_REPORTED = 132;
+  ATOM_USB_PORT_OVERHEAT_EVENT_REPORTED = 133;
+  ATOM_NFC_ERROR_OCCURRED = 134;
+  ATOM_NFC_STATE_CHANGED = 135;
+  ATOM_NFC_BEAM_OCCURRED = 136;
+  ATOM_NFC_CARDEMULATION_OCCURRED = 137;
+  ATOM_NFC_TAG_OCCURRED = 138;
+  ATOM_NFC_HCE_TRANSACTION_OCCURRED = 139;
+  ATOM_SE_STATE_CHANGED = 140;
+  ATOM_SE_OMAPI_REPORTED = 141;
+  ATOM_BROADCAST_DISPATCH_LATENCY_REPORTED = 142;
+  ATOM_ATTENTION_MANAGER_SERVICE_RESULT_REPORTED = 143;
+  ATOM_ADB_CONNECTION_CHANGED = 144;
+  ATOM_SPEECH_DSP_STAT_REPORTED = 145;
+  ATOM_USB_CONTAMINANT_REPORTED = 146;
+  ATOM_WATCHDOG_ROLLBACK_OCCURRED = 147;
+  ATOM_BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED = 148;
+  ATOM_BUBBLE_UI_CHANGED = 149;
+  ATOM_SCHEDULED_JOB_CONSTRAINT_CHANGED = 150;
+  ATOM_BLUETOOTH_ACTIVE_DEVICE_CHANGED = 151;
+  ATOM_BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED = 152;
+  ATOM_BLUETOOTH_A2DP_CODEC_CONFIG_CHANGED = 153;
+  ATOM_BLUETOOTH_A2DP_CODEC_CAPABILITY_CHANGED = 154;
+  ATOM_BLUETOOTH_A2DP_AUDIO_UNDERRUN_REPORTED = 155;
+  ATOM_BLUETOOTH_A2DP_AUDIO_OVERRUN_REPORTED = 156;
+  ATOM_BLUETOOTH_DEVICE_RSSI_REPORTED = 157;
+  ATOM_BLUETOOTH_DEVICE_FAILED_CONTACT_COUNTER_REPORTED = 158;
+  ATOM_BLUETOOTH_DEVICE_TX_POWER_LEVEL_REPORTED = 159;
+  ATOM_BLUETOOTH_HCI_TIMEOUT_REPORTED = 160;
+  ATOM_BLUETOOTH_QUALITY_REPORT_REPORTED = 161;
+  ATOM_BLUETOOTH_DEVICE_INFO_REPORTED = 162;
+  ATOM_BLUETOOTH_REMOTE_VERSION_INFO_REPORTED = 163;
+  ATOM_BLUETOOTH_SDP_ATTRIBUTE_REPORTED = 164;
+  ATOM_BLUETOOTH_BOND_STATE_CHANGED = 165;
+  ATOM_BLUETOOTH_CLASSIC_PAIRING_EVENT_REPORTED = 166;
+  ATOM_BLUETOOTH_SMP_PAIRING_EVENT_REPORTED = 167;
+  ATOM_SCREEN_TIMEOUT_EXTENSION_REPORTED = 168;
+  ATOM_PROCESS_START_TIME = 169;
+  ATOM_PERMISSION_GRANT_REQUEST_RESULT_REPORTED = 170;
+  ATOM_BLUETOOTH_SOCKET_CONNECTION_STATE_CHANGED = 171;
+  ATOM_DEVICE_IDENTIFIER_ACCESS_DENIED = 172;
+  ATOM_BUBBLE_DEVELOPER_ERROR_REPORTED = 173;
+  ATOM_ASSIST_GESTURE_STAGE_REPORTED = 174;
+  ATOM_ASSIST_GESTURE_FEEDBACK_REPORTED = 175;
+  ATOM_ASSIST_GESTURE_PROGRESS_REPORTED = 176;
+  ATOM_TOUCH_GESTURE_CLASSIFIED = 177;
+  ATOM_HIDDEN_API_USED = 178;
+  ATOM_STYLE_UI_CHANGED = 179;
+  ATOM_PRIVACY_INDICATORS_INTERACTED = 180;
+  ATOM_APP_INSTALL_ON_EXTERNAL_STORAGE_REPORTED = 181;
+  ATOM_NETWORK_STACK_REPORTED = 182;
+  ATOM_APP_MOVED_STORAGE_REPORTED = 183;
+  ATOM_BIOMETRIC_ENROLLED = 184;
+  ATOM_SYSTEM_SERVER_WATCHDOG_OCCURRED = 185;
+  ATOM_TOMB_STONE_OCCURRED = 186;
+  ATOM_BLUETOOTH_CLASS_OF_DEVICE_REPORTED = 187;
+  ATOM_INTELLIGENCE_EVENT_REPORTED = 188;
+  ATOM_THERMAL_THROTTLING_SEVERITY_STATE_CHANGED = 189;
+  ATOM_ROLE_REQUEST_RESULT_REPORTED = 190;
+  ATOM_MEDIAMETRICS_AUDIOPOLICY_REPORTED = 191;
+  ATOM_MEDIAMETRICS_AUDIORECORD_REPORTED = 192;
+  ATOM_MEDIAMETRICS_AUDIOTHREAD_REPORTED = 193;
+  ATOM_MEDIAMETRICS_AUDIOTRACK_REPORTED = 194;
+  ATOM_MEDIAMETRICS_CODEC_REPORTED = 195;
+  ATOM_MEDIAMETRICS_DRM_WIDEVINE_REPORTED = 196;
+  ATOM_MEDIAMETRICS_EXTRACTOR_REPORTED = 197;
+  ATOM_MEDIAMETRICS_MEDIADRM_REPORTED = 198;
+  ATOM_MEDIAMETRICS_NUPLAYER_REPORTED = 199;
+  ATOM_MEDIAMETRICS_RECORDER_REPORTED = 200;
+  ATOM_MEDIAMETRICS_DRMMANAGER_REPORTED = 201;
+  ATOM_CAR_POWER_STATE_CHANGED = 203;
+  ATOM_GARAGE_MODE_INFO = 204;
+  ATOM_TEST_ATOM_REPORTED = 205;
+  ATOM_CONTENT_CAPTURE_CALLER_MISMATCH_REPORTED = 206;
+  ATOM_CONTENT_CAPTURE_SERVICE_EVENTS = 207;
+  ATOM_CONTENT_CAPTURE_SESSION_EVENTS = 208;
+  ATOM_CONTENT_CAPTURE_FLUSHED = 209;
+  ATOM_LOCATION_MANAGER_API_USAGE_REPORTED = 210;
+  ATOM_REVIEW_PERMISSIONS_FRAGMENT_RESULT_REPORTED = 211;
+  ATOM_RUNTIME_PERMISSIONS_UPGRADE_RESULT = 212;
+  ATOM_GRANT_PERMISSIONS_ACTIVITY_BUTTON_ACTIONS = 213;
+  ATOM_LOCATION_ACCESS_CHECK_NOTIFICATION_ACTION = 214;
+  ATOM_APP_PERMISSION_FRAGMENT_ACTION_REPORTED = 215;
+  ATOM_APP_PERMISSION_FRAGMENT_VIEWED = 216;
+  ATOM_APP_PERMISSIONS_FRAGMENT_VIEWED = 217;
+  ATOM_PERMISSION_APPS_FRAGMENT_VIEWED = 218;
+  ATOM_TEXT_SELECTION_EVENT = 219;
+  ATOM_TEXT_LINKIFY_EVENT = 220;
+  ATOM_CONVERSATION_ACTIONS_EVENT = 221;
+  ATOM_LANGUAGE_DETECTION_EVENT = 222;
+  ATOM_EXCLUSION_RECT_STATE_CHANGED = 223;
+  ATOM_BACK_GESTURE_REPORTED_REPORTED = 224;
+  ATOM_UPDATE_ENGINE_UPDATE_ATTEMPT_REPORTED = 225;
+  ATOM_UPDATE_ENGINE_SUCCESSFUL_UPDATE_REPORTED = 226;
+  ATOM_CAMERA_ACTION_EVENT = 227;
+  ATOM_APP_COMPATIBILITY_CHANGE_REPORTED = 228;
+  ATOM_PERFETTO_UPLOADED = 229;
+  ATOM_VMS_CLIENT_CONNECTION_STATE_CHANGED = 230;
+  ATOM_MEDIA_PROVIDER_SCAN_OCCURRED = 233;
+  ATOM_MEDIA_CONTENT_DELETED = 234;
+  ATOM_MEDIA_PROVIDER_PERMISSION_REQUESTED = 235;
+  ATOM_MEDIA_PROVIDER_SCHEMA_CHANGED = 236;
+  ATOM_MEDIA_PROVIDER_IDLE_MAINTENANCE_FINISHED = 237;
+  ATOM_REBOOT_ESCROW_RECOVERY_REPORTED = 238;
+  ATOM_BOOT_TIME_EVENT_DURATION_REPORTED = 239;
+  ATOM_BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED = 240;
+  ATOM_BOOT_TIME_EVENT_UTC_TIME_REPORTED = 241;
+  ATOM_BOOT_TIME_EVENT_ERROR_CODE_REPORTED = 242;
+  ATOM_USERSPACE_REBOOT_REPORTED = 243;
+  ATOM_NOTIFICATION_REPORTED = 244;
+  ATOM_NOTIFICATION_PANEL_REPORTED = 245;
+  ATOM_NOTIFICATION_CHANNEL_MODIFIED = 246;
+  ATOM_INTEGRITY_CHECK_RESULT_REPORTED = 247;
+  ATOM_INTEGRITY_RULES_PUSHED = 248;
+  ATOM_CB_MESSAGE_REPORTED = 249;
+  ATOM_CB_MESSAGE_ERROR = 250;
+  ATOM_WIFI_HEALTH_STAT_REPORTED = 251;
+  ATOM_WIFI_FAILURE_STAT_REPORTED = 252;
+  ATOM_WIFI_CONNECTION_RESULT_REPORTED = 253;
+  ATOM_APP_FREEZE_CHANGED = 254;
+  ATOM_SNAPSHOT_MERGE_REPORTED = 255;
+  ATOM_FOREGROUND_SERVICE_APP_OP_SESSION_ENDED = 256;
+  ATOM_DISPLAY_JANK_REPORTED = 257;
+  ATOM_APP_STANDBY_BUCKET_CHANGED = 258;
+  ATOM_SHARESHEET_STARTED = 259;
+  ATOM_RANKING_SELECTED = 260;
+  ATOM_TVSETTINGS_UI_INTERACTED = 261;
+  ATOM_LAUNCHER_SNAPSHOT = 262;
+  ATOM_PACKAGE_INSTALLER_V2_REPORTED = 263;
+  ATOM_USER_LIFECYCLE_JOURNEY_REPORTED = 264;
+  ATOM_USER_LIFECYCLE_EVENT_OCCURRED = 265;
+  ATOM_ACCESSIBILITY_SHORTCUT_REPORTED = 266;
+  ATOM_ACCESSIBILITY_SERVICE_REPORTED = 267;
+  ATOM_DOCS_UI_DRAG_AND_DROP_REPORTED = 268;
+  ATOM_APP_USAGE_EVENT_OCCURRED = 269;
+  ATOM_AUTO_REVOKE_NOTIFICATION_CLICKED = 270;
+  ATOM_AUTO_REVOKE_FRAGMENT_APP_VIEWED = 271;
+  ATOM_AUTO_REVOKED_APP_INTERACTION = 272;
+  ATOM_APP_PERMISSION_GROUPS_FRAGMENT_AUTO_REVOKE_ACTION = 273;
+  ATOM_EVS_USAGE_STATS_REPORTED = 274;
+  ATOM_AUDIO_POWER_USAGE_DATA_REPORTED = 275;
+  ATOM_TV_TUNER_STATE_CHANGED = 276;
+  ATOM_MEDIAOUTPUT_OP_SWITCH_REPORTED = 277;
+  ATOM_CB_MESSAGE_FILTERED = 278;
+  ATOM_TV_TUNER_DVR_STATUS = 279;
+  ATOM_TV_CAS_SESSION_OPEN_STATUS = 280;
+  ATOM_ASSISTANT_INVOCATION_REPORTED = 281;
+  ATOM_DISPLAY_WAKE_REPORTED = 282;
+  ATOM_CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED = 283;
+  ATOM_CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED = 284;
+  ATOM_CAR_USER_HAL_POST_SWITCH_RESPONSE_REPORTED = 285;
+  ATOM_CAR_USER_HAL_INITIAL_USER_INFO_REQUEST_REPORTED = 286;
+  ATOM_CAR_USER_HAL_INITIAL_USER_INFO_RESPONSE_REPORTED = 287;
+  ATOM_CAR_USER_HAL_USER_ASSOCIATION_REQUEST_REPORTED = 288;
+  ATOM_CAR_USER_HAL_SET_USER_ASSOCIATION_RESPONSE_REPORTED = 289;
+  ATOM_NETWORK_IP_PROVISIONING_REPORTED = 290;
+  ATOM_NETWORK_DHCP_RENEW_REPORTED = 291;
+  ATOM_NETWORK_VALIDATION_REPORTED = 292;
+  ATOM_NETWORK_STACK_QUIRK_REPORTED = 293;
+  ATOM_MEDIAMETRICS_AUDIORECORDDEVICEUSAGE_REPORTED = 294;
+  ATOM_MEDIAMETRICS_AUDIOTHREADDEVICEUSAGE_REPORTED = 295;
+  ATOM_MEDIAMETRICS_AUDIOTRACKDEVICEUSAGE_REPORTED = 296;
+  ATOM_MEDIAMETRICS_AUDIODEVICECONNECTION_REPORTED = 297;
+  ATOM_BLOB_COMMITTED = 298;
+  ATOM_BLOB_LEASED = 299;
+  ATOM_BLOB_OPENED = 300;
+  ATOM_CONTACTS_PROVIDER_STATUS_REPORTED = 301;
+  ATOM_KEYSTORE_KEY_EVENT_REPORTED = 302;
+  ATOM_NETWORK_TETHERING_REPORTED = 303;
+  ATOM_IME_TOUCH_REPORTED = 304;
+  ATOM_UI_INTERACTION_FRAME_INFO_REPORTED = 305;
+  ATOM_UI_ACTION_LATENCY_REPORTED = 306;
+  ATOM_WIFI_DISCONNECT_REPORTED = 307;
+  ATOM_WIFI_CONNECTION_STATE_CHANGED = 308;
+  ATOM_HDMI_CEC_ACTIVE_SOURCE_CHANGED = 309;
+  ATOM_HDMI_CEC_MESSAGE_REPORTED = 310;
+  ATOM_AIRPLANE_MODE = 311;
+  ATOM_MODEM_RESTART = 312;
+  ATOM_CARRIER_ID_MISMATCH_REPORTED = 313;
+  ATOM_CARRIER_ID_TABLE_UPDATED = 314;
+  ATOM_DATA_STALL_RECOVERY_REPORTED = 315;
+  ATOM_MEDIAMETRICS_MEDIAPARSER_REPORTED = 316;
+  ATOM_TLS_HANDSHAKE_REPORTED = 317;
+  ATOM_TEXT_CLASSIFIER_API_USAGE_REPORTED = 318;
+  ATOM_CAR_WATCHDOG_KILL_STATS_REPORTED = 319;
+  ATOM_MEDIAMETRICS_PLAYBACK_REPORTED = 320;
+  ATOM_MEDIA_NETWORK_INFO_CHANGED = 321;
+  ATOM_MEDIA_PLAYBACK_STATE_CHANGED = 322;
+  ATOM_MEDIA_PLAYBACK_ERROR_REPORTED = 323;
+  ATOM_MEDIA_PLAYBACK_TRACK_CHANGED = 324;
+  ATOM_WIFI_SCAN_REPORTED = 325;
+  ATOM_WIFI_PNO_SCAN_REPORTED = 326;
+  ATOM_TIF_TUNE_CHANGED = 327;
+  ATOM_AUTO_ROTATE_REPORTED = 328;
+  ATOM_PERFETTO_TRIGGER = 329;
+  ATOM_TRANSCODING_DATA = 330;
+  ATOM_IMS_SERVICE_ENTITLEMENT_UPDATED = 331;
+  ATOM_DEVICE_ROTATED = 333;
+  ATOM_SIM_SPECIFIC_SETTINGS_RESTORED = 334;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_REPORTED = 335;
+  ATOM_PIN_STORAGE_EVENT = 336;
+  ATOM_FACE_DOWN_REPORTED = 337;
+  ATOM_BLUETOOTH_HAL_CRASH_REASON_REPORTED = 338;
+  ATOM_REBOOT_ESCROW_PREPARATION_REPORTED = 339;
+  ATOM_REBOOT_ESCROW_LSKF_CAPTURE_REPORTED = 340;
+  ATOM_REBOOT_ESCROW_REBOOT_REPORTED = 341;
+  ATOM_BINDER_LATENCY_REPORTED = 342;
+  ATOM_MEDIAMETRICS_AAUDIOSTREAM_REPORTED = 343;
+  ATOM_MEDIA_TRANSCODING_SESSION_ENDED = 344;
+  ATOM_MAGNIFICATION_USAGE_REPORTED = 345;
+  ATOM_MAGNIFICATION_MODE_WITH_IME_ON_REPORTED = 346;
+  ATOM_APP_SEARCH_CALL_STATS_REPORTED = 347;
+  ATOM_APP_SEARCH_PUT_DOCUMENT_STATS_REPORTED = 348;
+  ATOM_DEVICE_CONTROL_CHANGED = 349;
+  ATOM_DEVICE_STATE_CHANGED = 350;
+  ATOM_INPUTDEVICE_REGISTERED = 351;
+  ATOM_SMARTSPACE_CARD_REPORTED = 352;
+  ATOM_AUTH_PROMPT_AUTHENTICATE_INVOKED = 353;
+  ATOM_AUTH_MANAGER_CAN_AUTHENTICATE_INVOKED = 354;
+  ATOM_AUTH_ENROLL_ACTION_INVOKED = 355;
+  ATOM_AUTH_DEPRECATED_API_USED = 356;
+  ATOM_UNATTENDED_REBOOT_OCCURRED = 357;
+  ATOM_LONG_REBOOT_BLOCKING_REPORTED = 358;
+  ATOM_LOCATION_TIME_ZONE_PROVIDER_STATE_CHANGED = 359;
+  ATOM_FDTRACK_EVENT_OCCURRED = 364;
+  ATOM_TIMEOUT_AUTO_EXTENDED_REPORTED = 365;
+  ATOM_ALARM_BATCH_DELIVERED = 367;
+  ATOM_ALARM_SCHEDULED = 368;
+  ATOM_CAR_WATCHDOG_IO_OVERUSE_STATS_REPORTED = 369;
+  ATOM_USER_LEVEL_HIBERNATION_STATE_CHANGED = 370;
+  ATOM_APP_SEARCH_INITIALIZE_STATS_REPORTED = 371;
+  ATOM_APP_SEARCH_QUERY_STATS_REPORTED = 372;
+  ATOM_APP_PROCESS_DIED = 373;
+  ATOM_NETWORK_IP_REACHABILITY_MONITOR_REPORTED = 374;
+  ATOM_SLOW_INPUT_EVENT_REPORTED = 375;
+  ATOM_ANR_OCCURRED_PROCESSING_STARTED = 376;
+  ATOM_APP_SEARCH_REMOVE_STATS_REPORTED = 377;
+  ATOM_MEDIA_CODEC_REPORTED = 378;
+  ATOM_PERMISSION_USAGE_FRAGMENT_INTERACTION = 379;
+  ATOM_PERMISSION_DETAILS_INTERACTION = 380;
+  ATOM_PRIVACY_SENSOR_TOGGLE_INTERACTION = 381;
+  ATOM_PRIVACY_TOGGLE_DIALOG_INTERACTION = 382;
+  ATOM_APP_SEARCH_OPTIMIZE_STATS_REPORTED = 383;
+  ATOM_NON_A11Y_TOOL_SERVICE_WARNING_REPORT = 384;
+  ATOM_APP_SEARCH_SET_SCHEMA_STATS_REPORTED = 385;
+  ATOM_APP_COMPAT_STATE_CHANGED = 386;
+  ATOM_SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED = 387;
+  ATOM_SPLITSCREEN_UI_CHANGED = 388;
+  ATOM_NETWORK_DNS_HANDSHAKE_REPORTED = 389;
+  ATOM_BLUETOOTH_CODE_PATH_COUNTER = 390;
+  ATOM_BLUETOOTH_LE_BATCH_SCAN_REPORT_DELAY = 392;
+  ATOM_ACCESSIBILITY_FLOATING_MENU_UI_CHANGED = 393;
+  ATOM_NEURALNETWORKS_COMPILATION_COMPLETED = 394;
+  ATOM_NEURALNETWORKS_EXECUTION_COMPLETED = 395;
+  ATOM_NEURALNETWORKS_COMPILATION_FAILED = 396;
+  ATOM_NEURALNETWORKS_EXECUTION_FAILED = 397;
+  ATOM_CONTEXT_HUB_BOOTED = 398;
+  ATOM_CONTEXT_HUB_RESTARTED = 399;
+  ATOM_CONTEXT_HUB_LOADED_NANOAPP_SNAPSHOT_REPORTED = 400;
+  ATOM_CHRE_CODE_DOWNLOAD_TRANSACTED = 401;
+  ATOM_UWB_SESSION_INITED = 402;
+  ATOM_UWB_SESSION_CLOSED = 403;
+  ATOM_UWB_FIRST_RANGING_RECEIVED = 404;
+  ATOM_UWB_RANGING_MEASUREMENT_RECEIVED = 405;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_WORK_SCHEDULED = 406;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_WORK_COMPLETED = 407;
+  ATOM_CLIPBOARD_CLEARED = 408;
+  ATOM_VM_CREATION_REQUESTED = 409;
+  ATOM_NEARBY_DEVICE_SCAN_STATE_CHANGED = 410;
+  ATOM_CAMERA_COMPAT_CONTROL_EVENT_REPORTED = 411;
+  ATOM_APPLICATION_LOCALES_CHANGED = 412;
+  ATOM_MEDIAMETRICS_AUDIOTRACKSTATUS_REPORTED = 413;
+  ATOM_FOLD_STATE_DURATION_REPORTED = 414;
+  ATOM_LOCATION_TIME_ZONE_PROVIDER_CONTROLLER_STATE_CHANGED = 415;
+  ATOM_DISPLAY_HBM_STATE_CHANGED = 416;
+  ATOM_DISPLAY_HBM_BRIGHTNESS_CHANGED = 417;
+  ATOM_PERSISTENT_URI_PERMISSIONS_FLUSHED = 418;
+  ATOM_EARLY_BOOT_COMP_OS_ARTIFACTS_CHECK_REPORTED = 419;
+  ATOM_VBMETA_DIGEST_REPORTED = 420;
+  ATOM_APEX_INFO_GATHERED = 421;
+  ATOM_PVM_INFO_GATHERED = 422;
+  ATOM_WEAR_SETTINGS_UI_INTERACTED = 423;
+  ATOM_TRACING_SERVICE_REPORT_EVENT = 424;
+  ATOM_MEDIAMETRICS_AUDIORECORDSTATUS_REPORTED = 425;
+  ATOM_LAUNCHER_LATENCY = 426;
+  ATOM_DROPBOX_ENTRY_DROPPED = 427;
+  ATOM_WIFI_P2P_CONNECTION_REPORTED = 428;
+  ATOM_GAME_STATE_CHANGED = 429;
+  ATOM_HOTWORD_DETECTOR_CREATE_REQUESTED = 430;
+  ATOM_HOTWORD_DETECTION_SERVICE_INIT_RESULT_REPORTED = 431;
+  ATOM_HOTWORD_DETECTION_SERVICE_RESTARTED = 432;
+  ATOM_HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED = 433;
+  ATOM_HOTWORD_DETECTOR_EVENTS = 434;
+  ATOM_AD_SERVICES_API_CALLED = 435;
+  ATOM_AD_SERVICES_MESUREMENT_REPORTS_UPLOADED = 436;
+  ATOM_BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED = 437;
+  ATOM_CONTACTS_INDEXER_UPDATE_STATS_REPORTED = 440;
+  ATOM_APP_BACKGROUND_RESTRICTIONS_INFO = 441;
+  ATOM_MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED = 442;
+  ATOM_MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED = 443;
+  ATOM_PERMISSION_REMINDER_NOTIFICATION_INTERACTED = 444;
+  ATOM_RECENT_PERMISSION_DECISIONS_INTERACTED = 445;
+  ATOM_GNSS_PSDS_DOWNLOAD_REPORTED = 446;
+  ATOM_LE_AUDIO_CONNECTION_SESSION_REPORTED = 447;
+  ATOM_LE_AUDIO_BROADCAST_SESSION_REPORTED = 448;
+  ATOM_DREAM_UI_EVENT_REPORTED = 449;
+  ATOM_TASK_MANAGER_EVENT_REPORTED = 450;
+  ATOM_CDM_ASSOCIATION_ACTION = 451;
+  ATOM_MAGNIFICATION_TRIPLE_TAP_AND_HOLD_ACTIVATED_SESSION_REPORTED = 452;
+  ATOM_MAGNIFICATION_FOLLOW_TYPING_FOCUS_ACTIVATED_SESSION_REPORTED = 453;
+  ATOM_ACCESSIBILITY_TEXT_READING_OPTIONS_CHANGED = 454;
+  ATOM_WIFI_SETUP_FAILURE_CRASH_REPORTED = 455;
+  ATOM_UWB_DEVICE_ERROR_REPORTED = 456;
+  ATOM_ISOLATED_COMPILATION_SCHEDULED = 457;
+  ATOM_ISOLATED_COMPILATION_ENDED = 458;
+  ATOM_ONS_OPPORTUNISTIC_ESIM_PROVISIONING_COMPLETE = 459;
+  ATOM_SYSTEM_SERVER_PRE_WATCHDOG_OCCURRED = 460;
+  ATOM_TELEPHONY_ANOMALY_DETECTED = 461;
+  ATOM_LETTERBOX_POSITION_CHANGED = 462;
+  ATOM_REMOTE_KEY_PROVISIONING_ATTEMPT = 463;
+  ATOM_REMOTE_KEY_PROVISIONING_NETWORK_INFO = 464;
+  ATOM_REMOTE_KEY_PROVISIONING_TIMING = 465;
+  ATOM_MEDIAOUTPUT_OP_INTERACTION_REPORT = 466;
+  ATOM_SYNC_EXEMPTION_OCCURRED = 468;
+  ATOM_AUTOFILL_PRESENTATION_EVENT_REPORTED = 469;
+  ATOM_DOCK_STATE_CHANGED = 470;
+  ATOM_SAFETY_SOURCE_STATE_COLLECTED = 471;
+  ATOM_SAFETY_CENTER_SYSTEM_EVENT_REPORTED = 472;
+  ATOM_SAFETY_CENTER_INTERACTION_REPORTED = 473;
+  ATOM_SETTINGS_PROVIDER_SETTING_CHANGED = 474;
+  ATOM_BROADCAST_DELIVERY_EVENT_REPORTED = 475;
+  ATOM_SERVICE_REQUEST_EVENT_REPORTED = 476;
+  ATOM_PROVIDER_ACQUISITION_EVENT_REPORTED = 477;
+  ATOM_BLUETOOTH_DEVICE_NAME_REPORTED = 478;
+  ATOM_CB_CONFIG_UPDATED = 479;
+  ATOM_CB_MODULE_ERROR_REPORTED = 480;
+  ATOM_CB_SERVICE_FEATURE_CHANGED = 481;
+  ATOM_CB_RECEIVER_FEATURE_CHANGED = 482;
+  ATOM_JSSCRIPTENGINE_LATENCY_REPORTED = 483;
+  ATOM_PRIVACY_SIGNAL_NOTIFICATION_INTERACTION = 484;
+  ATOM_PRIVACY_SIGNAL_ISSUE_CARD_INTERACTION = 485;
+  ATOM_PRIVACY_SIGNALS_JOB_FAILURE = 486;
+  ATOM_VIBRATION_REPORTED = 487;
+  ATOM_UWB_RANGING_START = 489;
+  ATOM_MOBILE_DATA_DOWNLOAD_FILE_GROUP_STATUS_REPORTED = 490;
+  ATOM_APP_COMPACTED_V2 = 491;
+  ATOM_AD_SERVICES_SETTINGS_USAGE_REPORTED = 493;
+  ATOM_DISPLAY_BRIGHTNESS_CHANGED = 494;
+  ATOM_ACTIVITY_ACTION_BLOCKED = 495;
+  ATOM_BACKGROUND_FETCH_PROCESS_REPORTED = 496;
+  ATOM_UPDATE_CUSTOM_AUDIENCE_PROCESS_REPORTED = 497;
+  ATOM_RUN_AD_BIDDING_PROCESS_REPORTED = 498;
+  ATOM_RUN_AD_SCORING_PROCESS_REPORTED = 499;
+  ATOM_RUN_AD_SELECTION_PROCESS_REPORTED = 500;
+  ATOM_RUN_AD_BIDDING_PER_CA_PROCESS_REPORTED = 501;
+  ATOM_MOBILE_DATA_DOWNLOAD_DOWNLOAD_RESULT_REPORTED = 502;
+  ATOM_MOBILE_DATA_DOWNLOAD_FILE_GROUP_STORAGE_STATS_REPORTED = 503;
+  ATOM_NETWORK_DNS_SERVER_SUPPORT_REPORTED = 504;
+  ATOM_VM_BOOTED = 505;
+  ATOM_VM_EXITED = 506;
+  ATOM_AMBIENT_BRIGHTNESS_STATS_REPORTED = 507;
+  ATOM_MEDIAMETRICS_SPATIALIZERCAPABILITIES_REPORTED = 508;
+  ATOM_MEDIAMETRICS_SPATIALIZERDEVICEENABLED_REPORTED = 509;
+  ATOM_MEDIAMETRICS_HEADTRACKERDEVICEENABLED_REPORTED = 510;
+  ATOM_MEDIAMETRICS_HEADTRACKERDEVICESUPPORTED_REPORTED = 511;
+  ATOM_AD_SERVICES_MEASUREMENT_REGISTRATIONS = 512;
+  ATOM_HEARING_AID_INFO_REPORTED = 513;
+  ATOM_DEVICE_WIDE_JOB_CONSTRAINT_CHANGED = 514;
+  ATOM_AMBIENT_MODE_CHANGED = 515;
+  ATOM_ANR_LATENCY_REPORTED = 516;
+  ATOM_RESOURCE_API_INFO = 517;
+  ATOM_SYSTEM_DEFAULT_NETWORK_CHANGED = 518;
+  ATOM_IWLAN_SETUP_DATA_CALL_RESULT_REPORTED = 519;
+  ATOM_IWLAN_PDN_DISCONNECTED_REASON_REPORTED = 520;
+  ATOM_AIRPLANE_MODE_SESSION_REPORTED = 521;
+  ATOM_VM_CPU_STATUS_REPORTED = 522;
+  ATOM_VM_MEM_STATUS_REPORTED = 523;
+  ATOM_PACKAGE_INSTALLATION_SESSION_REPORTED = 524;
+  ATOM_DEFAULT_NETWORK_REMATCH_INFO = 525;
+  ATOM_NETWORK_SELECTION_PERFORMANCE = 526;
+  ATOM_NETWORK_NSD_REPORTED = 527;
+  ATOM_BLUETOOTH_DISCONNECTION_REASON_REPORTED = 529;
+  ATOM_BLUETOOTH_LOCAL_VERSIONS_REPORTED = 530;
+  ATOM_BLUETOOTH_REMOTE_SUPPORTED_FEATURES_REPORTED = 531;
+  ATOM_BLUETOOTH_LOCAL_SUPPORTED_FEATURES_REPORTED = 532;
+  ATOM_BLUETOOTH_GATT_APP_INFO = 533;
+  ATOM_BRIGHTNESS_CONFIGURATION_UPDATED = 534;
+  ATOM_AD_SERVICES_GET_TOPICS_REPORTED = 535;
+  ATOM_AD_SERVICES_EPOCH_COMPUTATION_GET_TOP_TOPICS_REPORTED = 536;
+  ATOM_AD_SERVICES_EPOCH_COMPUTATION_CLASSIFIER_REPORTED = 537;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_LAUNCHED = 538;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_FINISHED = 539;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_CONNECTION_REPORTED = 540;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_DEVICE_SCAN_TRIGGERED = 541;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_FIRST_DEVICE_SCAN_LATENCY = 542;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_CONNECT_DEVICE_LATENCY = 543;
+  ATOM_PACKAGE_MANAGER_SNAPSHOT_REPORTED = 544;
+  ATOM_PACKAGE_MANAGER_APPS_FILTER_CACHE_BUILD_REPORTED = 545;
+  ATOM_PACKAGE_MANAGER_APPS_FILTER_CACHE_UPDATE_REPORTED = 546;
+  ATOM_LAUNCHER_IMPRESSION_EVENT = 547;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_ALL_DEVICES_SCAN_LATENCY = 549;
+  ATOM_WS_WATCH_FACE_EDITED = 551;
+  ATOM_WS_WATCH_FACE_FAVORITE_ACTION_REPORTED = 552;
+  ATOM_WS_WATCH_FACE_SET_ACTION_REPORTED = 553;
+  ATOM_PACKAGE_UNINSTALLATION_REPORTED = 554;
+  ATOM_GAME_MODE_CHANGED = 555;
+  ATOM_GAME_MODE_CONFIGURATION_CHANGED = 556;
+  ATOM_BEDTIME_MODE_STATE_CHANGED = 557;
+  ATOM_NETWORK_SLICE_SESSION_ENDED = 558;
+  ATOM_NETWORK_SLICE_DAILY_DATA_USAGE_REPORTED = 559;
+  ATOM_NFC_TAG_TYPE_OCCURRED = 560;
+  ATOM_NFC_AID_CONFLICT_OCCURRED = 561;
+  ATOM_NFC_READER_CONFLICT_OCCURRED = 562;
+  ATOM_WS_TILE_LIST_CHANGED = 563;
+  ATOM_GET_TYPE_ACCESSED_WITHOUT_PERMISSION = 564;
+  ATOM_MOBILE_BUNDLED_APP_INFO_GATHERED = 566;
+  ATOM_WS_WATCH_FACE_COMPLICATION_SET_CHANGED = 567;
+  ATOM_MEDIA_DRM_CREATED = 568;
+  ATOM_MEDIA_DRM_ERRORED = 569;
+  ATOM_MEDIA_DRM_SESSION_OPENED = 570;
+  ATOM_MEDIA_DRM_SESSION_CLOSED = 571;
+  ATOM_USER_SELECTED_RESOLUTION = 572;
+  ATOM_UNSAFE_INTENT_EVENT_REPORTED = 573;
+  ATOM_PERFORMANCE_HINT_SESSION_REPORTED = 574;
+  ATOM_MEDIAMETRICS_MIDI_DEVICE_CLOSE_REPORTED = 576;
+  ATOM_BIOMETRIC_TOUCH_REPORTED = 577;
+  ATOM_HOTWORD_AUDIO_EGRESS_EVENT_REPORTED = 578;
+  ATOM_APP_SEARCH_SCHEMA_MIGRATION_STATS_REPORTED = 579;
+  ATOM_LOCATION_ENABLED_STATE_CHANGED = 580;
+  ATOM_IME_REQUEST_FINISHED = 581;
+  ATOM_USB_COMPLIANCE_WARNINGS_REPORTED = 582;
+  ATOM_APP_SUPPORTED_LOCALES_CHANGED = 583;
+  ATOM_GRAMMATICAL_INFLECTION_CHANGED = 584;
+  ATOM_MEDIA_PROVIDER_VOLUME_RECOVERY_REPORTED = 586;
+  ATOM_BIOMETRIC_PROPERTIES_COLLECTED = 587;
+  ATOM_KERNEL_WAKEUP_ATTRIBUTED = 588;
+  ATOM_SCREEN_STATE_CHANGED_V2 = 589;
+  ATOM_WS_BACKUP_ACTION_REPORTED = 590;
+  ATOM_WS_RESTORE_ACTION_REPORTED = 591;
+  ATOM_DEVICE_LOG_ACCESS_EVENT_REPORTED = 592;
+  ATOM_MEDIA_SESSION_UPDATED = 594;
+  ATOM_WEAR_OOBE_STATE_CHANGED = 595;
+  ATOM_WS_NOTIFICATION_UPDATED = 596;
+  ATOM_NETWORK_VALIDATION_FAILURE_STATS_DAILY_REPORTED = 601;
+  ATOM_WS_COMPLICATION_TAPPED = 602;
+  ATOM_WS_WEAR_TIME_SESSION = 610;
+  ATOM_WIFI_BYTES_TRANSFER = 10000;
+  ATOM_WIFI_BYTES_TRANSFER_BY_FG_BG = 10001;
+  ATOM_MOBILE_BYTES_TRANSFER = 10002;
+  ATOM_MOBILE_BYTES_TRANSFER_BY_FG_BG = 10003;
+  ATOM_BLUETOOTH_BYTES_TRANSFER = 10006;
+  ATOM_KERNEL_WAKELOCK = 10004;
+  ATOM_SUBSYSTEM_SLEEP_STATE = 10005;
+  ATOM_CPU_TIME_PER_UID = 10009;
+  ATOM_CPU_TIME_PER_UID_FREQ = 10010;
+  ATOM_WIFI_ACTIVITY_INFO = 10011;
+  ATOM_MODEM_ACTIVITY_INFO = 10012;
+  ATOM_BLUETOOTH_ACTIVITY_INFO = 10007;
+  ATOM_PROCESS_MEMORY_STATE = 10013;
+  ATOM_SYSTEM_ELAPSED_REALTIME = 10014;
+  ATOM_SYSTEM_UPTIME = 10015;
+  ATOM_CPU_ACTIVE_TIME = 10016;
+  ATOM_CPU_CLUSTER_TIME = 10017;
+  ATOM_DISK_SPACE = 10018;
+  ATOM_REMAINING_BATTERY_CAPACITY = 10019;
+  ATOM_FULL_BATTERY_CAPACITY = 10020;
+  ATOM_TEMPERATURE = 10021;
+  ATOM_BINDER_CALLS = 10022;
+  ATOM_BINDER_CALLS_EXCEPTIONS = 10023;
+  ATOM_LOOPER_STATS = 10024;
+  ATOM_DISK_STATS = 10025;
+  ATOM_DIRECTORY_USAGE = 10026;
+  ATOM_APP_SIZE = 10027;
+  ATOM_CATEGORY_SIZE = 10028;
+  ATOM_PROC_STATS = 10029;
+  ATOM_BATTERY_VOLTAGE = 10030;
+  ATOM_NUM_FINGERPRINTS_ENROLLED = 10031;
+  ATOM_DISK_IO = 10032;
+  ATOM_POWER_PROFILE = 10033;
+  ATOM_PROC_STATS_PKG_PROC = 10034;
+  ATOM_PROCESS_CPU_TIME = 10035;
+  ATOM_CPU_TIME_PER_THREAD_FREQ = 10037;
+  ATOM_ON_DEVICE_POWER_MEASUREMENT = 10038;
+  ATOM_DEVICE_CALCULATED_POWER_USE = 10039;
+  ATOM_PROCESS_MEMORY_HIGH_WATER_MARK = 10042;
+  ATOM_BATTERY_LEVEL = 10043;
+  ATOM_BUILD_INFORMATION = 10044;
+  ATOM_BATTERY_CYCLE_COUNT = 10045;
+  ATOM_DEBUG_ELAPSED_CLOCK = 10046;
+  ATOM_DEBUG_FAILING_ELAPSED_CLOCK = 10047;
+  ATOM_NUM_FACES_ENROLLED = 10048;
+  ATOM_ROLE_HOLDER = 10049;
+  ATOM_DANGEROUS_PERMISSION_STATE = 10050;
+  ATOM_TRAIN_INFO = 10051;
+  ATOM_TIME_ZONE_DATA_INFO = 10052;
+  ATOM_EXTERNAL_STORAGE_INFO = 10053;
+  ATOM_GPU_STATS_GLOBAL_INFO = 10054;
+  ATOM_GPU_STATS_APP_INFO = 10055;
+  ATOM_SYSTEM_ION_HEAP_SIZE = 10056;
+  ATOM_APPS_ON_EXTERNAL_STORAGE_INFO = 10057;
+  ATOM_FACE_SETTINGS = 10058;
+  ATOM_COOLING_DEVICE = 10059;
+  ATOM_APP_OPS = 10060;
+  ATOM_PROCESS_SYSTEM_ION_HEAP_SIZE = 10061;
+  ATOM_SURFACEFLINGER_STATS_GLOBAL_INFO = 10062;
+  ATOM_SURFACEFLINGER_STATS_LAYER_INFO = 10063;
+  ATOM_PROCESS_MEMORY_SNAPSHOT = 10064;
+  ATOM_VMS_CLIENT_STATS = 10065;
+  ATOM_NOTIFICATION_REMOTE_VIEWS = 10066;
+  ATOM_DANGEROUS_PERMISSION_STATE_SAMPLED = 10067;
+  ATOM_GRAPHICS_STATS = 10068;
+  ATOM_RUNTIME_APP_OP_ACCESS = 10069;
+  ATOM_ION_HEAP_SIZE = 10070;
+  ATOM_PACKAGE_NOTIFICATION_PREFERENCES = 10071;
+  ATOM_PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES = 10072;
+  ATOM_PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES = 10073;
+  ATOM_GNSS_STATS = 10074;
+  ATOM_ATTRIBUTED_APP_OPS = 10075;
+  ATOM_VOICE_CALL_SESSION = 10076;
+  ATOM_VOICE_CALL_RAT_USAGE = 10077;
+  ATOM_SIM_SLOT_STATE = 10078;
+  ATOM_SUPPORTED_RADIO_ACCESS_FAMILY = 10079;
+  ATOM_SETTING_SNAPSHOT = 10080;
+  ATOM_BLOB_INFO = 10081;
+  ATOM_DATA_USAGE_BYTES_TRANSFER = 10082;
+  ATOM_BYTES_TRANSFER_BY_TAG_AND_METERED = 10083;
+  ATOM_DND_MODE_RULE = 10084;
+  ATOM_GENERAL_EXTERNAL_STORAGE_ACCESS_STATS = 10085;
+  ATOM_INCOMING_SMS = 10086;
+  ATOM_OUTGOING_SMS = 10087;
+  ATOM_CARRIER_ID_TABLE_VERSION = 10088;
+  ATOM_DATA_CALL_SESSION = 10089;
+  ATOM_CELLULAR_SERVICE_STATE = 10090;
+  ATOM_CELLULAR_DATA_SERVICE_SWITCH = 10091;
+  ATOM_SYSTEM_MEMORY = 10092;
+  ATOM_IMS_REGISTRATION_TERMINATION = 10093;
+  ATOM_IMS_REGISTRATION_STATS = 10094;
+  ATOM_CPU_TIME_PER_CLUSTER_FREQ = 10095;
+  ATOM_CPU_CYCLES_PER_UID_CLUSTER = 10096;
+  ATOM_DEVICE_ROTATED_DATA = 10097;
+  ATOM_CPU_CYCLES_PER_THREAD_GROUP_CLUSTER = 10098;
+  ATOM_MEDIA_DRM_ACTIVITY_INFO = 10099;
+  ATOM_OEM_MANAGED_BYTES_TRANSFER = 10100;
+  ATOM_GNSS_POWER_STATS = 10101;
+  ATOM_TIME_ZONE_DETECTOR_STATE = 10102;
+  ATOM_KEYSTORE2_STORAGE_STATS = 10103;
+  ATOM_RKP_POOL_STATS = 10104;
+  ATOM_PROCESS_DMABUF_MEMORY = 10105;
+  ATOM_PENDING_ALARM_INFO = 10106;
+  ATOM_USER_LEVEL_HIBERNATED_APPS = 10107;
+  ATOM_LAUNCHER_LAYOUT_SNAPSHOT = 10108;
+  ATOM_GLOBAL_HIBERNATED_APPS = 10109;
+  ATOM_INPUT_EVENT_LATENCY_SKETCH = 10110;
+  ATOM_BATTERY_USAGE_STATS_BEFORE_RESET = 10111;
+  ATOM_BATTERY_USAGE_STATS_SINCE_RESET = 10112;
+  ATOM_BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL = 10113;
+  ATOM_INSTALLED_INCREMENTAL_PACKAGE = 10114;
+  ATOM_TELEPHONY_NETWORK_REQUESTS = 10115;
+  ATOM_APP_SEARCH_STORAGE_INFO = 10116;
+  ATOM_VMSTAT = 10117;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO = 10118;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO = 10119;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO = 10120;
+  ATOM_KEYSTORE2_ATOM_WITH_OVERFLOW = 10121;
+  ATOM_KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO = 10122;
+  ATOM_KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO = 10123;
+  ATOM_RKP_ERROR_STATS = 10124;
+  ATOM_KEYSTORE2_CRASH_STATS = 10125;
+  ATOM_VENDOR_APEX_INFO = 10126;
+  ATOM_ACCESSIBILITY_SHORTCUT_STATS = 10127;
+  ATOM_ACCESSIBILITY_FLOATING_MENU_STATS = 10128;
+  ATOM_DATA_USAGE_BYTES_TRANSFER_V2 = 10129;
+  ATOM_MEDIA_CAPABILITIES = 10130;
+  ATOM_CAR_WATCHDOG_SYSTEM_IO_USAGE_SUMMARY = 10131;
+  ATOM_CAR_WATCHDOG_UID_IO_USAGE_SUMMARY = 10132;
+  ATOM_IMS_REGISTRATION_FEATURE_TAG_STATS = 10133;
+  ATOM_RCS_CLIENT_PROVISIONING_STATS = 10134;
+  ATOM_RCS_ACS_PROVISIONING_STATS = 10135;
+  ATOM_SIP_DELEGATE_STATS = 10136;
+  ATOM_SIP_TRANSPORT_FEATURE_TAG_STATS = 10137;
+  ATOM_SIP_MESSAGE_RESPONSE = 10138;
+  ATOM_SIP_TRANSPORT_SESSION = 10139;
+  ATOM_IMS_DEDICATED_BEARER_LISTENER_EVENT = 10140;
+  ATOM_IMS_DEDICATED_BEARER_EVENT = 10141;
+  ATOM_IMS_REGISTRATION_SERVICE_DESC_STATS = 10142;
+  ATOM_UCE_EVENT_STATS = 10143;
+  ATOM_PRESENCE_NOTIFY_EVENT = 10144;
+  ATOM_GBA_EVENT = 10145;
+  ATOM_PER_SIM_STATUS = 10146;
+  ATOM_GPU_WORK_PER_UID = 10147;
+  ATOM_PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE = 10148;
+  ATOM_SIGNED_PARTITION_INFO = 10149;
+  ATOM_PINNED_FILE_SIZES_PER_PACKAGE = 10150;
+  ATOM_PENDING_INTENTS_PER_PACKAGE = 10151;
+  ATOM_USER_INFO = 10152;
+  ATOM_TELEPHONY_NETWORK_REQUESTS_V2 = 10153;
+  ATOM_DEVICE_TELEPHONY_PROPERTIES = 10154;
+  ATOM_REMOTE_KEY_PROVISIONING_ERROR_COUNTS = 10155;
+  ATOM_SAFETY_STATE = 10156;
+  ATOM_INCOMING_MMS = 10157;
+  ATOM_OUTGOING_MMS = 10158;
+  ATOM_MULTI_USER_INFO = 10160;
+  ATOM_NETWORK_BPF_MAP_INFO = 10161;
+  ATOM_OUTGOING_SHORT_CODE_SMS = 10162;
+  ATOM_CONNECTIVITY_STATE_SAMPLE = 10163;
+  ATOM_NETWORK_SELECTION_REMATCH_REASONS_INFO = 10164;
+  ATOM_GAME_MODE_INFO = 10165;
+  ATOM_GAME_MODE_CONFIGURATION = 10166;
+  ATOM_GAME_MODE_LISTENER = 10167;
+  ATOM_NETWORK_SLICE_REQUEST_COUNT = 10168;
+  ATOM_WS_TILE_SNAPSHOT = 10169;
+  ATOM_WS_ACTIVE_WATCH_FACE_COMPLICATION_SET_SNAPSHOT = 10170;
+  ATOM_PROCESS_STATE = 10171;
+  ATOM_PROCESS_ASSOCIATION = 10172;
+  ATOM_ADPF_SYSTEM_COMPONENT_INFO = 10173;
+  ATOM_NOTIFICATION_MEMORY_USE = 10174;
+  ATOM_HDR_CAPABILITIES = 10175;
+  ATOM_WS_FAVOURITE_WATCH_FACE_LIST_SNAPSHOT = 10176;
+  ATOM_WIFI_AWARE_NDP_REPORTED = 638;
+  ATOM_WIFI_AWARE_ATTACH_REPORTED = 639;
+  ATOM_WIFI_SELF_RECOVERY_TRIGGERED = 661;
+  ATOM_SOFT_AP_STARTED = 680;
+  ATOM_SOFT_AP_STOPPED = 681;
+  ATOM_WIFI_LOCK_RELEASED = 687;
+  ATOM_WIFI_LOCK_DEACTIVATED = 688;
+  ATOM_WIFI_CONFIG_SAVED = 689;
+  ATOM_WIFI_AWARE_RESOURCE_USING_CHANGED = 690;
+  ATOM_WIFI_AWARE_HAL_API_CALLED = 691;
+  ATOM_WIFI_LOCAL_ONLY_REQUEST_RECEIVED = 692;
+  ATOM_WIFI_LOCAL_ONLY_REQUEST_SCAN_TRIGGERED = 693;
+  ATOM_WIFI_THREAD_TASK_EXECUTED = 694;
+  ATOM_WIFI_STATE_CHANGED = 700;
+  ATOM_WIFI_AWARE_CAPABILITIES = 10190;
+  ATOM_WIFI_MODULE_INFO = 10193;
+  ATOM_SETTINGS_SPA_REPORTED = 622;
+  ATOM_EXPRESS_EVENT_REPORTED = 528;
+  ATOM_EXPRESS_HISTOGRAM_SAMPLE_REPORTED = 593;
+  ATOM_EXPRESS_UID_EVENT_REPORTED = 644;
+  ATOM_EXPRESS_UID_HISTOGRAM_SAMPLE_REPORTED = 658;
+  ATOM_PERMISSION_RATIONALE_DIALOG_VIEWED = 645;
+  ATOM_PERMISSION_RATIONALE_DIALOG_ACTION_REPORTED = 646;
+  ATOM_APP_DATA_SHARING_UPDATES_NOTIFICATION_INTERACTION = 647;
+  ATOM_APP_DATA_SHARING_UPDATES_FRAGMENT_VIEWED = 648;
+  ATOM_APP_DATA_SHARING_UPDATES_FRAGMENT_ACTION_REPORTED = 649;
+  ATOM_WS_INCOMING_CALL_ACTION_REPORTED = 626;
+  ATOM_WS_CALL_DISCONNECTION_REPORTED = 627;
+  ATOM_WS_CALL_DURATION_REPORTED = 628;
+  ATOM_WS_CALL_USER_EXPERIENCE_LATENCY_REPORTED = 629;
+  ATOM_WS_CALL_INTERACTION_REPORTED = 630;
+  ATOM_FULL_SCREEN_INTENT_LAUNCHED = 631;
+  ATOM_BAL_ALLOWED = 632;
+  ATOM_IN_TASK_ACTIVITY_STARTED = 685;
+  ATOM_CACHED_APPS_HIGH_WATERMARK = 10189;
+  ATOM_ODREFRESH_REPORTED = 366;
+  ATOM_ODSIGN_REPORTED = 548;
+  ATOM_ART_DATUM_REPORTED = 332;
+  ATOM_ART_DEVICE_DATUM_REPORTED = 550;
+  ATOM_ART_DATUM_DELTA_REPORTED = 565;
+  ATOM_BACKGROUND_DEXOPT_JOB_ENDED = 467;
+  ATOM_WEAR_ADAPTIVE_SUSPEND_STATS_REPORTED = 619;
+  ATOM_WEAR_POWER_ANOMALY_SERVICE_OPERATIONAL_STATS_REPORTED = 620;
+  ATOM_WEAR_POWER_ANOMALY_SERVICE_EVENT_STATS_REPORTED = 621;
+  ATOM_EMERGENCY_STATE_CHANGED = 633;
+  ATOM_DND_STATE_CHANGED = 657;
+  ATOM_MTE_STATE = 10181;
+  ATOM_AD_SERVICES_BACK_COMPAT_GET_TOPICS_REPORTED = 598;
+  ATOM_AD_SERVICES_BACK_COMPAT_EPOCH_COMPUTATION_CLASSIFIER_REPORTED = 599;
+  ATOM_AD_SERVICES_MEASUREMENT_DEBUG_KEYS = 640;
+  ATOM_AD_SERVICES_ERROR_REPORTED = 662;
+  ATOM_AD_SERVICES_BACKGROUND_JOBS_EXECUTION_REPORTED = 663;
+  ATOM_AD_SERVICES_MEASUREMENT_DELAYED_SOURCE_REGISTRATION = 673;
+  ATOM_AD_SERVICES_MEASUREMENT_ATTRIBUTION = 674;
+  ATOM_AD_SERVICES_MEASUREMENT_JOBS = 675;
+  ATOM_AD_SERVICES_MEASUREMENT_WIPEOUT = 676;
+  ATOM_AD_SERVICES_CONSENT_MIGRATED = 702;
+  ATOM_RKPD_POOL_STATS = 664;
+  ATOM_RKPD_CLIENT_OPERATION = 665;
+  ATOM_AUTOFILL_UI_EVENT_REPORTED = 603;
+  ATOM_AUTOFILL_FILL_REQUEST_REPORTED = 604;
+  ATOM_AUTOFILL_FILL_RESPONSE_REPORTED = 605;
+  ATOM_AUTOFILL_SAVE_EVENT_REPORTED = 606;
+  ATOM_AUTOFILL_SESSION_COMMITTED = 607;
+  ATOM_AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED = 659;
+  ATOM_TEST_EXTENSION_ATOM_REPORTED = 660;
+  ATOM_TEST_RESTRICTED_ATOM_REPORTED = 672;
+  ATOM_STATS_SOCKET_LOSS_REPORTED = 752;
+  ATOM_PLUGIN_INITIALIZED = 655;
+  ATOM_TV_LOW_POWER_STANDBY_POLICY = 679;
+  ATOM_LOCKSCREEN_SHORTCUT_SELECTED = 611;
+  ATOM_LOCKSCREEN_SHORTCUT_TRIGGERED = 612;
+  ATOM_EMERGENCY_NUMBERS_INFO = 10180;
+  ATOM_QUALIFIED_RAT_LIST_CHANGED = 634;
+  ATOM_QNS_IMS_CALL_DROP_STATS = 635;
+  ATOM_QNS_FALLBACK_RESTRICTION_CHANGED = 636;
+  ATOM_QNS_RAT_PREFERENCE_MISMATCH_INFO = 10177;
+  ATOM_QNS_HANDOVER_TIME_MILLIS = 10178;
+  ATOM_QNS_HANDOVER_PINGPONG = 10179;
+  ATOM_SATELLITE_CONTROLLER = 10182;
+  ATOM_SATELLITE_SESSION = 10183;
+  ATOM_SATELLITE_INCOMING_DATAGRAM = 10184;
+  ATOM_SATELLITE_OUTGOING_DATAGRAM = 10185;
+  ATOM_SATELLITE_PROVISION = 10186;
+  ATOM_SATELLITE_SOS_MESSAGE_RECOMMENDER = 10187;
+  ATOM_IKE_SESSION_TERMINATED = 678;
+  ATOM_IKE_LIVENESS_CHECK_SESSION_VALIDATED = 760;
+  ATOM_BLUETOOTH_HASHED_DEVICE_NAME_REPORTED = 613;
+  ATOM_BLUETOOTH_L2CAP_COC_CLIENT_CONNECTION = 614;
+  ATOM_BLUETOOTH_L2CAP_COC_SERVER_CONNECTION = 615;
+  ATOM_BLUETOOTH_LE_SESSION_CONNECTED = 656;
+  ATOM_RESTRICTED_BLUETOOTH_DEVICE_NAME_REPORTED = 666;
+  ATOM_BLUETOOTH_PROFILE_CONNECTION_ATTEMPTED = 696;
+  ATOM_HEALTH_CONNECT_UI_IMPRESSION = 623;
+  ATOM_HEALTH_CONNECT_UI_INTERACTION = 624;
+  ATOM_HEALTH_CONNECT_APP_OPENED_REPORTED = 625;
+  ATOM_HEALTH_CONNECT_API_CALLED = 616;
+  ATOM_HEALTH_CONNECT_USAGE_STATS = 617;
+  ATOM_HEALTH_CONNECT_STORAGE_STATS = 618;
+  ATOM_HEALTH_CONNECT_API_INVOKED = 643;
+  ATOM_EXERCISE_ROUTE_API_CALLED = 654;
+  ATOM_ATOM_9999 = 9999;
+  ATOM_ATOM_99999 = 99999;
+  ATOM_THREADNETWORK_TELEMETRY_DATA_REPORTED = 738;
+  ATOM_THREADNETWORK_TOPO_ENTRY_REPEATED = 739;
+  ATOM_THREADNETWORK_DEVICE_INFO_REPORTED = 740;
+  ATOM_EMERGENCY_NUMBER_DIALED = 637;
+  ATOM_SANDBOX_API_CALLED = 488;
+  ATOM_SANDBOX_ACTIVITY_EVENT_OCCURRED = 735;
+  ATOM_SANDBOX_SDK_STORAGE = 10159;
+  ATOM_CRONET_ENGINE_CREATED = 703;
+  ATOM_CRONET_TRAFFIC_REPORTED = 704;
+  ATOM_CRONET_ENGINE_BUILDER_INITIALIZED = 762;
+  ATOM_CRONET_HTTP_FLAGS_INITIALIZED = 763;
+  ATOM_CRONET_INITIALIZED = 764;
+  ATOM_DAILY_KEEPALIVE_INFO_REPORTED = 650;
+  ATOM_IP_CLIENT_RA_INFO_REPORTED = 778;
+  ATOM_APF_SESSION_INFO_REPORTED = 777;
+  ATOM_CREDENTIAL_MANAGER_API_CALLED = 585;
+  ATOM_CREDENTIAL_MANAGER_INIT_PHASE_REPORTED = 651;
+  ATOM_CREDENTIAL_MANAGER_CANDIDATE_PHASE_REPORTED = 652;
+  ATOM_CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED = 653;
+  ATOM_CREDENTIAL_MANAGER_TOTAL_REPORTED = 667;
+  ATOM_CREDENTIAL_MANAGER_FINALNOUID_REPORTED = 668;
+  ATOM_CREDENTIAL_MANAGER_GET_REPORTED = 669;
+  ATOM_CREDENTIAL_MANAGER_AUTH_CLICK_REPORTED = 670;
+  ATOM_CREDENTIAL_MANAGER_APIV2_CALLED = 671;
+  ATOM_UWB_ACTIVITY_INFO = 10188;
+  ATOM_MEDIA_ACTION_REPORTED = 608;
+  ATOM_MEDIA_CONTROLS_LAUNCHED = 609;
+  ATOM_MEDIA_CODEC_RECLAIM_REQUEST_COMPLETED = 600;
+  ATOM_MEDIA_CODEC_STARTED = 641;
+  ATOM_MEDIA_CODEC_STOPPED = 642;
+  ATOM_MEDIA_CODEC_RENDERED = 684;
+}
diff --git a/src/libtracing/protos/perfetto/config/statsd/statsd_tracing_config.proto b/src/libtracing/protos/perfetto/config/statsd/statsd_tracing_config.proto
new file mode 100644
index 000000000..754b1dae7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/statsd/statsd_tracing_config.proto
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/config/statsd/atom_ids.proto";
+
+// This file is named 'statsd_tracing_config.proto' rather than
+// 'statsd_config.proto' (which would be more consistent with the other
+// config protos) so it doesn't show up and confuse folks looking for
+// the existing statsd_config.proto for configuring statsd itself.
+// Same for the config proto itself.
+message StatsdTracingConfig {
+  // This is for the common case of the atom id being known in the enum AtomId.
+  repeated AtomId push_atom_id = 1;
+
+  // Escape hatch for Atom IDs that are not yet in the AtomId enum
+  // (e.g. non-upstream atoms that don't exist in AOSP).
+  repeated int32 raw_push_atom_id = 2;
+  repeated StatsdPullAtomConfig pull_config = 3;
+}
+
+message StatsdPullAtomConfig {
+  repeated AtomId pull_atom_id = 1;
+  repeated int32 raw_pull_atom_id = 2;
+
+  optional int32 pull_frequency_ms = 3;
+  repeated string packages = 4;
+}
diff --git a/src/libtracing/protos/perfetto/config/stress_test_config.proto b/src/libtracing/protos/perfetto/config/stress_test_config.proto
new file mode 100644
index 000000000..6ed8cbcfa
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/stress_test_config.proto
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/config/trace_config.proto";
+
+package perfetto.protos;
+
+// This is the schema for the config files in /test/stress_test/configs/*.cfg.
+message StressTestConfig {
+  optional TraceConfig trace_config = 1;
+
+  // Shared Memory Buffer setup, passed as arguments to Tracing.Initialize().
+  optional uint32 shmem_size_kb = 2;
+  optional uint32 shmem_page_size_kb = 3;
+
+  // How many producer processes to spawn.
+  optional uint32 num_processes = 4;
+
+  // How many writer threads each producer process should spawn.
+  optional uint32 num_threads = 5;
+
+  // The producer will write events until one of the following is met:
+  // - trace_config.duration_ms is reached.
+  // - max_events is reached.
+  optional uint32 max_events = 6;
+
+  // If > 0 will write nested messages up to N levels deep. The size of each
+  // nested message depends on the payload_mean / sttdev arguments (below).
+  // This is to cover the patching logic.
+  optional uint32 nesting = 7;
+
+  // This submessage defines the timings of each writer worker thread.
+  message WriterTiming {
+    // The size of the payload written on each iteration.
+    optional double payload_mean = 1;
+    optional double payload_stddev = 2;
+
+    // The nominal event writing rate, expressed in events/sec.
+    // E.g. if payload_mean = 500 (bytes) and rate_mean = 1000 (Hz), each thread
+    // will write 500 KB / sec approximately (% stalling).
+    optional double rate_mean = 3;
+    optional double rate_stddev = 4;
+
+    // If non-zero each worker will slow down the writing of the payload:
+    // it writes half payload, sleep for payload_write_time_ms, then write the
+    // other half.
+    optional uint32 payload_write_time_ms = 5;
+  }
+
+  // The timings used by default.
+  optional WriterTiming steady_state_timings = 8;
+
+  // Optionally it is possible to cause a writer to enter "burst mode",
+  // simulating peaks of high-intensity writing. The way it works is the
+  // following: by default the writer writes events using the
+  // |steady_state_timings|. Then every |burst_period_ms| it will switch to the
+  // |burst_timings| for |burst_duration_ms|, and go back to the steady state
+  // after that (and then repeat).
+  optional uint32 burst_period_ms = 9;
+  optional uint32 burst_duration_ms = 10;
+  optional WriterTiming burst_timings = 11;
+}
diff --git a/src/libtracing/protos/perfetto/config/sys_stats/sys_stats_config.proto b/src/libtracing/protos/perfetto/config/sys_stats/sys_stats_config.proto
new file mode 100644
index 000000000..1cae840bf
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/sys_stats/sys_stats_config.proto
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/common/sys_stats_counters.proto";
+
+// This file defines the configuration for the Linux /proc poller data source,
+// which injects counters in the trace.
+// Counters that are needed in the trace must be explicitly listed in the
+// *_counters fields. This is to avoid spamming the trace with all counters
+// at all times.
+// The sampling rate is configurable. All polling rates (*_period_ms) need
+// to be integer multiples of each other.
+// OK:     [10ms, 10ms, 10ms],  [10ms, 20ms, 10ms],  [10ms, 20ms, 60ms]
+// Not OK: [10ms, 10ms, 11ms],  [10ms, 15ms, 20ms]
+message SysStatsConfig {
+  // Polls /proc/meminfo every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 0.3 ms [read] + 0.07 ms [parse + trace injection]
+  optional uint32 meminfo_period_ms = 1;
+
+  // If empty all known counters are reported. Otherwise, only the counters
+  // specified below are reported.
+  repeated MeminfoCounters meminfo_counters = 2;
+
+  // Polls /proc/vmstat every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 0.2 ms [read] + 0.3 ms [parse + trace injection]
+  optional uint32 vmstat_period_ms = 3;
+  repeated VmstatCounters vmstat_counters = 4;
+
+  // Pols /proc/stat every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 4.1 ms [read] + 1.9 ms [parse + trace injection]
+  optional uint32 stat_period_ms = 5;
+  enum StatCounters {
+    STAT_UNSPECIFIED = 0;
+    STAT_CPU_TIMES = 1;
+    STAT_IRQ_COUNTS = 2;
+    STAT_SOFTIRQ_COUNTS = 3;
+    STAT_FORK_COUNT = 4;
+  }
+  repeated StatCounters stat_counters = 6;
+
+  // Polls /sys/devfreq/*/curfreq every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // This option can be used to record unchanging values.
+  // Updates from frequency changes can come from ftrace/set_clock_rate.
+  optional uint32 devfreq_period_ms = 7;
+
+  // Polls /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_cur_freq every X ms.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 cpufreq_period_ms = 8;
+
+  // Polls /proc/buddyinfo every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 buddyinfo_period_ms = 9;
+
+  // Polls /proc/diskstats every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 diskstat_period_ms = 10;
+
+  // Polls /proc/pressure/* every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 psi_period_ms = 11;
+}
diff --git a/src/libtracing/protos/perfetto/config/system_info/system_info.proto b/src/libtracing/protos/perfetto/config/system_info/system_info.proto
new file mode 100644
index 000000000..23c85a6b8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/system_info/system_info.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This data-source does a one-off recording of system information when
+// the trace starts.
+// Currently this includes:
+// - Values of
+// /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_frequencies This
+// datasource has no configuration options at present.
+message SystemInfoConfig {}
diff --git a/src/libtracing/protos/perfetto/config/test_config.proto b/src/libtracing/protos/perfetto/config/test_config.proto
new file mode 100644
index 000000000..40bfa8aee
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/test_config.proto
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The configuration for a fake producer used in tests.
+message TestConfig {
+  message DummyFields {
+    optional uint32 field_uint32 = 1;
+    optional int32 field_int32 = 2;
+    optional uint64 field_uint64 = 3;
+    optional int64 field_int64 = 4;
+    optional fixed64 field_fixed64 = 5;
+    optional sfixed64 field_sfixed64 = 6;
+    optional fixed32 field_fixed32 = 7;
+    optional sfixed32 field_sfixed32 = 8;
+    optional double field_double = 9;
+    optional float field_float = 10;
+    optional sint64 field_sint64 = 11;
+    optional sint32 field_sint32 = 12;
+    optional string field_string = 13;
+    optional bytes field_bytes = 14;
+  }
+
+  // The number of messages the fake producer should send.
+  optional uint32 message_count = 1;
+
+  // The maximum number of messages which should be sent each second.
+  // The actual obserced speed may be lower if the producer is unable to
+  // work fast enough.
+  // If this is zero or unset, the producer will send as fast as possible.
+  optional uint32 max_messages_per_second = 2;
+
+  // The seed value for a simple multiplicative congruential pseudo-random
+  // number sequence.
+  optional uint32 seed = 3;
+
+  // The size of each message in bytes. Should be greater than or equal 5 to
+  // account for the number of bytes needed to encode the random number and a
+  // null byte for the string.
+  optional uint32 message_size = 4;
+
+  // Whether the producer should send a event batch when the data source is
+  // is initially registered.
+  optional bool send_batch_on_register = 5;
+
+  optional DummyFields dummy_fields = 6;
+}
diff --git a/src/libtracing/protos/perfetto/config/trace_config.proto b/src/libtracing/protos/perfetto/config/trace_config.proto
new file mode 100644
index 000000000..29173ec7b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/trace_config.proto
@@ -0,0 +1,695 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/common/builtin_clock.proto";
+import "protos/perfetto/config/data_source_config.proto";
+
+// The overall config that is used when starting a new tracing session through
+// ProducerPort::StartTracing().
+// It contains the general config for the logging buffer(s) and the configs for
+// all the data source being enabled.
+//
+// Next id: 39.
+message TraceConfig {
+  message BufferConfig {
+    optional uint32 size_kb = 1;
+
+    // |page_size|, now deprecated.
+    reserved 2;
+
+    // |optimize_for|, now deprecated.
+    reserved 3;
+
+    enum FillPolicy {
+      UNSPECIFIED = 0;
+
+      // Default behavior. The buffer operates as a conventional ring buffer.
+      // If the writer is faster than the reader (or if the reader reads only
+      // after tracing is stopped) newly written packets will overwrite old
+      // packets.
+      RING_BUFFER = 1;
+
+      // Behaves like RING_BUFFER as long as there is space in the buffer or
+      // the reader catches up with the writer. As soon as the writer hits
+      // an unread chunk, it stops accepting new data in the buffer.
+      DISCARD = 2;
+    }
+    optional FillPolicy fill_policy = 4;
+
+    // When true the buffer is moved (rather than copied) onto the cloned
+    // session, and an empty buffer of the same size is allocated in the source
+    // tracing session. This feature will likely get deprecated in the future.
+    // It been introduced mainly to support the surfaceflinger snapshot dump
+    // for bugreports, where SF can dumps O(400MB) into the bugreport trace. In
+    // that case we don't want to retain another in-memory copy of the buffer.
+    optional bool transfer_on_clone = 5;
+
+    // Used in conjuction with transfer_on_clone. When true the buffer is
+    // cleared before issuing the Flush(reason=kTraceClone). This is to ensure
+    // that if the data source took too long to write the data in a previous
+    // clone-related flush, we don't end up with a mixture of leftovers from
+    // the previous write and new data.
+    optional bool clear_before_clone = 6;
+  }
+  repeated BufferConfig buffers = 1;
+
+  message DataSource {
+    // Filters and data-source specific config. It contains also the unique name
+    // of the data source, the one passed in the  DataSourceDescriptor when they
+    // register on the service.
+    optional protos.DataSourceConfig config = 1;
+
+    // Optional. If multiple producers (~processes) expose the same data source
+    // and either |producer_name_filter| or |producer_name_regex_filter| is set,
+    // the data source is enabled only for producers whose names match any of
+    // the filters.
+    // |producer_name_filter| has to be an exact match, while
+    // |producer_name_regex_filter| is a regular expression.
+    // This allows to enable a data source only for specific processes.
+    // The "repeated" fields have OR semantics: specifying a filter ["foo",
+    // "bar"] will enable data sources on both "foo" and "bar" (if they exist).
+    repeated string producer_name_filter = 2;
+    repeated string producer_name_regex_filter = 3;
+  }
+  repeated DataSource data_sources = 2;
+
+  // Config for disabling builtin data sources in the tracing service.
+  message BuiltinDataSource {
+    // Disable emitting clock timestamps into the trace.
+    optional bool disable_clock_snapshotting = 1;
+
+    // Disable echoing the original trace config in the trace.
+    optional bool disable_trace_config = 2;
+
+    // Disable emitting system info (build fingerprint, cpuinfo, etc).
+    optional bool disable_system_info = 3;
+
+    // Disable emitting events for data-source state changes (e.g. the marker
+    // for all data sources having ACKed the start of the trace).
+    optional bool disable_service_events = 4;
+
+    // The authoritative clock domain for the trace. Defaults to BOOTTIME. See
+    // also ClockSnapshot's primary_trace_clock. The configured value is written
+    // into the trace as part of the ClockSnapshots emitted by the service.
+    // Trace processor will attempt to translate packet/event timestamps from
+    // various data sources (and their chosen clock domains) to this domain
+    // during import. Added in Android R.
+    optional BuiltinClock primary_trace_clock = 5;
+
+    // Time interval in between snapshotting of sync markers, clock snapshots,
+    // stats, and other periodic service-emitted events. Note that the service
+    // only keeps track of the first and the most recent snapshot until
+    // ReadBuffers() is called.
+    optional uint32 snapshot_interval_ms = 6;
+
+    // Hints to the service that a suspend-aware (i.e. counting time in suspend)
+    // clock should be used for periodic snapshots of service-emitted events.
+    // This means, if a snapshot *should* have happened during suspend, it will
+    // happen immediately after the device resumes.
+    //
+    // Choosing a clock like this is done on best-effort basis; not all
+    // platforms (e.g. Windows) expose a clock which can be used for periodic
+    // tasks counting suspend. If such a clock is not available, the service
+    // falls back to the best-available alternative.
+    //
+    // Introduced in Android S.
+    // TODO(lalitm): deprecate this in T and make this the default if nothing
+    // crashes in S.
+    optional bool prefer_suspend_clock_for_snapshot = 7;
+
+    // Disables the reporting of per-trace-writer histograms in TraceStats.
+    optional bool disable_chunk_usage_histograms = 8;
+  }
+  optional BuiltinDataSource builtin_data_sources = 20;
+
+  // If specified, the trace will be stopped |duration_ms| after starting.
+  // This does *not* count the time the system is suspended, so we will run
+  // for duration_ms of system activity, not wall time.
+  //
+  // However in case of traces with triggers, see
+  // TriggerConfig.trigger_timeout_ms instead.
+  optional uint32 duration_ms = 3;
+
+  // If true, tries to use CLOCK_BOOTTIME for duration_ms rather than
+  // CLOCK_MONOTONIC (which doesn't count time in suspend). Supported only on
+  // Linux/Android, no-op on other platforms. This is used when dealing with
+  // long (e.g. 24h) traces, where suspend can inflate them to weeks of
+  // wall-time, making them more likely to hit device reboots (and hence loss).
+  // This option also changes consistently the semantic of
+  // TriggerConfig.stop_delay_ms.
+  optional bool prefer_suspend_clock_for_duration = 36;
+
+  // This is set when --dropbox is passed to the Perfetto command line client
+  // and enables guardrails that limit resource usage for traces requested
+  // by statsd.
+  optional bool enable_extra_guardrails = 4;
+
+  enum LockdownModeOperation {
+    LOCKDOWN_UNCHANGED = 0;
+    LOCKDOWN_CLEAR = 1;
+    LOCKDOWN_SET = 2;
+  }
+  // Reject producers that are not running under the same UID as the tracing
+  // service.
+  optional LockdownModeOperation lockdown_mode = 5;
+
+  message ProducerConfig {
+    // Identifies the producer for which this config is for.
+    optional string producer_name = 1;
+
+    // Specifies the preferred size of the shared memory buffer. If the size is
+    // larger than the max size, the max will be used. If it is smaller than
+    // the page size or doesn't fit pages evenly into it, it will fall back to
+    // the size specified by the producer or finally the default shared memory
+    // size.
+    optional uint32 shm_size_kb = 2;
+
+    // Specifies the preferred size of each page in the shared memory buffer.
+    // Must be an integer multiple of 4K.
+    optional uint32 page_size_kb = 3;
+  }
+
+  repeated ProducerConfig producers = 6;
+
+  // Contains statsd-specific metadata about an alert associated with the trace.
+  message StatsdMetadata {
+    // The identifier of the alert which triggered this trace.
+    optional int64 triggering_alert_id = 1;
+    // The uid which registered the triggering configuration with statsd.
+    optional int32 triggering_config_uid = 2;
+    // The identifier of the config which triggered the alert.
+    optional int64 triggering_config_id = 3;
+    // The identifier of the subscription which triggered this trace.
+    optional int64 triggering_subscription_id = 4;
+  }
+
+  // Statsd-specific metadata.
+  optional StatsdMetadata statsd_metadata = 7;
+
+  // When true && |output_path| is empty, the EnableTracing() request must
+  // provide a file descriptor. The service will then periodically read packets
+  // out of the trace buffer and store it into the passed file.
+  // If |output_path| is not empty no fd should be passed, the service
+  // will create a new file and write into that (see comment below).
+  optional bool write_into_file = 8;
+
+  // This must point to a non-existing file. If the file exists the service
+  // will NOT overwrite and will fail instead as a security precaution.
+  // On Android, when this is used with the system traced, the path must be
+  // within /data/misc/perfetto-traces/ or the trace will fail.
+  // This option has been introduced in Android R. Before R write_into_file
+  // can be used only with the "pass a file descriptor over IPC" mode.
+  optional string output_path = 29;
+
+  // Optional. If non-zero tunes the write period. A min value of 100ms is
+  // enforced (i.e. smaller values are ignored).
+  optional uint32 file_write_period_ms = 9;
+
+  // Optional. When non zero the periodic write stops once at most X bytes
+  // have been written into the file. Tracing is disabled when this limit is
+  // reached, even if |duration_ms| has not been reached yet.
+  optional uint64 max_file_size_bytes = 10;
+
+  // Contains flags which override the default values of the guardrails inside
+  // Perfetto.
+  message GuardrailOverrides {
+    // Override the default limit (in bytes) for uploading data to server within
+    // a 24 hour period.
+    // On R-, this override only affected userdebug builds. Since S, it also
+    // affects user builds.
+    // In 24Q3+ (V+), this override is a noop because upload guardrail logic
+    // was removed from Perfetto.
+    optional uint64 max_upload_per_day_bytes = 1 [deprecated = true];
+
+    // Overrides the guardrail for maximum trace buffer size.
+    // Available on U+
+    optional uint32 max_tracing_buffer_size_kb = 2;
+  }
+  optional GuardrailOverrides guardrail_overrides = 11;
+
+  // When true, data sources are not started until an explicit call to
+  // StartTracing() on the consumer port. This is to support early
+  // initialization and fast trace triggering. This can be used only when the
+  // Consumer explicitly triggers the StartTracing() method.
+  // This should not be used in a remote trace config via statsd, doing so will
+  // result in a hung trace session.
+  optional bool deferred_start = 12;
+
+  // When set, it periodically issues a Flush() to all data source, forcing them
+  // to commit their data into the tracing service. This can be used for
+  // quasi-real-time streaming mode and to guarantee some partial ordering of
+  // events in the trace in windows of X ms.
+  optional uint32 flush_period_ms = 13;
+
+  // Wait for this long for producers to acknowledge flush requests.
+  // Default 5s.
+  optional uint32 flush_timeout_ms = 14;
+
+  // Wait for this long for producers to acknowledge stop requests.
+  // Default 5s.
+  optional uint32 data_source_stop_timeout_ms = 23;
+
+  // |disable_clock_snapshotting| moved.
+  reserved 15;
+
+  // Android-only. If set, sends an intent to the Traceur system app when the
+  // trace ends to notify it about the trace readiness.
+  optional bool notify_traceur = 16;
+
+  // This field was introduced in Android S.
+  // Android-only. If set to a value > 0, marks the trace session as a candidate
+  // for being attached to a bugreport. This field effectively acts as a z-index
+  // for bugreports. When Android's dumpstate runs perfetto
+  // --save-for-bugreport, traced will pick the tracing session with the highest
+  // score (score <= 0 is ignored) and:
+  // On Android S, T:  will steal its contents, save the trace into
+  //     a known path and stop prematurely.
+  // On Android U+: will create a read-only snapshot and save that into a known
+  //     path, without stoppin the original tracing session.
+  // When this field is set the tracing session becomes eligible to be cloned
+  // by other UIDs.
+  optional int32 bugreport_score = 30;
+
+  // When set, defines name of the file that will be saved under
+  // /data/misc/perfetto-traces/bugreport/ when using --save-all-for-bugreport.
+  // If omitted, traces will be named systrace.pftrace, systrace_1.pftrace, etc,
+  // starting from the highest `bugreport_score`.
+  // Introduced in v42 / Android V.
+  optional string bugreport_filename = 38;
+
+  // Triggers allow producers to start or stop the tracing session when an event
+  // occurs.
+  //
+  // For example if we are tracing probabilistically, most traces will be
+  // uninteresting. Triggers allow us to keep only the interesting ones such as
+  // those traces during which the device temperature reached a certain
+  // threshold. In this case the producer can activate a trigger to keep
+  // (STOP_TRACING) the trace, otherwise it can also begin a trace
+  // (START_TRACING) because it knows something is about to happen.
+  message TriggerConfig {
+    enum TriggerMode {
+      UNSPECIFIED = 0;
+
+      // When this mode is chosen, data sources are not started until one of the
+      // |triggers| are received. This supports early initialization and fast
+      // starting of the tracing system. On triggering, the session will then
+      // record for |stop_delay_ms|. However if no trigger is seen
+      // after |trigger_timeout_ms| the session will be stopped and no data will
+      // be returned.
+      START_TRACING = 1;
+
+      // When this mode is chosen, the session will be started via the normal
+      // EnableTracing() & StartTracing(). If no trigger is ever seen
+      // the session will be stopped after |trigger_timeout_ms| and no data will
+      // be returned. However if triggered the trace will stop after
+      // |stop_delay_ms| and any data in the buffer will be returned to the
+      // consumer.
+      STOP_TRACING = 2;
+
+      // 3 was taken by CLONE_SNAPSHOT but that has been moved to 4.
+      // The early implementation of CLONE_SNAPSHOT had various bugs
+      // (b/290798988, b/290799105) and made it into Android U. The number
+      // change is to make sure nobody rolls out a config that hits the broken
+      // behaviour.
+      reserved 3;
+
+      // When this mode is chosen, this causes a snapshot of the current tracing
+      // session to be created after |stop_delay_ms| while the current tracing
+      // session continues undisturbed (% an extra flush). This mode can be
+      // used only when the tracing session is handled by the "perfetto" cmdline
+      // client (which is true in 90% of cases). Part of the business logic
+      // necessary for this behavior, and ensuing file handling, lives in
+      // perfetto_cmd.cc . On other consumers, this causes only a notification
+      // of the trigger through a CloneTriggerHit ObservableEvent. The custom
+      // consumer is supposed to call CloneSession() itself after the event.
+      // Use use_clone_snapshot_if_available=true when targeting older versions
+      // of perfetto.
+      CLONE_SNAPSHOT = 4;
+
+      // NOTE: CLONE_SNAPSHOT should be used only when we targeting Android V+
+      // (15+) / Perfetto v38+. A bug in older versions of the tracing service
+      // might cause indefinitely long tracing sessions (see b/274931668).
+    }
+    optional TriggerMode trigger_mode = 1;
+
+    // This flag is really a workaround for b/274931668. This is needed only
+    // when deploying configs to different versions of the tracing service.
+    // When this is set to true this has the same effect of setting trigger_mode
+    // to CLONE_SNAPSHOT on newer versions of the service. This boolean has been
+    // introduced to allow to have configs that use CLONE_SNAPSHOT on newer
+    // versions of Android and fall back to STOP_TRACING on older versions where
+    // CLONE_SNAPSHOT did not exist.
+    // When using this flag, trigger_mode must be set to STOP_TRACING.
+    optional bool use_clone_snapshot_if_available = 5;
+
+    // DEPRECATED, was use_clone_snapshot_if_available in U. See the comment
+    // around CLONE_SNAPSHOT.
+    reserved 4;
+
+    message Trigger {
+      // The producer must specify this name to activate the trigger.
+      optional string name = 1;
+
+      // An std::regex that will match the producer that can activate this
+      // trigger. This is optional. If unset any producers can activate this
+      // trigger.
+      optional string producer_name_regex = 2;
+
+      // After a trigger is received either in START_TRACING or STOP_TRACING
+      // mode then the trace will end |stop_delay_ms| after triggering.
+      // In CLONE_SNAPSHOT mode, this is the delay between the trigger and the
+      // snapshot.
+      // If |prefer_suspend_clock_for_duration| is set, the duration will be
+      // based on wall-clock, counting also time in suspend.
+      optional uint32 stop_delay_ms = 3;
+
+      // Limits the number of traces this trigger can start/stop in a rolling
+      // 24 hour window. If this field is unset or zero, no limit is applied and
+      // activiation of this trigger *always* starts/stops the trace.
+      optional uint32 max_per_24_h = 4;
+
+      // A value between 0 and 1 which encodes the probability of skipping a
+      // trigger with this name. This is useful for reducing the probability
+      // of high-frequency triggers from dominating trace finaization. If this
+      // field is unset or zero, the trigger will *never* be skipped. If this
+      // field is greater than or equal to 1, this trigger will *always* be
+      // skipped i.e. it will be as if this trigger was never included in the
+      // first place.
+      // This probability check is applied *before* any other limits. For
+      // example, if |max_per_24_h| is also set, first we will check if the
+      // probability bar is met and only then will we check the |max_per_24_h|
+      // limit.
+      optional double skip_probability = 5;
+    }
+    // A list of triggers which are related to this configuration. If ANY
+    // trigger is seen then an action will be performed based on |trigger_mode|.
+    repeated Trigger triggers = 2;
+
+    // Required and must be positive if a TriggerConfig is specified. This is
+    // how long this TraceConfig should wait for a trigger to arrive. After this
+    // period of time if no trigger is seen the TracingSession will be cleaned
+    // up.
+    optional uint32 trigger_timeout_ms = 3;
+  }
+  optional TriggerConfig trigger_config = 17;
+
+  // When this is non-empty the perfetto command line tool will ignore the rest
+  // of this TraceConfig and instead connect to the perfetto service as a
+  // producer and send these triggers, potentially stopping or starting traces
+  // that were previous configured to use a TriggerConfig.
+  repeated string activate_triggers = 18;
+
+  // Configuration for trace contents that reference earlier trace data. For
+  // example, a data source might intern strings, and emit packets containing
+  // {interned id : string} pairs. Future packets from that data source can then
+  // use the interned ids instead of duplicating the raw string contents. The
+  // trace parser will then need to use that interning table to fully interpret
+  // the rest of the trace.
+  message IncrementalStateConfig {
+    // If nonzero, notify eligible data sources to clear their incremental state
+    // periodically, with the given period. The notification is sent only to
+    // data sources that have |handles_incremental_state_clear| set in their
+    // DataSourceDescriptor. The notification requests that the data source
+    // stops referring to past trace contents. This is particularly useful when
+    // tracing in ring buffer mode, where it is not exceptional to overwrite old
+    // trace data.
+    //
+    // Warning: this time-based global clearing is likely to be removed in the
+    // future, to be replaced with a smarter way of sending the notifications
+    // only when necessary.
+    optional uint32 clear_period_ms = 1;
+  }
+  optional IncrementalStateConfig incremental_state_config = 21;
+
+  // Additional guardrail used by the Perfetto command line client.
+  // On user builds when --dropbox is set perfetto will refuse to trace unless
+  // this is also set.
+  // Added in Q.
+  optional bool allow_user_build_tracing = 19;
+
+  // If set the tracing service will ensure there is at most one tracing session
+  // with this key.
+  optional string unique_session_name = 22;
+
+  // Compress trace with the given method. Best effort.
+  enum CompressionType {
+    COMPRESSION_TYPE_UNSPECIFIED = 0;
+    COMPRESSION_TYPE_DEFLATE = 1;
+  }
+  optional CompressionType compression_type = 24;
+
+  // DEPRECATED, was compress_from_cli.
+  reserved 37;
+
+  // Android-only. Not for general use. If set, saves the trace into an
+  // incident. This field is read by perfetto_cmd, rather than the tracing
+  // service. This field must be set when passing the --upload flag to
+  // perfetto_cmd.
+  message IncidentReportConfig {
+    // In this message, either:
+    //  * all of |destination_package|, |destination_class| and |privacy_level|
+    //    must be set.
+    //  * |skip_incidentd| must be explicitly set to true.
+
+    optional string destination_package = 1;
+    optional string destination_class = 2;
+    // Level of filtering in the requested incident. See |Destination| in
+    // frameworks/base/core/proto/android/privacy.proto.
+    optional int32 privacy_level = 3;
+
+    // If true, then skips saving the trace to incidentd.
+    //
+    // This flag is useful in testing (e.g. Perfetto-statsd integration tests)
+    // or when we explicitly don't want traces to go to incidentd even when they
+    // usually would (e.g. configs deployed using statsd but only used for
+    // inclusion in bugreports using |bugreport_score|).
+    //
+    // The motivation for having this flag, instead of just not setting
+    // |incident_report_config|, is prevent accidents where
+    // |incident_report_config| is omitted by mistake.
+    optional bool skip_incidentd = 5;
+
+    // If true, do not write the trace into dropbox (i.e. incident only).
+    // Otherwise, write to both dropbox and incident.
+    // TODO(lalitm): remove this field as we no longer use Dropbox.
+    optional bool skip_dropbox = 4 [deprecated = true];
+  }
+  optional IncidentReportConfig incident_report_config = 25;
+
+  enum StatsdLogging {
+    STATSD_LOGGING_UNSPECIFIED = 0;
+    STATSD_LOGGING_ENABLED = 1;
+    STATSD_LOGGING_DISABLED = 2;
+  }
+
+  // Android-only. Not for general use. If specified, sets the logging to statsd
+  // of guardrails and checkpoints in the tracing service. perfetto_cmd sets
+  // this to enabled (if not explicitly set in the config) when specifying
+  // --upload.
+  optional StatsdLogging statsd_logging = 31;
+
+  // DEPRECATED. Was trace_uuid, use trace_uuid_msb and trace_uuid_lsb instead.
+  reserved 26;
+
+  // An identifier clients can use to tie this trace to other logging.
+  // DEPRECATED as per v32. See TracePacket.trace_uuid for the authoritative
+  // Trace UUID. If this field is set, the tracing service will respect the
+  // requested UUID (i.e. TracePacket.trace_uuid == this field) but only if
+  // gap-less snapshotting is not used.
+  optional int64 trace_uuid_msb = 27 [deprecated = true];
+  optional int64 trace_uuid_lsb = 28 [deprecated = true];
+
+  // When set applies a post-filter to the trace contents using the filter
+  // provided. The filter is applied at ReadBuffers() time and works both in the
+  // case of IPC readback and write_into_file. This filter can be generated
+  // using `tools/proto_filter -s schema.proto -F filter_out.bytes` or
+  // `-T filter_out.escaped_string` (for .pbtx). See go/trace-filtering for
+  // design.
+  //
+  // Introduced in Android S, but it was broken (b/195065199). Reintroduced in
+  // Android T with a different field number. Updated in Android U with a new
+  // bytecode version which supports string filtering.
+  message TraceFilter {
+    // =========================
+    // Filter bytecode.
+    // =========================
+
+    // The bytecode as implemented in Android T.
+    optional bytes bytecode = 1;
+
+    // The bytecode as implemented in Android U. Adds support for string
+    // filtering.
+    optional bytes bytecode_v2 = 2;
+
+    // =========================
+    // String filtering
+    // =========================
+
+    // The principles and terminology of string filtering is heavily inspired by
+    // iptables. A "rule" decide how strings should be filtered. Each rule
+    // contains a "policy" which indicates the algorithm to use for filtering.
+    // A "chain" is a list of rules which will be sequentially checked against
+    // each string.
+    //
+    // The first rule which applies to the string terminates filtering for that
+    // string. If no rules apply, the string is left unchanged.
+
+    // A policy specifies which algorithm should be used for filtering the
+    // string.
+    enum StringFilterPolicy {
+      SFP_UNSPECIFIED = 0;
+
+      // Tries to match the string field against |regex_pattern|. If it
+      // matches, all matching groups are "redacted" (i.e. replaced with a
+      // constant string) and filtering is terminated (i.e. no further rules are
+      // checked). If it doesn't match, the string is left unchanged and the
+      // next rule in chain is considered.
+      SFP_MATCH_REDACT_GROUPS = 1;
+
+      // Like |SFP_MATCH_REDACT_GROUPS| but tries to do some pre-work before
+      // checking the regex. Specifically, it tries to parse the string field as
+      // an atrace tracepoint and checks if the post-tgid field starts with
+      // |atrace_post_tgid_starts_with|. The regex matching is only performed if
+      // this check succeeds.
+      SFP_ATRACE_MATCH_REDACT_GROUPS = 2;
+
+      // Tries to match the string field against |regex_pattern|. If it
+      // matches, filtering is terminated (i.e. no further rules are checked).
+      // If it doesn't match, the string is left unchanged and the next rule in
+      // chain is considered.
+      SFP_MATCH_BREAK = 3;
+
+      // Like |SFP_MATCH_BREAK| but tries to do some pre-work before checking
+      // the regex. Specifically, it tries to parse the string field as an
+      // atrace tracepoint and checks if the post-tgid field starts with
+      // |atrace_post_tgid_starts_with|. The regex matching is only performed if
+      // this check succeeds.
+      SFP_ATRACE_MATCH_BREAK = 4;
+
+      // Tries to repeatedly search (i.e. find substrings of) the string field
+      // with |regex_pattern|. For each match, redacts any matching groups (i.e.
+      // replaced with a constant string). Once there are no further matches,
+      // filtering is terminated (i.e. no further rules are checked).
+      //
+      // Note that this is policy is a "search" policy not a "match" policy
+      // unlike the above policies:
+      //  * Match policies require matching the full string i.e. there is an
+      //    implicit leading `^` and trailing `$`.
+      //  * Search policies perform repeated partial matching of the string
+      //    e.g.
+      //      - String: `foo=aaa,bar=123,foo=bbb,baz=456`
+      //      - Pattern: `foo=(\d+)`
+      //      - Output: `foo=P6O,bar=123,foo=P6O,baz=456`
+      //    where P6O is the redaction string
+      //
+      // All of this is only performed after some pre-work where we try to parse
+      // the string field as an atrace tracepoint and check if the post-tgid
+      // field starts with |atrace_post_tgid_starts_with|.
+      //
+      // If there are no partial matches, the string is left unchanged and the
+      // next rule in chain is considered.
+      SFP_ATRACE_REPEATED_SEARCH_REDACT_GROUPS = 5;
+    }
+
+    // A rule specifies how strings should be filtered.
+    message StringFilterRule {
+      // The policy (i.e. algorithm) dictating how strings matching this rule
+      // should be handled.
+      optional StringFilterPolicy policy = 1;
+
+      // The regex pattern used to match against each string.
+      optional string regex_pattern = 2;
+
+      // The string which should appear after the tgid in atrace tracepoint
+      // strings.
+      optional string atrace_payload_starts_with = 3;
+    }
+
+    // A chain is a list of rules which string will be sequentially checked
+    // against.
+    message StringFilterChain {
+      repeated StringFilterRule rules = 1;
+    }
+    optional StringFilterChain string_filter_chain = 3;
+  }
+  // old field number for trace_filter
+  reserved 32;
+  optional TraceFilter trace_filter = 33;
+
+  // Android-only. Not for general use. If set, reports the trace to the
+  // Android framework. This field is read by perfetto_cmd, rather than the
+  // tracing service. This field must be set when passing the --upload flag to
+  // perfetto_cmd.
+  message AndroidReportConfig {
+    // In this message, either:
+    //  * |reporter_service_package| and |reporter_service_class| must be set.
+    //  * |skip_reporting| must be explicitly set to true.
+
+    optional string reporter_service_package = 1;
+    optional string reporter_service_class = 2;
+
+    // If true, then skips reporting the trace to Android framework.
+    //
+    // This flag is useful in testing (e.g. Perfetto-statsd integration tests)
+    // or when we explicitly don't want to report traces to the framework even
+    // when they usually would (e.g. configs deployed using statsd but only
+    // used for inclusion in bugreports using |bugreport_score|).
+    //
+    // The motivation for having this flag, instead of just not setting
+    // |framework_report_config|, is prevent accidents where
+    // |framework_report_config| is omitted by mistake.
+    optional bool skip_report = 3;
+
+    // If true, will direct the Android framework to read the data in trace
+    // file and pass it to the reporter class over a pipe instead of passing
+    // the file descriptor directly.
+    //
+    // This flag is needed because the Android test framework does not
+    // currently support priv-app helper apps (in terms of SELinux) and we
+    // really don't want to add an allow rule for untrusted_app to receive
+    // trace fds.
+    //
+    // Because of this, we instead will direct the framework to create a new
+    // pipe and pass this to the reporter process instead. As the pipe is
+    // created by the framework, we won't have any problems with SELinux
+    // (system_server is already allowed to pass pipe fds, even
+    // to untrusted apps).
+    //
+    // As the name suggests this option *MUST* only be used for testing.
+    // Note that the framework will reject (and drop) files which are too
+    // large both for simplicity and to be minimize the amount of data we
+    // pass to a non-priv app (note that the framework will still check
+    // manifest permissions even though SELinux permissions are worked around).
+    optional bool use_pipe_in_framework_for_testing = 4;
+  }
+  optional AndroidReportConfig android_report_config = 34;
+
+  // If set, delays the start of tracing by a random duration. The duration is
+  // chosen from a uniform distribution between the specified minimum and
+  // maximum.
+  // Note: this delay is implemented by perfetto_cmd *not* by traced so will
+  // not work if you communicate with traced directly over the consumer API.
+  // Introduced in Android T.
+  message CmdTraceStartDelay {
+    optional uint32 min_delay_ms = 1;
+    optional uint32 max_delay_ms = 2;
+  }
+  optional CmdTraceStartDelay cmd_trace_start_delay = 35;
+}
diff --git a/src/libtracing/protos/perfetto/config/track_event/track_event_config.proto b/src/libtracing/protos/perfetto/config/track_event/track_event_config.proto
new file mode 100644
index 000000000..5c029e21b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/config/track_event/track_event_config.proto
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message TrackEventConfig {
+  // The following fields define the set of enabled trace categories. Each list
+  // item is a glob.
+  //
+  // To determine if category is enabled, it is checked against the filters in
+  // the following order:
+  //
+  //   1. Exact matches in enabled categories.
+  //   2. Exact matches in enabled tags.
+  //   3. Exact matches in disabled categories.
+  //   4. Exact matches in disabled tags.
+  //   5. Pattern matches in enabled categories.
+  //   6. Pattern matches in enabled tags.
+  //   7. Pattern matches in disabled categories.
+  //   8. Pattern matches in disabled tags.
+  //
+  // If none of the steps produced a match:
+  //  - In the C++ SDK (`perfetto::Category`), categories are enabled by
+  //  default.
+  //  - In the C SDK (`PerfettoTeCategory`), categories are disabled by default.
+  //
+  // Examples:
+  //
+  //  - To enable all non-slow/debug categories:
+  //
+  //       enabled_categories: "*"
+  //
+  //  - To enable specific categories:
+  //
+  //       disabled_categories: "*"
+  //       enabled_categories: "my_category"
+  //       enabled_categories: "my_category2"
+  //
+  //  - To enable only categories with a specific tag:
+  //
+  //       disabled_tags: "*"
+  //       enabled_tags: "my_tag"
+  //
+
+  // Default: []
+  repeated string disabled_categories = 1;
+
+  // Default: []
+  repeated string enabled_categories = 2;
+
+  // Default: ["slow", "debug"]
+  repeated string disabled_tags = 3;
+
+  // Default: []
+  repeated string enabled_tags = 4;
+
+  // Default: false (i.e. enabled by default)
+  optional bool disable_incremental_timestamps = 5;
+
+  // Allows to specify a custom unit different than the default (ns).
+  // Also affects thread timestamps if enable_thread_time_sampling = true.
+  // A multiplier of 1000 means that a timestamp = 3 should be interpreted as
+  // 3000 ns = 3 us.
+  // Default: 1 (if unset, it should be read as 1).
+  optional uint64 timestamp_unit_multiplier = 6;
+
+  // Default: false (i.e. debug_annotations is NOT filtered out by default)
+  // When true, any debug annotations provided as arguments to the
+  // TRACE_EVENT macros are not written into the trace. Typed arguments will
+  // still be emitted even if set to true.
+  optional bool filter_debug_annotations = 7;
+
+  // Default : false (i.e. disabled)
+  // When true, the SDK samples and emits the current thread time counter value
+  // for each event on the current thread's track. This value represents the
+  // total CPU time consumed by that thread since its creation. Note that if a
+  // thread is not scheduled by OS for some duration, that time won't be
+  // included in thread_time.
+  // Learn more : "CLOCK_THREAD_CPUTIME_ID" flag at
+  // https://linux.die.net/man/3/clock_gettime
+  optional bool enable_thread_time_sampling = 8;
+
+  // Default: false (i.e. dynamic event names are NOT filtered out by default)
+  // When true, event_names wrapped in perfetto::DynamicString will be filtered
+  // out.
+  optional bool filter_dynamic_event_names = 9;
+}
diff --git a/src/libtracing/protos/perfetto/ipc/OWNERS b/src/libtracing/protos/perfetto/ipc/OWNERS
new file mode 100644
index 000000000..a10c8b820
--- /dev/null
+++ b/src/libtracing/protos/perfetto/ipc/OWNERS
@@ -0,0 +1,9 @@
+# Changes to the Tracing Protocol ABI are extremely subtle because they need to
+# be forward/backward compatible with various combinations of producer and
+# service versions. Adding >1 OWNER is encouraged here.
+
+set noparent
+eseckler@google.com
+hjd@google.com
+primiano@google.com
+skyostil@google.com
diff --git a/src/libtracing/protos/perfetto/ipc/consumer_port.proto b/src/libtracing/protos/perfetto/ipc/consumer_port.proto
new file mode 100644
index 000000000..d7a654ccd
--- /dev/null
+++ b/src/libtracing/protos/perfetto/ipc/consumer_port.proto
@@ -0,0 +1,312 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/observable_events.proto";
+import "protos/perfetto/common/tracing_service_state.proto";
+import "protos/perfetto/common/tracing_service_capabilities.proto";
+import "protos/perfetto/common/trace_stats.proto";
+import "protos/perfetto/config/trace_config.proto";
+
+package perfetto.protos;
+
+// IPC interface definition for the consumer port of the tracing service.
+service ConsumerPort {
+  // Enables tracing for one or more data sources. At least one buffer must have
+  // been previously created. The EnableTracingResponse is sent when tracing is
+  // disabled (either explicitly or because of the |duration_ms| expired).
+  // If |deferred_start| == true in the passed TraceConfig, all the tracing
+  // harness is brought up (creating buffers and data sources) without actually
+  // starting the data sources. Data sources will be started upon an explicit
+  // StartTracing() call.
+  // Note that |deferred_start| and StartTracing() have been introduced only
+  // in Android Q and are not supported in Android P.
+  rpc EnableTracing(EnableTracingRequest) returns (EnableTracingResponse) {}
+
+  // Disables tracing for one or more data sources.
+  rpc DisableTracing(DisableTracingRequest) returns (DisableTracingResponse) {}
+
+  // Streams back the contents of one or more buffers. One call is enough to
+  // drain all the buffers. The response consists in a sequence of
+  // ReadBufferResponse messages (hence the "stream" in the return type), each
+  // carrying one or more TracePacket(s). An EOF flag is attached to the last
+  // ReadBufferResponse through the |has_more| == false field.
+  rpc ReadBuffers(ReadBuffersRequest) returns (stream ReadBuffersResponse) {}
+
+  // Destroys the buffers previously created. Note: all buffers are destroyed
+  // implicitly if the Consumer disconnects.
+  rpc FreeBuffers(FreeBuffersRequest) returns (FreeBuffersResponse) {}
+
+  // Asks the service to request to all data sources involved in the tracing
+  // session to commit their data into the trace buffer. The FlushResponse is
+  // sent only:
+  // - After the data has been committed (in which case FlushResponse succeeds)
+  // or
+  // - After FlushRequest.timeout_ms milliseconds (in which case the
+  //   FlushResponse is rejected and fails).
+  rpc Flush(FlushRequest) returns (FlushResponse) {}
+
+  // ----------------------------------------------------
+  // All methods below have been introduced in Android Q.
+  // ----------------------------------------------------
+
+  // Starts tracing. Only valid if EnableTracing() was called setting
+  // deferred_start = true in the TraceConfig passed to EnableTracing().
+  rpc StartTracing(StartTracingRequest) returns (StartTracingResponse) {}
+
+  // Changes the configuration for a running tracing session; only possible
+  // for a subset of configuration options.
+  rpc ChangeTraceConfig(ChangeTraceConfigRequest)
+      returns (ChangeTraceConfigResponse) {}
+
+  // Allows the consumer to detach from the session. The session will keep
+  // running even if the consumer disconnects and the consumer will not receive
+  // any further IPC until reattached.
+  rpc Detach(DetachRequest) returns (DetachResponse) {}
+
+  // Allows the consumer to re-attach to a previously detached session. The
+  // consumer will start receiving IPC notification for that session.
+  // The session will be terminated if the consumer closes the IPC channel, as
+  // in the standard non-detached case.
+  rpc Attach(AttachRequest) returns (AttachResponse) {}
+
+  // Allows the consumer to obtain statistics about the current tracing session,
+  // such as buffer usage stats. Intended for debugging or UI use.
+  rpc GetTraceStats(GetTraceStatsRequest) returns (GetTraceStatsResponse) {}
+
+  // Allows the consumer to observe certain state changes, such as data source
+  // instances starting to record.
+  rpc ObserveEvents(ObserveEventsRequest)
+      returns (stream ObserveEventsResponse) {}
+
+  // ----------------------------------------------------
+  // All methods below have been introduced in Android R.
+  // ----------------------------------------------------
+
+  // Allows to obtain the list of data sources connected and their descriptors.
+  rpc QueryServiceState(QueryServiceStateRequest)
+      returns (stream QueryServiceStateResponse) {}
+
+  // Obtains a list of features supported by the service. This is to deal with
+  // backward/forward compatibility and feature detection.
+  rpc QueryCapabilities(QueryCapabilitiesRequest)
+      returns (QueryCapabilitiesResponse) {}
+
+  // ----------------------------------------------------
+  // All methods below have been introduced in Android S.
+  // ----------------------------------------------------
+
+  // This method has been deprecated and removed in Android U in favour of
+  // CloneSession.
+  rpc SaveTraceForBugreport(SaveTraceForBugreportRequest)
+      returns (SaveTraceForBugreportResponse) {}
+
+  // ----------------------------------------------------
+  // All methods below have been introduced in Android U.
+  // ----------------------------------------------------
+
+  // Clones an existing tracing session and binds the consumer to it (as if
+  // the session was created via EnableTracing), copying over all the tracing
+  // data (including metadata and stats).
+  // The cloned session is stopped and read-only (as if DisableTracing was
+  // invoked).
+  // A consumer can clone a session only if the uid of the consumer matches the
+  // uid of the source session or if the consumer uid is 0 (root).
+  rpc CloneSession(CloneSessionRequest) returns (CloneSessionResponse) {}
+}
+
+// Arguments for rpc EnableTracing().
+message EnableTracingRequest {
+  optional protos.TraceConfig trace_config = 1;
+
+  // Introduced in Android Q. This is used for re-attaching to the end-of-trace
+  // EnableTracingResponse notification after a Detach+Attach request.
+  // When this flag is set the |trace_config| is ignored and no method is called
+  // on the tracing service.
+  optional bool attach_notification_only = 2;
+}
+
+message EnableTracingResponse {
+  oneof state { bool disabled = 1; }
+
+  // If present and non-empty tracing was disabled because of an error.
+  // Introduced in Android S.
+  optional string error = 3;
+}
+
+// Arguments for rpc StartTracing().
+message StartTracingRequest {}
+
+message StartTracingResponse {}
+
+// Arguments for rpc ChangeTraceConfig().
+message ChangeTraceConfigRequest {
+  optional protos.TraceConfig trace_config = 1;
+}
+
+message ChangeTraceConfigResponse {}
+
+// Arguments for rpc DisableTracing().
+message DisableTracingRequest {
+  // TODO: not supported yet, selectively disable only some data sources.
+  // repeated string data_source_name;
+}
+
+message DisableTracingResponse {}
+
+// Arguments for rpc ReadBuffers().
+message ReadBuffersRequest {
+  // The |id|s of the buffer, as passed to CreateBuffers().
+  // TODO: repeated uint32 buffer_ids = 1;
+}
+
+message ReadBuffersResponse {
+  // TODO: uint32 buffer_id = 1;
+
+  // Each streaming reply returns one or more slices for one or more trace
+  // packets, or even just a portion of it (if it's too big to fit within one
+  // IPC). The returned slices are ordered and contiguous: packets' slices are
+  // not interleaved and slices are sent only once all slices for a packet are
+  // available (i.e. the consumer will never see any gap).
+  message Slice {
+    optional bytes data = 1;
+
+    // When true, this is the last slice for the packet. A ReadBufferResponse
+    // might have no slices marked as |last_slice_for_packet|==true, in the case
+    // of a very large packet that gets chunked into several IPCs (in which case
+    // only the last IPC for the packet will have this flag set).
+    optional bool last_slice_for_packet = 2;
+  }
+  repeated Slice slices = 2;
+}
+
+// Arguments for rpc FreeBuffers().
+message FreeBuffersRequest {
+  // The |id|s of the buffer, as passed to CreateBuffers().
+  repeated uint32 buffer_ids = 1;
+}
+
+message FreeBuffersResponse {}
+
+// Arguments for rpc Flush().
+message FlushRequest {
+  optional uint32 timeout_ms = 1;
+
+  // More details such as flush reason and originator. Introduced in v38 / V.
+  // See FlushFlags in include/perfetto/ext/tracing/core/flush_flags.h.
+  optional uint64 flags = 2;
+}
+
+message FlushResponse {}
+
+// Arguments for rpc Detach
+message DetachRequest {
+  optional string key = 1;
+}
+
+message DetachResponse {}
+
+// Arguments for rpc Attach.
+message AttachRequest {
+  optional string key = 1;
+}
+
+message AttachResponse {
+  optional protos.TraceConfig trace_config = 1;
+}
+
+// Arguments for rpc GetTraceStats.
+
+message GetTraceStatsRequest {}
+
+message GetTraceStatsResponse {
+  optional TraceStats trace_stats = 1;
+}
+
+// Arguments for rpc ObserveEvents.
+
+// To stop observing events of a certain type, send a request with the remaining
+// types. To stop observing completely, send an empty request.
+message ObserveEventsRequest {
+  repeated ObservableEvents.Type events_to_observe = 1;
+}
+
+message ObserveEventsResponse {
+  optional ObservableEvents events = 1;
+}
+
+// Arguments for rpc QueryServiceState.
+message QueryServiceStateRequest {
+  // If set, only the TracingServiceState.tracing_sessions is filled. Producers
+  // and data sources are omitted.
+  optional bool sessions_only = 1;
+}
+
+message QueryServiceStateResponse {
+  // In order to avoid hitting IPC message size limitations, the service will
+  // return >1 replies for each query, chunking the TracingServiceState. The
+  // receiver is expected to merge replies together and parse that when the
+  // last reply is received (i.e. when IPC's |has_more| == false).
+  optional TracingServiceState service_state = 1;
+}
+
+// Arguments for rpc QueryCapabilities.
+message QueryCapabilitiesRequest {}
+
+message QueryCapabilitiesResponse {
+  optional TracingServiceCapabilities capabilities = 1;
+}
+
+// Arguments for rpc SaveTraceForBugreport.
+message SaveTraceForBugreportRequest {}
+
+// This response is sent only after the trace was saved into file (if succeeded)
+// or something failed.
+message SaveTraceForBugreportResponse {
+  // If true, an eligible the trace was saved into a known location (on Android
+  // /data/misc/perfetto-traces, see GetBugreportTracePath()).
+  // If false no trace with bugreport_score > 0 was found or an error occurred.
+  // see |msg| in that case for details about the failure.
+  optional bool success = 1;
+  optional string msg = 2;
+}
+
+// Arguments for rpc CloneSession.
+message CloneSessionRequest {
+  // The session ID to clone. If session_id == kBugreportSessionId (0xff...ff)
+  // the session with the highest bugreport score is cloned (if any exists).
+  optional uint64 session_id = 1;
+
+  // If set, the trace filter will not have effect on the cloned session.
+  // Used for bugreports.
+  optional bool skip_trace_filter = 2;
+
+  // If set, affects the generation of the FlushFlags::CloneTarget to be set
+  // to kBugreport when requesting the flush to the producers.
+  optional bool for_bugreport = 3;
+}
+
+message CloneSessionResponse {
+  // If true, the clone was successful. If false it failed and |error| contains
+  // the details about the failure.
+  optional bool success = 1;
+  optional string error = 2;
+
+  // The UUID of the cloned session.
+  optional int64 uuid_msb = 3;
+  optional int64 uuid_lsb = 4;
+}
diff --git a/src/libtracing/protos/perfetto/ipc/producer_port.proto b/src/libtracing/protos/perfetto/ipc/producer_port.proto
new file mode 100644
index 000000000..9e3d5d10d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/ipc/producer_port.proto
@@ -0,0 +1,352 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/commit_data_request.proto";
+import "protos/perfetto/config/data_source_config.proto";
+import "protos/perfetto/common/data_source_descriptor.proto";
+
+package perfetto.protos;
+
+// IPC interface definition for the producer port of the tracing service.
+service ProducerPort {
+  // Called once only after establishing the connection with the Service.
+  // The service replies sending the shared memory file descriptor in reply.
+  rpc InitializeConnection(InitializeConnectionRequest)
+      returns (InitializeConnectionResponse) {}
+
+  // Advertises a new data source.
+  rpc RegisterDataSource(RegisterDataSourceRequest)
+      returns (RegisterDataSourceResponse) {}
+
+  // Unregisters a previously registered data source.
+  rpc UnregisterDataSource(UnregisterDataSourceRequest)
+      returns (UnregisterDataSourceResponse) {}
+
+  // Sent by the client to request the service to:
+  // 1) Move some chunks from the shmem buffer into the logging buffer.
+  // 2) Patch the content of some chunks previously moved.
+  // 3) Acknowledge a Flush() request.
+  rpc CommitData(protos.CommitDataRequest) returns (CommitDataResponse) {}
+
+  // This is a backchannel to get asynchronous commands / notifications back
+  // from the Service.
+  rpc GetAsyncCommand(GetAsyncCommandRequest)
+      returns (stream GetAsyncCommandResponse) {}
+
+  // ----------------------------------------------------
+  // All methods below have been introduced in Android Q.
+  // ----------------------------------------------------
+
+  // Associates a trace writer with its target buffer.
+  rpc RegisterTraceWriter(RegisterTraceWriterRequest)
+      returns (RegisterTraceWriterResponse) {}
+
+  // Removes a trace writer association previously added by
+  // RegisterTraceWriter.
+  rpc UnregisterTraceWriter(UnregisterTraceWriterRequest)
+      returns (UnregisterTraceWriterResponse) {}
+
+  // Sent by the client in response to a StartDataSource message, when a data
+  // source is successfully started. This is expected only for data sources that
+  // set the DataSourceDescriptor.will_notify_on_start flag when registering.
+  rpc NotifyDataSourceStarted(NotifyDataSourceStartedRequest)
+      returns (NotifyDataSourceStartedResponse) {}
+
+  // Sent by the client in response to a StopDataSource message, when a data
+  // source is successfully stopped. This is expected only for data sources that
+  // set the DataSourceDescriptor.will_notify_on_stop flag when registering.
+  rpc NotifyDataSourceStopped(NotifyDataSourceStoppedRequest)
+      returns (NotifyDataSourceStoppedResponse) {}
+
+  // Sent by the client to request the service to:
+  // 1) Find all sessions which define these triggers
+  // 2) Perform an action as defined in those sessions configs.
+  rpc ActivateTriggers(ActivateTriggersRequest)
+      returns (ActivateTriggersResponse) {}
+
+  // ----------------------------------------------------
+  // All methods below have been introduced in Android R.
+  // ----------------------------------------------------
+
+  // This is used to linearize the producer with the service and to guarantee
+  // that all IPCs prior to this call have been seen and processed by the
+  // service. Example:
+  //   - RegisterDataSource(A)
+  //   - RegisterDataSource(B)
+  //   - Sync()
+  // When the Sync() response is received, the producer is guaranteed that the
+  // service has seen both data source registrations.
+  rpc Sync(SyncRequest) returns (SyncResponse) {}
+
+  // ----------------------------------------------------
+  // All methods below have been introduced in Android T.
+  // ----------------------------------------------------
+
+  // Updates the data source descriptor for an already-registered data source.
+  // This can be used to update the list of features supported.
+  // Only the data source with a matching data_source_descriptor.id is updated.
+  // The data_source_descriptor.name cannot be changed.
+  rpc UpdateDataSource(UpdateDataSourceRequest)
+      returns (UpdateDataSourceResponse) {}
+}
+
+// Arguments for rpc InitializeConnection().
+message InitializeConnectionRequest {
+  // Optional. Provides a hint to the tracing service about the suggested size
+  // of the shared memory buffer pages. The service is not required to respect
+  // this if it has already another value in the configuration or if the hint
+  // is unreasonably large. Must be an integer multiple of 4096. See tradeoff
+  // considerations in shared_memory_abi.h.
+  optional uint32 shared_memory_page_size_hint_bytes = 1;
+
+  // Optional. Provides a hint to the tracing service about the suggested size
+  // of the shared memory buffer. The service is not required to respect this
+  // and might return a smaller buffer.
+  optional uint32 shared_memory_size_hint_bytes = 2;
+
+  // Required to match the producer config set by the service to the correct
+  // producer.
+  optional string producer_name = 3;
+
+  enum ProducerSMBScrapingMode {
+    // Use the service's default setting for SMB scraping.
+    SMB_SCRAPING_UNSPECIFIED = 0;
+
+    // Enable scraping of uncommitted chunks from the producer's shared memory
+    // buffer.
+    SMB_SCRAPING_ENABLED = 1;
+
+    // Disable scraping of uncommitted chunks from the producer's shared memory
+    // buffer.
+    SMB_SCRAPING_DISABLED = 2;
+  }
+
+  // If provided, overrides the service's SMB scraping setting for the producer.
+  optional ProducerSMBScrapingMode smb_scraping_mode = 4;
+
+  // Was build_flags = BUILD_FLAGS_DCHECKS_ON|OFF. It was used to emit an error
+  // when DCHECKs level didn't match between service and producer (in turn that
+  // would crash the service when applying patches).
+  // Removed in v20 as part of b/197340286.
+  reserved 5;
+
+  // ---------------------------------------------------
+  // All fields below have been introduced in Android R.
+  // ---------------------------------------------------
+
+  // Since Android R, this request can also transport an FD for the producer's
+  // shared memory buffer, if allocated by the producer (e.g. for startup
+  // tracing). In this case, |shared_memory_page_size_hint_bytes| is a required
+  // field, and describes the SMB's page size. Note that the service may not
+  // accept this SMB (e.g. because it is too old or its size / page size are
+  // invalid) and instead allocate a new SMB which is provided in the
+  // SetupTracing response. See TracingService::ConnectProducer() and
+  // |using_shmem_provided_by_producer| in InitializeConnectionResponse.
+  optional bool producer_provided_shmem = 6;
+
+  // ---------------------------------------------------
+  // All fields below have been introduced in Android S.
+  // ---------------------------------------------------
+
+  // The version of the client library used by the producer.
+  // This is a human readable string with and its format varies depending on
+  // the build system that is used to build the code and the repo (standalone
+  // vs AOSP). This is intended for human debugging only.
+  optional string sdk_version = 8;
+
+  // On Windows, when producer_provided_shmem = true, the client creates a named
+  // SHM region and passes the name (an unguessable token) back to the service.
+  // Introduced in v13.
+  optional string shm_key_windows = 7;
+}
+
+message InitializeConnectionResponse {
+  // Indicates whether the service accepted the SMB provided by the producer in
+  // InitializeConnectionRequest (if any). If false, the shared memory buffer FD
+  // will provided by the service via the SetupTracing async command.
+  optional bool using_shmem_provided_by_producer = 1;
+
+  // Indicates to the producer that the service allows direct SMB patching of
+  // chunks that have not yet been committed to it.
+  // This field has been introduced in Android S.
+  optional bool direct_smb_patching_supported = 2;
+
+  // Indicates whether the service would like to use SMB emulation for the
+  // connection, and request the client to send chunk data over the socket e.g.
+  // for remote connection from a VM guest.
+  optional bool use_shmem_emulation = 3;
+}
+
+// Arguments for rpc RegisterDataSource().
+
+message RegisterDataSourceRequest {
+  optional protos.DataSourceDescriptor data_source_descriptor = 1;
+}
+
+message RegisterDataSourceResponse {
+  // Only set in case of errors, when |data_source_id| == 0.
+  optional string error = 1;
+};
+
+// Arguments for rpc UpdateDataSource().
+
+message UpdateDataSourceRequest {
+  // The new data_source_descriptor.{id, name} must match {id, name} of a
+  // data source previously registered via RegisterDataSource().
+  optional protos.DataSourceDescriptor data_source_descriptor = 1;
+}
+
+message UpdateDataSourceResponse {};
+
+// Arguments for rpc UnregisterDataSource().
+
+message UnregisterDataSourceRequest {
+  // The name of the data source to unregister, as previously passed in
+  // |RegisterDataSourceRequest.name|.
+  optional string data_source_name = 1;
+}
+
+message UnregisterDataSourceResponse {}
+
+// Arguments for rpc RegisterTraceWriter().
+
+message RegisterTraceWriterRequest {
+  // The ID of a producer's trace writer.
+  optional uint32 trace_writer_id = 1;
+
+  // The ID of the target buffer that the trace writer commits its chunks to.
+  optional uint32 target_buffer = 2;
+}
+
+message RegisterTraceWriterResponse {}
+
+// Arguments for rpc UnregisterTraceWriter().
+
+message UnregisterTraceWriterRequest {
+  // The ID of a producer's trace writer.
+  optional uint32 trace_writer_id = 1;
+}
+
+message UnregisterTraceWriterResponse {}
+
+// Arguments for rpc CommitData().
+// See commit_data_request.proto for CommitDataRequest. That has its own file
+// because it is used also as input to generate C++ classes (xxx.gen.h).
+
+message CommitDataResponse {}
+
+// Arguments for rpc NotifyDataSourceStarted().
+
+message NotifyDataSourceStartedRequest {
+  // ID of the data source that has successfully started.
+  optional uint64 data_source_id = 1;
+}
+
+message NotifyDataSourceStartedResponse {}
+
+// Arguments for rpc NotifyDataSourceStopped().
+
+message NotifyDataSourceStoppedRequest {
+  // ID of the data source that has successfully stopped.
+  optional uint64 data_source_id = 1;
+}
+
+message NotifyDataSourceStoppedResponse {}
+
+// Arguments for rpc ActivateTriggersRequest().
+
+message ActivateTriggersRequest {
+  repeated string trigger_names = 1;
+}
+
+message ActivateTriggersResponse {}
+
+// Arguments for rpc GetAsyncCommand().
+
+message GetAsyncCommandRequest {}
+
+message GetAsyncCommandResponse {
+  // Called after SetupTracing and before StartDataSource.
+  // This message was introduced in Android Q.
+  message SetupDataSource {
+    optional uint64 new_instance_id = 1;
+    optional protos.DataSourceConfig config = 2;
+  }
+
+  message StartDataSource {
+    optional uint64 new_instance_id = 1;
+
+    // For backwards compat reasons (with Android P), the config passed here
+    // is identical to the one passed to SetupDataSource.config.
+    optional protos.DataSourceConfig config = 2;
+  }
+
+  message StopDataSource { optional uint64 instance_id = 1; }
+
+  // On Android/Linux/Mac this message also transports the file descriptor for
+  // the shared memory buffer (not a proto field).
+  message SetupTracing {
+    optional uint32 shared_buffer_page_size_kb = 1;
+
+    // On Windows, instead, we pass the name (an unguessable token) of a shared
+    // memory region that can be attached by the other process by name.
+    // Introduced in v13.
+    optional string shm_key_windows = 2;
+  }
+
+  message Flush {
+    // The instance id (i.e. StartDataSource.new_instance_id) of the data
+    // sources to flush.
+    repeated uint64 data_source_ids = 1;
+
+    // A monotonic counter generated by the service. The producer is simply
+    // expected to copy this value back into the CommitDataRequest, so the
+    // service can tell when the data for this flush has been committed.
+    optional uint64 request_id = 2;
+
+    // More details such as flush reason and originator. Introduced in v38 / V.
+    // See FlushFlags in include/perfetto/ext/tracing/core/flush_flags.h.
+    optional uint64 flags = 3;
+  }
+
+  // Instructs the given data sources to stop referring to any trace contents
+  // emitted so far. Sent only to active data sources that set
+  // |handles_incremental_state_clear| in their DataSourceDescriptor.
+  //
+  // Added to perfetto tree in May 2019.
+  message ClearIncrementalState {
+    // The instance id (i.e. StartDataSource.new_instance_id) of the data
+    // sources that should clear their incremental state.
+    repeated uint64 data_source_ids = 1;
+  }
+
+  // Next id: 8.
+  oneof cmd {
+    SetupTracing setup_tracing = 3;
+    SetupDataSource setup_data_source = 6;
+    StartDataSource start_data_source = 1;
+    StopDataSource stop_data_source = 2;
+    // id == 4 was teardown_tracing, never implemented.
+    Flush flush = 5;
+    ClearIncrementalState clear_incremental_state = 7;
+  }
+}
+
+// Arguments for rpc Sync().
+message SyncRequest {}
+message SyncResponse {}
diff --git a/src/libtracing/protos/perfetto/ipc/relay_port.proto b/src/libtracing/protos/perfetto/ipc/relay_port.proto
new file mode 100644
index 000000000..2b9c01432
--- /dev/null
+++ b/src/libtracing/protos/perfetto/ipc/relay_port.proto
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// IPC interface definition for serving the requests from the relay service.
+service RelayPort {
+  // Synchronize the clocks with a guest. This is used for multi-machine tracing
+  // with a VM guest or a remote machine. The client may make consecutive calls
+  // of this method to get better results.
+  rpc SyncClock(SyncClockRequest) returns (SyncClockResponse) {}
+}
+
+// For the client to send its clock readings to the host.
+message SyncClockRequest {
+  // Relay service synchronizes its clocks with the host using round-trip
+  // messages of clock snapshots on both sides for an estimation of clock
+  // offsets of the built-in clocks.
+  enum Phase {
+    // Clock synchronization starts with the client (relay service) sends its
+    // clock snapshots in the PING phase. The host also snapshots its clocks on
+    // receiving the request and acks the client.
+    PING = 1;
+    // Clock synchronization completes with the client sending the second clock
+    // snapshot request after the round-trip of the PING request. The host
+    // estimates the clock offsets using 2 consecutive clock snapshots on both
+    // sides.
+    UPDATE = 2;
+  };
+
+  message Clock {
+    // The clock ID enumerated in builtin_clocks.proto.
+    optional uint32 clock_id = 1;
+    // The clock reading value (e.g. in nanoseconds for BUILTIN_CLOCK_BOOTTIME).
+    optional uint64 timestamp = 2;
+  }
+
+  optional Phase phase = 1;
+  repeated Clock clocks = 2;
+}
+
+// The host doesn't send any information back to the client.
+message SyncClockResponse {}
diff --git a/src/libtracing/protos/perfetto/ipc/wire_protocol.proto b/src/libtracing/protos/perfetto/ipc/wire_protocol.proto
new file mode 100644
index 000000000..e01a798fe
--- /dev/null
+++ b/src/libtracing/protos/perfetto/ipc/wire_protocol.proto
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message IPCFrame {
+  // Client -> Host.
+  message BindService { optional string service_name = 1; }
+
+  // Host -> Client.
+  message BindServiceReply {
+    message MethodInfo {
+      optional uint32 id = 1;
+      optional string name = 2;
+    }
+    optional bool success = 1;
+    optional uint32 service_id = 2;
+    repeated MethodInfo methods = 3;
+  }
+
+  // Client -> Host.
+  message InvokeMethod {
+    // BindServiceReply.id.
+    optional uint32 service_id = 1;
+
+    // BindServiceReply.method.id.
+    optional uint32 method_id = 2;
+
+    // Proto-encoded request argument.
+    optional bytes args_proto = 3;
+
+    // When true the client specifies that a reply is not needed. The use case
+    // is a method with an empty, where the client doesn't care about the
+    // success/failure of the method invocation and rather prefers avoiding the
+    // IPC roundtrip + context switch associated with the reply.
+    optional bool drop_reply = 4;
+  }
+
+  // Host -> Client.
+  message InvokeMethodReply {
+    optional bool success = 1;
+
+    // only for streaming RPCs.
+    optional bool has_more = 2;
+
+    // proto-encoded response value.
+    optional bytes reply_proto = 3;
+  }
+
+  // Host -> Client.
+  message RequestError { optional string error = 1; }
+
+  // Client (relay service) -> Host. This is generated by the relay service to
+  // fill the producer identity in the guest. This message is sent to the host
+  // service *before* any IPCFrame is from a local producer is relayed. This is
+  // accepted only on AF_VSOCK and AF_INET sockets, where we cannot validate the
+  // endpoont of the connection. for AF_UNIX sockets, this is ignored and traced
+  // uses instead the SO_PEERCRED.
+  message SetPeerIdentity {
+    // The UID and PID of the producer process.
+    optional int32 pid = 1;
+    optional int32 uid = 2;
+
+    // The hint for the tracing service to infer the machine ID. This field
+    // should satisfy the requriement that different machines should have
+    // different values. In practice, this filed contains the Linux kernel
+    // boot_id, or a hash of kernel bootup timestamp and uname(2) if boot_id
+    // isn't available.
+    optional string machine_id_hint = 3;
+  }
+
+  // The client is expected to send requests with monotonically increasing
+  // request_id. The host will match the request_id sent from the client.
+  // In the case of a Streaming response (has_more = true) the host will send
+  // several InvokeMethodReply with the same request_id.
+  optional uint64 request_id = 2;
+
+  oneof msg {
+    BindService msg_bind_service = 3;
+    BindServiceReply msg_bind_service_reply = 4;
+    InvokeMethod msg_invoke_method = 5;
+    InvokeMethodReply msg_invoke_method_reply = 6;
+    RequestError msg_request_error = 7;
+    SetPeerIdentity set_peer_identity = 8;
+  }
+
+  // Used only in unittests to generate a parsable message of arbitrary size.
+  repeated bytes data_for_testing = 1;
+};
diff --git a/src/libtracing/protos/perfetto/metrics/android/OWNERS b/src/libtracing/protos/perfetto/metrics/android/OWNERS
new file mode 100644
index 000000000..0bcdb4d35
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/OWNERS
@@ -0,0 +1 @@
+ilkos@google.com
diff --git a/src/libtracing/protos/perfetto/metrics/android/ad_services_metric.proto b/src/libtracing/protos/perfetto/metrics/android/ad_services_metric.proto
new file mode 100644
index 000000000..539f29d5b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/ad_services_metric.proto
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Next: 8
+message AdServicesUiMetric {
+  optional double common_service_initialization_latency = 1;
+  optional double common_service_permission_check_latency = 2;
+  optional double common_service_ux_engine_flow_latency = 3;
+  optional double main_activity_creation_latency = 4;
+  optional double consent_manager_initialization_latency = 5;
+  optional double consent_manager_read_latency = 6;
+  optional double consent_manager_write_latency = 7;
+}
+
+// Next: 2
+message AdServicesAdIdMetric {
+  optional double latency = 1;
+}
+
+// Next: 2
+message AdServicesAppSetIdMetric {
+  optional double latency = 1;
+}
+
+// Next: 5
+message OnDevicePersonalizationMetric {
+  optional double managing_service_initialization_latency = 1;
+  optional double service_delegate_execute_flow_latency = 2;
+  optional double service_delegate_request_surface_package_latency = 3;
+  optional double service_delegate_register_web_trigger_latency = 4;
+}
+
+// Next: 5
+message AdServicesMetric {
+  repeated AdServicesUiMetric ui_metric = 1;
+  repeated AdServicesAdIdMetric ad_id_metric = 2;
+  repeated AdServicesAppSetIdMetric app_set_id_metric = 3;
+  repeated OnDevicePersonalizationMetric odp_metric = 4;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_blocking_call.proto b/src/libtracing/protos/perfetto/metrics/android/android_blocking_call.proto
new file mode 100644
index 000000000..0352fec24
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_blocking_call.proto
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Blocking call on the main thread.
+message AndroidBlockingCall {
+    // Name of the blocking call
+    optional string name = 1;
+    // Number of times it happened within the CUJ
+    optional int64 cnt = 2;
+    // Total duration within the CUJ
+    optional int64 total_dur_ms = 3;
+    // Maximal duration within the CUJ
+    optional int64 max_dur_ms = 4;
+    // Minimal duration within the CUJ
+    optional int64 min_dur_ms = 5;
+    // Total duration within the CUJ in nanoseconds
+    optional int64 total_dur_ns = 6;
+    // Maximal duration within the CUJ in nanoseconds
+    optional int64 max_dur_ns = 7;
+    // Minimal duration within the CUJ in nanoseconds
+    optional int64 min_dur_ns = 8;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto b/src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto
new file mode 100644
index 000000000..8cda119f7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/android_blocking_call.proto";
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+// Blocking calls inside Android CUJs. Shows count and total duration for each.
+message AndroidBlockingCallsCujMetric {
+  repeated Cuj cuj = 1;
+
+  // Next id: 7
+  message Cuj {
+    // ID of the CUJ that is unique within the trace.
+    optional int32 id = 1;
+
+    // Name of the CUJ, extracted from the CUJ jank or latency trace marker.
+    // For example SHADE_EXPAND_COLLAPSE from J<SHADE_EXPAND_COLLAPSE>.
+    optional string name = 2;
+
+    // Details about the process (uid, version, etc)
+    optional AndroidProcessMetadata process = 3;
+
+    // ts of the CUJ trace marker slice, in ns.
+    optional int64 ts = 4;
+
+    // dur of the CUJ trace marker slice, in ns.
+    optional int64 dur = 5;
+
+    // List of blocking calls on the process main thread.
+    repeated AndroidBlockingCall blocking_calls = 6;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_unagg.proto b/src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_unagg.proto
new file mode 100644
index 000000000..96b73ba27
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_blocking_calls_unagg.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/android_blocking_call.proto";
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+// All blocking calls for a trace. Shows count and total duration for each.
+message AndroidBlockingCallsUnagg {
+
+    repeated ProcessWithBlockingCalls process_with_blocking_calls = 1;
+
+    message ProcessWithBlockingCalls {
+        // Details about the process (uid, version, etc)
+        optional AndroidProcessMetadata process = 1;
+
+        // List of blocking calls on the process main thread.
+        repeated AndroidBlockingCall blocking_calls = 2;
+    }
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_boot.proto b/src/libtracing/protos/perfetto/metrics/android/android_boot.proto
new file mode 100644
index 000000000..a043efe06
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_boot.proto
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This metric computes how much time processes spend in UNINTERRUPTIBLE_SLEEP
+// state
+message ProcessStateDurations {
+  optional int64 total_dur = 2;
+  optional int64 uninterruptible_sleep_dur = 3;
+}
+
+message AndroidBootMetric {
+  optional ProcessStateDurations system_server_durations = 1;
+  optional ProcessStateDurations systemui_durations = 2;
+  optional ProcessStateDurations launcher_durations = 3;
+  optional ProcessStateDurations gms_durations = 4;
+  // Launcher related boot metrics
+  message LauncherBreakdown {
+    //  reports cold start time of NexusLauncher
+    optional int64 cold_start_dur = 1;
+  }
+  optional LauncherBreakdown launcher_breakdown = 5;
+
+  message ProcessStartAggregation {
+    optional int64 total_start_sum = 1;
+    optional int64 num_of_processes = 2;
+    optional double average_start_time = 3;
+  }
+  message GarbageCollectionAggregation {
+    optional int64 total_gc_count = 1;
+    optional int64 num_of_processes_with_gc = 2;
+    optional int64 num_of_threads_with_gc = 3;
+    optional double avg_gc_duration = 4;
+    optional double avg_running_gc_duration = 5;
+    optional int64 full_gc_count = 6;
+    optional int64 collector_transition_gc_count = 7;
+    optional int64 young_gc_count = 8;
+    optional int64 native_alloc_gc_count = 9;
+    optional int64 explicit_gc_count = 10;
+    optional int64 alloc_gc_count = 11;
+    optional double mb_per_ms_of_gc = 12;
+  }
+  optional ProcessStartAggregation full_trace_process_start_aggregation = 6;
+  optional ProcessStartAggregation post_boot_process_start_aggregation = 7;
+  optional GarbageCollectionAggregation full_trace_gc_aggregation = 8;
+  optional GarbageCollectionAggregation post_boot_gc_aggregation = 9;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_boot_unagg.proto b/src/libtracing/protos/perfetto/metrics/android/android_boot_unagg.proto
new file mode 100644
index 000000000..c2098401b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_boot_unagg.proto
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/app_process_starts_metric.proto";
+import "protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto";
+
+message AndroidBootUnagg {
+  // Looks at all apps started after boot complete broadcast.
+  optional AndroidAppProcessStartsMetric android_app_process_start_metric = 1;
+  // Looks at all GC that occurs after boot complete broadcast.
+  optional AndroidGarbageCollectionUnaggMetric android_post_boot_gc_metric = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_frame_timeline_metric.proto b/src/libtracing/protos/perfetto/metrics/android/android_frame_timeline_metric.proto
new file mode 100644
index 000000000..65159b8b1
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_frame_timeline_metric.proto
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+message AndroidFrameTimelineMetric {
+  message JankTypeMetric {
+    // The jank type
+    optional string type = 1;
+
+    // The count of frames with this jank type
+    optional int64 total_count = 2;
+
+    // The count of frames with this jank type and present type = PRESENT_UNSPECIFIED
+    optional int64 present_unspecified_count = 3;
+
+    // The count of frames with this jank type and present type = PRESENT_ON_TIME
+    optional int64 present_on_time_count = 4;
+
+    // The count of frames with this jank type and present type = PRESENT_LATE
+    optional int64 present_late_count = 5;
+
+    // The count of frames with this jank type and present type = PRESENT_EARLY
+    optional int64 present_early_count = 6;
+
+    // The count of frames with this jank type and present type = PRESENT_DROPPED
+    optional int64 present_dropped_count = 7;
+
+    // The count of frames with this jank type and present type = PRESENT_UNKNOWN
+    optional int64 present_unknown_count = 8;
+  }
+
+  message ProcessBreakdown {
+    optional AndroidProcessMetadata process = 3;
+
+    optional int64 total_frames = 4;
+    optional int64 missed_frames = 5;
+    optional int64 missed_app_frames = 6;
+    optional int64 missed_sf_frames = 7;
+
+    optional int64 frame_dur_max = 8;
+    optional int64 frame_dur_avg = 9;
+    optional int64 frame_dur_p50 = 10;
+    optional int64 frame_dur_p90 = 11;
+    optional int64 frame_dur_p95 = 12;
+    optional int64 frame_dur_p99 = 13;
+    optional double frame_dur_ms_p50 = 14;
+    optional double frame_dur_ms_p90 = 15;
+    optional double frame_dur_ms_p95 = 16;
+    optional double frame_dur_ms_p99 = 17;
+    optional int64 dropped_frames = 18;
+
+    // Metrics for each jank type in this process
+    repeated JankTypeMetric jank_types = 19;
+
+    reserved 1, 2;
+  }
+
+  optional int64 total_frames = 4;
+  optional int64 missed_app_frames = 5;
+  optional int64 dropped_frames = 6;
+
+  repeated ProcessBreakdown process = 2;
+
+  // Metrics for each jank type globally
+  repeated JankTypeMetric jank_types = 7;
+
+  reserved 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto b/src/libtracing/protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto
new file mode 100644
index 000000000..cf8c738a5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidGarbageCollectionUnaggMetric {
+  message GarbageCollectionEvent {
+    // Name of thread running garbage collection.
+    optional string thread_name = 1;
+    // Name of process running garbage collection.
+    optional string process_name = 2;
+    // Type of garbage collection.
+    optional string gc_type = 3;
+    // Whether gargage collection is mark compact or copying.
+    optional int64 is_mark_compact = 4;
+    // MB reclaimed after garbage collection.
+    optional double reclaimed_mb = 5;
+    // Minimum heap size in MB during garbage collection.
+    optional double min_heap_mb = 6;
+    // Maximum heap size in MB during garbage collection.
+    optional double max_heap_mb = 7;
+    // Memory reclaimed per ms of running time.
+    optional double mb_per_ms_of_running_gc = 8;
+    // Memory reclaimed per ms of wall time.
+    optional double mb_per_ms_of_wall_gc = 9;
+    // Garbage collection wall duration.
+    optional int64 gc_dur = 10;
+    // Garbage collection duration spent executing on CPU.
+    optional int64 gc_running_dur = 11;
+    // Garbage collection duration spent waiting for CPU.
+    optional int64 gc_runnable_dur = 12;
+    // Garbage collection duration spent waiting in the Linux kernel on IO.
+    optional int64 gc_unint_io_dur = 13;
+    // Garbage collection duration spent waiting in the Linux kernel without IO.
+    optional int64 gc_unint_non_io_dur = 14;
+    // Garbage collection duration spent waiting in interruptible sleep.
+    optional int64 gc_int_dur = 15;
+    // ts of the event in trace.
+    optional int64 gc_ts = 16;
+    // pid of the event in trace.
+    optional int64 pid = 17;
+    // tid of the event in trace.
+    optional int64 tid = 18;
+    // monotonic duration of event.
+    optional int64 gc_monotonic_dur = 19;
+  }
+  repeated GarbageCollectionEvent gc_events = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto b/src/libtracing/protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto
new file mode 100644
index 000000000..752746255
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/android_blocking_call.proto";
+
+// Blocking calls inside System UI Notifications. Shows count and total duration for each.
+message AndroidSysUINotificationsBlockingCallsMetric {
+  repeated AndroidBlockingCall blocking_calls = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/android_trusty_workqueues.proto b/src/libtracing/protos/perfetto/metrics/android/android_trusty_workqueues.proto
new file mode 100644
index 000000000..b7a1d5a3d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/android_trusty_workqueues.proto
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Metric used to generate a simplified view of the Trusty kworker events.
+message AndroidTrustyWorkqueues {}
diff --git a/src/libtracing/protos/perfetto/metrics/android/anr_metric.proto b/src/libtracing/protos/perfetto/metrics/android/anr_metric.proto
new file mode 100644
index 000000000..70662df7f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/anr_metric.proto
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ syntax = "proto2";
+
+ package perfetto.protos;
+
+ message AndroidAnrMetric {
+  repeated Anr anr = 1;
+
+  // Next id: 12
+  message Anr {
+    // UUID that identifies the ANR.
+    optional string error_id = 1;
+
+    // Name of the process that ANRed.
+    optional string process_name = 2;
+
+    // PID of the ANRing process.
+    optional int32 pid = 3;
+
+    // ANR subject line.
+    optional string subject = 4;
+
+    // Timestamp of the ANR in the trace.
+    optional int64 ts = 5;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/app_process_starts_metric.proto b/src/libtracing/protos/perfetto/metrics/android/app_process_starts_metric.proto
new file mode 100644
index 000000000..e8457df37
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/app_process_starts_metric.proto
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidAppProcessStartsMetric {
+  // Next id : 4
+  message ProcessStart {
+    optional string process_name = 1;
+    optional string intent = 2;
+    optional string reason = 3;
+    optional int64 proc_start_dur = 4;
+    optional int64 bind_app_dur = 5;
+    optional int64 intent_dur = 6;
+    optional int64 total_dur = 7;
+  }
+  // Provides java process startup information for
+  // all processes starting after Boot completed broadcast in a trace.
+  repeated ProcessStart all_apps = 1;
+  // Provides java process startup information for all
+  // processes started from a broadcast after Boot Complete broadcasts.
+  repeated ProcessStart started_by_broadcast = 2;
+  // Provides java process startup information for all
+  // processes started from a service after Boot Complete broadcasts.
+  repeated ProcessStart started_by_service = 3;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/batt_metric.proto b/src/libtracing/protos/perfetto/metrics/android/batt_metric.proto
new file mode 100644
index 000000000..015a2a844
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/batt_metric.proto
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidBatteryMetric {
+  message BatteryCounters {
+    // Timestamp measured from boot time [ns].
+    optional int64 timestamp_ns = 1;
+    // Fields 2-5 are the same as in BatteryCounters proto in TracePacket.
+    optional double charge_counter_uah = 2;
+    optional float capacity_percent = 3;
+    optional double current_ua = 4;
+    optional double current_avg_ua = 5;
+  }
+
+  message BatteryAggregates {
+    // Field numbers for these 3 == the int values from Android
+    optional int64 total_screen_off_ns = 1;
+    optional int64 total_screen_on_ns = 2;
+    optional int64 total_screen_doze_ns = 3;
+    // Total time a wakelock was held
+    optional int64 total_wakelock_ns = 4;
+    // Amount of time the device was suspended. Depends on the ftrace source
+    // "power/suspend_resume".
+    optional int64 sleep_ns = 5;
+    optional int64 sleep_screen_off_ns = 6;
+    optional int64 sleep_screen_on_ns = 7;
+    optional int64 sleep_screen_doze_ns = 8;
+  }
+
+  // Period of time during the trace that the device went to sleep completely.
+  message SuspendPeriod {
+    optional int64 timestamp_ns = 1;
+    optional int64 duration_ns = 2;
+  }
+
+  // Battery counters info for each ts of the trace. This should only be
+  // extracted for short traces.
+  repeated BatteryCounters battery_counters = 1;
+
+  optional BatteryAggregates battery_aggregates = 2;
+
+  repeated SuspendPeriod suspend_period = 3;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/binder_metric.proto b/src/libtracing/protos/perfetto/metrics/android/binder_metric.proto
new file mode 100644
index 000000000..d16e2ee51
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/binder_metric.proto
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This metric provides the following:
+// 1. Per-process Binder statistics for traces with binder_driver enabled.
+//    Specifically, transactions are categorized and counted
+// 2. Unaggregated binder txn durations with per-txn aggregated thread state and
+// blocked function
+//    durations
+message AndroidBinderMetric {
+  message PerProcessBreakdown {
+    optional string process_name = 1;
+    optional uint32 pid = 2;
+    optional string slice_name = 3;
+    optional uint32 count = 4;
+  }
+
+  // Next field id: 30
+  message UnaggregatedTxnBreakdown {
+    // General
+    optional string aidl_name = 1;
+    optional int64 aidl_ts = 22;
+    optional int64 aidl_dur = 23;
+    optional bool is_sync = 21;
+    // Client
+    // Removed: was binder_txn_id
+    reserved 2;
+    optional string client_process = 3;
+    optional string client_thread = 4;
+    optional bool is_main_thread = 5;
+    optional int64 client_ts = 6;
+    optional int64 client_dur = 7;
+    optional int64 client_monotonic_dur = 28;
+    optional int64 client_oom_score = 19;
+    optional int64 client_package_version_code = 24;
+    optional bool is_client_package_debuggable = 25;
+    // Server
+    // Removed: was binder_reply_id
+    reserved 8;
+    optional string server_process = 9;
+    optional string server_thread = 10;
+    optional int64 server_ts = 11;
+    optional int64 server_dur = 12;
+    optional int64 server_monotonic_dur = 29;
+    optional int64 server_oom_score = 20;
+    optional int64 server_package_version_code = 26;
+    optional bool is_server_package_debuggable = 27;
+    // Aggregations
+    repeated ThreadStateBreakdown thread_states = 13;
+    repeated BlockedFunctionBreakdown blocked_functions = 14;
+
+    optional uint32 client_tid = 15;
+    optional uint32 server_tid = 16;
+
+    optional uint32 client_pid = 17;
+    optional uint32 server_pid = 18;
+  }
+
+  message ThreadStateBreakdown {
+    optional string thread_state_type = 1;
+    optional string thread_state = 2;
+    optional int64 thread_state_dur = 3;
+    optional int64 thread_state_count = 4;
+  }
+
+  message BlockedFunctionBreakdown {
+    optional string thread_state_type = 1;
+    optional string blocked_function = 2;
+    optional int64 blocked_function_dur = 3;
+    optional int64 blocked_function_count = 4;
+  }
+
+  repeated PerProcessBreakdown process_breakdown = 1;
+  repeated UnaggregatedTxnBreakdown unaggregated_txn_breakdown = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/camera_metric.proto b/src/libtracing/protos/perfetto/metrics/android/camera_metric.proto
new file mode 100644
index 000000000..932cd7e93
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/camera_metric.proto
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidCameraMetric {
+  message Counter {
+    optional double min = 1;
+    optional double max = 2;
+    optional double avg = 3;
+  }
+
+  // Counter for the sum of DMA and RSS across GCA, cameraserver
+  // and HAL. This provides a single number for the memory
+  // pressure using the camera is putting on the rest of the
+  // system.
+  //
+  // Note: this number assumes that all DMA pressure is coming
+  // from the camera as this is usually a pretty good
+  // approximation. Being more accurate here would increase the
+  // complexity of the metric significantly.
+  //
+  // Note: if there are multiple GCA/cameraserver/HAL processes
+  // in the trace, this metric will simply take the latest
+  // one in the trace and ignore the others.
+  optional Counter gc_rss_and_dma = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/camera_unagg_metric.proto b/src/libtracing/protos/perfetto/metrics/android/camera_unagg_metric.proto
new file mode 100644
index 000000000..e1f540368
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/camera_unagg_metric.proto
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidCameraUnaggregatedMetric {
+  message Value {
+    optional int64 ts = 1;
+    optional double gca_rss_val = 2;
+    optional double hal_rss_val = 3;
+    optional double cameraserver_rss_val = 4;
+    optional double dma_val = 5;
+    optional double value = 6;
+  }
+
+  // Timeseries for the sum of DMA and RSS across GCA, cameraserver
+  // and HAL. This provides a single number for the memory
+  // pressure using the camera is putting on the rest of the
+  // system.
+  //
+  // Note: this number assumes that all DMA pressure is coming
+  // from the camera as this is usually a pretty good
+  // approximation. Being more accurate here would increase the
+  // complexity of the metric significantly.
+  //
+  // Note: if there are multiple GCA/cameraserver/HAL processes
+  // in the trace, this metric will simply take the latest
+  // one in the trace and ignore the others.
+  repeated Value gc_rss_and_dma = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/codec_metrics.proto b/src/libtracing/protos/perfetto/metrics/android/codec_metrics.proto
new file mode 100644
index 000000000..2f8b94d77
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/codec_metrics.proto
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/cpu_metric.proto";
+
+// These metrices collects various function and thread
+// usage within androd's codec framework. This can give an
+// idea about performance and cpu usage when using codec
+// framework
+message AndroidCodecMetrics {
+
+  // profile details in messages
+  message Detail {
+    // function thread
+    optional string thread_name = 1;
+    // total time
+    optional int64 total_cpu_ns = 2;
+    // CPU time ( time 'Running' on cpu)
+    optional int64 running_cpu_ns = 3;
+  }
+
+  // These are traces and could indicate framework queue latency
+  // buffer-packing, buffer-preprocess, buffer post-process
+  // latency etc. These metrics are monitored to track quality.
+  // Same message can come from different
+  // processes.
+  message CodecFunction {
+    // codec string
+    optional string codec_string = 1;
+    // process_name
+    optional string process_name = 2;
+    // details
+    optional Detail detail = 3;
+  }
+
+  // This message can indicate overall cpu
+  // utilization of codec framework threads.
+  message CpuUsage {
+    // name of process using codec framework
+    optional string process_name = 1;
+    // name of the codec thread
+    optional string thread_name = 2;
+    // was thread_cpu_us
+    reserved 3;
+    // total cpu usage of the codec thread
+    optional int64 thread_cpu_ns = 6;
+    // can be number of codec framework thread
+    optional uint32 num_threads = 4;
+    // core type data info used by codec thread
+    repeated AndroidCpuMetric.CoreTypeData core_data = 5;
+  }
+
+  repeated CpuUsage cpu_usage = 1;
+  repeated CodecFunction codec_function = 2;
+
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/cpu_metric.proto b/src/libtracing/protos/perfetto/metrics/android/cpu_metric.proto
new file mode 100644
index 000000000..ec805442e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/cpu_metric.proto
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+message AndroidCpuMetric {
+  // Next id: 6
+  message Metrics {
+    // CPU megacycles (i.e. cycles divided by 1e6).
+    optional int64 mcycles = 1;
+
+    // Total time the thread was running for this breakdown in
+    // nanoseconds.
+    optional int64 runtime_ns = 2;
+
+    // Min/max/average CPU frequency weighted by the time the CPU was
+    // running at each frequency in this breakdown.
+    optional int64 min_freq_khz = 3;
+    optional int64 max_freq_khz = 4;
+    optional int64 avg_freq_khz = 5;
+  }
+
+  // Next id: 7
+  message CoreData {
+    optional uint32 id = 1;
+    optional Metrics metrics = 6;
+
+    reserved 2 to 5;
+  }
+
+  // Next id: 3
+  message CoreTypeData {
+    optional string type = 1;
+    optional Metrics metrics = 2;
+  }
+
+  // Next id: 7
+  message Thread {
+    optional string name = 1;
+    optional Metrics metrics = 4;
+
+    // Breakdowns of above metrics.
+    repeated CoreData core = 2;
+    repeated CoreTypeData core_type = 5;
+
+    reserved 3;
+  }
+
+  // Next id: 8
+  message Process {
+    optional string name = 1;
+    optional AndroidProcessMetadata process = 8;
+    optional Metrics metrics = 4;
+
+    // Breakdowns of above metrics.
+    repeated Thread threads = 6;
+    repeated CoreData core = 7;
+    repeated CoreTypeData core_type = 5;
+
+    reserved 3;
+  }
+
+  repeated Process process_info = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/display_metrics.proto b/src/libtracing/protos/perfetto/metrics/android/display_metrics.proto
new file mode 100644
index 000000000..daec26886
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/display_metrics.proto
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidDisplayMetrics {
+  // Stat that reports the number of duplicate frames submitted
+  // to the display for rendering. That is frames that have the same
+  // pixels values but where still submitted. It is tracked based on
+  // comparing the MISR of the current frame vs previous frame.
+  optional uint32 total_duplicate_frames = 1;
+
+  // Stat reports whether there is any duplicate_frames tracked
+  optional uint32 duplicate_frames_logged = 2;
+
+  // Stat that reports the number of dpu underrrun occurs count.
+  optional uint32 total_dpu_underrun_count = 3;
+
+
+  message RefreshRateStat {
+    // The refresh rate value (the number of frames per second)
+    optional uint32 refresh_rate_fps = 1;
+
+    // Calculate the number of refresh rate switches to this fps
+    optional uint32 count = 2;
+
+    // Calculate the total duration of refresh rate stays at this fps
+    optional double total_dur_ms = 3;
+
+    // Calculate the average duration of refresh rate stays at this fps
+    optional double avg_dur_ms = 4;
+  }
+
+  // Calculate the total number of refresh rate changes
+  optional uint32 refresh_rate_switches = 4;
+
+  // The statistics for each refresh rate value
+  repeated RefreshRateStat refresh_rate_stats = 5;
+
+  // Stats to measure the runtime of updating the power state in
+  // DisplayPowerController
+  message UpdatePowerState {
+    optional uint32 avg_runtime_micro_secs = 2;
+
+    // Removed: avg_runtime_ms
+    reserved 1;
+  }
+
+  optional UpdatePowerState update_power_state = 6;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/dma_heap_metric.proto b/src/libtracing/protos/perfetto/metrics/android/dma_heap_metric.proto
new file mode 100644
index 000000000..c9f95c25d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/dma_heap_metric.proto
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// dma-buf heap memory stats on Android.
+message AndroidDmaHeapMetric {
+    optional double avg_size_bytes = 1;
+    optional double min_size_bytes = 2;
+    optional double max_size_bytes = 3;
+
+    // Total allocation size.
+    // Essentially the sum of positive allocs.
+    optional double total_alloc_size_bytes = 4;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/dvfs_metric.proto b/src/libtracing/protos/perfetto/metrics/android/dvfs_metric.proto
new file mode 100644
index 000000000..e7bb625ba
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/dvfs_metric.proto
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidDvfsMetric {
+
+  message BandStat {
+    // Operating frequency
+    optional int32 freq_value = 1;
+
+    // Percentage of duration in this operating frequency compared to all frequencies
+    optional double percentage = 2;
+
+    // Total duration in ns when the state was in this operating frequency
+    optional int64 duration_ns = 3;
+  }
+
+  message FrequencyResidency {
+    // Frequency representative name
+    optional string freq_name = 1;
+    // Each band statistics meta
+    repeated BandStat band_stat = 2;
+  }
+
+  // Frequency residency metrics from clock_set_rate ftrace event.
+  repeated FrequencyResidency freq_residencies = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/fastrpc_metric.proto b/src/libtracing/protos/perfetto/metrics/android/fastrpc_metric.proto
new file mode 100644
index 000000000..417acda89
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/fastrpc_metric.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// fastrpc memory stats on Android.
+message AndroidFastrpcMetric {
+  message Subsystem {
+    optional string name = 1;
+    optional double avg_size_bytes = 2;
+    optional double min_size_bytes = 3;
+    optional double max_size_bytes = 4;
+
+    // Total allocation size.
+    // Essentially the sum of positive allocs.
+    optional double total_alloc_size_bytes = 5;
+  }
+
+  repeated Subsystem subsystem = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/g2d_metric.proto b/src/libtracing/protos/perfetto/metrics/android/g2d_metric.proto
new file mode 100644
index 000000000..29b3888c6
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/g2d_metric.proto
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message G2dMetrics {
+  message G2dInstance {
+    // G2d name.
+    optional string name = 1;
+
+    optional uint32 frame_count = 5;
+    optional uint32 error_count = 6;
+
+    optional double max_dur_ms = 7;
+    optional double min_dur_ms = 8;
+    optional double avg_dur_ms = 9;
+
+    // Removed: was int64 versions of max_dur_ns, min_dur_ns and avg_dur_ns.
+    reserved 2 to 4;
+  }
+  message G2dMetric {
+    // G2D Metric for each G2D Instance.
+    repeated G2dInstance instances = 1;
+
+    // the number of frames processed by G2D
+    optional uint32 frame_count = 5;
+    // the number of error events
+    optional uint32 error_count = 6;
+
+    // max/min/avg G2d frame durations for all instances.
+    optional double max_dur_ms = 7;
+    optional double min_dur_ms = 8;
+    optional double avg_dur_ms = 9;
+
+    // Removed: was int64 versions of max_dur_ns, min_dur_ns and avg_dur_ns.
+    reserved 2 to 4;
+  }
+
+  optional G2dMetric g2d_hw = 1;
+  optional G2dMetric g2d_sw = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/gpu_metric.proto b/src/libtracing/protos/perfetto/metrics/android/gpu_metric.proto
new file mode 100644
index 000000000..2aaaeafa5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/gpu_metric.proto
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidGpuMetric {
+  message Process {
+    // Process name.
+    optional string name = 1;
+
+    // max/min/avg GPU memory used by this process.
+    optional int64 mem_max = 2;
+    optional int64 mem_min = 3;
+    optional int64 mem_avg = 4;
+  }
+
+  // GPU metric for processes using GPU.
+  repeated Process processes = 1;
+
+  // max/min/avg GPU memory used by the entire system.
+  optional int64 mem_max = 2;
+  optional int64 mem_min = 3;
+  optional int64 mem_avg = 4;
+
+  message FrequencyMetric {
+    // Identifier for GPU in a multi-gpu device.
+    optional uint32 gpu_id = 1;
+
+    // max/min/avg GPU frequency for this gpu_id
+    // the calculation of avg is weighted by the duration of each frequency
+    optional int64 freq_max = 2;
+    optional int64 freq_min = 3;
+    optional double freq_avg = 4;
+
+    message MetricsPerFrequency {
+      // Used frequency
+      optional int64 freq = 1;
+
+      // Total duration in ms when the state of GPU was in this frequency
+      optional double dur_ms = 2;
+
+      // Percentage of duration in this frequency compared to all frequencies
+      // in this gpu_id
+      optional double percentage = 3;
+    }
+
+    // Metrics for each used GPU frequency
+    repeated MetricsPerFrequency used_freqs = 5;
+  }
+
+  // GPU frequency metric for each gpu_id
+  repeated FrequencyMetric freq_metrics = 5;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/hwcomposer.proto b/src/libtracing/protos/perfetto/metrics/android/hwcomposer.proto
new file mode 100644
index 000000000..56bd6b3fe
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/hwcomposer.proto
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidHwcomposerMetrics {
+  // Counts the number of composition total layers in the trace. (non-weighted average)
+  optional double composition_total_layers = 1;
+
+  // Counts the number of composition dpu layers in the trace. (non-weighted average)
+  optional double composition_dpu_layers = 2;
+
+  // Counts the number of composition gpu layers in the trace. (non-weighted average)
+  optional double composition_gpu_layers = 3;
+
+  // Counts the number of composition dpu cached layers in the trace. (non-weighted average)
+  optional double composition_dpu_cached_layers = 4;
+
+  // Counts the number of composition surfaceflinger cached layers in the trace.
+  // (non-weighted average)
+  optional double composition_sf_cached_layers = 5;
+
+  // Counts the number of composition rounded corner decoration layers in the trace.
+  // (non-weighted average)
+  optional double composition_rcd_layers = 15;
+
+  // Counts how many times validateDisplay is skipped.
+  optional int32 skipped_validation_count = 6;
+
+  // Counts how many times validateDisplay cannot be skipped.
+  optional int32 unskipped_validation_count = 7;
+
+  // Counts how many times validateDisplay is already separated from presentDisplay
+  // since the beginning.
+  optional int32 separated_validation_count = 8;
+
+  // Counts how many unhandled validation cases which might be caused by errors.
+  optional int32 unknown_validation_count = 9;
+
+  // the average of overall hwcomposer execution time.
+  optional double avg_all_execution_time_ms = 10;
+
+  // the average of hwcomposer execution time for skipped validation cases.
+  optional double avg_skipped_execution_time_ms = 11;
+
+  // the average of hwcomposer execution time for unskipped validation cases.
+  optional double avg_unskipped_execution_time_ms = 12;
+
+  // the average of hwcomposer execution time for separated validation cases.
+  optional double avg_separated_execution_time_ms = 13;
+
+  message DpuVoteMetrics {
+    // the thread ID that handles this track
+    optional uint32 tid = 1;
+
+    // the weighted average of DPU Vote Clock
+    optional double avg_dpu_vote_clock = 2;
+
+    // the weighted average of DPU Vote Avg Bandwidth
+    optional double avg_dpu_vote_avg_bw = 3;
+
+    // the weighted average of DPU Vote Peak Bandwidth
+    optional double avg_dpu_vote_peak_bw = 4;
+
+    // the weighted average of DPU Vote RT (Real Time) Bandwidth
+    optional double avg_dpu_vote_rt_bw = 5;
+  }
+
+  // DPU Vote Metrics for each thread track
+  repeated DpuVoteMetrics dpu_vote_metrics = 14;
+
+  message MetricsPerDisplay {
+    // Display ID in HWC
+    optional string display_id = 1;
+
+    // Counts the number of composition total layers in the trace. (non-weighted average)
+    optional double composition_total_layers = 2;
+
+    // Counts the number of composition dpu layers in the trace. (non-weighted average)
+    optional double composition_dpu_layers = 3;
+
+    // Counts the number of composition gpu layers in the trace. (non-weighted average)
+    optional double composition_gpu_layers = 4;
+
+    // Counts the number of composition dpu cached layers in the trace. (non-weighted average)
+    optional double composition_dpu_cached_layers = 5;
+
+    // Counts the number of composition surfaceflinger cached layers in the trace.
+    // (non-weighted average)
+    optional double composition_sf_cached_layers = 6;
+
+    // Counts the number of composition rounded corner decoration layers in the trace.
+    // (non-weighted average)
+    optional double composition_rcd_layers = 7;
+
+    // Counts how many times validateDisplay is skipped.
+    optional int32 skipped_validation_count = 8;
+
+    // Counts how many times validateDisplay cannot be skipped.
+    optional int32 unskipped_validation_count = 9;
+
+    // Counts how many times validateDisplay is already separated from presentDisplay
+    // since the beginning.
+    optional int32 separated_validation_count = 10;
+
+    // Counts how many unhandled validation cases which might be caused by errors.
+    optional int32 unknown_validation_count = 11;
+
+    // the average of overall hwcomposer execution time.
+    optional double avg_all_execution_time_ms = 12;
+
+    // the average of hwcomposer execution time for skipped validation cases.
+    optional double avg_skipped_execution_time_ms = 13;
+
+    // the average of hwcomposer execution time for unskipped validation cases.
+    optional double avg_unskipped_execution_time_ms = 14;
+
+    // the average of hwcomposer execution time for separated validation cases.
+    optional double avg_separated_execution_time_ms = 15;
+  }
+
+  repeated MetricsPerDisplay metrics_per_display = 16;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/hwui_metric.proto b/src/libtracing/protos/perfetto/metrics/android/hwui_metric.proto
new file mode 100644
index 000000000..b2c11c826
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/hwui_metric.proto
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Android HWUI graphics performance and graphics memory usage metrics.
+message ProcessRenderInfo {
+  // Name of the package launched
+  optional string process_name = 1;
+
+  // CPU time spent on RenderThread in milliseconds.
+  optional int64 rt_cpu_time_ms = 2;
+
+  // Number of frames drawn on RenderThread, followed by max/min/avg CPU time to draw a frame
+  // in nanoseconds.
+  optional uint32 draw_frame_count = 3;
+  optional int64 draw_frame_max = 4;
+  optional int64 draw_frame_min = 5;
+  optional double draw_frame_avg = 6;
+
+  // Number of GPU commands flushes and max/min/avg time per flush in nanoseconds.
+  optional uint32 flush_count = 7;
+  optional int64 flush_max = 8;
+  optional int64 flush_min = 9;
+  optional double flush_avg = 10;
+
+  // Number of View tree preparation counts and max/min/avg time to traverse the tree in
+  // nanoseconds.
+  optional uint32 prepare_tree_count = 11;
+  optional int64 prepare_tree_max = 12;
+  optional int64 prepare_tree_min = 13;
+  optional double prepare_tree_avg = 14;
+
+  // Number of times the GPU rendered a frame and max/min/avg time for GPU to finish rendering in
+  // in nanoseconds.
+  optional uint32 gpu_completion_count = 15;
+  optional int64 gpu_completion_max = 16;
+  optional int64 gpu_completion_min = 17;
+  optional double gpu_completion_avg = 18;
+
+  // Number of times a frame was recorded/serialized in a display list on the UI thread with
+  // max/min/avg time in nanoseconds.
+  optional uint32 ui_record_count = 19;
+  optional int64 ui_record_max = 20;
+  optional int64 ui_record_min = 21;
+  optional double ui_record_avg = 22;
+
+  // number of unique shader programs that were used to render frames, followed by total and average
+  // times to prepare a shader in nanoseconds.
+  optional uint32 shader_compile_count = 23;
+  optional int64 shader_compile_time = 24;
+  optional double shader_compile_avg = 25;
+  // number of shader programs loaded from the disk cache, followed by total time and average time
+  // to prepare a shader in nanoseconds.
+  optional uint32 cache_hit_count = 26;
+  optional int64 cache_hit_time = 27;
+  optional double cache_hit_avg = 28;
+  // number of shader programs compiled/linked, followed by total time and average time to prepare
+  // a shader in nanoseconds.
+  optional uint32 cache_miss_count = 29;
+  optional int64 cache_miss_time = 30;
+  optional double cache_miss_avg = 31;
+
+  // max/min/avg CPU memory used for graphics by HWUI at the end of a frame.
+  optional int64 graphics_cpu_mem_max = 32;
+  optional int64 graphics_cpu_mem_min = 33;
+  optional double graphics_cpu_mem_avg = 34;
+
+  // max/min/avg GPU memory used by HWUI at the end of a frame excluding textures.
+  optional int64 graphics_gpu_mem_max = 35;
+  optional int64 graphics_gpu_mem_min = 36;
+  optional double graphics_gpu_mem_avg = 37;
+
+  // max/min/avg memory used for GPU textures by HWUI at the end of a frame.
+  optional int64 texture_mem_max = 38;
+  optional int64 texture_mem_min = 39;
+  optional double texture_mem_avg = 40;
+
+  // max/min/avg memory used by HWUI at the end of a frame. This is a sum of previous 3 categories.
+  optional int64 all_mem_max = 41;
+  optional int64 all_mem_min = 42;
+  optional double all_mem_avg = 43;
+}
+
+message AndroidHwuiMetric {
+  //  HWUI metrics for processes that have a RenderThread.
+  repeated ProcessRenderInfo process_info = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/io_metric.proto b/src/libtracing/protos/perfetto/metrics/android/io_metric.proto
new file mode 100644
index 000000000..a2126ac9b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/io_metric.proto
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Measure Android IO stats in a trace.
+// Note: This is an aggregated metric, for unaggregated metrics look at AndroidIoUnaggregated
+// in io_unagg_metric.proto.
+message AndroidIo {
+  // Next id: 3
+  // Stats for Counters in an f2fs file system.
+  // Counters are available for various operations.
+  message F2fsCounterStats {
+    optional string name = 1;
+    optional double max = 2;
+    optional double sum = 3;
+    optional double min = 5;
+    optional int64 dur = 6;
+    optional int64 count = 7;
+    optional double avg = 8;
+  }
+  // Aggregated stats for write operations in an f2fs file system.
+  message F2fsWriteStats {
+    optional int64 total_write_count = 1;
+    optional int64 distinct_processes = 2;
+    optional int64 total_bytes_written = 3;
+    optional int64 distinct_device_count = 4;
+    optional int64 distinct_inode_count = 5;
+    optional int64 distinct_thread_count = 6;
+  }
+  repeated F2fsCounterStats f2fs_counter_stats = 1;
+  repeated F2fsWriteStats f2fs_write_stats = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/io_unagg_metric.proto b/src/libtracing/protos/perfetto/metrics/android/io_unagg_metric.proto
new file mode 100644
index 000000000..3cc805f17
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/io_unagg_metric.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// IO metrics on Android in unaggregated form.
+// Note: this generates a lot of data so should not be requested unless it
+// is clear that this data is necessary.
+message AndroidIoUnaggregated {
+    // Next id: 2
+    message F2fsWriteUnaggreagatedStat {
+      optional uint32 tid = 1;
+      optional string thread_name = 2;
+      optional uint32 pid = 3;
+      optional string process_name = 4;
+      optional int64 ino = 5;
+      optional int64 dev = 6;
+    }
+    // F2fs write stats which are grouped by thread and inode.
+    repeated F2fsWriteUnaggreagatedStat f2fs_write_unaggregated_stats = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/ion_metric.proto b/src/libtracing/protos/perfetto/metrics/android/ion_metric.proto
new file mode 100644
index 000000000..810529c2d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/ion_metric.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// ion memory stats on Android.
+message AndroidIonMetric {
+  message Buffer {
+    optional string name = 1;
+    optional double avg_size_bytes = 2;
+    optional double min_size_bytes = 3;
+    optional double max_size_bytes = 4;
+
+    // Total allocation size.
+    // Essentially the sum of positive allocs (-> new buffers).
+    optional double total_alloc_size_bytes = 5;
+  }
+
+  repeated Buffer buffer = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/irq_runtime_metric.proto b/src/libtracing/protos/perfetto/metrics/android/irq_runtime_metric.proto
new file mode 100644
index 000000000..a5c8b6a52
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/irq_runtime_metric.proto
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// measure max IRQ runtime and IRQ tasks running over threshold.
+message AndroidIrqRuntimeMetric {
+  message IrqSlice {
+    // IRQ name
+    optional string irq_name = 1;
+    // timestamp
+    optional int64 ts = 2;
+    // runtime of IRQ task
+    optional int64 dur = 3;
+  }
+  message ThresholdMetric {
+    // Threshold value
+    optional string threshold = 1;
+    // over threshold count
+    optional int64 over_threshold_count = 2;
+    // anomaly ratio (over threshold count / total count)
+    optional double anomaly_ratio= 3;
+  }
+  message IrqRuntimeMetric {
+    // max runtime of IRQ tasks
+    optional int64 max_runtime = 1;
+    // total IRQ tasks
+    optional int64 total_count = 2;
+    // over threshold metric
+    optional ThresholdMetric threshold_metric = 3;
+    // information for top 10 IRQ tasks
+    repeated IrqSlice longest_irq_slices = 4;
+  }
+
+  // metrics for hardirq and softirq
+  optional IrqRuntimeMetric hw_irq = 1;
+  optional IrqRuntimeMetric sw_irq = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/jank_cuj_metric.proto b/src/libtracing/protos/perfetto/metrics/android/jank_cuj_metric.proto
new file mode 100644
index 000000000..007554ff6
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/jank_cuj_metric.proto
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+message AndroidJankCujMetric {
+  repeated Cuj cuj = 1;
+
+  // Next id: 12
+  message Cuj {
+    // ID of the CUJ that is unique within the trace.
+    optional int32 id = 1;
+
+    // Name of the CUJ, extracted from the CUJ trace marker.
+    // For example SHADE_EXPAND_COLLAPSE from J<SHADE_EXPAND_COLLAPSE>.
+    optional string name = 2;
+
+    // Details about the process (uid, version, etc)
+    optional AndroidProcessMetadata process = 3;
+
+    // ts of the CUJ trace marker slice.
+    optional int64 ts = 4;
+
+    // dur of the CUJ trace marker slice.
+    optional int64 dur = 5;
+
+    // Details about each of the frames within the CUJ.
+    repeated Frame frame = 6;
+
+    // Details about each of the SF frames within the CUJ.
+    repeated Frame sf_frame = 10;
+
+    // Metrics extracted from the counters output by FrameTracker
+    // Does not contain the frame_dur percentile information.
+    optional Metrics counter_metrics = 7;
+
+    // Metrics extracted from the frame timeline.
+    optional Metrics timeline_metrics = 8;
+
+    // Metrics extracted from the trace slices.
+    optional Metrics trace_metrics = 9;
+
+    // Layer name of the surface where the cuj is drawn.
+    optional string layer_name = 11;
+  }
+
+  // Next id: 10
+  message Frame {
+    // Index of the frame within the single user journey.
+    optional int64 frame_number = 1;
+
+    // VSYNC ID of the frame.
+    optional int64 vsync = 2;
+
+    optional int64 ts = 3;
+    optional int64 dur = 4;
+    optional int64 dur_expected = 7;
+
+    // Whether the app process missed the frame deadline.
+    // Only set for the App frames. Always left unset for SF frames.
+    optional bool app_missed = 5;
+
+    // Whether SF missed the frame deadline.
+    optional bool sf_missed = 6;
+
+    // Whether the SF callback missed before emitting jank metrics.
+    // SF callback is used to get the jank classification.
+    optional bool sf_callback_missed = 8;
+
+    // Whether the HWUI callback missed before emitting jank metrics.
+    // HWUI callback is used to get the frame duration.
+    optional bool hwui_callback_missed = 9;
+  }
+
+  // Next id: 18
+  message Metrics {
+    // Overall number of frames within the CUJ.
+    optional int64 total_frames = 1;
+
+    // Number of missed frames.
+    optional int64 missed_frames = 2;
+
+    // Number of frames missed due to the app missing the deadline.
+    optional int64 missed_app_frames = 3;
+
+    // Number of frames missed due to SF.
+    optional int64 missed_sf_frames = 4;
+
+    // Number of successive frames missed.
+    // Not available in timeline_metrics and trace_metrics.
+    optional int64 missed_frames_max_successive = 5;
+
+    // Max frame duration in nanoseconds.
+    optional int64 frame_dur_max = 6;
+
+    // Average frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_avg = 7;
+
+    // Median frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p50 = 8;
+
+    // P90 frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p90 = 9;
+
+    // P95 frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p95 = 10;
+
+    // P99 frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p99 = 11;
+
+    // Median frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p50 = 12;
+
+    // P90 frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p90 = 13;
+
+    // P95 frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p95 = 14;
+
+    // P99 frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p99 = 15;
+
+    // Number of frames with missed SF callback.
+    optional int64 sf_callback_missed_frames = 16;
+
+    // Number of frames with missed HWUI callback.
+    optional int64 hwui_callback_missed_frames = 17;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/java_heap_histogram.proto b/src/libtracing/protos/perfetto/metrics/android/java_heap_histogram.proto
new file mode 100644
index 000000000..7fa86ef06
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/java_heap_histogram.proto
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+message JavaHeapHistogram {
+  // Next id: 9
+  message TypeCount {
+    optional string type_name = 1;
+    optional string category = 4;
+
+    optional uint32 obj_count = 2;
+    optional uint32 reachable_obj_count = 3;
+
+    optional uint32 size_kb = 5;
+    optional uint32 reachable_size_kb = 6;
+    optional uint32 native_size_kb = 7;
+    optional uint32 reachable_native_size_kb = 8;
+  }
+
+  message Sample {
+    optional int64 ts = 1;
+    repeated TypeCount type_count = 2;
+  }
+
+  // Heap stats per process. One sample per dump (with continuous dump you can
+  // have more samples differentiated by ts).
+  message InstanceStats {
+    optional uint32 upid = 1;
+    optional AndroidProcessMetadata process = 2;
+    repeated Sample samples = 3;
+  }
+
+  repeated InstanceStats instance_stats = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/java_heap_stats.proto b/src/libtracing/protos/perfetto/metrics/android/java_heap_stats.proto
new file mode 100644
index 000000000..10a0b8b57
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/java_heap_stats.proto
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+message JavaHeapStats {
+  message HeapRoots {
+    optional string root_type = 1;
+    optional string type_name = 2;
+    optional int64 obj_count = 3;
+  }
+
+  // Next id: 11
+  message Sample {
+    optional int64 ts = 1;
+    // Size of the Java heap in bytes
+    optional int64 heap_size = 2;
+    // Native size of all the objects (not included in heap_size)
+    optional int64 heap_native_size = 8;
+    optional int64 obj_count = 4;
+    // Size of the reachable objects in bytes.
+    optional int64 reachable_heap_size = 3;
+    // Native size of all the reachable objects (not included in
+    // reachable_heap_size)
+    optional int64 reachable_heap_native_size = 9;
+    optional int64 reachable_obj_count = 5;
+    // Sum of anonymous RSS + swap pages in bytes.
+    optional int64 anon_rss_and_swap_size = 6;
+
+    // ART root objects
+    repeated HeapRoots roots = 7;
+    // OOM adjustment score
+    optional int64 oom_score_adj = 10;
+  }
+
+  // Heap stats per process. One sample per dump (can be > 1 if continuous
+  // dump is enabled).
+  message InstanceStats {
+    optional uint32 upid = 1;
+    optional AndroidProcessMetadata process = 2;
+    repeated Sample samples = 3;
+  }
+
+  repeated InstanceStats instance_stats = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/lmk_metric.proto b/src/libtracing/protos/perfetto/metrics/android/lmk_metric.proto
new file mode 100644
index 000000000..83fc090dc
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/lmk_metric.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// LMK stats on Android.
+message AndroidLmkMetric {
+  message ByOomScore {
+    optional int32 oom_score_adj = 1;
+    optional int32 count = 2;
+  }
+
+  // Total count of LMK events observed in the trace.
+  optional int32 total_count = 1;
+  repeated ByOomScore by_oom_score = 2;
+
+  // OOM reaper kills. Enabled via the oom/mark_victim point. Should never
+  // happen.
+  optional int32 oom_victim_count = 3;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/lmk_reason_metric.proto b/src/libtracing/protos/perfetto/metrics/android/lmk_reason_metric.proto
new file mode 100644
index 000000000..ca1d89405
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/lmk_reason_metric.proto
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+// Global process state at LMK time, used to identify potential culprits.
+// TODO: rename to AndroidLmkProcessState
+message AndroidLmkReasonMetric {
+  message Process {
+    optional AndroidProcessMetadata process = 1;
+
+    // OOM score adj of the process.
+    optional int32 oom_score_adj = 2;
+
+    // RSS + swap.
+    optional int64 size = 3;
+
+    optional int64 file_rss_bytes = 4;
+    optional int64 anon_rss_bytes = 5;
+    optional int64 shmem_rss_bytes = 6;
+    optional int64 swap_bytes = 7;
+  }
+  message Lmk {
+    // OOM score adj of the LMK'ed process.
+    optional int32 oom_score_adj = 1;
+
+    // Total size of the ION heap in bytes during this LMK.
+    optional int64 ion_heaps_bytes = 4;
+    // Deprecated. Prefer ion_heaps_bytes.
+    optional int64 system_ion_heap_size = 2;
+
+    // Processes present during this LMK.
+    repeated Process processes = 3;
+  }
+
+  // LMKs present in the trace, ordered on their timestamp.
+  repeated Lmk lmks = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/mem_metric.proto b/src/libtracing/protos/perfetto/metrics/android/mem_metric.proto
new file mode 100644
index 000000000..6dee65864
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/mem_metric.proto
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Memory metrics on Android.
+message AndroidMemoryMetric {
+  message ProcessMetrics {
+    optional string process_name = 1;
+    optional ProcessMemoryCounters total_counters = 2;
+    repeated PriorityBreakdown priority_breakdown = 3;
+  }
+
+  message PriorityBreakdown {
+    optional string priority = 1;
+    optional ProcessMemoryCounters counters = 2;
+  }
+
+  message ProcessMemoryCounters {
+    optional Counter anon_rss = 1;
+    optional Counter file_rss = 2;
+    optional Counter swap = 3;
+    optional Counter anon_and_swap = 4;
+
+    // Available when ART trace events are available.
+    optional Counter java_heap = 5;
+  }
+
+  message Counter {
+    optional double min = 1;
+    optional double max = 2;
+    optional double avg = 3;
+
+    // Memory growth observed in the counter sequence. In case of multiple
+    // processes with the same name, break ties using max.
+    optional double delta = 4;
+  }
+
+  // Process metrics, grouped by process name
+  repeated ProcessMetrics process_metrics = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/mem_unagg_metric.proto b/src/libtracing/protos/perfetto/metrics/android/mem_unagg_metric.proto
new file mode 100644
index 000000000..fc9276d82
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/mem_unagg_metric.proto
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Unaggregated memory metrics on Android.
+message AndroidMemoryUnaggregatedMetric {
+  message ProcessValues {
+    optional string process_name = 1;
+    optional ProcessMemoryValues mem_values = 2;
+  }
+
+  message ProcessMemoryValues {
+    repeated Value anon_rss = 1;
+    repeated Value file_rss = 2;
+    repeated Value swap = 3;
+    repeated Value anon_and_swap = 4;
+  }
+
+  message Value {
+    optional int64 ts = 1;
+    optional int32 oom_score = 2;
+    optional double value = 3;
+  }
+
+  // Process metrics for every process instance in trace.
+  repeated ProcessValues process_values = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/monitor_contention_agg_metric.proto b/src/libtracing/protos/perfetto/metrics/android/monitor_contention_agg_metric.proto
new file mode 100644
index 000000000..43d861e8a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/monitor_contention_agg_metric.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+ // This metric provides aggregated information about monitor contention graph
+ // in a trace
+message AndroidMonitorContentionAggMetric {
+  // Next id: 2
+  // Stats for Monitor contention aggregated by process.
+  message ProcessAggregation {
+    optional string name = 1;
+    optional int64 total_contention_count = 2;
+    optional int64 total_contention_dur = 3;
+    optional int64 main_thread_contention_count = 4;
+    optional int64 main_thread_contention_dur = 5;
+  }
+  repeated ProcessAggregation process_aggregation = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/monitor_contention_metric.proto b/src/libtracing/protos/perfetto/metrics/android/monitor_contention_metric.proto
new file mode 100644
index 000000000..a13e2baa4
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/monitor_contention_metric.proto
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This metric provides information about the monitor contention graph in a
+// trace
+message AndroidMonitorContentionMetric {
+  // Next field id: 26
+  message Node {
+    // Global context
+    optional int64 node_parent_id = 1;
+    optional int64 node_child_id = 24;
+    optional int64 node_id = 2;
+    optional int64 ts = 3;
+    optional int64 dur = 4;
+    optional int64 monotonic_dur = 25;
+    optional string process_name = 14;
+    optional uint32 pid = 23;
+    optional uint32 waiter_count = 11;
+    repeated ThreadStateBreakdown thread_states = 19;
+    repeated BlockedFunctionBreakdown blocked_functions = 20;
+
+    // Blocking context
+    optional string blocking_method = 5;
+    optional string short_blocking_method = 7;
+    optional string blocking_src = 9;
+    optional string blocking_thread_name = 13;
+    optional bool is_blocking_thread_main = 16;
+    optional uint32 blocking_thread_tid = 22;
+
+    // Blocked context
+    optional string blocked_method = 6;
+    optional string short_blocked_method = 8;
+    optional string blocked_src = 10;
+    optional string blocked_thread_name = 12;
+    optional bool is_blocked_thread_main = 15;
+    optional uint32 blocked_thread_tid = 21;
+
+    // Binder context
+    optional int64 binder_reply_ts = 17;
+    optional uint32 binder_reply_tid = 18;
+  }
+
+  message ThreadStateBreakdown {
+    optional string thread_state = 1;
+    optional int64 thread_state_dur = 2;
+    optional int64 thread_state_count = 3;
+  }
+
+  message BlockedFunctionBreakdown {
+    optional string blocked_function = 1;
+    optional int64 blocked_function_dur = 2;
+    optional int64 blocked_function_count = 3;
+  }
+
+  repeated Node node = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/multiuser_metric.proto b/src/libtracing/protos/perfetto/metrics/android/multiuser_metric.proto
new file mode 100644
index 000000000..068579101
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/multiuser_metric.proto
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Metrics for Multiuser events, such as switching users.
+message AndroidMultiuserMetric {
+
+  // Holds the data for a Multiuser event.
+  message EventData {
+    // Duration of the event (in milliseconds).
+    optional int32 duration_ms = 1;
+
+    // CPU usage of each process during the event.
+    message CpuUsage {
+      // The userId of the process (e.g. 0 or 10).
+      optional int32 user_id = 1;
+      // The name of the process.
+      optional string process_name = 2;
+      // The number of CPU cycles (in megacycles) spent by that process during the event.
+      optional int32 cpu_mcycles = 3;
+      // The ratio of this process's cycles to the total for all processes, expressed as a percentage.
+      optional float cpu_percentage = 4;
+      // General identifier for this usage source: determined from the process name, user, etc.
+      // Should be stable across multiple runs (i.e. does not print the user_id directly).
+      optional string identifier = 5;
+    }
+    repeated CpuUsage cpu_usage = 2;
+  }
+
+  // Metrics for a user switch.
+  optional EventData user_switch = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/network_metric.proto b/src/libtracing/protos/perfetto/metrics/android/network_metric.proto
new file mode 100644
index 000000000..5f10d1263
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/network_metric.proto
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidNetworkMetric {
+  message PacketStatistic {
+    // Packet count.
+    optional int64 packets = 1;
+
+    // Packet Bytes.
+    optional int64 bytes = 2;
+
+    // Timestamp when first packet received or transmitted.
+    optional int64 first_packet_timestamp_ns = 3;
+
+    // Timestamp when last packet received or transmitted.
+    optional int64 last_packet_timestamp_ns = 4;
+
+    // Interval between first & last packet. The minimum interval is 10ms.
+    optional int64 interval_ns = 5;
+
+    // Data Speed.
+    optional double data_rate_kbps = 6;
+  }
+
+  message CorePacketStatistic {
+    optional uint32 id = 1;
+    optional PacketStatistic packet_statistic = 2;
+  }
+
+  message Rx {
+    // Total packets statistic.
+    optional PacketStatistic total = 1;
+
+    // Per core packets statistic.
+    repeated CorePacketStatistic core = 2;
+
+    // GRO aggregation ratio.
+    optional string gro_aggregation_ratio = 3;
+  }
+
+  message Tx {
+    // Total packets statistic.
+    optional PacketStatistic total = 1;
+
+    // Per core packets statistic.
+    repeated CorePacketStatistic core = 2;
+  }
+
+  message NetDevice {
+    // Network device name.
+    optional string name = 1;
+
+    // Ingress traffic statistic.
+    optional Rx rx = 2;
+
+    // Egress traffic statistic
+    optional Tx tx = 3;
+  }
+
+  message NetRxActionStatistic {
+    // SoftIrq NET_RX action count.
+    optional int64 count = 1;
+
+    // SoftIrq NET_RX action was running in millisecond.
+    optional double runtime_ms = 2;
+
+    // SoftIrq NET_RX action average running time.
+    optional double avg_runtime_ms = 3;
+
+    // CPU megacycles (i.e. cycles divided by 1e6).
+    optional int64 mcycles = 4;
+
+    // Average weighted CPU frequency by the time the NET_RX Action
+    // running at each frequency.
+    optional int64 avg_freq_khz = 5;
+  }
+
+  message NetTxActionStatistic {
+    // SoftIrq NET_TX action count.
+    optional int64 count = 1;
+
+    // SoftIrq NET_TX action was running in millisecond.
+    optional double runtime_ms = 2;
+
+    // SoftIrq NET_TX action average running time.
+    optional double avg_runtime_ms = 3;
+
+    // CPU megacycles (i.e. cycles divided by 1e6).
+    optional int64 mcycles = 4;
+
+    // Average weighted CPU frequency by the time the NET_TX Action
+    // running at each frequency.
+    optional int64 avg_freq_khz = 5;
+  }
+
+  message IpiActionStatistic {
+    // SoftIrq IPI action count.
+    optional int64 count = 1;
+
+    // SoftIrq IPI action was running in millisecond.
+    optional double runtime_ms = 2;
+
+    // SoftIrq IPI action average running time.
+    optional double avg_runtime_ms = 3;
+  }
+
+  message CoreNetRxActionStatistic {
+    optional uint32 id = 1;
+    optional NetRxActionStatistic net_rx_action_statistic = 2;
+  }
+
+  message CoreNetTxActionStatistic {
+    optional uint32 id = 1;
+    optional NetTxActionStatistic net_tx_action_statistic = 2;
+  }
+
+  message NetRxAction {
+    // Total NET_RX action statistics.
+    optional NetRxActionStatistic total = 1;
+
+    // Per core NET_RX action statistics.
+    repeated CoreNetRxActionStatistic core = 2;
+
+    // The average packet time moves through the kernel stack.
+    optional double avg_interstack_latency_ms = 3;
+  }
+
+  message NetTxAction {
+    // Total NET_TX action statistics.
+    optional NetTxActionStatistic total = 1;
+
+    // Per core NET_TX action statistics.
+    repeated CoreNetTxActionStatistic core = 2;
+  }
+
+  message IpiAction {
+    // Total IPI action statistics.
+    optional IpiActionStatistic total = 1;
+  }
+
+  // Network device metrics.
+  repeated NetDevice net_devices = 1;
+
+  // SoftIrq NET_RX action metrics.
+  optional NetRxAction net_rx_action = 2;
+
+  // Packet retransmission rate.
+  optional double retransmission_rate = 3;
+
+  // Kfree Skb rate (i.e. kfree_skb count divided by the packet count from all
+  // net devices).
+  optional double kfree_skb_rate = 4;
+
+  // SoftIrq NET_TX action metrics.
+  optional NetTxAction net_tx_action = 5;
+
+  // SoftIrq IPI action metrics.
+  optional IpiAction ipi_action = 6;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/other_traces.proto b/src/libtracing/protos/perfetto/metrics/android/other_traces.proto
new file mode 100644
index 000000000..1795ee243
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/other_traces.proto
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidOtherTracesMetric {
+  // Uuids of other traces being finalized while the current trace was being
+  // recorded.
+  repeated string finalized_traces_uuid = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/package_list.proto b/src/libtracing/protos/perfetto/metrics/android/package_list.proto
new file mode 100644
index 000000000..6701979eb
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/package_list.proto
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidPackageList {
+  message Package {
+    optional string package_name = 1;
+    optional int64 uid = 2;
+    optional int64 version_code = 3;
+  }
+
+  repeated Package packages = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/powrails_metric.proto b/src/libtracing/protos/perfetto/metrics/android/powrails_metric.proto
new file mode 100644
index 000000000..754a0efd4
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/powrails_metric.proto
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidPowerRails {
+  // Energy data per Power Rail at given ts.
+  message EnergyData {
+    // Time since device boot(CLOCK_BOTTOMTIME) in milli-seconds.
+    optional int64 timestamp_ms = 1;
+    // Accumulated energy since device boot in microwatt-seconds(uws).
+    optional double energy_uws = 2;
+  }
+
+  message PowerRails {
+    // Name of the rail.
+    optional string name = 1;
+    // Energy data for given rail and for all samples in the trace.
+    repeated EnergyData energy_data = 2;
+    // The average used power between the first and the last sampled
+    // energy data in miliwatt (mw)
+    optional double avg_used_power_mw = 3;
+  }
+
+  // Energy data per Power Rail.
+  repeated PowerRails power_rails = 1;
+
+  // The average used power between the first and last sampled rail across all
+  // the rails in milliwatts (mw).
+  optional double avg_total_used_power_mw = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/process_metadata.proto b/src/libtracing/protos/perfetto/metrics/android/process_metadata.proto
new file mode 100644
index 000000000..fa766bea9
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/process_metadata.proto
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidProcessMetadata {
+  // Process name. Usually, cmdline or <package_name>(:<custom_name>)?.
+  optional string name = 1;
+
+  // User id under which this process runs.
+  optional int64 uid = 2;
+
+  // Package metadata from Android package list.
+  message Package {
+    optional string package_name = 1;
+    optional int64 apk_version_code = 2;
+    optional bool debuggable = 3;
+  }
+
+  // Package that this process belongs to.
+  //
+  // If this process shares its uid (see `packages_for_uid` field), the package
+  // is determined based on the process name and package name. If there is no
+  // match this field is empty.
+  optional Package package = 7;
+
+  // All packages using this uid.
+  //
+  // Shared uid documentation:
+  // https://developer.android.com/guide/topics/manifest/manifest-element#uid
+  repeated Package packages_for_uid = 8;
+
+  // Pid of the process name.
+  optional int64 pid = 9;
+
+  reserved 3, 4, 5, 6;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/profiler_smaps.proto b/src/libtracing/protos/perfetto/metrics/android/profiler_smaps.proto
new file mode 100644
index 000000000..bfb1416e7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/profiler_smaps.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+message ProfilerSmaps {
+  message Mapping {
+    optional string path = 1;
+    optional int32 size_kb = 2;
+    optional int32 private_dirty_kb = 3;
+    optional int32 swap_kb = 4;
+  }
+
+  message Instance {
+    optional AndroidProcessMetadata process = 1;
+    repeated Mapping mappings = 2;
+  }
+
+  repeated Instance instance = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/rt_runtime_metric.proto b/src/libtracing/protos/perfetto/metrics/android/rt_runtime_metric.proto
new file mode 100644
index 000000000..7caf5f5ad
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/rt_runtime_metric.proto
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// measure max RT runtime and RT tasks running over 5ms.
+message AndroidRtRuntimeMetric {
+  message RtSlice {
+    // thread name
+    optional string tname = 1;
+    // timestamp
+    optional int64 ts = 2;
+    // runtime of RT task
+    optional int64 dur = 3;
+  }
+
+  // max runtime of RT tasks
+  optional int64 max_runtime = 1;
+  // how many RT tasks are over 5ms.
+  optional int64 over_5ms_count = 2;
+  // information for top 10 RT tasks
+  repeated RtSlice longest_rt_slices = 3;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/simpleperf.proto b/src/libtracing/protos/perfetto/metrics/android/simpleperf.proto
new file mode 100644
index 000000000..39e6946a3
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/simpleperf.proto
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Metric that stores information related to atrace events generated by
+// simpleperf tool
+message AndroidSimpleperfMetric {
+  optional double urgent_ratio = 1;
+
+  message PerfEventMetric {
+    // Simpleperf event name
+    optional string name = 1;
+
+    message Thread {
+      // Thread ID
+      optional int32 tid = 1;
+      // Thread name
+      optional string name = 2;
+      // CPU ID
+      optional int32 cpu = 3;
+      // Total counter value
+      optional double total = 4;
+    }
+
+    message Process {
+      // Process ID
+      optional int32 pid = 1;
+      // Process name
+      optional string name = 2;
+      // Metrics for each thread in this process.
+      repeated Thread threads = 3;
+      // Total counter value over all threads in this process
+      optional double total = 4;
+    }
+
+    // Metrics for each process
+    repeated Process processes = 2;
+
+    // Total counter value over all processes and threads
+    optional double total = 3;
+  }
+
+  repeated PerfEventMetric events = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/startup_metric.proto b/src/libtracing/protos/perfetto/metrics/android/startup_metric.proto
new file mode 100644
index 000000000..e2ca850bd
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/startup_metric.proto
@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+// Android app startup metrics.
+message AndroidStartupMetric {
+  // A simplified view of the task state durations for a thread
+  // and a span of time.
+  message TaskStateBreakdown {
+    optional int64 running_dur_ns = 1;
+    optional int64 runnable_dur_ns = 2;
+    optional int64 uninterruptible_sleep_dur_ns = 3;
+    optional int64 interruptible_sleep_dur_ns = 4;
+    optional int64 uninterruptible_io_sleep_dur_ns = 5;
+    optional int64 uninterruptible_non_io_sleep_dur_ns = 6;
+  }
+
+  message McyclesByCoreType {
+    optional int64 little = 1;
+    optional int64 big = 2;
+    optional int64 bigger = 3;
+    optional int64 unknown = 4;
+  }
+
+  message Slice {
+    optional int64 dur_ns = 1;
+    optional double dur_ms = 2;
+  }
+
+  // Timing information spanning the intent received by the
+  // activity manager to the first frame drawn.
+  // Next id: 36.
+  message ToFirstFrame {
+    // The duration between the intent received and first frame.
+    optional int64 dur_ns = 1;
+    optional double dur_ms = 17;
+
+    // Breakdown of time to first frame by task state for the main thread of
+    // the process starting up.
+    optional TaskStateBreakdown main_thread_by_task_state = 2;
+
+    // The mcycles taken by this startup across all CPUs (broken down by core
+    // type).
+    optional McyclesByCoreType mcycles_by_core_type = 26;
+
+    // In this timespan, how many processes (apart from the main activity) were
+    // spawned.
+    optional uint32 other_processes_spawned_count = 3;
+
+    // Total time spent in activity manager between the initial intent
+    // and the end of the activity starter.
+    optional Slice time_activity_manager = 4;
+
+    // The following slices follow the typical steps post-fork.
+    optional Slice time_activity_thread_main = 5;
+    optional Slice time_bind_application = 6;
+    optional Slice time_activity_start = 7;
+    optional Slice time_activity_resume = 8;
+    optional Slice time_activity_restart = 21;
+    optional Slice time_choreographer = 9;
+    optional Slice time_inflate = 22;
+    optional Slice time_get_resources = 23;
+
+    // If we are starting a new process, record the duration from the
+    // intent being received to the time we call the zygote.
+    optional Slice time_before_start_process = 10;
+
+    // The actual duration of the process start (based on the zygote slice).
+    optional Slice time_during_start_process = 11;
+
+    // The duration from launch to first running state thread of startup process.
+    optional Slice time_to_running_state = 35;
+
+    optional Slice to_post_fork = 18;
+    optional Slice to_activity_thread_main = 19;
+    optional Slice to_bind_application = 20;
+
+    optional Slice time_post_fork = 16;
+
+    // The total time spent on opening dex files.
+    optional Slice time_dex_open = 24;
+    // Total time spent verifying classes during app startup.
+    optional Slice time_verify_class = 25;
+
+    // Number of methods that were compiled by JIT during app startup.
+    optional uint32 jit_compiled_methods = 27;
+
+    // Time spent running CPU on jit thread pool.
+    optional Slice time_jit_thread_pool_on_cpu = 28;
+
+    // Time spent on garbage collection.
+    optional Slice time_gc_total = 29;
+    optional Slice time_gc_on_cpu = 30;
+
+    // Time spent in lock contention on the main thread of the process being
+    // started up. This includes *all* types of lock contention not just monitor
+    // contention.
+    optional Slice time_lock_contention_thread_main = 31;
+
+    // Time spent in monitor lock contention on the main thread of the
+    // process being started up. This will be a subset of the time counted by
+    // |time_lock_contention_thread_main|.
+    optional Slice time_monitor_contention_thread_main = 32;
+
+    // Time spent in opening dex files on the main thread of the process
+    // being started up.
+    optional Slice time_dex_open_thread_main = 33;
+
+    // Time spent in dlopening .so files on the main thread of the process
+    // being started up.
+    optional Slice time_dlopen_thread_main = 34;
+
+    // Removed: was other_process_to_activity_cpu_ratio.
+    reserved 12;
+
+    // Removed: was uint32 versions of to_post_fork, to_activity_thread_main and
+    // to_bind_application.
+    reserved 13, 14, 15;
+  }
+
+  // Metrics about startup which were developed by looking at experiments using
+  // high-speed cameras (HSC).
+  message HscMetrics {
+    // The duration of the full "startup" as defined by HSC tests.
+    optional Slice full_startup = 1;
+  }
+
+  message Activity {
+    optional string name = 1;
+    optional string method = 2;
+    optional int64 ts_method_start = 4;
+
+    // Field 3 contained Slice with a sum of durations for matching slices.
+    reserved 3;
+  }
+
+  message BinderTransaction {
+    optional Slice duration = 1;
+    optional string thread = 2;
+    optional string destination_thread = 3;
+    optional string destination_process = 4;
+    // From
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/perfetto/protos/perfetto/trace/ftrace/binder.proto;l=15;drc=7b6a788162a30802f4c9d8d7a30a54e25edd30f1
+    optional string flags = 5;
+    // From
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/perfetto/protos/perfetto/trace/ftrace/binder.proto;l=14;drc=7b6a788162a30802f4c9d8d7a30a54e25edd30f1
+    optional string code = 6;
+    // From
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/perfetto/protos/perfetto/trace/ftrace/binder.proto;l=37;drc=7b6a788162a30802f4c9d8d7a30a54e25edd30f1
+    optional int64 data_size = 7;
+  }
+
+  // Metrics with information about the status of odex files and the outcome
+  // of the loading process.
+  // Multiple files might be loaded for a single startup. Platform might also
+  // decide to discard an odex file and instead load a fallback, for example
+  // in case the OS or apk were updated.
+  message OptimizationStatus {
+    optional string odex_status = 1;
+    optional string compilation_filter = 2;
+    optional string compilation_reason = 3;
+    optional string location = 4;
+    optional string summary = 5;
+  }
+
+  // Contains the name and duration of class verification occurred during
+  // the startup.
+  message VerifyClass {
+    optional string name = 1;
+    optional int64 dur_ns = 2;
+  }
+
+  // Contains timestamps of important events which occurred during the
+  // startup.
+  message EventTimestamps {
+    optional int64 intent_received = 1;
+    optional int64 first_frame = 2;
+  }
+
+  // Contains information about the state of a system during the app startup.
+  // Useful to put the startup in context.
+  message SystemState {
+    // Whether the dex2oat64 process was running concurrent to the startup.
+    // Deprecated as of 10/2022.
+    optional bool dex2oat_running = 1 [deprecated=true];
+
+    // Whether the installd process was running concurrent to the startup.
+    // Deprecated as of 10/2022.
+    optional bool installd_running = 2 [deprecated=true];
+
+    // The number of broadcasts dispatched by the system during the app
+    // launch.
+    optional int64 broadcast_dispatched_count = 3;
+
+    // The number of broadcasts received by an app or the system during the
+    // app launch. Note that multiple packages can be subscribed to the same
+    // broadcast so a single dsipatch can cause multiple packages to receive
+    // and process a broadcast.
+    optional int64 broadcast_received_count = 4;
+
+    // The most active (i.e. consuming the most mcycles) processes during the
+    // app launch excluding the process(es) being launched.
+    // Note: the exact number of returned is an implementation detail and
+    // will likely change over time.
+    repeated string most_active_non_launch_processes = 5;
+
+    // Duration the installd process was running concurrent to the startup.
+    optional int64 installd_dur_ns = 6;
+    // Duration the dex2oat64 process was running concurrent to the startup.
+    optional int64 dex2oat_dur_ns = 7;
+  }
+
+  // Contains detailed information for slow startup causes.
+  message SlowStartReasonDetailed {
+    optional string reason = 1;
+    optional string details = 2;
+  }
+
+  // Next id: 22
+  message Startup {
+    // Random id uniquely identifying an app startup in this trace.
+    optional uint32 startup_id = 1;
+
+    // Startup type (cold / warm / hot)
+    optional string startup_type = 16;
+
+    // Name of the package launched
+    optional string package_name = 2;
+
+    // Name of the process launched
+    optional string process_name = 3;
+
+    // Details about the activities launched
+    repeated Activity activities = 11;
+
+    // Details about slow binder transactions during the startup. The definition
+    // of a slow transaction is an implementation detail.
+    repeated BinderTransaction long_binder_transactions = 14;
+
+    // Did we ask the zygote for a new process
+    optional bool zygote_new_process = 4;
+
+    // Number of processes hosting the activity involved in the launch.
+    // This will usually be 1. If it is 0, it is indicative of a data / process
+    // error. If > 1, the process died during startup and the system respawned
+    // it.
+    optional uint32 activity_hosting_process_count = 6;
+
+    // Contains timestamps of important events which happened during
+    // the startup.
+    optional EventTimestamps event_timestamps = 13;
+
+    // Timing information spanning the intent received by the
+    // activity manager to the first frame drawn.
+    optional ToFirstFrame to_first_frame = 5;
+
+    // Details about the process (uid, version, etc)
+    optional AndroidProcessMetadata process = 7;
+
+    // Metrics about startup which were developed by looking at experiments
+    // using high-speed cameras (HSC).
+    optional HscMetrics hsc = 8;
+
+    // The time taken in the startup from intent received to the start time
+    // of the reportFullyDrawn slice. This should be longer than the time to
+    // first frame as the application decides this after it starts rendering.
+    optional Slice report_fully_drawn = 9;
+
+    // Contains information about the status of odex files.
+    repeated OptimizationStatus optimization_status = 12;
+
+    // Contains information about the class verification.
+    repeated VerifyClass verify_class = 19;
+
+    // Contains the dlopen file names.
+    repeated string dlopen_file = 20;
+
+    // Package name of startups running concurrent to the launch.
+    repeated string startup_concurrent_to_launch = 18;
+
+    // Contains information about the state of the rest of the system during the
+    // startup. This is useful for getting context about why a startup might
+    // be slow beyond just what the app is doing.
+    optional SystemState system_state = 15;
+
+    // A list of identified potential causes for slow startup.
+    // Optional.
+    repeated string slow_start_reason = 17;
+
+    // Same as slow_start_reason, but with more detailed information.
+    repeated SlowStartReasonDetailed slow_start_reason_detailed = 21;
+
+    reserved 10;
+  }
+
+  repeated Startup startup = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/surfaceflinger.proto b/src/libtracing/protos/perfetto/metrics/android/surfaceflinger.proto
new file mode 100644
index 000000000..1f81827e8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/surfaceflinger.proto
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message AndroidSurfaceflingerMetric {
+  // Counts the number of missed frames in the trace.
+  optional uint32 missed_frames = 1;
+
+  // Counts the number of missed HWC frames in the trace.
+  optional uint32 missed_hwc_frames = 2;
+
+  // Counts the number of missed GPU frames in the trace.
+  optional uint32 missed_gpu_frames = 3;
+
+  // Calculate the number of missed frames divided by
+  // total frames
+  optional double missed_frame_rate = 4;
+
+  // Calculate the number of missed HWC frames divided by
+  // total HWC frames
+  optional double missed_hwc_frame_rate = 5;
+
+  // Calculate the number of missed GPU frames divided by
+  // total GPU frames
+  optional double missed_gpu_frame_rate = 6;
+
+  // Count the number of times SurfaceFlinger needs to invoke GPU
+  // for rendering some layers
+  optional uint32 gpu_invocations = 7;
+
+  // Calculate the average duration of GPU request by SurfaceFlinger
+  // since it enters the FenceMonitor's queue until it gets completed
+  optional double avg_gpu_waiting_dur_ms = 8;
+
+  // Calculate the total duration when there is at least one GPU request
+  // by SurfaceFlinger that is still waiting for GPU to complete the
+  // request.
+  // This also equals to the total duration of
+  // "waiting for GPU completion <fence_num>" in SurfaceFlinger.
+  optional double total_non_empty_gpu_waiting_dur_ms = 9;
+
+  message MetricsPerDisplay {
+    // Display ID in SF
+    optional string display_id = 1;
+
+    // Counts the number of missed frames in the trace.
+    optional uint32 missed_frames = 2;
+
+    // Counts the number of missed HWC frames in the trace.
+    optional uint32 missed_hwc_frames = 3;
+
+    // Counts the number of missed GPU frames in the trace.
+    optional uint32 missed_gpu_frames = 4;
+
+    // Calculate the number of missed frames divided by
+    // total frames
+    optional double missed_frame_rate = 5;
+
+    // Calculate the number of missed HWC frames divided by
+    // total HWC frames
+    optional double missed_hwc_frame_rate = 6;
+
+    // Calculate the number of missed GPU frames divided by
+    // total GPU frames
+    optional double missed_gpu_frame_rate = 7;
+  }
+
+  repeated MetricsPerDisplay metrics_per_display = 10;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.proto b/src/libtracing/protos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.proto
new file mode 100644
index 000000000..d7be83dec
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.proto
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+import "protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto";
+
+// System UI Notifications ShadeListBuilder.buildList slices.
+// Shows count, average duration, and max duration for each.
+message SysuiNotifShadeListBuilderMetric {
+  optional SysUiSlicePerformanceStatisticalData all_slices_performance = 1;
+  optional SysUiSlicePerformanceStatisticalData slices_with_inflation_performance = 2;
+  optional SysUiSlicePerformanceStatisticalData slices_with_modification_performance = 3;
+
+  // Data row for a single slice
+  message SliceDuration {
+    // Name of the Slice
+    optional string name = 1;
+
+    // Duration in ms
+    optional int64 dur_ms = 2;
+
+    // Duration in ns
+    optional int64 dur_ns = 3;
+  }
+  repeated SliceDuration slice = 4;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto b/src/libtracing/protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto
new file mode 100644
index 000000000..4297b11a8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Statistical performance data row for a set of slices
+message SysUiSlicePerformanceStatisticalData {
+  // Name of the Slice
+  optional string name = 1;
+  // Number of times it happened within the CUJ
+  optional int64 cnt = 2;
+  // Average duration within the CUJ
+  optional int64 avg_dur_ms = 3;
+  // Maximal duration within the CUJ
+  optional int64 max_dur_ms = 4;
+  // Average duration within the CUJ in nanoseconds
+  optional int64 avg_dur_ns = 6;
+  // Maximal duration within the CUJ in nanoseconds
+  optional int64 max_dur_ns = 7;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.proto b/src/libtracing/protos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.proto
new file mode 100644
index 000000000..03f305dc7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.proto
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto";
+
+// System UI Notifications ShadeListBuilder.buildList slices.
+// Shows count, average duration, and max duration for each.
+message SysuiUpdateNotifOnUiModeChangedMetric {
+  optional SysUiSlicePerformanceStatisticalData all_slices_performance = 1;
+  // Data row for a single slice
+  message SliceDuration {
+    // Name of the Slice
+    optional string name = 1;
+
+    // Duration in ms
+    optional int64 dur_ms = 2;
+
+    // Duration in ns
+    optional int64 dur_ns = 3;
+  }
+  repeated SliceDuration slice = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/task_names.proto b/src/libtracing/protos/perfetto/metrics/android/task_names.proto
new file mode 100644
index 000000000..f261ce6d9
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/task_names.proto
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+package perfetto.protos;
+
+message AndroidTaskNames {
+  message Process {
+    optional int64 pid = 1;
+
+    // Process name.
+    optional string process_name = 2;
+
+    // Names of all threads for this process.
+    repeated string thread_name = 3;
+
+    // User id under which this process runs.
+    optional int64 uid = 4;
+
+    // Packages matching the process uid.
+    repeated string uid_package_name = 5;
+
+    // Removed, was short_lived_tasks.
+    reserved 6;
+
+    // Removed, was long_lived_tasks.
+    reserved 7;
+  }
+
+  repeated Process process = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/thread_time_in_state_metric.proto b/src/libtracing/protos/perfetto/metrics/android/thread_time_in_state_metric.proto
new file mode 100644
index 000000000..f664d293a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/thread_time_in_state_metric.proto
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/process_metadata.proto";
+
+message AndroidThreadTimeInStateMetric {
+  message MetricsByCoreType {
+    optional int32 time_in_state_cpu = 5;
+    optional string core_type = 1;
+
+    optional int64 runtime_ms = 2;
+    // CPU megacycles (i.e. cycles divided by 1e6).
+    optional int64 mcycles = 3;
+    // Power cost as predicted by the power profile.
+    optional double power_profile_mah = 4;
+  }
+
+  message Thread {
+    optional string name = 1;
+    optional bool main_thread = 3;
+    repeated MetricsByCoreType metrics_by_core_type = 2;
+  }
+
+  message Process {
+    optional AndroidProcessMetadata metadata = 1;
+    repeated MetricsByCoreType metrics_by_core_type = 2;
+    repeated Thread threads = 3;
+  }
+
+  repeated Process processes = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/trace_quality.proto b/src/libtracing/protos/perfetto/metrics/android/trace_quality.proto
new file mode 100644
index 000000000..b736e280f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/trace_quality.proto
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Metric which checks the data in the trace processor tables is "reasonble"
+// (i.e. we would expect to see it from a real device).
+//
+// This is useful to reject traces which may be valid (so no stat would be
+// recorded) but a human would find the trace nonsensical.
+message AndroidTraceQualityMetric {
+  message Failure {
+    // The name of the failed check.
+    optional string name = 1;
+  }
+  repeated Failure failures = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/android/unsymbolized_frames.proto b/src/libtracing/protos/perfetto/metrics/android/unsymbolized_frames.proto
new file mode 100644
index 000000000..afd942174
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/android/unsymbolized_frames.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message UnsymbolizedFrames {
+  message Frame {
+    optional string module = 1;
+    optional string build_id = 2;
+    optional int64 address = 3;
+
+    // In some cases (Chrome/Webview) the ID that should be used to query
+    // symbols in Google's internal tera-scale symbolization service is !=
+    // `build_id` and requires some mangling.
+    // This field is == 'build_id` for non-chromium cases, and is the breakpad
+    // module ID (with lowercase hex digics) for chromium cases.
+    optional string google_lookup_id = 4;
+  }
+
+  repeated Frame frames = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/all_chrome_metrics.proto b/src/libtracing/protos/perfetto/metrics/chrome/all_chrome_metrics.proto
new file mode 100644
index 000000000..596bc7fca
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/all_chrome_metrics.proto
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/metrics.proto";
+import "protos/perfetto/metrics/chrome/args_class_names.proto";
+import "protos/perfetto/metrics/chrome/dropped_frames.proto";
+import "protos/perfetto/metrics/chrome/frame_times.proto";
+import "protos/perfetto/metrics/chrome/histogram_hashes.proto";
+import "protos/perfetto/metrics/chrome/long_latency.proto";
+import "protos/perfetto/metrics/chrome/media_metric.proto";
+import "protos/perfetto/metrics/chrome/performance_mark_hashes.proto";
+import "protos/perfetto/metrics/chrome/reported_by_page.proto";
+import "protos/perfetto/metrics/chrome/slice_names.proto";
+import "protos/perfetto/metrics/chrome/scroll_jank.proto";
+import "protos/perfetto/metrics/chrome/scroll_jank_v3.proto";
+import "protos/perfetto/metrics/chrome/test_chrome_metric.proto";
+import "protos/perfetto/metrics/chrome/touch_jank.proto";
+import "protos/perfetto/metrics/chrome/user_event_hashes.proto";
+import "protos/perfetto/metrics/chrome/unsymbolized_args.proto";
+
+// TODO(lalitm): rename metrics below to include a "chrome_" prefix.
+extend TraceMetrics {
+  optional TestChromeMetric test_chrome_metric = 1001;
+  optional FrameTimes frame_times = 1002;
+  optional ReportedByPage reported_by_page = 1003;
+  optional ScrollJank scroll_jank = 1004;
+  // reserved 1005, was BlinkGcMetric, removed in aosp/2617418
+  optional MediaMetric media_metric = 1006;
+  optional TouchJank touch_jank = 1007;
+  optional ChromeDroppedFrames chrome_dropped_frames = 1008;
+  optional ChromeLongLatency chrome_long_latency = 1009;
+  optional ChromeHistogramHashes chrome_histogram_hashes = 1010;
+  optional ChromeUserEventHashes chrome_user_event_hashes = 1011;
+  optional ChromePerformanceMarkHashes chrome_performance_mark_hashes = 1012;
+  optional ChromeSliceNames chrome_slice_names = 1013;
+  optional ChromeUnsymbolizedArgs chrome_unsymbolized_args = 1014;
+  optional ChromeArgsClassNames chrome_args_class_names = 1015;
+  optional ChromeScrollJankV3 chrome_scroll_jank_v3 = 1017;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/args_class_names.proto b/src/libtracing/protos/perfetto/metrics/chrome/args_class_names.proto
new file mode 100644
index 000000000..daa0e67c4
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/args_class_names.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The list of class names from the "args" table per |package_name| &
+// |version_code|.
+message ChromeArgsClassNames {
+  message ChromeArgsClassNamesPerVersion {
+    optional string package_name = 1;
+    optional int64 version_code = 2;
+    repeated string class_name = 3;
+  }
+
+  repeated ChromeArgsClassNamesPerVersion class_names_per_version = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/dropped_frames.proto b/src/libtracing/protos/perfetto/metrics/chrome/dropped_frames.proto
new file mode 100644
index 000000000..2203ca51c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/dropped_frames.proto
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message ChromeDroppedFrames {
+  message DroppedFrame {
+    optional int64 ts = 1;
+    optional string process_name = 2;
+    optional int64 pid = 3;
+  }
+
+  repeated DroppedFrame dropped_frame = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/frame_times.proto b/src/libtracing/protos/perfetto/metrics/chrome/frame_times.proto
new file mode 100644
index 000000000..5206a1c7e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/frame_times.proto
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/custom_options.proto";
+
+message FrameTimes {
+  repeated double frame_time = 1 [(unit) = "ms_smallerIsBetter"];
+  repeated double exp_frame_time = 2 [(unit) = "ms_smallerIsBetter"];
+  optional double avg_surface_fps = 3 [(unit) = "unitless_biggerIsBetter"];
+  optional double exp_avg_surface_fps = 4 [(unit) = "unitless_biggerIsBetter"];
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/histogram_hashes.proto b/src/libtracing/protos/perfetto/metrics/chrome/histogram_hashes.proto
new file mode 100644
index 000000000..8f7323e5f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/histogram_hashes.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The list of Chrome Histogram hashes in trace track events.
+// Use cases include translating histogram hashes to histogram
+// names by getting this list, and prepending a translation table to the trace.
+message ChromeHistogramHashes {
+  repeated int64 hash = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/long_latency.proto b/src/libtracing/protos/perfetto/metrics/chrome/long_latency.proto
new file mode 100644
index 000000000..c60649db1
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/long_latency.proto
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Information of a frame associated with long latency input events.
+// The latency info is extracted from EventLatency slices.
+message ChromeLongLatency {
+  message LongLatency {
+    // The ending timestamp of the input event, i.e. the presentation time of
+    // the frame that contains updates triggered by the input event.
+    optional int64 ts = 1;
+
+    // The type of the input event as reported in the EventLatency slice,
+    // e.g. 'GestureScrollUpdate'.
+    optional string event_type = 2;
+
+    // The name and pid of the process where the EventLatency slice
+    // originates from.
+    optional string process_name = 3;
+    optional int64 pid = 4;
+  }
+
+  repeated LongLatency long_latency = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/media_metric.proto b/src/libtracing/protos/perfetto/metrics/chrome/media_metric.proto
new file mode 100644
index 000000000..e3d9baff4
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/media_metric.proto
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/custom_options.proto";
+
+// Ported from catapult's media_metric.html.
+message MediaMetric {
+  repeated double time_to_video_play = 1 [(unit) = "ms_smallerIsBetter"];
+  repeated double time_to_audio_play = 2 [(unit) = "ms_smallerIsBetter"];
+  repeated int64 dropped_frame_count = 3 [(unit) = "count_smallerIsBetter"];
+  repeated double buffering_time = 4 [(unit) = "ms_smallerIsBetter"];
+  repeated double roughness = 5 [(unit) = "count_smallerIsBetter"];
+  repeated double freezing = 6 [(unit) = "ms_smallerIsBetter"];
+
+  // These have multiple dynamic histogram names in the TBMv2 version. Because
+  // TBMv3 doesn't support dynamic names, we report one value per seek into each
+  // of these two combined histograms.
+  repeated double seek_time = 8 [(unit) = "ms_smallerIsBetter"];
+  repeated double pipeline_seek_time = 9 [(unit) = "ms_smallerIsBetter"];
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/performance_mark_hashes.proto b/src/libtracing/protos/perfetto/metrics/chrome/performance_mark_hashes.proto
new file mode 100644
index 000000000..d3ae5dcaa
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/performance_mark_hashes.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The list of Chrome performance mark hashes in trace track events.
+// Use cases include translating performance mark hashes to site and mark
+// names by getting this list, and prepending a translation table to the trace.
+message ChromePerformanceMarkHashes {
+  repeated int64 site_hash = 1;
+  repeated int64 mark_hash = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/reported_by_page.proto b/src/libtracing/protos/perfetto/metrics/chrome/reported_by_page.proto
new file mode 100644
index 000000000..c9870e9be
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/reported_by_page.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/custom_options.proto";
+
+message ReportedByPage {
+  // Time from navigation start to telemetry:reported_by_page:viewable.
+  repeated double time_to_viewable = 1 [(unit) = "ms_smallerIsBetter"];
+  // Time from navigation start to telemetry:reported_by_page:interactive.
+  repeated double time_to_interactive = 2 [(unit) = "ms_smallerIsBetter"];
+  // Time from telemetry:reported_by_page:benchmark_begin to
+  // telemetry:reported_by_page:benchmark_end.
+  repeated double benchmark_time = 3 [(unit) = "ms_smallerIsBetter"];
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/scroll_jank.proto b/src/libtracing/protos/perfetto/metrics/chrome/scroll_jank.proto
new file mode 100644
index 000000000..3fe397d5a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/scroll_jank.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/custom_options.proto";
+
+message ScrollJank {
+  // The percentage of time we consider janky of the total time spent scrolling
+  // during the trace. I.E. approximately equal to |scroll_jank_ms|/|scroll_ms|.
+  optional double scroll_jank_percentage = 1 [(unit) = "n%_smallerIsBetter"];
+  optional double scroll_ms = 2 [(unit) = "ms_biggerIsBetter"];
+  optional double scroll_processing_ms = 3 [(unit) = "ms_biggerIsBetter"];
+  optional double scroll_jank_processing_ms = 4 [(unit) = "ms_smallerIsBetter"];
+  optional int64 num_scroll_update_count = 5 [(unit) = "count_biggerIsBetter"];
+  optional int64 num_scroll_update_jank_count = 6
+      [(unit) = "count_smallerIsBetter"];
+  optional double scroll_jank_budget_ms = 7 [(unit) = "ms_smallerIsBetter"];
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/scroll_jank_v3.proto b/src/libtracing/protos/perfetto/metrics/chrome/scroll_jank_v3.proto
new file mode 100644
index 000000000..6f677a629
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/scroll_jank_v3.proto
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/custom_options.proto";
+
+message ChromeScrollJankV3 {
+  // Total count of unique frames in the trace.
+  optional int64 trace_num_frames = 1 [(unit) = "count_biggerIsBetter"];
+  // Number of frames in the trace that had missed vsyncs.
+  optional int64 trace_num_janky_frames = 2 [(unit) = "count_smallerIsBetter"];
+  // Computed as: `100 * trace_num_janky_frames /
+  // trace_num_frames`.
+  optional double trace_scroll_jank_percentage = 3
+      [(unit) = "n%_smallerIsBetter"];
+  // Vsync interval at the time of recording the trace.
+  optional double vsync_interval_ms = 4 [(unit) = "ms_biggerIsBetter"];
+  // Per-scroll metrics.
+  message Scroll {
+    // Total count of unique frames during this scroll.
+    optional int64 num_frames = 1 [(unit) = "count_biggerIsBetter"];
+    // Number of frames during this scroll that had missed vsyncs.
+    optional int64 num_janky_frames = 2 [(unit) = "count_smallerIsBetter"];
+    // Computed as: `100 * num_janky_frames / num_frames`.
+    optional double scroll_jank_percentage = 3 [(unit) = "n%_smallerIsBetter"];
+    // Maximum `delay_since_last_frame` for janky frames during this scroll
+    // (i.e. maximum `delay_since_last_frame` from the `scroll_jank_causes`
+    // repeated field below).
+    // This is measured in units of vsync interval. For example, a value of 2
+    // means the delay was 2x the vsync interval.
+    optional double max_delay_since_last_frame = 4
+        [(unit) = "unitless_smallerIsBetter"];
+    // The primary cause and sub-cause for scroll jank, one for each jank.
+    // There are exactly `num_janky_frames` items in this field.
+    message ScrollJankCause {
+      // May be empty, if a cause is not available.
+      optional string cause = 1;
+      // May be empty, if a sub-cause is not available.
+      optional string sub_cause = 2;
+      // Number of vsyncs elapsed since the previous frame was presented: will
+      // be > 1.0 since this was a "janky" frame. For example, a value of 2
+      // means the delay was 2x the vsync interval.
+      optional double delay_since_last_frame = 3
+          [(unit) = "unitless_smallerIsBetter"];
+    }
+    repeated ScrollJankCause scroll_jank_causes = 5;
+  }
+  repeated Scroll scrolls = 5;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/slice_names.proto b/src/libtracing/protos/perfetto/metrics/chrome/slice_names.proto
new file mode 100644
index 000000000..c0a166556
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/slice_names.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The list of slice names in a trace.
+// Use cases include deobfuscating slice names by getting this list,
+// generating, and prepending a translation table to the trace.
+message ChromeSliceNames {
+  repeated int64 chrome_version_code = 1;
+  repeated string slice_name = 2;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/test_chrome_metric.proto b/src/libtracing/protos/perfetto/metrics/chrome/test_chrome_metric.proto
new file mode 100644
index 000000000..3ae32405f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/test_chrome_metric.proto
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/custom_options.proto";
+
+message TestChromeMetric {
+  optional int64 test_value = 1 [(unit) = "count_smallerIsBetter"];
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/touch_jank.proto b/src/libtracing/protos/perfetto/metrics/chrome/touch_jank.proto
new file mode 100644
index 000000000..20318b8c8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/touch_jank.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/custom_options.proto";
+
+message TouchJank {
+  // The percentage of time we consider janky of the total time spent performing
+  // touch gestures during the trace. I.E. approximately equal to
+  // |touch_jank_ms|/|touch_ms|.
+  optional double touch_jank_percentage = 1 [(unit) = "n%_smallerIsBetter"];
+  optional double touch_ms = 2 [(unit) = "ms_biggerIsBetter"];
+  optional double touch_processing_ms = 3 [(unit) = "ms_biggerIsBetter"];
+  optional double touch_jank_processing_ms = 4 [(unit) = "ms_smallerIsBetter"];
+  optional int64 num_touch_update_count = 5 [(unit) = "count_biggerIsBetter"];
+  optional int64 num_touch_update_jank_count = 6
+      [(unit) = "count_smallerIsBetter"];
+  optional double touch_jank_budget_ms = 7 [(unit) = "ms_smallerIsBetter"];
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/unsymbolized_args.proto b/src/libtracing/protos/perfetto/metrics/chrome/unsymbolized_args.proto
new file mode 100644
index 000000000..aa8f5c03f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/unsymbolized_args.proto
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This message is similar to perfetto.protos.UnsymbolizedFrames, but this is
+// for trace event arguments, not stack frames. Keeping them separate because
+// the protos may evolve independently.
+message ChromeUnsymbolizedArgs {
+  message Arg {
+    optional string module = 1;
+    optional string build_id = 2;
+    optional int64 address = 3;
+
+    // In some cases (Chrome/Webview) the ID that should be used to query
+    // symbols in Google's internal tera-scale symbolization service is !=
+    // `build_id` and requires some mangling.
+    // This field is == 'build_id` for non-chromium cases, and is the breakpad
+    // module ID (with lowercase hex digics) for chromium cases.
+    optional string google_lookup_id = 4;
+  }
+
+  repeated Arg args = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/chrome/user_event_hashes.proto b/src/libtracing/protos/perfetto/metrics/chrome/user_event_hashes.proto
new file mode 100644
index 000000000..e50e6bd3d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/chrome/user_event_hashes.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The list of Chrome user event hashes in trace track events.
+// Use cases include translating user event hashes to action
+// names by getting this list, and prepending a translation table to the trace.
+message ChromeUserEventHashes {
+  repeated int64 action_hash = 1;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/custom_options.proto b/src/libtracing/protos/perfetto/metrics/custom_options.proto
new file mode 100644
index 000000000..8f4bfbb92
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/custom_options.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "google/protobuf/descriptor.proto";
+
+// Field options you can define on a metric. These options are only exposed as
+// part of JSON export.
+extend google.protobuf.FieldOptions {
+  optional string unit = 50001;
+  optional string improvementDirection = 50002;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/metrics.proto b/src/libtracing/protos/perfetto/metrics/metrics.proto
new file mode 100644
index 000000000..83395ecb4
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/metrics.proto
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/android/ad_services_metric.proto";
+import "protos/perfetto/metrics/android/android_boot.proto";
+import "protos/perfetto/metrics/android/android_boot_unagg.proto";
+import "protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto";
+import "protos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.proto";
+import "protos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.proto";
+import "protos/perfetto/metrics/android/android_frame_timeline_metric.proto";
+import "protos/perfetto/metrics/android/anr_metric.proto";
+import "protos/perfetto/metrics/android/batt_metric.proto";
+import "protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto";
+import "protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto";
+import "protos/perfetto/metrics/android/android_blocking_calls_unagg.proto";
+import "protos/perfetto/metrics/android/codec_metrics.proto";
+import "protos/perfetto/metrics/android/cpu_metric.proto";
+import "protos/perfetto/metrics/android/camera_metric.proto";
+import "protos/perfetto/metrics/android/camera_unagg_metric.proto";
+import "protos/perfetto/metrics/android/display_metrics.proto";
+import "protos/perfetto/metrics/android/dma_heap_metric.proto";
+import "protos/perfetto/metrics/android/dvfs_metric.proto";
+import "protos/perfetto/metrics/android/fastrpc_metric.proto";
+import "protos/perfetto/metrics/android/g2d_metric.proto";
+import "protos/perfetto/metrics/android/gpu_metric.proto";
+import "protos/perfetto/metrics/android/hwcomposer.proto";
+import "protos/perfetto/metrics/android/hwui_metric.proto";
+import "protos/perfetto/metrics/android/io_metric.proto";
+import "protos/perfetto/metrics/android/io_unagg_metric.proto";
+import "protos/perfetto/metrics/android/ion_metric.proto";
+import "protos/perfetto/metrics/android/irq_runtime_metric.proto";
+import "protos/perfetto/metrics/android/jank_cuj_metric.proto";
+import "protos/perfetto/metrics/android/java_heap_histogram.proto";
+import "protos/perfetto/metrics/android/java_heap_stats.proto";
+import "protos/perfetto/metrics/android/lmk_metric.proto";
+import "protos/perfetto/metrics/android/lmk_reason_metric.proto";
+import "protos/perfetto/metrics/android/mem_metric.proto";
+import "protos/perfetto/metrics/android/mem_unagg_metric.proto";
+import "protos/perfetto/metrics/android/multiuser_metric.proto";
+import "protos/perfetto/metrics/android/network_metric.proto";
+import "protos/perfetto/metrics/android/other_traces.proto";
+import "protos/perfetto/metrics/android/package_list.proto";
+import "protos/perfetto/metrics/android/powrails_metric.proto";
+import "protos/perfetto/metrics/android/profiler_smaps.proto";
+import "protos/perfetto/metrics/android/rt_runtime_metric.proto";
+import "protos/perfetto/metrics/android/simpleperf.proto";
+import "protos/perfetto/metrics/android/startup_metric.proto";
+import "protos/perfetto/metrics/android/surfaceflinger.proto";
+import "protos/perfetto/metrics/android/task_names.proto";
+import "protos/perfetto/metrics/android/trace_quality.proto";
+import "protos/perfetto/metrics/android/android_trusty_workqueues.proto";
+import "protos/perfetto/metrics/android/unsymbolized_frames.proto";
+import "protos/perfetto/metrics/android/binder_metric.proto";
+import "protos/perfetto/metrics/android/monitor_contention_metric.proto";
+import "protos/perfetto/metrics/android/monitor_contention_agg_metric.proto";
+import "protos/perfetto/metrics/android/app_process_starts_metric.proto";
+
+// Trace processor metadata
+message TraceMetadata {
+  reserved 1;
+  optional int64 trace_duration_ns = 2;
+  optional string trace_uuid = 3;
+  optional string android_build_fingerprint = 4;
+  optional int64 statsd_triggering_subscription_id = 5;
+  optional int64 trace_size_bytes = 6;
+  repeated string trace_trigger = 7;
+  optional string unique_session_name = 8;
+  optional string trace_config_pbtxt = 9;
+  optional int64 sched_duration_ns = 10;
+  optional int64 tracing_started_ns = 11;
+}
+
+// Stats counters for the trace.
+// Defined in src/trace_processor/storage/stats.h
+message TraceAnalysisStats {
+  enum Severity {
+    SEVERITY_UNKNOWN = 0;
+    SEVERITY_INFO = 1;
+    SEVERITY_DATA_LOSS = 2;
+    SEVERITY_ERROR = 3;
+  }
+
+  enum Source {
+    SOURCE_UNKNOWN = 0;
+    SOURCE_TRACE = 1;
+    SOURCE_ANALYSIS = 2;
+  }
+
+  message Stat {
+    optional string name = 1;
+    optional uint32 idx = 2;
+    optional Severity severity = 3;
+    optional Source source = 4;
+
+    optional int64 count = 5;
+  }
+
+  repeated Stat stat = 1;
+}
+
+// Root message for all Perfetto-based metrics.
+//
+// Next id: 66
+message TraceMetrics {
+  reserved 4, 10, 13, 14, 16, 19;
+
+  // Battery counters metric on Android.
+  optional AndroidBatteryMetric android_batt = 5;
+
+  // CPU usage per trace, process and thread.
+  optional AndroidCpuMetric android_cpu = 6;
+
+  // Memory metrics on Android (owned by the Android Telemetry team).
+  optional AndroidMemoryMetric android_mem = 1;
+
+  // Memory metrics on Android in unaggregated form. (owned by the Android
+  // Telemetry team).
+  // Note: this generates a lot of data so should not be requested unless it
+  // is clear that this data is necessary.
+  optional AndroidMemoryUnaggregatedMetric android_mem_unagg = 11;
+
+  // Package list.
+  optional AndroidPackageList android_package_list = 12;
+
+  // ion buffer memory metrics.
+  optional AndroidIonMetric android_ion = 9;
+
+  // fastrpc subsystem memory metrics.
+  optional AndroidFastrpcMetric android_fastrpc = 31;
+
+  // Statistics about low memory kills.
+  optional AndroidLmkMetric android_lmk = 8;
+
+  // Power Rails metrics on Android.
+  optional AndroidPowerRails android_powrails = 7;
+
+  // Startup metrics on Android (owned by the Android Telemetry team).
+  optional AndroidStartupMetric android_startup = 2;
+
+  // Trace metadata (applicable to all traces).
+  optional TraceMetadata trace_metadata = 3;
+
+  // Trace stats (applicable to all traces).
+  optional TraceAnalysisStats trace_stats = 33;
+
+  // Returns stack frames missing symbols.
+  optional UnsymbolizedFrames unsymbolized_frames = 15;
+
+  // If the trace contains a heap graph, output allocation statistics.
+  optional JavaHeapStats java_heap_stats = 17;
+
+  // If the trace contains a heap graph, output histogram.
+  optional JavaHeapHistogram java_heap_histogram = 21;
+
+  // Metrics used to find potential culprits of low-memory kills.
+  optional AndroidLmkReasonMetric android_lmk_reason = 18;
+
+  optional AndroidHwuiMetric android_hwui_metric = 20;
+
+  optional AndroidDisplayMetrics display_metrics = 22;
+
+  optional AndroidTaskNames android_task_names = 23;
+
+  // Deprecated was AndroidThreadTimeInStateMetric
+  reserved 24;
+
+  // Metric associated with surfaceflinger.
+  optional AndroidSurfaceflingerMetric android_surfaceflinger = 25;
+
+  // GPU metrics on Android.
+  optional AndroidGpuMetric android_gpu = 26;
+
+  // Deprecated AndroidSysUiCujMetrics.
+  reserved 27;
+
+  // Interaction and frame timings for CUJs (important UI transitions).
+  optional AndroidJankCujMetric android_jank_cuj = 48;
+
+  // Metric associated with hwcomposer.
+  optional AndroidHwcomposerMetrics android_hwcomposer = 28;
+
+  // Deprecated was AndroidJankMetrics;
+  reserved 29;
+
+  // G2D metrics.
+  optional G2dMetrics g2d = 30;
+
+  // Dmabuf heap metrics.
+  optional AndroidDmaHeapMetric android_dma_heap = 32;
+
+  // Metric to verify the quality of the trace.
+  optional AndroidTraceQualityMetric android_trace_quality = 34;
+
+  // Profiler smaps
+  optional ProfilerSmaps profiler_smaps = 35;
+
+  // Multiuser - metrics for switching users.
+  optional AndroidMultiuserMetric android_multiuser = 36;
+
+  // Metrics related to simpleperf tool
+  optional AndroidSimpleperfMetric android_simpleperf = 37;
+
+  // Metrics for the Camera team.
+  optional AndroidCameraMetric android_camera = 38;
+
+  // Metrics for dynamic voltage and frequency scaling.
+  optional AndroidDvfsMetric android_dvfs = 39;
+
+  // Metrics for network performance.
+  optional AndroidNetworkMetric android_netperf = 40;
+
+  // Metrics for the Camera team.
+  // Note: this generates a lot of data so should not be requested unless it
+  // is clear that this data is necessary.
+  optional AndroidCameraUnaggregatedMetric android_camera_unagg = 41;
+
+  // Metrics for RT runtime.
+  optional AndroidRtRuntimeMetric android_rt_runtime = 42;
+
+  // Metrics for IRQ runtime.
+  optional AndroidIrqRuntimeMetric android_irq_runtime = 43;
+
+  // Metrics for the Trusty team.
+  optional AndroidTrustyWorkqueues android_trusty_workqueues = 44;
+
+  // Summary of other concurrent trace recording.
+  optional AndroidOtherTracesMetric android_other_traces = 45;
+
+  // Per-process Binder transaction metrics.
+  optional AndroidBinderMetric android_binder = 46;
+
+  // Metrics for app deadline missed.
+  optional AndroidFrameTimelineMetric android_frame_timeline_metric = 47;
+
+  // Blocking calls (e.g. binder calls) for CUJs (important UI transitions).
+  optional AndroidBlockingCallsCujMetric android_blocking_calls_cuj_metric = 49;
+
+  optional AndroidMonitorContentionMetric android_monitor_contention = 50;
+
+  optional AndroidSysUINotificationsBlockingCallsMetric android_sysui_notifications_blocking_calls_metric = 51;
+
+  // Metrics to track codec framework.
+  optional AndroidCodecMetrics codec_metrics = 52;
+
+  // Metric to track Android IO.
+  optional AndroidIo android_io = 53;
+
+  // IO metrics on Android in unaggregated form.
+  // Note: this generates a lot of data so should not be requested unless it
+  // is clear that this data is necessary.
+  optional AndroidIoUnaggregated android_io_unagg = 54;
+
+  // Metrics for App Not Responding (ANR) errors.
+  optional AndroidAnrMetric android_anr = 55;
+
+  // Aggregated Android Monitor Contention metrics
+  optional AndroidMonitorContentionAggMetric android_monitor_contention_agg = 56;
+
+  optional AndroidBootMetric android_boot = 57;
+
+  // Metric for AdServices module.
+  optional AdServicesMetric ad_services_metric = 58;
+
+  optional SysuiNotifShadeListBuilderMetric sysui_notif_shade_list_builder_metric = 59;
+
+  optional SysuiUpdateNotifOnUiModeChangedMetric sysui_update_notif_on_ui_mode_changed_metric = 60;
+
+  // Metrics for Process starts.
+  optional AndroidAppProcessStartsMetric android_app_process_starts = 61;
+
+  // Android boot unaggregated metrics.
+  optional AndroidBootUnagg android_boot_unagg = 62;
+
+  // Android garbage collection metrics
+  optional AndroidGarbageCollectionUnaggMetric android_garbage_collection_unagg = 63;
+
+  // Multiuser - metrics for switching users.
+  // Specific for Android Auto
+  optional AndroidMultiuserMetric android_auto_multiuser = 64;
+
+  // All blocking calls (e.g. binder calls) for a trace.
+  optional AndroidBlockingCallsUnagg android_blocking_calls_unagg = 65;
+
+  // Demo extensions.
+  extensions 450 to 499;
+
+  // Vendor extensions.
+  extensions 500 to 1000;
+
+  // Chrome metrics.
+  extensions 1001 to 2000;
+
+  // WebView metrics.
+  extensions 2001 to 2500;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/perfetto_merged_metrics.proto b/src/libtracing/protos/perfetto/metrics/perfetto_merged_metrics.proto
new file mode 100644
index 000000000..14a28477f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/perfetto_merged_metrics.proto
@@ -0,0 +1,2735 @@
+// AUTOGENERATED - DO NOT EDIT
+// ---------------------------
+// This file has been generated by
+// AOSP://external/perfetto/tools/gen_merged_protos
+// merging the perfetto config protos.
+// This fused proto is intended to be copied in:
+//  - Android tree, for statsd.
+//  - Google internal repos.
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+option go_package = "github.com/google/perfetto/perfetto_proto";
+
+// Begin of protos/perfetto/metrics/android/ad_services_metric.proto
+
+// Next: 8
+message AdServicesUiMetric {
+  optional double common_service_initialization_latency = 1;
+  optional double common_service_permission_check_latency = 2;
+  optional double common_service_ux_engine_flow_latency = 3;
+  optional double main_activity_creation_latency = 4;
+  optional double consent_manager_initialization_latency = 5;
+  optional double consent_manager_read_latency = 6;
+  optional double consent_manager_write_latency = 7;
+}
+
+// Next: 2
+message AdServicesAdIdMetric {
+  optional double latency = 1;
+}
+
+// Next: 2
+message AdServicesAppSetIdMetric {
+  optional double latency = 1;
+}
+
+// Next: 5
+message OnDevicePersonalizationMetric {
+  optional double managing_service_initialization_latency = 1;
+  optional double service_delegate_execute_flow_latency = 2;
+  optional double service_delegate_request_surface_package_latency = 3;
+  optional double service_delegate_register_web_trigger_latency = 4;
+}
+
+// Next: 5
+message AdServicesMetric {
+  repeated AdServicesUiMetric ui_metric = 1;
+  repeated AdServicesAdIdMetric ad_id_metric = 2;
+  repeated AdServicesAppSetIdMetric app_set_id_metric = 3;
+  repeated OnDevicePersonalizationMetric odp_metric = 4;
+}
+// End of protos/perfetto/metrics/android/ad_services_metric.proto
+
+// Begin of protos/perfetto/metrics/android/android_blocking_call.proto
+
+// Blocking call on the main thread.
+message AndroidBlockingCall {
+    // Name of the blocking call
+    optional string name = 1;
+    // Number of times it happened within the CUJ
+    optional int64 cnt = 2;
+    // Total duration within the CUJ
+    optional int64 total_dur_ms = 3;
+    // Maximal duration within the CUJ
+    optional int64 max_dur_ms = 4;
+    // Minimal duration within the CUJ
+    optional int64 min_dur_ms = 5;
+    // Total duration within the CUJ in nanoseconds
+    optional int64 total_dur_ns = 6;
+    // Maximal duration within the CUJ in nanoseconds
+    optional int64 max_dur_ns = 7;
+    // Minimal duration within the CUJ in nanoseconds
+    optional int64 min_dur_ns = 8;
+}
+
+// End of protos/perfetto/metrics/android/android_blocking_call.proto
+
+// Begin of protos/perfetto/metrics/android/process_metadata.proto
+
+message AndroidProcessMetadata {
+  // Process name. Usually, cmdline or <package_name>(:<custom_name>)?.
+  optional string name = 1;
+
+  // User id under which this process runs.
+  optional int64 uid = 2;
+
+  // Package metadata from Android package list.
+  message Package {
+    optional string package_name = 1;
+    optional int64 apk_version_code = 2;
+    optional bool debuggable = 3;
+  }
+
+  // Package that this process belongs to.
+  //
+  // If this process shares its uid (see `packages_for_uid` field), the package
+  // is determined based on the process name and package name. If there is no
+  // match this field is empty.
+  optional Package package = 7;
+
+  // All packages using this uid.
+  //
+  // Shared uid documentation:
+  // https://developer.android.com/guide/topics/manifest/manifest-element#uid
+  repeated Package packages_for_uid = 8;
+
+  // Pid of the process name.
+  optional int64 pid = 9;
+
+  reserved 3, 4, 5, 6;
+}
+
+// End of protos/perfetto/metrics/android/process_metadata.proto
+
+// Begin of protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto
+
+// Blocking calls inside Android CUJs. Shows count and total duration for each.
+message AndroidBlockingCallsCujMetric {
+  repeated Cuj cuj = 1;
+
+  // Next id: 7
+  message Cuj {
+    // ID of the CUJ that is unique within the trace.
+    optional int32 id = 1;
+
+    // Name of the CUJ, extracted from the CUJ jank or latency trace marker.
+    // For example SHADE_EXPAND_COLLAPSE from J<SHADE_EXPAND_COLLAPSE>.
+    optional string name = 2;
+
+    // Details about the process (uid, version, etc)
+    optional AndroidProcessMetadata process = 3;
+
+    // ts of the CUJ trace marker slice, in ns.
+    optional int64 ts = 4;
+
+    // dur of the CUJ trace marker slice, in ns.
+    optional int64 dur = 5;
+
+    // List of blocking calls on the process main thread.
+    repeated AndroidBlockingCall blocking_calls = 6;
+  }
+}
+
+// End of protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto
+
+// Begin of protos/perfetto/metrics/android/android_blocking_calls_unagg.proto
+
+// All blocking calls for a trace. Shows count and total duration for each.
+message AndroidBlockingCallsUnagg {
+
+    repeated ProcessWithBlockingCalls process_with_blocking_calls = 1;
+
+    message ProcessWithBlockingCalls {
+        // Details about the process (uid, version, etc)
+        optional AndroidProcessMetadata process = 1;
+
+        // List of blocking calls on the process main thread.
+        repeated AndroidBlockingCall blocking_calls = 2;
+    }
+}
+
+// End of protos/perfetto/metrics/android/android_blocking_calls_unagg.proto
+
+// Begin of protos/perfetto/metrics/android/android_boot.proto
+
+// This metric computes how much time processes spend in UNINTERRUPTIBLE_SLEEP
+// state
+message ProcessStateDurations {
+  optional int64 total_dur = 2;
+  optional int64 uninterruptible_sleep_dur = 3;
+}
+
+message AndroidBootMetric {
+  optional ProcessStateDurations system_server_durations = 1;
+  optional ProcessStateDurations systemui_durations = 2;
+  optional ProcessStateDurations launcher_durations = 3;
+  optional ProcessStateDurations gms_durations = 4;
+  // Launcher related boot metrics
+  message LauncherBreakdown {
+    //  reports cold start time of NexusLauncher
+    optional int64 cold_start_dur = 1;
+  }
+  optional LauncherBreakdown launcher_breakdown = 5;
+
+  message ProcessStartAggregation {
+    optional int64 total_start_sum = 1;
+    optional int64 num_of_processes = 2;
+    optional double average_start_time = 3;
+  }
+  message GarbageCollectionAggregation {
+    optional int64 total_gc_count = 1;
+    optional int64 num_of_processes_with_gc = 2;
+    optional int64 num_of_threads_with_gc = 3;
+    optional double avg_gc_duration = 4;
+    optional double avg_running_gc_duration = 5;
+    optional int64 full_gc_count = 6;
+    optional int64 collector_transition_gc_count = 7;
+    optional int64 young_gc_count = 8;
+    optional int64 native_alloc_gc_count = 9;
+    optional int64 explicit_gc_count = 10;
+    optional int64 alloc_gc_count = 11;
+    optional double mb_per_ms_of_gc = 12;
+  }
+  optional ProcessStartAggregation full_trace_process_start_aggregation = 6;
+  optional ProcessStartAggregation post_boot_process_start_aggregation = 7;
+  optional GarbageCollectionAggregation full_trace_gc_aggregation = 8;
+  optional GarbageCollectionAggregation post_boot_gc_aggregation = 9;
+}
+
+// End of protos/perfetto/metrics/android/android_boot.proto
+
+// Begin of protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto
+
+message AndroidGarbageCollectionUnaggMetric {
+  message GarbageCollectionEvent {
+    // Name of thread running garbage collection.
+    optional string thread_name = 1;
+    // Name of process running garbage collection.
+    optional string process_name = 2;
+    // Type of garbage collection.
+    optional string gc_type = 3;
+    // Whether gargage collection is mark compact or copying.
+    optional int64 is_mark_compact = 4;
+    // MB reclaimed after garbage collection.
+    optional double reclaimed_mb = 5;
+    // Minimum heap size in MB during garbage collection.
+    optional double min_heap_mb = 6;
+    // Maximum heap size in MB during garbage collection.
+    optional double max_heap_mb = 7;
+    // Memory reclaimed per ms of running time.
+    optional double mb_per_ms_of_running_gc = 8;
+    // Memory reclaimed per ms of wall time.
+    optional double mb_per_ms_of_wall_gc = 9;
+    // Garbage collection wall duration.
+    optional int64 gc_dur = 10;
+    // Garbage collection duration spent executing on CPU.
+    optional int64 gc_running_dur = 11;
+    // Garbage collection duration spent waiting for CPU.
+    optional int64 gc_runnable_dur = 12;
+    // Garbage collection duration spent waiting in the Linux kernel on IO.
+    optional int64 gc_unint_io_dur = 13;
+    // Garbage collection duration spent waiting in the Linux kernel without IO.
+    optional int64 gc_unint_non_io_dur = 14;
+    // Garbage collection duration spent waiting in interruptible sleep.
+    optional int64 gc_int_dur = 15;
+    // ts of the event in trace.
+    optional int64 gc_ts = 16;
+    // pid of the event in trace.
+    optional int64 pid = 17;
+    // tid of the event in trace.
+    optional int64 tid = 18;
+    // monotonic duration of event.
+    optional int64 gc_monotonic_dur = 19;
+  }
+  repeated GarbageCollectionEvent gc_events = 1;
+}
+// End of protos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto
+
+// Begin of protos/perfetto/metrics/android/app_process_starts_metric.proto
+
+message AndroidAppProcessStartsMetric {
+  // Next id : 4
+  message ProcessStart {
+    optional string process_name = 1;
+    optional string intent = 2;
+    optional string reason = 3;
+    optional int64 proc_start_dur = 4;
+    optional int64 bind_app_dur = 5;
+    optional int64 intent_dur = 6;
+    optional int64 total_dur = 7;
+  }
+  // Provides java process startup information for
+  // all processes starting after Boot completed broadcast in a trace.
+  repeated ProcessStart all_apps = 1;
+  // Provides java process startup information for all
+  // processes started from a broadcast after Boot Complete broadcasts.
+  repeated ProcessStart started_by_broadcast = 2;
+  // Provides java process startup information for all
+  // processes started from a service after Boot Complete broadcasts.
+  repeated ProcessStart started_by_service = 3;
+}
+
+// End of protos/perfetto/metrics/android/app_process_starts_metric.proto
+
+// Begin of protos/perfetto/metrics/android/android_boot_unagg.proto
+
+message AndroidBootUnagg {
+  // Looks at all apps started after boot complete broadcast.
+  optional AndroidAppProcessStartsMetric android_app_process_start_metric = 1;
+  // Looks at all GC that occurs after boot complete broadcast.
+  optional AndroidGarbageCollectionUnaggMetric android_post_boot_gc_metric = 2;
+}
+
+// End of protos/perfetto/metrics/android/android_boot_unagg.proto
+
+// Begin of protos/perfetto/metrics/android/android_frame_timeline_metric.proto
+
+message AndroidFrameTimelineMetric {
+  message JankTypeMetric {
+    // The jank type
+    optional string type = 1;
+
+    // The count of frames with this jank type
+    optional int64 total_count = 2;
+
+    // The count of frames with this jank type and present type = PRESENT_UNSPECIFIED
+    optional int64 present_unspecified_count = 3;
+
+    // The count of frames with this jank type and present type = PRESENT_ON_TIME
+    optional int64 present_on_time_count = 4;
+
+    // The count of frames with this jank type and present type = PRESENT_LATE
+    optional int64 present_late_count = 5;
+
+    // The count of frames with this jank type and present type = PRESENT_EARLY
+    optional int64 present_early_count = 6;
+
+    // The count of frames with this jank type and present type = PRESENT_DROPPED
+    optional int64 present_dropped_count = 7;
+
+    // The count of frames with this jank type and present type = PRESENT_UNKNOWN
+    optional int64 present_unknown_count = 8;
+  }
+
+  message ProcessBreakdown {
+    optional AndroidProcessMetadata process = 3;
+
+    optional int64 total_frames = 4;
+    optional int64 missed_frames = 5;
+    optional int64 missed_app_frames = 6;
+    optional int64 missed_sf_frames = 7;
+
+    optional int64 frame_dur_max = 8;
+    optional int64 frame_dur_avg = 9;
+    optional int64 frame_dur_p50 = 10;
+    optional int64 frame_dur_p90 = 11;
+    optional int64 frame_dur_p95 = 12;
+    optional int64 frame_dur_p99 = 13;
+    optional double frame_dur_ms_p50 = 14;
+    optional double frame_dur_ms_p90 = 15;
+    optional double frame_dur_ms_p95 = 16;
+    optional double frame_dur_ms_p99 = 17;
+    optional int64 dropped_frames = 18;
+
+    // Metrics for each jank type in this process
+    repeated JankTypeMetric jank_types = 19;
+
+    reserved 1, 2;
+  }
+
+  optional int64 total_frames = 4;
+  optional int64 missed_app_frames = 5;
+  optional int64 dropped_frames = 6;
+
+  repeated ProcessBreakdown process = 2;
+
+  // Metrics for each jank type globally
+  repeated JankTypeMetric jank_types = 7;
+
+  reserved 1;
+}
+
+
+// End of protos/perfetto/metrics/android/android_frame_timeline_metric.proto
+
+// Begin of protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto
+
+// Blocking calls inside System UI Notifications. Shows count and total duration for each.
+message AndroidSysUINotificationsBlockingCallsMetric {
+  repeated AndroidBlockingCall blocking_calls = 1;
+}
+
+// End of protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto
+
+// Begin of protos/perfetto/metrics/android/android_trusty_workqueues.proto
+
+// Metric used to generate a simplified view of the Trusty kworker events.
+message AndroidTrustyWorkqueues {}
+
+// End of protos/perfetto/metrics/android/android_trusty_workqueues.proto
+
+// Begin of protos/perfetto/metrics/android/anr_metric.proto
+
+ message AndroidAnrMetric {
+  repeated Anr anr = 1;
+
+  // Next id: 12
+  message Anr {
+    // UUID that identifies the ANR.
+    optional string error_id = 1;
+
+    // Name of the process that ANRed.
+    optional string process_name = 2;
+
+    // PID of the ANRing process.
+    optional int32 pid = 3;
+
+    // ANR subject line.
+    optional string subject = 4;
+
+    // Timestamp of the ANR in the trace.
+    optional int64 ts = 5;
+  }
+}
+// End of protos/perfetto/metrics/android/anr_metric.proto
+
+// Begin of protos/perfetto/metrics/android/batt_metric.proto
+
+message AndroidBatteryMetric {
+  message BatteryCounters {
+    // Timestamp measured from boot time [ns].
+    optional int64 timestamp_ns = 1;
+    // Fields 2-5 are the same as in BatteryCounters proto in TracePacket.
+    optional double charge_counter_uah = 2;
+    optional float capacity_percent = 3;
+    optional double current_ua = 4;
+    optional double current_avg_ua = 5;
+  }
+
+  message BatteryAggregates {
+    // Field numbers for these 3 == the int values from Android
+    optional int64 total_screen_off_ns = 1;
+    optional int64 total_screen_on_ns = 2;
+    optional int64 total_screen_doze_ns = 3;
+    // Total time a wakelock was held
+    optional int64 total_wakelock_ns = 4;
+    // Amount of time the device was suspended. Depends on the ftrace source
+    // "power/suspend_resume".
+    optional int64 sleep_ns = 5;
+    optional int64 sleep_screen_off_ns = 6;
+    optional int64 sleep_screen_on_ns = 7;
+    optional int64 sleep_screen_doze_ns = 8;
+  }
+
+  // Period of time during the trace that the device went to sleep completely.
+  message SuspendPeriod {
+    optional int64 timestamp_ns = 1;
+    optional int64 duration_ns = 2;
+  }
+
+  // Battery counters info for each ts of the trace. This should only be
+  // extracted for short traces.
+  repeated BatteryCounters battery_counters = 1;
+
+  optional BatteryAggregates battery_aggregates = 2;
+
+  repeated SuspendPeriod suspend_period = 3;
+}
+
+// End of protos/perfetto/metrics/android/batt_metric.proto
+
+// Begin of protos/perfetto/metrics/android/binder_metric.proto
+
+// This metric provides the following:
+// 1. Per-process Binder statistics for traces with binder_driver enabled.
+//    Specifically, transactions are categorized and counted
+// 2. Unaggregated binder txn durations with per-txn aggregated thread state and
+// blocked function
+//    durations
+message AndroidBinderMetric {
+  message PerProcessBreakdown {
+    optional string process_name = 1;
+    optional uint32 pid = 2;
+    optional string slice_name = 3;
+    optional uint32 count = 4;
+  }
+
+  // Next field id: 30
+  message UnaggregatedTxnBreakdown {
+    // General
+    optional string aidl_name = 1;
+    optional int64 aidl_ts = 22;
+    optional int64 aidl_dur = 23;
+    optional bool is_sync = 21;
+    // Client
+    // Removed: was binder_txn_id
+    reserved 2;
+    optional string client_process = 3;
+    optional string client_thread = 4;
+    optional bool is_main_thread = 5;
+    optional int64 client_ts = 6;
+    optional int64 client_dur = 7;
+    optional int64 client_monotonic_dur = 28;
+    optional int64 client_oom_score = 19;
+    optional int64 client_package_version_code = 24;
+    optional bool is_client_package_debuggable = 25;
+    // Server
+    // Removed: was binder_reply_id
+    reserved 8;
+    optional string server_process = 9;
+    optional string server_thread = 10;
+    optional int64 server_ts = 11;
+    optional int64 server_dur = 12;
+    optional int64 server_monotonic_dur = 29;
+    optional int64 server_oom_score = 20;
+    optional int64 server_package_version_code = 26;
+    optional bool is_server_package_debuggable = 27;
+    // Aggregations
+    repeated ThreadStateBreakdown thread_states = 13;
+    repeated BlockedFunctionBreakdown blocked_functions = 14;
+
+    optional uint32 client_tid = 15;
+    optional uint32 server_tid = 16;
+
+    optional uint32 client_pid = 17;
+    optional uint32 server_pid = 18;
+  }
+
+  message ThreadStateBreakdown {
+    optional string thread_state_type = 1;
+    optional string thread_state = 2;
+    optional int64 thread_state_dur = 3;
+    optional int64 thread_state_count = 4;
+  }
+
+  message BlockedFunctionBreakdown {
+    optional string thread_state_type = 1;
+    optional string blocked_function = 2;
+    optional int64 blocked_function_dur = 3;
+    optional int64 blocked_function_count = 4;
+  }
+
+  repeated PerProcessBreakdown process_breakdown = 1;
+  repeated UnaggregatedTxnBreakdown unaggregated_txn_breakdown = 2;
+}
+
+// End of protos/perfetto/metrics/android/binder_metric.proto
+
+// Begin of protos/perfetto/metrics/android/camera_metric.proto
+
+message AndroidCameraMetric {
+  message Counter {
+    optional double min = 1;
+    optional double max = 2;
+    optional double avg = 3;
+  }
+
+  // Counter for the sum of DMA and RSS across GCA, cameraserver
+  // and HAL. This provides a single number for the memory
+  // pressure using the camera is putting on the rest of the
+  // system.
+  //
+  // Note: this number assumes that all DMA pressure is coming
+  // from the camera as this is usually a pretty good
+  // approximation. Being more accurate here would increase the
+  // complexity of the metric significantly.
+  //
+  // Note: if there are multiple GCA/cameraserver/HAL processes
+  // in the trace, this metric will simply take the latest
+  // one in the trace and ignore the others.
+  optional Counter gc_rss_and_dma = 1;
+}
+
+// End of protos/perfetto/metrics/android/camera_metric.proto
+
+// Begin of protos/perfetto/metrics/android/camera_unagg_metric.proto
+
+message AndroidCameraUnaggregatedMetric {
+  message Value {
+    optional int64 ts = 1;
+    optional double gca_rss_val = 2;
+    optional double hal_rss_val = 3;
+    optional double cameraserver_rss_val = 4;
+    optional double dma_val = 5;
+    optional double value = 6;
+  }
+
+  // Timeseries for the sum of DMA and RSS across GCA, cameraserver
+  // and HAL. This provides a single number for the memory
+  // pressure using the camera is putting on the rest of the
+  // system.
+  //
+  // Note: this number assumes that all DMA pressure is coming
+  // from the camera as this is usually a pretty good
+  // approximation. Being more accurate here would increase the
+  // complexity of the metric significantly.
+  //
+  // Note: if there are multiple GCA/cameraserver/HAL processes
+  // in the trace, this metric will simply take the latest
+  // one in the trace and ignore the others.
+  repeated Value gc_rss_and_dma = 1;
+}
+
+// End of protos/perfetto/metrics/android/camera_unagg_metric.proto
+
+// Begin of protos/perfetto/metrics/android/cpu_metric.proto
+
+message AndroidCpuMetric {
+  // Next id: 6
+  message Metrics {
+    // CPU megacycles (i.e. cycles divided by 1e6).
+    optional int64 mcycles = 1;
+
+    // Total time the thread was running for this breakdown in
+    // nanoseconds.
+    optional int64 runtime_ns = 2;
+
+    // Min/max/average CPU frequency weighted by the time the CPU was
+    // running at each frequency in this breakdown.
+    optional int64 min_freq_khz = 3;
+    optional int64 max_freq_khz = 4;
+    optional int64 avg_freq_khz = 5;
+  }
+
+  // Next id: 7
+  message CoreData {
+    optional uint32 id = 1;
+    optional Metrics metrics = 6;
+
+    reserved 2 to 5;
+  }
+
+  // Next id: 3
+  message CoreTypeData {
+    optional string type = 1;
+    optional Metrics metrics = 2;
+  }
+
+  // Next id: 7
+  message Thread {
+    optional string name = 1;
+    optional Metrics metrics = 4;
+
+    // Breakdowns of above metrics.
+    repeated CoreData core = 2;
+    repeated CoreTypeData core_type = 5;
+
+    reserved 3;
+  }
+
+  // Next id: 8
+  message Process {
+    optional string name = 1;
+    optional AndroidProcessMetadata process = 8;
+    optional Metrics metrics = 4;
+
+    // Breakdowns of above metrics.
+    repeated Thread threads = 6;
+    repeated CoreData core = 7;
+    repeated CoreTypeData core_type = 5;
+
+    reserved 3;
+  }
+
+  repeated Process process_info = 1;
+}
+
+// End of protos/perfetto/metrics/android/cpu_metric.proto
+
+// Begin of protos/perfetto/metrics/android/codec_metrics.proto
+
+// These metrices collects various function and thread
+// usage within androd's codec framework. This can give an
+// idea about performance and cpu usage when using codec
+// framework
+message AndroidCodecMetrics {
+
+  // profile details in messages
+  message Detail {
+    // function thread
+    optional string thread_name = 1;
+    // total time
+    optional int64 total_cpu_ns = 2;
+    // CPU time ( time 'Running' on cpu)
+    optional int64 running_cpu_ns = 3;
+  }
+
+  // These are traces and could indicate framework queue latency
+  // buffer-packing, buffer-preprocess, buffer post-process
+  // latency etc. These metrics are monitored to track quality.
+  // Same message can come from different
+  // processes.
+  message CodecFunction {
+    // codec string
+    optional string codec_string = 1;
+    // process_name
+    optional string process_name = 2;
+    // details
+    optional Detail detail = 3;
+  }
+
+  // This message can indicate overall cpu
+  // utilization of codec framework threads.
+  message CpuUsage {
+    // name of process using codec framework
+    optional string process_name = 1;
+    // name of the codec thread
+    optional string thread_name = 2;
+    // was thread_cpu_us
+    reserved 3;
+    // total cpu usage of the codec thread
+    optional int64 thread_cpu_ns = 6;
+    // can be number of codec framework thread
+    optional uint32 num_threads = 4;
+    // core type data info used by codec thread
+    repeated AndroidCpuMetric.CoreTypeData core_data = 5;
+  }
+
+  repeated CpuUsage cpu_usage = 1;
+  repeated CodecFunction codec_function = 2;
+
+}
+
+// End of protos/perfetto/metrics/android/codec_metrics.proto
+
+// Begin of protos/perfetto/metrics/android/display_metrics.proto
+
+message AndroidDisplayMetrics {
+  // Stat that reports the number of duplicate frames submitted
+  // to the display for rendering. That is frames that have the same
+  // pixels values but where still submitted. It is tracked based on
+  // comparing the MISR of the current frame vs previous frame.
+  optional uint32 total_duplicate_frames = 1;
+
+  // Stat reports whether there is any duplicate_frames tracked
+  optional uint32 duplicate_frames_logged = 2;
+
+  // Stat that reports the number of dpu underrrun occurs count.
+  optional uint32 total_dpu_underrun_count = 3;
+
+
+  message RefreshRateStat {
+    // The refresh rate value (the number of frames per second)
+    optional uint32 refresh_rate_fps = 1;
+
+    // Calculate the number of refresh rate switches to this fps
+    optional uint32 count = 2;
+
+    // Calculate the total duration of refresh rate stays at this fps
+    optional double total_dur_ms = 3;
+
+    // Calculate the average duration of refresh rate stays at this fps
+    optional double avg_dur_ms = 4;
+  }
+
+  // Calculate the total number of refresh rate changes
+  optional uint32 refresh_rate_switches = 4;
+
+  // The statistics for each refresh rate value
+  repeated RefreshRateStat refresh_rate_stats = 5;
+
+  // Stats to measure the runtime of updating the power state in
+  // DisplayPowerController
+  message UpdatePowerState {
+    optional uint32 avg_runtime_micro_secs = 2;
+
+    // Removed: avg_runtime_ms
+    reserved 1;
+  }
+
+  optional UpdatePowerState update_power_state = 6;
+}
+
+// End of protos/perfetto/metrics/android/display_metrics.proto
+
+// Begin of protos/perfetto/metrics/android/dma_heap_metric.proto
+
+// dma-buf heap memory stats on Android.
+message AndroidDmaHeapMetric {
+    optional double avg_size_bytes = 1;
+    optional double min_size_bytes = 2;
+    optional double max_size_bytes = 3;
+
+    // Total allocation size.
+    // Essentially the sum of positive allocs.
+    optional double total_alloc_size_bytes = 4;
+}
+
+// End of protos/perfetto/metrics/android/dma_heap_metric.proto
+
+// Begin of protos/perfetto/metrics/android/dvfs_metric.proto
+
+message AndroidDvfsMetric {
+
+  message BandStat {
+    // Operating frequency
+    optional int32 freq_value = 1;
+
+    // Percentage of duration in this operating frequency compared to all frequencies
+    optional double percentage = 2;
+
+    // Total duration in ns when the state was in this operating frequency
+    optional int64 duration_ns = 3;
+  }
+
+  message FrequencyResidency {
+    // Frequency representative name
+    optional string freq_name = 1;
+    // Each band statistics meta
+    repeated BandStat band_stat = 2;
+  }
+
+  // Frequency residency metrics from clock_set_rate ftrace event.
+  repeated FrequencyResidency freq_residencies = 1;
+}
+
+// End of protos/perfetto/metrics/android/dvfs_metric.proto
+
+// Begin of protos/perfetto/metrics/android/fastrpc_metric.proto
+
+// fastrpc memory stats on Android.
+message AndroidFastrpcMetric {
+  message Subsystem {
+    optional string name = 1;
+    optional double avg_size_bytes = 2;
+    optional double min_size_bytes = 3;
+    optional double max_size_bytes = 4;
+
+    // Total allocation size.
+    // Essentially the sum of positive allocs.
+    optional double total_alloc_size_bytes = 5;
+  }
+
+  repeated Subsystem subsystem = 1;
+}
+
+// End of protos/perfetto/metrics/android/fastrpc_metric.proto
+
+// Begin of protos/perfetto/metrics/android/g2d_metric.proto
+
+message G2dMetrics {
+  message G2dInstance {
+    // G2d name.
+    optional string name = 1;
+
+    optional uint32 frame_count = 5;
+    optional uint32 error_count = 6;
+
+    optional double max_dur_ms = 7;
+    optional double min_dur_ms = 8;
+    optional double avg_dur_ms = 9;
+
+    // Removed: was int64 versions of max_dur_ns, min_dur_ns and avg_dur_ns.
+    reserved 2 to 4;
+  }
+  message G2dMetric {
+    // G2D Metric for each G2D Instance.
+    repeated G2dInstance instances = 1;
+
+    // the number of frames processed by G2D
+    optional uint32 frame_count = 5;
+    // the number of error events
+    optional uint32 error_count = 6;
+
+    // max/min/avg G2d frame durations for all instances.
+    optional double max_dur_ms = 7;
+    optional double min_dur_ms = 8;
+    optional double avg_dur_ms = 9;
+
+    // Removed: was int64 versions of max_dur_ns, min_dur_ns and avg_dur_ns.
+    reserved 2 to 4;
+  }
+
+  optional G2dMetric g2d_hw = 1;
+  optional G2dMetric g2d_sw = 2;
+}
+
+// End of protos/perfetto/metrics/android/g2d_metric.proto
+
+// Begin of protos/perfetto/metrics/android/gpu_metric.proto
+
+message AndroidGpuMetric {
+  message Process {
+    // Process name.
+    optional string name = 1;
+
+    // max/min/avg GPU memory used by this process.
+    optional int64 mem_max = 2;
+    optional int64 mem_min = 3;
+    optional int64 mem_avg = 4;
+  }
+
+  // GPU metric for processes using GPU.
+  repeated Process processes = 1;
+
+  // max/min/avg GPU memory used by the entire system.
+  optional int64 mem_max = 2;
+  optional int64 mem_min = 3;
+  optional int64 mem_avg = 4;
+
+  message FrequencyMetric {
+    // Identifier for GPU in a multi-gpu device.
+    optional uint32 gpu_id = 1;
+
+    // max/min/avg GPU frequency for this gpu_id
+    // the calculation of avg is weighted by the duration of each frequency
+    optional int64 freq_max = 2;
+    optional int64 freq_min = 3;
+    optional double freq_avg = 4;
+
+    message MetricsPerFrequency {
+      // Used frequency
+      optional int64 freq = 1;
+
+      // Total duration in ms when the state of GPU was in this frequency
+      optional double dur_ms = 2;
+
+      // Percentage of duration in this frequency compared to all frequencies
+      // in this gpu_id
+      optional double percentage = 3;
+    }
+
+    // Metrics for each used GPU frequency
+    repeated MetricsPerFrequency used_freqs = 5;
+  }
+
+  // GPU frequency metric for each gpu_id
+  repeated FrequencyMetric freq_metrics = 5;
+}
+
+// End of protos/perfetto/metrics/android/gpu_metric.proto
+
+// Begin of protos/perfetto/metrics/android/hwcomposer.proto
+
+message AndroidHwcomposerMetrics {
+  // Counts the number of composition total layers in the trace. (non-weighted average)
+  optional double composition_total_layers = 1;
+
+  // Counts the number of composition dpu layers in the trace. (non-weighted average)
+  optional double composition_dpu_layers = 2;
+
+  // Counts the number of composition gpu layers in the trace. (non-weighted average)
+  optional double composition_gpu_layers = 3;
+
+  // Counts the number of composition dpu cached layers in the trace. (non-weighted average)
+  optional double composition_dpu_cached_layers = 4;
+
+  // Counts the number of composition surfaceflinger cached layers in the trace.
+  // (non-weighted average)
+  optional double composition_sf_cached_layers = 5;
+
+  // Counts the number of composition rounded corner decoration layers in the trace.
+  // (non-weighted average)
+  optional double composition_rcd_layers = 15;
+
+  // Counts how many times validateDisplay is skipped.
+  optional int32 skipped_validation_count = 6;
+
+  // Counts how many times validateDisplay cannot be skipped.
+  optional int32 unskipped_validation_count = 7;
+
+  // Counts how many times validateDisplay is already separated from presentDisplay
+  // since the beginning.
+  optional int32 separated_validation_count = 8;
+
+  // Counts how many unhandled validation cases which might be caused by errors.
+  optional int32 unknown_validation_count = 9;
+
+  // the average of overall hwcomposer execution time.
+  optional double avg_all_execution_time_ms = 10;
+
+  // the average of hwcomposer execution time for skipped validation cases.
+  optional double avg_skipped_execution_time_ms = 11;
+
+  // the average of hwcomposer execution time for unskipped validation cases.
+  optional double avg_unskipped_execution_time_ms = 12;
+
+  // the average of hwcomposer execution time for separated validation cases.
+  optional double avg_separated_execution_time_ms = 13;
+
+  message DpuVoteMetrics {
+    // the thread ID that handles this track
+    optional uint32 tid = 1;
+
+    // the weighted average of DPU Vote Clock
+    optional double avg_dpu_vote_clock = 2;
+
+    // the weighted average of DPU Vote Avg Bandwidth
+    optional double avg_dpu_vote_avg_bw = 3;
+
+    // the weighted average of DPU Vote Peak Bandwidth
+    optional double avg_dpu_vote_peak_bw = 4;
+
+    // the weighted average of DPU Vote RT (Real Time) Bandwidth
+    optional double avg_dpu_vote_rt_bw = 5;
+  }
+
+  // DPU Vote Metrics for each thread track
+  repeated DpuVoteMetrics dpu_vote_metrics = 14;
+
+  message MetricsPerDisplay {
+    // Display ID in HWC
+    optional string display_id = 1;
+
+    // Counts the number of composition total layers in the trace. (non-weighted average)
+    optional double composition_total_layers = 2;
+
+    // Counts the number of composition dpu layers in the trace. (non-weighted average)
+    optional double composition_dpu_layers = 3;
+
+    // Counts the number of composition gpu layers in the trace. (non-weighted average)
+    optional double composition_gpu_layers = 4;
+
+    // Counts the number of composition dpu cached layers in the trace. (non-weighted average)
+    optional double composition_dpu_cached_layers = 5;
+
+    // Counts the number of composition surfaceflinger cached layers in the trace.
+    // (non-weighted average)
+    optional double composition_sf_cached_layers = 6;
+
+    // Counts the number of composition rounded corner decoration layers in the trace.
+    // (non-weighted average)
+    optional double composition_rcd_layers = 7;
+
+    // Counts how many times validateDisplay is skipped.
+    optional int32 skipped_validation_count = 8;
+
+    // Counts how many times validateDisplay cannot be skipped.
+    optional int32 unskipped_validation_count = 9;
+
+    // Counts how many times validateDisplay is already separated from presentDisplay
+    // since the beginning.
+    optional int32 separated_validation_count = 10;
+
+    // Counts how many unhandled validation cases which might be caused by errors.
+    optional int32 unknown_validation_count = 11;
+
+    // the average of overall hwcomposer execution time.
+    optional double avg_all_execution_time_ms = 12;
+
+    // the average of hwcomposer execution time for skipped validation cases.
+    optional double avg_skipped_execution_time_ms = 13;
+
+    // the average of hwcomposer execution time for unskipped validation cases.
+    optional double avg_unskipped_execution_time_ms = 14;
+
+    // the average of hwcomposer execution time for separated validation cases.
+    optional double avg_separated_execution_time_ms = 15;
+  }
+
+  repeated MetricsPerDisplay metrics_per_display = 16;
+}
+
+// End of protos/perfetto/metrics/android/hwcomposer.proto
+
+// Begin of protos/perfetto/metrics/android/hwui_metric.proto
+
+// Android HWUI graphics performance and graphics memory usage metrics.
+message ProcessRenderInfo {
+  // Name of the package launched
+  optional string process_name = 1;
+
+  // CPU time spent on RenderThread in milliseconds.
+  optional int64 rt_cpu_time_ms = 2;
+
+  // Number of frames drawn on RenderThread, followed by max/min/avg CPU time to draw a frame
+  // in nanoseconds.
+  optional uint32 draw_frame_count = 3;
+  optional int64 draw_frame_max = 4;
+  optional int64 draw_frame_min = 5;
+  optional double draw_frame_avg = 6;
+
+  // Number of GPU commands flushes and max/min/avg time per flush in nanoseconds.
+  optional uint32 flush_count = 7;
+  optional int64 flush_max = 8;
+  optional int64 flush_min = 9;
+  optional double flush_avg = 10;
+
+  // Number of View tree preparation counts and max/min/avg time to traverse the tree in
+  // nanoseconds.
+  optional uint32 prepare_tree_count = 11;
+  optional int64 prepare_tree_max = 12;
+  optional int64 prepare_tree_min = 13;
+  optional double prepare_tree_avg = 14;
+
+  // Number of times the GPU rendered a frame and max/min/avg time for GPU to finish rendering in
+  // in nanoseconds.
+  optional uint32 gpu_completion_count = 15;
+  optional int64 gpu_completion_max = 16;
+  optional int64 gpu_completion_min = 17;
+  optional double gpu_completion_avg = 18;
+
+  // Number of times a frame was recorded/serialized in a display list on the UI thread with
+  // max/min/avg time in nanoseconds.
+  optional uint32 ui_record_count = 19;
+  optional int64 ui_record_max = 20;
+  optional int64 ui_record_min = 21;
+  optional double ui_record_avg = 22;
+
+  // number of unique shader programs that were used to render frames, followed by total and average
+  // times to prepare a shader in nanoseconds.
+  optional uint32 shader_compile_count = 23;
+  optional int64 shader_compile_time = 24;
+  optional double shader_compile_avg = 25;
+  // number of shader programs loaded from the disk cache, followed by total time and average time
+  // to prepare a shader in nanoseconds.
+  optional uint32 cache_hit_count = 26;
+  optional int64 cache_hit_time = 27;
+  optional double cache_hit_avg = 28;
+  // number of shader programs compiled/linked, followed by total time and average time to prepare
+  // a shader in nanoseconds.
+  optional uint32 cache_miss_count = 29;
+  optional int64 cache_miss_time = 30;
+  optional double cache_miss_avg = 31;
+
+  // max/min/avg CPU memory used for graphics by HWUI at the end of a frame.
+  optional int64 graphics_cpu_mem_max = 32;
+  optional int64 graphics_cpu_mem_min = 33;
+  optional double graphics_cpu_mem_avg = 34;
+
+  // max/min/avg GPU memory used by HWUI at the end of a frame excluding textures.
+  optional int64 graphics_gpu_mem_max = 35;
+  optional int64 graphics_gpu_mem_min = 36;
+  optional double graphics_gpu_mem_avg = 37;
+
+  // max/min/avg memory used for GPU textures by HWUI at the end of a frame.
+  optional int64 texture_mem_max = 38;
+  optional int64 texture_mem_min = 39;
+  optional double texture_mem_avg = 40;
+
+  // max/min/avg memory used by HWUI at the end of a frame. This is a sum of previous 3 categories.
+  optional int64 all_mem_max = 41;
+  optional int64 all_mem_min = 42;
+  optional double all_mem_avg = 43;
+}
+
+message AndroidHwuiMetric {
+  //  HWUI metrics for processes that have a RenderThread.
+  repeated ProcessRenderInfo process_info = 1;
+}
+
+// End of protos/perfetto/metrics/android/hwui_metric.proto
+
+// Begin of protos/perfetto/metrics/android/io_metric.proto
+
+// Measure Android IO stats in a trace.
+// Note: This is an aggregated metric, for unaggregated metrics look at AndroidIoUnaggregated
+// in io_unagg_metric.proto.
+message AndroidIo {
+  // Next id: 3
+  // Stats for Counters in an f2fs file system.
+  // Counters are available for various operations.
+  message F2fsCounterStats {
+    optional string name = 1;
+    optional double max = 2;
+    optional double sum = 3;
+    optional double min = 5;
+    optional int64 dur = 6;
+    optional int64 count = 7;
+    optional double avg = 8;
+  }
+  // Aggregated stats for write operations in an f2fs file system.
+  message F2fsWriteStats {
+    optional int64 total_write_count = 1;
+    optional int64 distinct_processes = 2;
+    optional int64 total_bytes_written = 3;
+    optional int64 distinct_device_count = 4;
+    optional int64 distinct_inode_count = 5;
+    optional int64 distinct_thread_count = 6;
+  }
+  repeated F2fsCounterStats f2fs_counter_stats = 1;
+  repeated F2fsWriteStats f2fs_write_stats = 2;
+}
+
+// End of protos/perfetto/metrics/android/io_metric.proto
+
+// Begin of protos/perfetto/metrics/android/io_unagg_metric.proto
+
+// IO metrics on Android in unaggregated form.
+// Note: this generates a lot of data so should not be requested unless it
+// is clear that this data is necessary.
+message AndroidIoUnaggregated {
+    // Next id: 2
+    message F2fsWriteUnaggreagatedStat {
+      optional uint32 tid = 1;
+      optional string thread_name = 2;
+      optional uint32 pid = 3;
+      optional string process_name = 4;
+      optional int64 ino = 5;
+      optional int64 dev = 6;
+    }
+    // F2fs write stats which are grouped by thread and inode.
+    repeated F2fsWriteUnaggreagatedStat f2fs_write_unaggregated_stats = 1;
+}
+// End of protos/perfetto/metrics/android/io_unagg_metric.proto
+
+// Begin of protos/perfetto/metrics/android/ion_metric.proto
+
+// ion memory stats on Android.
+message AndroidIonMetric {
+  message Buffer {
+    optional string name = 1;
+    optional double avg_size_bytes = 2;
+    optional double min_size_bytes = 3;
+    optional double max_size_bytes = 4;
+
+    // Total allocation size.
+    // Essentially the sum of positive allocs (-> new buffers).
+    optional double total_alloc_size_bytes = 5;
+  }
+
+  repeated Buffer buffer = 1;
+}
+
+// End of protos/perfetto/metrics/android/ion_metric.proto
+
+// Begin of protos/perfetto/metrics/android/irq_runtime_metric.proto
+
+// measure max IRQ runtime and IRQ tasks running over threshold.
+message AndroidIrqRuntimeMetric {
+  message IrqSlice {
+    // IRQ name
+    optional string irq_name = 1;
+    // timestamp
+    optional int64 ts = 2;
+    // runtime of IRQ task
+    optional int64 dur = 3;
+  }
+  message ThresholdMetric {
+    // Threshold value
+    optional string threshold = 1;
+    // over threshold count
+    optional int64 over_threshold_count = 2;
+    // anomaly ratio (over threshold count / total count)
+    optional double anomaly_ratio= 3;
+  }
+  message IrqRuntimeMetric {
+    // max runtime of IRQ tasks
+    optional int64 max_runtime = 1;
+    // total IRQ tasks
+    optional int64 total_count = 2;
+    // over threshold metric
+    optional ThresholdMetric threshold_metric = 3;
+    // information for top 10 IRQ tasks
+    repeated IrqSlice longest_irq_slices = 4;
+  }
+
+  // metrics for hardirq and softirq
+  optional IrqRuntimeMetric hw_irq = 1;
+  optional IrqRuntimeMetric sw_irq = 2;
+}
+
+
+// End of protos/perfetto/metrics/android/irq_runtime_metric.proto
+
+// Begin of protos/perfetto/metrics/android/jank_cuj_metric.proto
+
+message AndroidJankCujMetric {
+  repeated Cuj cuj = 1;
+
+  // Next id: 12
+  message Cuj {
+    // ID of the CUJ that is unique within the trace.
+    optional int32 id = 1;
+
+    // Name of the CUJ, extracted from the CUJ trace marker.
+    // For example SHADE_EXPAND_COLLAPSE from J<SHADE_EXPAND_COLLAPSE>.
+    optional string name = 2;
+
+    // Details about the process (uid, version, etc)
+    optional AndroidProcessMetadata process = 3;
+
+    // ts of the CUJ trace marker slice.
+    optional int64 ts = 4;
+
+    // dur of the CUJ trace marker slice.
+    optional int64 dur = 5;
+
+    // Details about each of the frames within the CUJ.
+    repeated Frame frame = 6;
+
+    // Details about each of the SF frames within the CUJ.
+    repeated Frame sf_frame = 10;
+
+    // Metrics extracted from the counters output by FrameTracker
+    // Does not contain the frame_dur percentile information.
+    optional Metrics counter_metrics = 7;
+
+    // Metrics extracted from the frame timeline.
+    optional Metrics timeline_metrics = 8;
+
+    // Metrics extracted from the trace slices.
+    optional Metrics trace_metrics = 9;
+
+    // Layer name of the surface where the cuj is drawn.
+    optional string layer_name = 11;
+  }
+
+  // Next id: 10
+  message Frame {
+    // Index of the frame within the single user journey.
+    optional int64 frame_number = 1;
+
+    // VSYNC ID of the frame.
+    optional int64 vsync = 2;
+
+    optional int64 ts = 3;
+    optional int64 dur = 4;
+    optional int64 dur_expected = 7;
+
+    // Whether the app process missed the frame deadline.
+    // Only set for the App frames. Always left unset for SF frames.
+    optional bool app_missed = 5;
+
+    // Whether SF missed the frame deadline.
+    optional bool sf_missed = 6;
+
+    // Whether the SF callback missed before emitting jank metrics.
+    // SF callback is used to get the jank classification.
+    optional bool sf_callback_missed = 8;
+
+    // Whether the HWUI callback missed before emitting jank metrics.
+    // HWUI callback is used to get the frame duration.
+    optional bool hwui_callback_missed = 9;
+  }
+
+  // Next id: 18
+  message Metrics {
+    // Overall number of frames within the CUJ.
+    optional int64 total_frames = 1;
+
+    // Number of missed frames.
+    optional int64 missed_frames = 2;
+
+    // Number of frames missed due to the app missing the deadline.
+    optional int64 missed_app_frames = 3;
+
+    // Number of frames missed due to SF.
+    optional int64 missed_sf_frames = 4;
+
+    // Number of successive frames missed.
+    // Not available in timeline_metrics and trace_metrics.
+    optional int64 missed_frames_max_successive = 5;
+
+    // Max frame duration in nanoseconds.
+    optional int64 frame_dur_max = 6;
+
+    // Average frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_avg = 7;
+
+    // Median frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p50 = 8;
+
+    // P90 frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p90 = 9;
+
+    // P95 frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p95 = 10;
+
+    // P99 frame duration in nanoseconds.
+    // Not available in counter_metrics.
+    optional int64 frame_dur_p99 = 11;
+
+    // Median frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p50 = 12;
+
+    // P90 frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p90 = 13;
+
+    // P95 frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p95 = 14;
+
+    // P99 frame duration in milliseconds.
+    // Not available in counter_metrics.
+    optional double frame_dur_ms_p99 = 15;
+
+    // Number of frames with missed SF callback.
+    optional int64 sf_callback_missed_frames = 16;
+
+    // Number of frames with missed HWUI callback.
+    optional int64 hwui_callback_missed_frames = 17;
+  }
+}
+
+// End of protos/perfetto/metrics/android/jank_cuj_metric.proto
+
+// Begin of protos/perfetto/metrics/android/java_heap_histogram.proto
+
+message JavaHeapHistogram {
+  // Next id: 9
+  message TypeCount {
+    optional string type_name = 1;
+    optional string category = 4;
+
+    optional uint32 obj_count = 2;
+    optional uint32 reachable_obj_count = 3;
+
+    optional uint32 size_kb = 5;
+    optional uint32 reachable_size_kb = 6;
+    optional uint32 native_size_kb = 7;
+    optional uint32 reachable_native_size_kb = 8;
+  }
+
+  message Sample {
+    optional int64 ts = 1;
+    repeated TypeCount type_count = 2;
+  }
+
+  // Heap stats per process. One sample per dump (with continuous dump you can
+  // have more samples differentiated by ts).
+  message InstanceStats {
+    optional uint32 upid = 1;
+    optional AndroidProcessMetadata process = 2;
+    repeated Sample samples = 3;
+  }
+
+  repeated InstanceStats instance_stats = 1;
+}
+
+// End of protos/perfetto/metrics/android/java_heap_histogram.proto
+
+// Begin of protos/perfetto/metrics/android/java_heap_stats.proto
+
+message JavaHeapStats {
+  message HeapRoots {
+    optional string root_type = 1;
+    optional string type_name = 2;
+    optional int64 obj_count = 3;
+  }
+
+  // Next id: 11
+  message Sample {
+    optional int64 ts = 1;
+    // Size of the Java heap in bytes
+    optional int64 heap_size = 2;
+    // Native size of all the objects (not included in heap_size)
+    optional int64 heap_native_size = 8;
+    optional int64 obj_count = 4;
+    // Size of the reachable objects in bytes.
+    optional int64 reachable_heap_size = 3;
+    // Native size of all the reachable objects (not included in
+    // reachable_heap_size)
+    optional int64 reachable_heap_native_size = 9;
+    optional int64 reachable_obj_count = 5;
+    // Sum of anonymous RSS + swap pages in bytes.
+    optional int64 anon_rss_and_swap_size = 6;
+
+    // ART root objects
+    repeated HeapRoots roots = 7;
+    // OOM adjustment score
+    optional int64 oom_score_adj = 10;
+  }
+
+  // Heap stats per process. One sample per dump (can be > 1 if continuous
+  // dump is enabled).
+  message InstanceStats {
+    optional uint32 upid = 1;
+    optional AndroidProcessMetadata process = 2;
+    repeated Sample samples = 3;
+  }
+
+  repeated InstanceStats instance_stats = 1;
+}
+
+// End of protos/perfetto/metrics/android/java_heap_stats.proto
+
+// Begin of protos/perfetto/metrics/android/lmk_metric.proto
+
+// LMK stats on Android.
+message AndroidLmkMetric {
+  message ByOomScore {
+    optional int32 oom_score_adj = 1;
+    optional int32 count = 2;
+  }
+
+  // Total count of LMK events observed in the trace.
+  optional int32 total_count = 1;
+  repeated ByOomScore by_oom_score = 2;
+
+  // OOM reaper kills. Enabled via the oom/mark_victim point. Should never
+  // happen.
+  optional int32 oom_victim_count = 3;
+}
+
+// End of protos/perfetto/metrics/android/lmk_metric.proto
+
+// Begin of protos/perfetto/metrics/android/lmk_reason_metric.proto
+
+// Global process state at LMK time, used to identify potential culprits.
+// TODO: rename to AndroidLmkProcessState
+message AndroidLmkReasonMetric {
+  message Process {
+    optional AndroidProcessMetadata process = 1;
+
+    // OOM score adj of the process.
+    optional int32 oom_score_adj = 2;
+
+    // RSS + swap.
+    optional int64 size = 3;
+
+    optional int64 file_rss_bytes = 4;
+    optional int64 anon_rss_bytes = 5;
+    optional int64 shmem_rss_bytes = 6;
+    optional int64 swap_bytes = 7;
+  }
+  message Lmk {
+    // OOM score adj of the LMK'ed process.
+    optional int32 oom_score_adj = 1;
+
+    // Total size of the ION heap in bytes during this LMK.
+    optional int64 ion_heaps_bytes = 4;
+    // Deprecated. Prefer ion_heaps_bytes.
+    optional int64 system_ion_heap_size = 2;
+
+    // Processes present during this LMK.
+    repeated Process processes = 3;
+  }
+
+  // LMKs present in the trace, ordered on their timestamp.
+  repeated Lmk lmks = 1;
+}
+
+// End of protos/perfetto/metrics/android/lmk_reason_metric.proto
+
+// Begin of protos/perfetto/metrics/android/mem_metric.proto
+
+// Memory metrics on Android.
+message AndroidMemoryMetric {
+  message ProcessMetrics {
+    optional string process_name = 1;
+    optional ProcessMemoryCounters total_counters = 2;
+    repeated PriorityBreakdown priority_breakdown = 3;
+  }
+
+  message PriorityBreakdown {
+    optional string priority = 1;
+    optional ProcessMemoryCounters counters = 2;
+  }
+
+  message ProcessMemoryCounters {
+    optional Counter anon_rss = 1;
+    optional Counter file_rss = 2;
+    optional Counter swap = 3;
+    optional Counter anon_and_swap = 4;
+
+    // Available when ART trace events are available.
+    optional Counter java_heap = 5;
+  }
+
+  message Counter {
+    optional double min = 1;
+    optional double max = 2;
+    optional double avg = 3;
+
+    // Memory growth observed in the counter sequence. In case of multiple
+    // processes with the same name, break ties using max.
+    optional double delta = 4;
+  }
+
+  // Process metrics, grouped by process name
+  repeated ProcessMetrics process_metrics = 1;
+}
+
+// End of protos/perfetto/metrics/android/mem_metric.proto
+
+// Begin of protos/perfetto/metrics/android/mem_unagg_metric.proto
+
+// Unaggregated memory metrics on Android.
+message AndroidMemoryUnaggregatedMetric {
+  message ProcessValues {
+    optional string process_name = 1;
+    optional ProcessMemoryValues mem_values = 2;
+  }
+
+  message ProcessMemoryValues {
+    repeated Value anon_rss = 1;
+    repeated Value file_rss = 2;
+    repeated Value swap = 3;
+    repeated Value anon_and_swap = 4;
+  }
+
+  message Value {
+    optional int64 ts = 1;
+    optional int32 oom_score = 2;
+    optional double value = 3;
+  }
+
+  // Process metrics for every process instance in trace.
+  repeated ProcessValues process_values = 1;
+}
+
+// End of protos/perfetto/metrics/android/mem_unagg_metric.proto
+
+// Begin of protos/perfetto/metrics/android/monitor_contention_agg_metric.proto
+
+ // This metric provides aggregated information about monitor contention graph
+ // in a trace
+message AndroidMonitorContentionAggMetric {
+  // Next id: 2
+  // Stats for Monitor contention aggregated by process.
+  message ProcessAggregation {
+    optional string name = 1;
+    optional int64 total_contention_count = 2;
+    optional int64 total_contention_dur = 3;
+    optional int64 main_thread_contention_count = 4;
+    optional int64 main_thread_contention_dur = 5;
+  }
+  repeated ProcessAggregation process_aggregation = 1;
+}
+
+// End of protos/perfetto/metrics/android/monitor_contention_agg_metric.proto
+
+// Begin of protos/perfetto/metrics/android/monitor_contention_metric.proto
+
+// This metric provides information about the monitor contention graph in a
+// trace
+message AndroidMonitorContentionMetric {
+  // Next field id: 26
+  message Node {
+    // Global context
+    optional int64 node_parent_id = 1;
+    optional int64 node_child_id = 24;
+    optional int64 node_id = 2;
+    optional int64 ts = 3;
+    optional int64 dur = 4;
+    optional int64 monotonic_dur = 25;
+    optional string process_name = 14;
+    optional uint32 pid = 23;
+    optional uint32 waiter_count = 11;
+    repeated ThreadStateBreakdown thread_states = 19;
+    repeated BlockedFunctionBreakdown blocked_functions = 20;
+
+    // Blocking context
+    optional string blocking_method = 5;
+    optional string short_blocking_method = 7;
+    optional string blocking_src = 9;
+    optional string blocking_thread_name = 13;
+    optional bool is_blocking_thread_main = 16;
+    optional uint32 blocking_thread_tid = 22;
+
+    // Blocked context
+    optional string blocked_method = 6;
+    optional string short_blocked_method = 8;
+    optional string blocked_src = 10;
+    optional string blocked_thread_name = 12;
+    optional bool is_blocked_thread_main = 15;
+    optional uint32 blocked_thread_tid = 21;
+
+    // Binder context
+    optional int64 binder_reply_ts = 17;
+    optional uint32 binder_reply_tid = 18;
+  }
+
+  message ThreadStateBreakdown {
+    optional string thread_state = 1;
+    optional int64 thread_state_dur = 2;
+    optional int64 thread_state_count = 3;
+  }
+
+  message BlockedFunctionBreakdown {
+    optional string blocked_function = 1;
+    optional int64 blocked_function_dur = 2;
+    optional int64 blocked_function_count = 3;
+  }
+
+  repeated Node node = 1;
+}
+
+// End of protos/perfetto/metrics/android/monitor_contention_metric.proto
+
+// Begin of protos/perfetto/metrics/android/multiuser_metric.proto
+
+// Metrics for Multiuser events, such as switching users.
+message AndroidMultiuserMetric {
+
+  // Holds the data for a Multiuser event.
+  message EventData {
+    // Duration of the event (in milliseconds).
+    optional int32 duration_ms = 1;
+
+    // CPU usage of each process during the event.
+    message CpuUsage {
+      // The userId of the process (e.g. 0 or 10).
+      optional int32 user_id = 1;
+      // The name of the process.
+      optional string process_name = 2;
+      // The number of CPU cycles (in megacycles) spent by that process during the event.
+      optional int32 cpu_mcycles = 3;
+      // The ratio of this process's cycles to the total for all processes, expressed as a percentage.
+      optional float cpu_percentage = 4;
+      // General identifier for this usage source: determined from the process name, user, etc.
+      // Should be stable across multiple runs (i.e. does not print the user_id directly).
+      optional string identifier = 5;
+    }
+    repeated CpuUsage cpu_usage = 2;
+  }
+
+  // Metrics for a user switch.
+  optional EventData user_switch = 1;
+}
+// End of protos/perfetto/metrics/android/multiuser_metric.proto
+
+// Begin of protos/perfetto/metrics/android/network_metric.proto
+
+message AndroidNetworkMetric {
+  message PacketStatistic {
+    // Packet count.
+    optional int64 packets = 1;
+
+    // Packet Bytes.
+    optional int64 bytes = 2;
+
+    // Timestamp when first packet received or transmitted.
+    optional int64 first_packet_timestamp_ns = 3;
+
+    // Timestamp when last packet received or transmitted.
+    optional int64 last_packet_timestamp_ns = 4;
+
+    // Interval between first & last packet. The minimum interval is 10ms.
+    optional int64 interval_ns = 5;
+
+    // Data Speed.
+    optional double data_rate_kbps = 6;
+  }
+
+  message CorePacketStatistic {
+    optional uint32 id = 1;
+    optional PacketStatistic packet_statistic = 2;
+  }
+
+  message Rx {
+    // Total packets statistic.
+    optional PacketStatistic total = 1;
+
+    // Per core packets statistic.
+    repeated CorePacketStatistic core = 2;
+
+    // GRO aggregation ratio.
+    optional string gro_aggregation_ratio = 3;
+  }
+
+  message Tx {
+    // Total packets statistic.
+    optional PacketStatistic total = 1;
+
+    // Per core packets statistic.
+    repeated CorePacketStatistic core = 2;
+  }
+
+  message NetDevice {
+    // Network device name.
+    optional string name = 1;
+
+    // Ingress traffic statistic.
+    optional Rx rx = 2;
+
+    // Egress traffic statistic
+    optional Tx tx = 3;
+  }
+
+  message NetRxActionStatistic {
+    // SoftIrq NET_RX action count.
+    optional int64 count = 1;
+
+    // SoftIrq NET_RX action was running in millisecond.
+    optional double runtime_ms = 2;
+
+    // SoftIrq NET_RX action average running time.
+    optional double avg_runtime_ms = 3;
+
+    // CPU megacycles (i.e. cycles divided by 1e6).
+    optional int64 mcycles = 4;
+
+    // Average weighted CPU frequency by the time the NET_RX Action
+    // running at each frequency.
+    optional int64 avg_freq_khz = 5;
+  }
+
+  message NetTxActionStatistic {
+    // SoftIrq NET_TX action count.
+    optional int64 count = 1;
+
+    // SoftIrq NET_TX action was running in millisecond.
+    optional double runtime_ms = 2;
+
+    // SoftIrq NET_TX action average running time.
+    optional double avg_runtime_ms = 3;
+
+    // CPU megacycles (i.e. cycles divided by 1e6).
+    optional int64 mcycles = 4;
+
+    // Average weighted CPU frequency by the time the NET_TX Action
+    // running at each frequency.
+    optional int64 avg_freq_khz = 5;
+  }
+
+  message IpiActionStatistic {
+    // SoftIrq IPI action count.
+    optional int64 count = 1;
+
+    // SoftIrq IPI action was running in millisecond.
+    optional double runtime_ms = 2;
+
+    // SoftIrq IPI action average running time.
+    optional double avg_runtime_ms = 3;
+  }
+
+  message CoreNetRxActionStatistic {
+    optional uint32 id = 1;
+    optional NetRxActionStatistic net_rx_action_statistic = 2;
+  }
+
+  message CoreNetTxActionStatistic {
+    optional uint32 id = 1;
+    optional NetTxActionStatistic net_tx_action_statistic = 2;
+  }
+
+  message NetRxAction {
+    // Total NET_RX action statistics.
+    optional NetRxActionStatistic total = 1;
+
+    // Per core NET_RX action statistics.
+    repeated CoreNetRxActionStatistic core = 2;
+
+    // The average packet time moves through the kernel stack.
+    optional double avg_interstack_latency_ms = 3;
+  }
+
+  message NetTxAction {
+    // Total NET_TX action statistics.
+    optional NetTxActionStatistic total = 1;
+
+    // Per core NET_TX action statistics.
+    repeated CoreNetTxActionStatistic core = 2;
+  }
+
+  message IpiAction {
+    // Total IPI action statistics.
+    optional IpiActionStatistic total = 1;
+  }
+
+  // Network device metrics.
+  repeated NetDevice net_devices = 1;
+
+  // SoftIrq NET_RX action metrics.
+  optional NetRxAction net_rx_action = 2;
+
+  // Packet retransmission rate.
+  optional double retransmission_rate = 3;
+
+  // Kfree Skb rate (i.e. kfree_skb count divided by the packet count from all
+  // net devices).
+  optional double kfree_skb_rate = 4;
+
+  // SoftIrq NET_TX action metrics.
+  optional NetTxAction net_tx_action = 5;
+
+  // SoftIrq IPI action metrics.
+  optional IpiAction ipi_action = 6;
+}
+
+// End of protos/perfetto/metrics/android/network_metric.proto
+
+// Begin of protos/perfetto/metrics/android/other_traces.proto
+
+message AndroidOtherTracesMetric {
+  // Uuids of other traces being finalized while the current trace was being
+  // recorded.
+  repeated string finalized_traces_uuid = 1;
+}
+
+// End of protos/perfetto/metrics/android/other_traces.proto
+
+// Begin of protos/perfetto/metrics/android/package_list.proto
+
+message AndroidPackageList {
+  message Package {
+    optional string package_name = 1;
+    optional int64 uid = 2;
+    optional int64 version_code = 3;
+  }
+
+  repeated Package packages = 1;
+}
+
+// End of protos/perfetto/metrics/android/package_list.proto
+
+// Begin of protos/perfetto/metrics/android/powrails_metric.proto
+
+message AndroidPowerRails {
+  // Energy data per Power Rail at given ts.
+  message EnergyData {
+    // Time since device boot(CLOCK_BOTTOMTIME) in milli-seconds.
+    optional int64 timestamp_ms = 1;
+    // Accumulated energy since device boot in microwatt-seconds(uws).
+    optional double energy_uws = 2;
+  }
+
+  message PowerRails {
+    // Name of the rail.
+    optional string name = 1;
+    // Energy data for given rail and for all samples in the trace.
+    repeated EnergyData energy_data = 2;
+    // The average used power between the first and the last sampled
+    // energy data in miliwatt (mw)
+    optional double avg_used_power_mw = 3;
+  }
+
+  // Energy data per Power Rail.
+  repeated PowerRails power_rails = 1;
+
+  // The average used power between the first and last sampled rail across all
+  // the rails in milliwatts (mw).
+  optional double avg_total_used_power_mw = 2;
+}
+// End of protos/perfetto/metrics/android/powrails_metric.proto
+
+// Begin of protos/perfetto/metrics/android/profiler_smaps.proto
+
+message ProfilerSmaps {
+  message Mapping {
+    optional string path = 1;
+    optional int32 size_kb = 2;
+    optional int32 private_dirty_kb = 3;
+    optional int32 swap_kb = 4;
+  }
+
+  message Instance {
+    optional AndroidProcessMetadata process = 1;
+    repeated Mapping mappings = 2;
+  }
+
+  repeated Instance instance = 1;
+}
+
+// End of protos/perfetto/metrics/android/profiler_smaps.proto
+
+// Begin of protos/perfetto/metrics/android/rt_runtime_metric.proto
+
+// measure max RT runtime and RT tasks running over 5ms.
+message AndroidRtRuntimeMetric {
+  message RtSlice {
+    // thread name
+    optional string tname = 1;
+    // timestamp
+    optional int64 ts = 2;
+    // runtime of RT task
+    optional int64 dur = 3;
+  }
+
+  // max runtime of RT tasks
+  optional int64 max_runtime = 1;
+  // how many RT tasks are over 5ms.
+  optional int64 over_5ms_count = 2;
+  // information for top 10 RT tasks
+  repeated RtSlice longest_rt_slices = 3;
+}
+
+
+// End of protos/perfetto/metrics/android/rt_runtime_metric.proto
+
+// Begin of protos/perfetto/metrics/android/simpleperf.proto
+
+// Metric that stores information related to atrace events generated by
+// simpleperf tool
+message AndroidSimpleperfMetric {
+  optional double urgent_ratio = 1;
+
+  message PerfEventMetric {
+    // Simpleperf event name
+    optional string name = 1;
+
+    message Thread {
+      // Thread ID
+      optional int32 tid = 1;
+      // Thread name
+      optional string name = 2;
+      // CPU ID
+      optional int32 cpu = 3;
+      // Total counter value
+      optional double total = 4;
+    }
+
+    message Process {
+      // Process ID
+      optional int32 pid = 1;
+      // Process name
+      optional string name = 2;
+      // Metrics for each thread in this process.
+      repeated Thread threads = 3;
+      // Total counter value over all threads in this process
+      optional double total = 4;
+    }
+
+    // Metrics for each process
+    repeated Process processes = 2;
+
+    // Total counter value over all processes and threads
+    optional double total = 3;
+  }
+
+  repeated PerfEventMetric events = 2;
+}
+
+// End of protos/perfetto/metrics/android/simpleperf.proto
+
+// Begin of protos/perfetto/metrics/android/startup_metric.proto
+
+// Android app startup metrics.
+message AndroidStartupMetric {
+  // A simplified view of the task state durations for a thread
+  // and a span of time.
+  message TaskStateBreakdown {
+    optional int64 running_dur_ns = 1;
+    optional int64 runnable_dur_ns = 2;
+    optional int64 uninterruptible_sleep_dur_ns = 3;
+    optional int64 interruptible_sleep_dur_ns = 4;
+    optional int64 uninterruptible_io_sleep_dur_ns = 5;
+    optional int64 uninterruptible_non_io_sleep_dur_ns = 6;
+  }
+
+  message McyclesByCoreType {
+    optional int64 little = 1;
+    optional int64 big = 2;
+    optional int64 bigger = 3;
+    optional int64 unknown = 4;
+  }
+
+  message Slice {
+    optional int64 dur_ns = 1;
+    optional double dur_ms = 2;
+  }
+
+  // Timing information spanning the intent received by the
+  // activity manager to the first frame drawn.
+  // Next id: 36.
+  message ToFirstFrame {
+    // The duration between the intent received and first frame.
+    optional int64 dur_ns = 1;
+    optional double dur_ms = 17;
+
+    // Breakdown of time to first frame by task state for the main thread of
+    // the process starting up.
+    optional TaskStateBreakdown main_thread_by_task_state = 2;
+
+    // The mcycles taken by this startup across all CPUs (broken down by core
+    // type).
+    optional McyclesByCoreType mcycles_by_core_type = 26;
+
+    // In this timespan, how many processes (apart from the main activity) were
+    // spawned.
+    optional uint32 other_processes_spawned_count = 3;
+
+    // Total time spent in activity manager between the initial intent
+    // and the end of the activity starter.
+    optional Slice time_activity_manager = 4;
+
+    // The following slices follow the typical steps post-fork.
+    optional Slice time_activity_thread_main = 5;
+    optional Slice time_bind_application = 6;
+    optional Slice time_activity_start = 7;
+    optional Slice time_activity_resume = 8;
+    optional Slice time_activity_restart = 21;
+    optional Slice time_choreographer = 9;
+    optional Slice time_inflate = 22;
+    optional Slice time_get_resources = 23;
+
+    // If we are starting a new process, record the duration from the
+    // intent being received to the time we call the zygote.
+    optional Slice time_before_start_process = 10;
+
+    // The actual duration of the process start (based on the zygote slice).
+    optional Slice time_during_start_process = 11;
+
+    // The duration from launch to first running state thread of startup process.
+    optional Slice time_to_running_state = 35;
+
+    optional Slice to_post_fork = 18;
+    optional Slice to_activity_thread_main = 19;
+    optional Slice to_bind_application = 20;
+
+    optional Slice time_post_fork = 16;
+
+    // The total time spent on opening dex files.
+    optional Slice time_dex_open = 24;
+    // Total time spent verifying classes during app startup.
+    optional Slice time_verify_class = 25;
+
+    // Number of methods that were compiled by JIT during app startup.
+    optional uint32 jit_compiled_methods = 27;
+
+    // Time spent running CPU on jit thread pool.
+    optional Slice time_jit_thread_pool_on_cpu = 28;
+
+    // Time spent on garbage collection.
+    optional Slice time_gc_total = 29;
+    optional Slice time_gc_on_cpu = 30;
+
+    // Time spent in lock contention on the main thread of the process being
+    // started up. This includes *all* types of lock contention not just monitor
+    // contention.
+    optional Slice time_lock_contention_thread_main = 31;
+
+    // Time spent in monitor lock contention on the main thread of the
+    // process being started up. This will be a subset of the time counted by
+    // |time_lock_contention_thread_main|.
+    optional Slice time_monitor_contention_thread_main = 32;
+
+    // Time spent in opening dex files on the main thread of the process
+    // being started up.
+    optional Slice time_dex_open_thread_main = 33;
+
+    // Time spent in dlopening .so files on the main thread of the process
+    // being started up.
+    optional Slice time_dlopen_thread_main = 34;
+
+    // Removed: was other_process_to_activity_cpu_ratio.
+    reserved 12;
+
+    // Removed: was uint32 versions of to_post_fork, to_activity_thread_main and
+    // to_bind_application.
+    reserved 13, 14, 15;
+  }
+
+  // Metrics about startup which were developed by looking at experiments using
+  // high-speed cameras (HSC).
+  message HscMetrics {
+    // The duration of the full "startup" as defined by HSC tests.
+    optional Slice full_startup = 1;
+  }
+
+  message Activity {
+    optional string name = 1;
+    optional string method = 2;
+    optional int64 ts_method_start = 4;
+
+    // Field 3 contained Slice with a sum of durations for matching slices.
+    reserved 3;
+  }
+
+  message BinderTransaction {
+    optional Slice duration = 1;
+    optional string thread = 2;
+    optional string destination_thread = 3;
+    optional string destination_process = 4;
+    // From
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/perfetto/protos/perfetto/trace/ftrace/binder.proto;l=15;drc=7b6a788162a30802f4c9d8d7a30a54e25edd30f1
+    optional string flags = 5;
+    // From
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/perfetto/protos/perfetto/trace/ftrace/binder.proto;l=14;drc=7b6a788162a30802f4c9d8d7a30a54e25edd30f1
+    optional string code = 6;
+    // From
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/perfetto/protos/perfetto/trace/ftrace/binder.proto;l=37;drc=7b6a788162a30802f4c9d8d7a30a54e25edd30f1
+    optional int64 data_size = 7;
+  }
+
+  // Metrics with information about the status of odex files and the outcome
+  // of the loading process.
+  // Multiple files might be loaded for a single startup. Platform might also
+  // decide to discard an odex file and instead load a fallback, for example
+  // in case the OS or apk were updated.
+  message OptimizationStatus {
+    optional string odex_status = 1;
+    optional string compilation_filter = 2;
+    optional string compilation_reason = 3;
+    optional string location = 4;
+    optional string summary = 5;
+  }
+
+  // Contains the name and duration of class verification occurred during
+  // the startup.
+  message VerifyClass {
+    optional string name = 1;
+    optional int64 dur_ns = 2;
+  }
+
+  // Contains timestamps of important events which occurred during the
+  // startup.
+  message EventTimestamps {
+    optional int64 intent_received = 1;
+    optional int64 first_frame = 2;
+  }
+
+  // Contains information about the state of a system during the app startup.
+  // Useful to put the startup in context.
+  message SystemState {
+    // Whether the dex2oat64 process was running concurrent to the startup.
+    // Deprecated as of 10/2022.
+    optional bool dex2oat_running = 1 [deprecated=true];
+
+    // Whether the installd process was running concurrent to the startup.
+    // Deprecated as of 10/2022.
+    optional bool installd_running = 2 [deprecated=true];
+
+    // The number of broadcasts dispatched by the system during the app
+    // launch.
+    optional int64 broadcast_dispatched_count = 3;
+
+    // The number of broadcasts received by an app or the system during the
+    // app launch. Note that multiple packages can be subscribed to the same
+    // broadcast so a single dsipatch can cause multiple packages to receive
+    // and process a broadcast.
+    optional int64 broadcast_received_count = 4;
+
+    // The most active (i.e. consuming the most mcycles) processes during the
+    // app launch excluding the process(es) being launched.
+    // Note: the exact number of returned is an implementation detail and
+    // will likely change over time.
+    repeated string most_active_non_launch_processes = 5;
+
+    // Duration the installd process was running concurrent to the startup.
+    optional int64 installd_dur_ns = 6;
+    // Duration the dex2oat64 process was running concurrent to the startup.
+    optional int64 dex2oat_dur_ns = 7;
+  }
+
+  // Contains detailed information for slow startup causes.
+  message SlowStartReasonDetailed {
+    optional string reason = 1;
+    optional string details = 2;
+  }
+
+  // Next id: 22
+  message Startup {
+    // Random id uniquely identifying an app startup in this trace.
+    optional uint32 startup_id = 1;
+
+    // Startup type (cold / warm / hot)
+    optional string startup_type = 16;
+
+    // Name of the package launched
+    optional string package_name = 2;
+
+    // Name of the process launched
+    optional string process_name = 3;
+
+    // Details about the activities launched
+    repeated Activity activities = 11;
+
+    // Details about slow binder transactions during the startup. The definition
+    // of a slow transaction is an implementation detail.
+    repeated BinderTransaction long_binder_transactions = 14;
+
+    // Did we ask the zygote for a new process
+    optional bool zygote_new_process = 4;
+
+    // Number of processes hosting the activity involved in the launch.
+    // This will usually be 1. If it is 0, it is indicative of a data / process
+    // error. If > 1, the process died during startup and the system respawned
+    // it.
+    optional uint32 activity_hosting_process_count = 6;
+
+    // Contains timestamps of important events which happened during
+    // the startup.
+    optional EventTimestamps event_timestamps = 13;
+
+    // Timing information spanning the intent received by the
+    // activity manager to the first frame drawn.
+    optional ToFirstFrame to_first_frame = 5;
+
+    // Details about the process (uid, version, etc)
+    optional AndroidProcessMetadata process = 7;
+
+    // Metrics about startup which were developed by looking at experiments
+    // using high-speed cameras (HSC).
+    optional HscMetrics hsc = 8;
+
+    // The time taken in the startup from intent received to the start time
+    // of the reportFullyDrawn slice. This should be longer than the time to
+    // first frame as the application decides this after it starts rendering.
+    optional Slice report_fully_drawn = 9;
+
+    // Contains information about the status of odex files.
+    repeated OptimizationStatus optimization_status = 12;
+
+    // Contains information about the class verification.
+    repeated VerifyClass verify_class = 19;
+
+    // Contains the dlopen file names.
+    repeated string dlopen_file = 20;
+
+    // Package name of startups running concurrent to the launch.
+    repeated string startup_concurrent_to_launch = 18;
+
+    // Contains information about the state of the rest of the system during the
+    // startup. This is useful for getting context about why a startup might
+    // be slow beyond just what the app is doing.
+    optional SystemState system_state = 15;
+
+    // A list of identified potential causes for slow startup.
+    // Optional.
+    repeated string slow_start_reason = 17;
+
+    // Same as slow_start_reason, but with more detailed information.
+    repeated SlowStartReasonDetailed slow_start_reason_detailed = 21;
+
+    reserved 10;
+  }
+
+  repeated Startup startup = 1;
+}
+
+// End of protos/perfetto/metrics/android/startup_metric.proto
+
+// Begin of protos/perfetto/metrics/android/surfaceflinger.proto
+
+message AndroidSurfaceflingerMetric {
+  // Counts the number of missed frames in the trace.
+  optional uint32 missed_frames = 1;
+
+  // Counts the number of missed HWC frames in the trace.
+  optional uint32 missed_hwc_frames = 2;
+
+  // Counts the number of missed GPU frames in the trace.
+  optional uint32 missed_gpu_frames = 3;
+
+  // Calculate the number of missed frames divided by
+  // total frames
+  optional double missed_frame_rate = 4;
+
+  // Calculate the number of missed HWC frames divided by
+  // total HWC frames
+  optional double missed_hwc_frame_rate = 5;
+
+  // Calculate the number of missed GPU frames divided by
+  // total GPU frames
+  optional double missed_gpu_frame_rate = 6;
+
+  // Count the number of times SurfaceFlinger needs to invoke GPU
+  // for rendering some layers
+  optional uint32 gpu_invocations = 7;
+
+  // Calculate the average duration of GPU request by SurfaceFlinger
+  // since it enters the FenceMonitor's queue until it gets completed
+  optional double avg_gpu_waiting_dur_ms = 8;
+
+  // Calculate the total duration when there is at least one GPU request
+  // by SurfaceFlinger that is still waiting for GPU to complete the
+  // request.
+  // This also equals to the total duration of
+  // "waiting for GPU completion <fence_num>" in SurfaceFlinger.
+  optional double total_non_empty_gpu_waiting_dur_ms = 9;
+
+  message MetricsPerDisplay {
+    // Display ID in SF
+    optional string display_id = 1;
+
+    // Counts the number of missed frames in the trace.
+    optional uint32 missed_frames = 2;
+
+    // Counts the number of missed HWC frames in the trace.
+    optional uint32 missed_hwc_frames = 3;
+
+    // Counts the number of missed GPU frames in the trace.
+    optional uint32 missed_gpu_frames = 4;
+
+    // Calculate the number of missed frames divided by
+    // total frames
+    optional double missed_frame_rate = 5;
+
+    // Calculate the number of missed HWC frames divided by
+    // total HWC frames
+    optional double missed_hwc_frame_rate = 6;
+
+    // Calculate the number of missed GPU frames divided by
+    // total GPU frames
+    optional double missed_gpu_frame_rate = 7;
+  }
+
+  repeated MetricsPerDisplay metrics_per_display = 10;
+}
+
+// End of protos/perfetto/metrics/android/surfaceflinger.proto
+
+// Begin of protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto
+
+// Statistical performance data row for a set of slices
+message SysUiSlicePerformanceStatisticalData {
+  // Name of the Slice
+  optional string name = 1;
+  // Number of times it happened within the CUJ
+  optional int64 cnt = 2;
+  // Average duration within the CUJ
+  optional int64 avg_dur_ms = 3;
+  // Maximal duration within the CUJ
+  optional int64 max_dur_ms = 4;
+  // Average duration within the CUJ in nanoseconds
+  optional int64 avg_dur_ns = 6;
+  // Maximal duration within the CUJ in nanoseconds
+  optional int64 max_dur_ns = 7;
+}
+// End of protos/perfetto/metrics/android/sysui_slice_performance_statistical_data.proto
+
+// Begin of protos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.proto
+// System UI Notifications ShadeListBuilder.buildList slices.
+// Shows count, average duration, and max duration for each.
+message SysuiNotifShadeListBuilderMetric {
+  optional SysUiSlicePerformanceStatisticalData all_slices_performance = 1;
+  optional SysUiSlicePerformanceStatisticalData slices_with_inflation_performance = 2;
+  optional SysUiSlicePerformanceStatisticalData slices_with_modification_performance = 3;
+
+  // Data row for a single slice
+  message SliceDuration {
+    // Name of the Slice
+    optional string name = 1;
+
+    // Duration in ms
+    optional int64 dur_ms = 2;
+
+    // Duration in ns
+    optional int64 dur_ns = 3;
+  }
+  repeated SliceDuration slice = 4;
+}
+// End of protos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.proto
+
+// Begin of protos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.proto
+
+// System UI Notifications ShadeListBuilder.buildList slices.
+// Shows count, average duration, and max duration for each.
+message SysuiUpdateNotifOnUiModeChangedMetric {
+  optional SysUiSlicePerformanceStatisticalData all_slices_performance = 1;
+  // Data row for a single slice
+  message SliceDuration {
+    // Name of the Slice
+    optional string name = 1;
+
+    // Duration in ms
+    optional int64 dur_ms = 2;
+
+    // Duration in ns
+    optional int64 dur_ns = 3;
+  }
+  repeated SliceDuration slice = 2;
+}
+// End of protos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.proto
+
+// Begin of protos/perfetto/metrics/android/task_names.proto
+
+message AndroidTaskNames {
+  message Process {
+    optional int64 pid = 1;
+
+    // Process name.
+    optional string process_name = 2;
+
+    // Names of all threads for this process.
+    repeated string thread_name = 3;
+
+    // User id under which this process runs.
+    optional int64 uid = 4;
+
+    // Packages matching the process uid.
+    repeated string uid_package_name = 5;
+
+    // Removed, was short_lived_tasks.
+    reserved 6;
+
+    // Removed, was long_lived_tasks.
+    reserved 7;
+  }
+
+  repeated Process process = 1;
+}
+
+// End of protos/perfetto/metrics/android/task_names.proto
+
+// Begin of protos/perfetto/metrics/android/trace_quality.proto
+
+// Metric which checks the data in the trace processor tables is "reasonble"
+// (i.e. we would expect to see it from a real device).
+//
+// This is useful to reject traces which may be valid (so no stat would be
+// recorded) but a human would find the trace nonsensical.
+message AndroidTraceQualityMetric {
+  message Failure {
+    // The name of the failed check.
+    optional string name = 1;
+  }
+  repeated Failure failures = 1;
+}
+// End of protos/perfetto/metrics/android/trace_quality.proto
+
+// Begin of protos/perfetto/metrics/android/unsymbolized_frames.proto
+
+message UnsymbolizedFrames {
+  message Frame {
+    optional string module = 1;
+    optional string build_id = 2;
+    optional int64 address = 3;
+
+    // In some cases (Chrome/Webview) the ID that should be used to query
+    // symbols in Google's internal tera-scale symbolization service is !=
+    // `build_id` and requires some mangling.
+    // This field is == 'build_id` for non-chromium cases, and is the breakpad
+    // module ID (with lowercase hex digics) for chromium cases.
+    optional string google_lookup_id = 4;
+  }
+
+  repeated Frame frames = 1;
+}
+
+// End of protos/perfetto/metrics/android/unsymbolized_frames.proto
+
+// Begin of protos/perfetto/metrics/metrics.proto
+
+// Trace processor metadata
+message TraceMetadata {
+  reserved 1;
+  optional int64 trace_duration_ns = 2;
+  optional string trace_uuid = 3;
+  optional string android_build_fingerprint = 4;
+  optional int64 statsd_triggering_subscription_id = 5;
+  optional int64 trace_size_bytes = 6;
+  repeated string trace_trigger = 7;
+  optional string unique_session_name = 8;
+  optional string trace_config_pbtxt = 9;
+  optional int64 sched_duration_ns = 10;
+  optional int64 tracing_started_ns = 11;
+}
+
+// Stats counters for the trace.
+// Defined in src/trace_processor/storage/stats.h
+message TraceAnalysisStats {
+  enum Severity {
+    SEVERITY_UNKNOWN = 0;
+    SEVERITY_INFO = 1;
+    SEVERITY_DATA_LOSS = 2;
+    SEVERITY_ERROR = 3;
+  }
+
+  enum Source {
+    SOURCE_UNKNOWN = 0;
+    SOURCE_TRACE = 1;
+    SOURCE_ANALYSIS = 2;
+  }
+
+  message Stat {
+    optional string name = 1;
+    optional uint32 idx = 2;
+    optional Severity severity = 3;
+    optional Source source = 4;
+
+    optional int64 count = 5;
+  }
+
+  repeated Stat stat = 1;
+}
+
+// Root message for all Perfetto-based metrics.
+//
+// Next id: 66
+message TraceMetrics {
+  reserved 4, 10, 13, 14, 16, 19;
+
+  // Battery counters metric on Android.
+  optional AndroidBatteryMetric android_batt = 5;
+
+  // CPU usage per trace, process and thread.
+  optional AndroidCpuMetric android_cpu = 6;
+
+  // Memory metrics on Android (owned by the Android Telemetry team).
+  optional AndroidMemoryMetric android_mem = 1;
+
+  // Memory metrics on Android in unaggregated form. (owned by the Android
+  // Telemetry team).
+  // Note: this generates a lot of data so should not be requested unless it
+  // is clear that this data is necessary.
+  optional AndroidMemoryUnaggregatedMetric android_mem_unagg = 11;
+
+  // Package list.
+  optional AndroidPackageList android_package_list = 12;
+
+  // ion buffer memory metrics.
+  optional AndroidIonMetric android_ion = 9;
+
+  // fastrpc subsystem memory metrics.
+  optional AndroidFastrpcMetric android_fastrpc = 31;
+
+  // Statistics about low memory kills.
+  optional AndroidLmkMetric android_lmk = 8;
+
+  // Power Rails metrics on Android.
+  optional AndroidPowerRails android_powrails = 7;
+
+  // Startup metrics on Android (owned by the Android Telemetry team).
+  optional AndroidStartupMetric android_startup = 2;
+
+  // Trace metadata (applicable to all traces).
+  optional TraceMetadata trace_metadata = 3;
+
+  // Trace stats (applicable to all traces).
+  optional TraceAnalysisStats trace_stats = 33;
+
+  // Returns stack frames missing symbols.
+  optional UnsymbolizedFrames unsymbolized_frames = 15;
+
+  // If the trace contains a heap graph, output allocation statistics.
+  optional JavaHeapStats java_heap_stats = 17;
+
+  // If the trace contains a heap graph, output histogram.
+  optional JavaHeapHistogram java_heap_histogram = 21;
+
+  // Metrics used to find potential culprits of low-memory kills.
+  optional AndroidLmkReasonMetric android_lmk_reason = 18;
+
+  optional AndroidHwuiMetric android_hwui_metric = 20;
+
+  optional AndroidDisplayMetrics display_metrics = 22;
+
+  optional AndroidTaskNames android_task_names = 23;
+
+  // Deprecated was AndroidThreadTimeInStateMetric
+  reserved 24;
+
+  // Metric associated with surfaceflinger.
+  optional AndroidSurfaceflingerMetric android_surfaceflinger = 25;
+
+  // GPU metrics on Android.
+  optional AndroidGpuMetric android_gpu = 26;
+
+  // Deprecated AndroidSysUiCujMetrics.
+  reserved 27;
+
+  // Interaction and frame timings for CUJs (important UI transitions).
+  optional AndroidJankCujMetric android_jank_cuj = 48;
+
+  // Metric associated with hwcomposer.
+  optional AndroidHwcomposerMetrics android_hwcomposer = 28;
+
+  // Deprecated was AndroidJankMetrics;
+  reserved 29;
+
+  // G2D metrics.
+  optional G2dMetrics g2d = 30;
+
+  // Dmabuf heap metrics.
+  optional AndroidDmaHeapMetric android_dma_heap = 32;
+
+  // Metric to verify the quality of the trace.
+  optional AndroidTraceQualityMetric android_trace_quality = 34;
+
+  // Profiler smaps
+  optional ProfilerSmaps profiler_smaps = 35;
+
+  // Multiuser - metrics for switching users.
+  optional AndroidMultiuserMetric android_multiuser = 36;
+
+  // Metrics related to simpleperf tool
+  optional AndroidSimpleperfMetric android_simpleperf = 37;
+
+  // Metrics for the Camera team.
+  optional AndroidCameraMetric android_camera = 38;
+
+  // Metrics for dynamic voltage and frequency scaling.
+  optional AndroidDvfsMetric android_dvfs = 39;
+
+  // Metrics for network performance.
+  optional AndroidNetworkMetric android_netperf = 40;
+
+  // Metrics for the Camera team.
+  // Note: this generates a lot of data so should not be requested unless it
+  // is clear that this data is necessary.
+  optional AndroidCameraUnaggregatedMetric android_camera_unagg = 41;
+
+  // Metrics for RT runtime.
+  optional AndroidRtRuntimeMetric android_rt_runtime = 42;
+
+  // Metrics for IRQ runtime.
+  optional AndroidIrqRuntimeMetric android_irq_runtime = 43;
+
+  // Metrics for the Trusty team.
+  optional AndroidTrustyWorkqueues android_trusty_workqueues = 44;
+
+  // Summary of other concurrent trace recording.
+  optional AndroidOtherTracesMetric android_other_traces = 45;
+
+  // Per-process Binder transaction metrics.
+  optional AndroidBinderMetric android_binder = 46;
+
+  // Metrics for app deadline missed.
+  optional AndroidFrameTimelineMetric android_frame_timeline_metric = 47;
+
+  // Blocking calls (e.g. binder calls) for CUJs (important UI transitions).
+  optional AndroidBlockingCallsCujMetric android_blocking_calls_cuj_metric = 49;
+
+  optional AndroidMonitorContentionMetric android_monitor_contention = 50;
+
+  optional AndroidSysUINotificationsBlockingCallsMetric android_sysui_notifications_blocking_calls_metric = 51;
+
+  // Metrics to track codec framework.
+  optional AndroidCodecMetrics codec_metrics = 52;
+
+  // Metric to track Android IO.
+  optional AndroidIo android_io = 53;
+
+  // IO metrics on Android in unaggregated form.
+  // Note: this generates a lot of data so should not be requested unless it
+  // is clear that this data is necessary.
+  optional AndroidIoUnaggregated android_io_unagg = 54;
+
+  // Metrics for App Not Responding (ANR) errors.
+  optional AndroidAnrMetric android_anr = 55;
+
+  // Aggregated Android Monitor Contention metrics
+  optional AndroidMonitorContentionAggMetric android_monitor_contention_agg = 56;
+
+  optional AndroidBootMetric android_boot = 57;
+
+  // Metric for AdServices module.
+  optional AdServicesMetric ad_services_metric = 58;
+
+  optional SysuiNotifShadeListBuilderMetric sysui_notif_shade_list_builder_metric = 59;
+
+  optional SysuiUpdateNotifOnUiModeChangedMetric sysui_update_notif_on_ui_mode_changed_metric = 60;
+
+  // Metrics for Process starts.
+  optional AndroidAppProcessStartsMetric android_app_process_starts = 61;
+
+  // Android boot unaggregated metrics.
+  optional AndroidBootUnagg android_boot_unagg = 62;
+
+  // Android garbage collection metrics
+  optional AndroidGarbageCollectionUnaggMetric android_garbage_collection_unagg = 63;
+
+  // Multiuser - metrics for switching users.
+  // Specific for Android Auto
+  optional AndroidMultiuserMetric android_auto_multiuser = 64;
+
+  // All blocking calls (e.g. binder calls) for a trace.
+  optional AndroidBlockingCallsUnagg android_blocking_calls_unagg = 65;
+
+  // Demo extensions.
+  extensions 450 to 499;
+
+  // Vendor extensions.
+  extensions 500 to 1000;
+
+  // Chrome metrics.
+  extensions 1001 to 2000;
+
+  // WebView metrics.
+  extensions 2001 to 2500;
+}
+
+// End of protos/perfetto/metrics/metrics.proto
diff --git a/src/libtracing/protos/perfetto/metrics/webview/all_webview_metrics.proto b/src/libtracing/protos/perfetto/metrics/webview/all_webview_metrics.proto
new file mode 100644
index 000000000..c0c035b9b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/webview/all_webview_metrics.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/metrics/metrics.proto";
+import "protos/perfetto/metrics/webview/webview_jank_approximation.proto";
+
+extend TraceMetrics {
+  optional WebViewJankApproximation webview_jank_approximation = 2001;
+}
diff --git a/src/libtracing/protos/perfetto/metrics/webview/webview_jank_approximation.proto b/src/libtracing/protos/perfetto/metrics/webview/webview_jank_approximation.proto
new file mode 100644
index 000000000..cdf7299a3
--- /dev/null
+++ b/src/libtracing/protos/perfetto/metrics/webview/webview_jank_approximation.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message WebViewJankApproximation {
+  optional int32 webview_janks = 1;
+  optional int32 webview_janks_without_startup = 2;
+  optional int32 webview_app_janks = 3;
+  optional int32 webview_total_janks = 4;
+  optional int32 total_janks = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/android_game_intervention_list.proto b/src/libtracing/protos/perfetto/trace/android/android_game_intervention_list.proto
new file mode 100644
index 000000000..90bc34b88
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/android_game_intervention_list.proto
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message AndroidGameInterventionList {
+  message GameModeInfo {
+    optional uint32 mode = 1;
+    optional bool use_angle = 2;
+    optional float resolution_downscale = 3;
+    optional float fps = 4;
+  }
+  message GamePackageInfo {
+    optional string name = 1;
+    optional uint64 uid = 2;
+    optional uint32 current_mode = 3;
+    repeated GameModeInfo game_mode_info = 4;
+  }
+
+  repeated GamePackageInfo game_packages = 1;
+
+  // True when at least one error occurred when parsing
+  // game_mode_intervention.list
+  optional bool parse_error = 2;
+
+  // Failed to open / read game_mode_intervention.list
+  optional bool read_error = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/android_input_event.proto b/src/libtracing/protos/perfetto/trace/android/android_input_event.proto
new file mode 100644
index 000000000..6a9195030
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/android_input_event.proto
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// A representation of an Android MotionEvent.
+// See: https://developer.android.com/reference/android/view/MotionEvent
+message AndroidMotionEvent {
+  // A representation of one pointer inside a MotionEvent.
+  // Each Pointer contains the values present in its corresponding
+  // MotionEvent.PointerCoords and MotionEvent.PointerProperties.
+  message Pointer {
+     message AxisValue {
+      optional int32 axis = 1;
+      optional float value = 2;
+    }
+    repeated AxisValue axis_value = 1;
+    optional int32 pointer_id = 2;
+    optional int32 tool_type = 3;
+  }
+
+  // The randomly-generated ID used to track the event through the pipeline.
+  optional fixed32 event_id = 1;
+  // The event's timestamp - generated by the kernel.
+  optional int64 event_time_nanos = 2;
+  optional uint32 source = 3;
+  optional int32 action = 4;
+  optional int32 device_id = 5;
+  // Use a signed int for display_id, because -1 (DISPLAY_IS_NONE) is a common value.
+  optional sint32 display_id = 6;
+  optional int32 classification = 7;
+  optional uint32 flags = 8;
+  repeated Pointer pointer = 9;
+
+  // Field numbers 10-15 are reserved for commonly used fields.
+
+  // If this event was synthesized as a result of one or more different
+  // event, original_event_ids are the event_ids associated with the original events.
+  // For example, if this is an ACTION_HOVER_ENTER event that is synthesized
+  // due to an ACTION_HOVER_MOVE event entering the bounds of a window, the
+  // id of the original hover move event will be listed here.
+  repeated fixed32 original_event_id = 16 [packed = true];
+  // The timestamp of the ACTION_DOWN event associated with this gesture.
+  optional int64 down_time_nanos = 17;
+  optional float cursor_position_x = 18;
+  optional float cursor_position_y = 19;
+  optional int32 action_button = 20;
+  optional uint32 button_state = 21;
+  optional uint32 meta_state = 22;
+  optional uint32 policy_flags = 23;
+  optional float precision_x = 24;
+  optional float precision_y = 25;
+}
+
+// A representation of an Android KeyEvent.
+// See: https://developer.android.com/reference/android/view/KeyEvent
+message AndroidKeyEvent {
+  // The randomly-generated ID used to track the event through the pipeline.
+  optional fixed32 event_id = 1;
+  // The event's timestamp - generated by the kernel.
+  optional int64 event_time_nanos = 2;
+  // The timestamp of the ACTION_DOWN event associated with this gesture.
+  optional int64 down_time_nanos = 3;
+  optional uint32 source = 4;
+  optional int32 action = 5;
+  optional int32 device_id = 6;
+  // Use a signed int for display_id, because -1 (DISPLAY_IS_NONE) is a common value.
+  optional sint32 display_id = 7;
+  optional int32 key_code = 8;
+  optional uint32 scan_code = 9;
+  optional uint32 meta_state = 10;
+  optional int32 repeat_count = 11;
+  optional uint32 flags = 12;
+  optional uint32 policy_flags = 13;
+}
+
+// An event that traces an input event being dispatched by the system to one window.
+message AndroidWindowInputDispatchEvent {
+  // Stores x/y values for each pointer sent to the window for events
+  // that are dispatched to a certain location on the screen. This is not relevant
+  // for KeyEvents and MotionEvents that are dispatched to focused windows.
+  message DispatchedPointer {
+    optional int32 pointer_id = 1;
+    // The coordinates of the pointer in the logical display space, AKA "raw coordinates".
+    optional float x_in_display = 2;
+    optional float y_in_display = 3;
+    // The axis values for this pointer that were modified by the window transform.
+    repeated AndroidMotionEvent.Pointer.AxisValue axis_value_in_window = 4;
+  }
+
+  // The event_id of the event that was dispatched to the window.
+  optional fixed32 event_id = 1;
+  // The vsync_id of the frame in which the decision was made to dispatch the event to
+  // the window.
+  optional int64 vsync_id = 2;
+  // The id of the window to which the event was dispatched.
+  optional int32 window_id = 3;
+  // Only relevant for MotionEvents that are dispatched to a screen location.
+  // Each DispatchedPointer has a 1:1 correspondence with the Pointers in the AndroidMotionEvent.
+  repeated DispatchedPointer dispatched_pointer = 4;
+  // The event flags that were used when dispatching the event to this window.
+  // If the same event is dispatched to more than one window, it is possible that they
+  // were dispatched using different flag values for each window.
+  optional uint32 resolved_flags = 5;
+}
+
+message AndroidInputEvent {
+  oneof event {
+    // Traces input events received by or generated by InputDispatcher
+    AndroidMotionEvent dispatcher_motion_event = 1;
+    AndroidMotionEvent dispatcher_motion_event_redacted = 2;
+    AndroidKeyEvent dispatcher_key_event = 3;
+    AndroidKeyEvent dispatcher_key_event_redacted = 4;
+
+    // Traces an event being dispatched to a window.
+    AndroidWindowInputDispatchEvent dispatcher_window_dispatch_event = 5;
+    AndroidWindowInputDispatchEvent dispatcher_window_dispatch_event_redacted = 6;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/android_log.proto b/src/libtracing/protos/perfetto/trace/android/android_log.proto
new file mode 100644
index 000000000..4ee0a5d84
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/android_log.proto
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+import "protos/perfetto/common/android_log_constants.proto";
+
+message AndroidLogPacket {
+  message LogEvent {
+    // The log buffer (e.g. MAIN, SYSTEM, RADIO) the event comes from.
+    optional AndroidLogId log_id = 1;
+
+    // PID (TGID), TID and UID of the task that emitted the event.
+    optional int32 pid = 2;
+    optional int32 tid = 3;
+    optional int32 uid = 4;
+
+    // Timestamp [ns]. The clock source is CLOCK_REALTIME, unlike many other
+    // Perfetto trace events that instead use CLOCK_BOOTTIME. The trace
+    // processor will take care of realigning clocks using the ClockSnapshot(s).
+    optional uint64 timestamp = 5;
+
+    // When log_id == LID_EVENTS, |tag| corresponds to the event name defined in
+    // the second column of /system/etc/event-log-tags. For all other events,
+    // |tag| is the app-specified argument passed to __android_log_write().
+    optional string tag = 6;
+
+    // Empty when log_id == LID_EVENTS.
+    optional AndroidLogPriority prio = 7;
+
+    // Empty when log_id == LID_EVENTS.
+    optional string message = 8;
+
+    message Arg {
+      optional string name = 1;
+      oneof value {
+        int64 int_value = 2;
+        float float_value = 3;
+        string string_value = 4;
+      }
+    }
+    // Only populated when log_id == LID_EVENTS.
+    repeated Arg args = 9;
+  }
+
+  repeated LogEvent events = 1;
+
+  // Stats are emitted only upon Flush() and are monotonic (i.e. they are
+  // absolute counters since the beginning of the lifetime of the tracing
+  // session and NOT relative to the previous Stats snapshot).
+  message Stats {
+    // Total number of log events seen, including errors and skipped entries
+    // (num of events stored in the trace = total - failed - skipped).
+    optional uint64 num_total = 1;
+
+    // Parser failures.
+    optional uint64 num_failed = 2;
+
+    // Messages skipped due to filters.
+    optional uint64 num_skipped = 3;
+  }
+  optional Stats stats = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/android_system_property.proto b/src/libtracing/protos/perfetto/trace/android/android_system_property.proto
new file mode 100644
index 000000000..5f5ada196
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/android_system_property.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message AndroidSystemProperty {
+  message PropertyValue {
+    optional string name = 1;
+    optional string value = 2;
+  }
+
+  repeated PropertyValue values = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/camera_event.proto b/src/libtracing/protos/perfetto/trace/android/camera_event.proto
new file mode 100644
index 000000000..1e0b88768
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/camera_event.proto
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// A profiling event corresponding to a single camera frame. This message
+// collects important details and timestamps involved in producing a single
+// camera frame.
+// Next ID: 17
+message AndroidCameraFrameEvent {
+  // Identifier for the CameraCaptureSession this frame originates from. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession
+  optional uint64 session_id = 1;
+  // Identifier for the camera sensor that is the source of this frame. This may
+  // be either a physical or logical camera (up to vendor interpretation).
+  optional uint32 camera_id = 2;
+  // The frame number identifying this frame on this camera.
+  optional int64 frame_number = 3;
+  // Identifier for the CaptureRequest. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CaptureRequest
+  //
+  // If multiple cameras are streaming simultaneously, the request_id may be
+  // used to identify which frames were captured in service of the same request.
+  optional int64 request_id = 4;
+
+  // The CLOCK_BOOTTIME timestamp at which the camera framework request is
+  // received by the camera HAL pipeline. Note that this request may wait for
+  // some time before processing actually begins. See also
+  // request_processing_started_ns.
+  optional int64 request_received_ns = 5;
+  // The CLOCK_BOOTTIME timestamp at which the framework request is accepted for
+  // processing by the camera HAL pipeline. This is the time at which the
+  // pipeline actually begins to work on the request.
+  optional int64 request_processing_started_ns = 6;
+
+  // The CLOCK_BOOTTIME timestamp at which the sensor begins its exposure.
+  optional int64 start_of_exposure_ns = 7;
+  // The CLOCK_BOOTTIME timestamp corresponding to the sensor start of frame
+  // event.
+  optional int64 start_of_frame_ns = 8;
+  // The CLOCK_BOOTTIME timestamp at which the camera HAL has sent all responses
+  // for the frame.
+  optional int64 responses_all_sent_ns = 9;
+
+  // The error status, if any, reported to the camera framework. Any status
+  // other than STATUS_OK indicates a dropped frame.
+  // Next Enum: 6
+  enum CaptureResultStatus {
+    STATUS_UNSPECIFIED = 0;
+    STATUS_OK = 1;
+    // Early metadata was returned to the camera framework with an error.
+    STATUS_EARLY_METADATA_ERROR = 2;
+    // Final metadata was returned to the camera framework with an error.
+    STATUS_FINAL_METADATA_ERROR = 3;
+    // One or more buffers were returned to the camera framework with an error.
+    STATUS_BUFFER_ERROR = 4;
+    // The frame was dropped as a result of a flush operation.
+    STATUS_FLUSH_ERROR = 5;
+  }
+  optional CaptureResultStatus capture_result_status = 10;
+
+  // The number of sensor frames that were skipped between this frame and the
+  // previous frame. Under normal operation, this should be zero. Any number
+  // greater than zero indicates dropped sensor frames.
+  optional int32 skipped_sensor_frames = 11;
+
+  // The value of CONTROL_CAPTURE_INTENT. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CaptureRequest#CONTROL_CAPTURE_INTENT
+  optional int32 capture_intent = 12;
+  // The number of streams in the capture request.
+  optional int32 num_streams = 13;
+
+  // A profiling event corresponding to a single node processing within the camera
+  // pipeline. Intuitively this corresponds to a single stage of processing to
+  // produce a camera frame.
+  // Next ID: 6
+  message CameraNodeProcessingDetails {
+    optional int64 node_id = 1;
+    // The timestamp at which node processing begins to run.
+    optional int64 start_processing_ns = 2;
+    // The timestamp at which node processing finishes running.
+    optional int64 end_processing_ns = 3;
+    // The delay between inputs becoming ready and the node actually beginning to
+    // run.
+    optional int64 scheduling_latency_ns = 4;
+  }
+  repeated CameraNodeProcessingDetails node_processing_details = 14;
+
+  // These fields capture vendor-specific additions to this proto message. In
+  // practice `vendor_data` typically contains a serialized message of the
+  // vendor's design, and `vendor_data_version` is incremented each time there
+  // is a backwards incompatible change made to the message.
+  optional int32 vendor_data_version = 15;
+  optional bytes vendor_data = 16;
+}
+
+// A profiling event that may be emitted periodically (i.e., at a slower rate
+// than `AndroidCameraFrameEvent`s) to record fixed and aggregated camera
+// session-specific values.
+message AndroidCameraSessionStats {
+  // Identifier for the CameraCaptureSession this frame originates from. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession
+  optional uint64 session_id = 1;
+
+  // Although vendor implementations may vary, camera pipeline processing is
+  // typically arranged into a directed graph-like structure. This message is
+  // used to record that graph.
+  message CameraGraph {
+    message CameraNode {
+      optional int64 node_id = 1;
+      // A list of inputs consumed by this node.
+      repeated int64 input_ids = 2;
+      // A list of outputs produced by this node.
+      repeated int64 output_ids = 3;
+
+      // These fields capture vendor-specific additions to this proto message. In
+      // practice `vendor_data` typically contains a serialized message of the
+      // vendor's design, and `vendor_data_version` is incremented each time there
+      // is a backwards incompatible change made to the message.
+      optional int32 vendor_data_version = 4;
+      optional bytes vendor_data = 5;
+    }
+    repeated CameraNode nodes = 1;
+
+    // An adjacency list describing connections between CameraNodes, mapping
+    // nodes and their outputs to other nodes that consume them as inputs.
+    message CameraEdge {
+      // The pair of IDs identifying the node and output connected by this edge.
+      optional int64 output_node_id = 1;
+      optional int64 output_id = 2;
+
+      // The pair of IDs identifying the node and input connected by this edge.
+      optional int64 input_node_id = 3;
+      optional int64 input_id = 4;
+
+      // These fields capture vendor-specific additions to this proto message. In
+      // practice `vendor_data` typically contains a serialized message of the
+      // vendor's design, and `vendor_data_version` is incremented each time there
+      // is a backwards incompatible change made to the message.
+      optional int32 vendor_data_version = 5;
+      optional bytes vendor_data = 6;
+    }
+    repeated CameraEdge edges = 2;
+  }
+  optional CameraGraph graph = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/frame_timeline_event.proto b/src/libtracing/protos/perfetto/trace/android/frame_timeline_event.proto
new file mode 100644
index 000000000..db6ed905c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/frame_timeline_event.proto
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Generated by SurfaceFlinger's FrameTimeline (go/adaptive-scheduling-fr).
+// Used in comparing the expected timeline of a frame to the actual timeline.
+// Key terms:
+//    1) DisplayFrame - represents SurfaceFlinger's work on a frame(composited)
+//    2) SurfaceFrame - represents App's work on its frame
+//    3) Timeline = start to end of a component's(app/SF) work on a frame.
+// SurfaceFlinger composites frames from many apps together, so
+//    One DisplayFrame can map to N SurfaceFrame(s)
+// This relationship can be reconstructed by using
+//    DisplayFrame.token = SurfaceFrame.display_frame_token
+message FrameTimelineEvent {
+  // Specifies the reason(s) most likely to have caused the jank.
+  // Used as a bitmask.
+  enum JankType {
+    JANK_UNSPECIFIED = 0;
+    JANK_NONE = 1;
+    JANK_SF_SCHEDULING = 2;
+    JANK_PREDICTION_ERROR = 4;
+    JANK_DISPLAY_HAL = 8;
+    JANK_SF_CPU_DEADLINE_MISSED = 16;
+    JANK_SF_GPU_DEADLINE_MISSED = 32;
+    JANK_APP_DEADLINE_MISSED = 64;
+    JANK_BUFFER_STUFFING = 128;
+    JANK_UNKNOWN = 256;
+    JANK_SF_STUFFING = 512;
+    JANK_DROPPED = 1024;
+  };
+
+  // Specifies the severity of a jank.
+  enum JankSeverityType {
+    SEVERITY_UNKNOWN = 0;
+    SEVERITY_NONE = 1;
+    SEVERITY_PARTIAL = 2;
+    SEVERITY_FULL = 3;
+  }
+
+  // Specifies how a frame was presented on screen w.r.t. timing.
+  // Can be different for SurfaceFrame and DisplayFrame.
+  enum PresentType {
+    PRESENT_UNSPECIFIED = 0;
+    PRESENT_ON_TIME = 1;
+    PRESENT_LATE = 2;
+    PRESENT_EARLY = 3;
+    PRESENT_DROPPED = 4;
+    PRESENT_UNKNOWN = 5;
+  };
+
+  // Specifies if the predictions for the frame are still valid, expired or
+  // unknown.
+  enum PredictionType {
+    PREDICTION_UNSPECIFIED = 0;
+    PREDICTION_VALID = 1;
+    PREDICTION_EXPIRED = 2;
+    PREDICTION_UNKNOWN = 3;
+  };
+
+  // Indicates the start of expected timeline slice for SurfaceFrames.
+  message ExpectedSurfaceFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by the app for its work. Can be shared between multiple
+    // layers of the same app (example: pip mode).
+    optional int64 token = 2;
+    // The corresponding DisplayFrame token is required to link the App's work
+    // with SurfaceFlinger's work. Many SurfaceFrames can be mapped to a single
+    // DisplayFrame.
+    // this.display_frame_token = DisplayFrame.token
+    optional int64 display_frame_token = 3;
+
+    // Pid of the app. Used in creating the timeline tracks (and slices) inside
+    // the respective process track group.
+    optional int32 pid = 4;
+    optional string layer_name = 5;
+  };
+
+  // Indicates the start of actual timeline slice for SurfaceFrames. Also
+  // includes the jank information.
+  message ActualSurfaceFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by the app for its work. Can be shared between multiple
+    // layers of the same app (example: pip mode).
+    optional int64 token = 2;
+    // The corresponding DisplayFrame token is required to link the App's work
+    // with SurfaceFlinger's work. Many SurfaceFrames can be mapped to a single
+    // DisplayFrame.
+    // this.display_frame_token = DisplayFrame.token
+    optional int64 display_frame_token = 3;
+
+    // Pid of the app. Used in creating the timeline tracks (and slices) inside
+    // the respective process track group.
+    optional int32 pid = 4;
+    optional string layer_name = 5;
+
+    optional PresentType present_type = 6;
+    optional bool on_time_finish = 7;
+    optional bool gpu_composition = 8;
+    // A bitmask of JankType. More than one reason can be attributed to a janky
+    // frame.
+    optional int32 jank_type = 9;
+    optional PredictionType prediction_type = 10;
+    optional bool is_buffer = 11;
+    optional JankSeverityType jank_severity_type = 12;
+  };
+
+  // Indicates the start of expected timeline slice for DisplayFrames.
+  message ExpectedDisplayFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by SurfaceFlinger for its work
+    // this.token = SurfaceFrame.display_frame_token
+    optional int64 token = 2;
+
+    // Pid of SurfaceFlinger. Used in creating the timeline tracks (and slices)
+    // inside the SurfaceFlinger process group.
+    optional int32 pid = 3;
+  };
+
+  // Indicates the start of actual timeline slice for DisplayFrames. Also
+  // includes the jank information.
+  message ActualDisplayFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by SurfaceFlinger for its work
+    // this.token = SurfaceFrame.display_frame_token
+    optional int64 token = 2;
+
+    // Pid of SurfaceFlinger. Used in creating the timeline tracks (and slices)
+    // inside the SurfaceFlinger process group.
+    optional int32 pid = 3;
+
+    optional PresentType present_type = 4;
+    optional bool on_time_finish = 5;
+    optional bool gpu_composition = 6;
+    // A bitmask of JankType. More than one reason can be attributed to a janky
+    // frame.
+    optional int32 jank_type = 7;
+    optional PredictionType prediction_type = 8;
+    optional JankSeverityType jank_severity_type = 9;
+  };
+
+  // FrameEnd just sends the cookie to indicate that the corresponding
+  // <display/surface>frame slice's end.
+  message FrameEnd { optional int64 cookie = 1; };
+
+  oneof event {
+    ExpectedDisplayFrameStart expected_display_frame_start = 1;
+    ActualDisplayFrameStart actual_display_frame_start = 2;
+
+    ExpectedSurfaceFrameStart expected_surface_frame_start = 3;
+    ActualSurfaceFrameStart actual_surface_frame_start = 4;
+
+    FrameEnd frame_end = 5;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/gpu_mem_event.proto b/src/libtracing/protos/perfetto/trace/android/gpu_mem_event.proto
new file mode 100644
index 000000000..430779725
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/gpu_mem_event.proto
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Generated by Android's GpuService.
+message GpuMemTotalEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 pid = 2;
+  optional uint64 size = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/graphics_frame_event.proto b/src/libtracing/protos/perfetto/trace/android/graphics_frame_event.proto
new file mode 100644
index 000000000..3fb67ebe4
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/graphics_frame_event.proto
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Generated by Android's SurfaceFlinger.
+message GraphicsFrameEvent {
+  enum BufferEventType {
+    UNSPECIFIED = 0;
+    DEQUEUE = 1;
+    QUEUE = 2;
+    POST = 3;
+    ACQUIRE_FENCE = 4;
+    LATCH = 5;
+    // HWC will compose this buffer
+    HWC_COMPOSITION_QUEUED = 6;
+    // renderEngine composition
+    FALLBACK_COMPOSITION = 7;
+    PRESENT_FENCE = 8;
+    RELEASE_FENCE = 9;
+    MODIFY = 10;
+    DETACH = 11;
+    ATTACH = 12;
+    CANCEL = 13;
+  }
+
+  message BufferEvent {
+    optional uint32 frame_number = 1;
+    optional BufferEventType type = 2;
+    optional string layer_name = 3;
+    // If no duration is set, the event is an instant event.
+    optional uint64 duration_ns = 4;
+    // Unique buffer identifier.
+    optional uint32 buffer_id = 5;
+  }
+
+  optional BufferEvent buffer_event = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/initial_display_state.proto b/src/libtracing/protos/perfetto/trace/android/initial_display_state.proto
new file mode 100644
index 000000000..09c1b73c2
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/initial_display_state.proto
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message InitialDisplayState {
+  // Same values as android.view.Display.STATE_*
+  optional int32 display_state = 1;
+  optional double brightness = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/network_trace.proto b/src/libtracing/protos/perfetto/trace/android/network_trace.proto
new file mode 100644
index 000000000..c339da4f5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/network_trace.proto
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+enum TrafficDirection {
+  DIR_UNSPECIFIED = 0;
+  DIR_INGRESS = 1;
+  DIR_EGRESS = 2;
+}
+
+// NetworkPacketEvent records the details of a single packet sent or received
+// on the network (in Linux kernel terminology, one sk_buff struct).
+message NetworkPacketEvent {
+  // The direction traffic is flowing for this event.
+  optional TrafficDirection direction = 1;
+
+  // The name of the interface if available (e.g. 'rmnet0').
+  optional string interface = 2;
+
+  // The length of the packet in bytes (wire_size - L2_header_size). Ignored
+  // when using NetworkPacketEvent as the ctx in either NetworkPacketBundle or
+  // NetworkPacketContext.
+  optional uint32 length = 3;
+
+  // The Linux user id associated with the packet's socket.
+  optional uint32 uid = 4;
+
+  // The Android network tag associated with the packet's socket.
+  optional uint32 tag = 5;
+
+  // The packet's IP protocol (TCP=6, UDP=17, etc).
+  optional uint32 ip_proto = 6;
+
+  // The packet's TCP flags as a bitmask (FIN=0x1, SYN=0x2, RST=0x4, etc).
+  optional uint32 tcp_flags = 7;
+
+  // The local udp/tcp port of the packet.
+  optional uint32 local_port = 8;
+
+  // The remote udp/tcp port of the packet.
+  optional uint32 remote_port = 9;
+
+  // The 1-byte ICMP type identifier.
+  optional uint32 icmp_type = 10;
+
+  // The 1-byte ICMP code identifier.
+  optional uint32 icmp_code = 11;
+}
+
+// NetworkPacketBundle bundles one or more packets sharing the same attributes.
+message NetworkPacketBundle {
+  oneof packet_context {
+    // The intern id for looking up the associated packet context.
+    uint64 iid = 1;
+
+    // The inlined context for events in this bundle.
+    NetworkPacketEvent ctx = 2;
+  }
+
+  // The timestamp of the i-th packet encoded as the nanoseconds since the
+  // enclosing TracePacket's timestamp.
+  repeated uint64 packet_timestamps = 3 [packed = true];
+
+  // The length of the i-th packet in bytes (wire_size - L2_header_size).
+  repeated uint32 packet_lengths = 4 [packed = true];
+
+  // Total number of packets in the bundle (when above aggregation_threshold).
+  optional uint32 total_packets = 5;
+
+  // Duration between first and last packet (when above aggregation_threshold).
+  optional uint64 total_duration = 6;
+
+  // Total packet length in bytes (when above aggregation_threshold).
+  optional uint64 total_length = 7;
+}
+
+// An internable packet context.
+message NetworkPacketContext {
+  optional uint64 iid = 1;
+  optional NetworkPacketEvent ctx = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/packages_list.proto b/src/libtracing/protos/perfetto/trace/android/packages_list.proto
new file mode 100644
index 000000000..1c4100fee
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/packages_list.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message PackagesList {
+  message PackageInfo {
+    optional string name = 1;
+    optional uint64 uid = 2;
+    optional bool debuggable = 3;
+    optional bool profileable_from_shell = 4;
+    optional int64 version_code = 5;
+  }
+
+  repeated PackageInfo packages = 1;
+
+  // At least one error occurred parsing the packages.list.
+  optional bool parse_error = 2;
+
+  // Failed to open / read packages.list.
+  optional bool read_error = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/protolog.proto b/src/libtracing/protos/perfetto/trace/android/protolog.proto
new file mode 100644
index 000000000..b520c7a9a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/protolog.proto
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/protolog_common.proto";
+
+package perfetto.protos;
+
+/* represents a single log entry */
+message ProtoLogMessage {
+  /* log statement identifier, created from message string and log level. */
+  optional fixed64 message_id = 1;
+  /* string parameters passed to the log call that have been interned. */
+  repeated uint32 str_param_iids = 2;
+  /* integer parameters passed to the log call. */
+  repeated sint64 sint64_params = 3;
+  /* floating point parameters passed to the log call. */
+  repeated double double_params = 4;
+  /* boolean parameters passed to the log call. */
+  repeated int32 boolean_params = 5;
+  // id of the interned stacktrace string
+  // (only dumped if explicitly confuigured to do so)
+  optional uint32 stacktrace_iid = 6;
+}
+
+/* contains all the data required to fully decode the protolog messages */
+message ProtoLogViewerConfig {
+  message MessageData {
+    // the id of the message that is logged in a ProtoLogMessage
+    optional fixed64 message_id = 1;
+    // the string representation of the message
+    optional string message = 2;
+    // the level of the message
+    optional ProtoLogLevel level = 3;
+    // the id of the log group this message belongs to
+    optional uint32 group_id = 4;
+  }
+
+  /* information about a ProtoLog log group */
+  message Group {
+    optional uint32 id = 1;
+    optional string name = 2;
+    optional string tag = 3;
+  }
+
+  repeated MessageData messages = 1;
+  repeated Group groups = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/shell_transition.proto b/src/libtracing/protos/perfetto/trace/android/shell_transition.proto
new file mode 100644
index 000000000..5a3821012
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/shell_transition.proto
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// ShellTransition messages record information about the shell transitions in
+// the system. This is used to track the animations that are created and execute
+// through the shell transition system.
+message ShellTransition {
+  // The unique identifier of the transition.
+  optional int32 id = 1;
+
+  // The time the transition was created on the WM side
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 create_time_ns = 2;
+  // The time the transition was sent from the WM side to shell
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 send_time_ns = 3;
+  // The time the transition was dispatched by shell to execute
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 dispatch_time_ns = 4;
+  // If the transition merge was accepted by the transition handler, this
+  // contains the time the transition was merged into transition with id
+  // `merge_target`.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 merge_time_ns = 5;
+  // The time shell proposed the transition should be merged to the transition
+  // handler into transition with id `merge_target`.
+  // (using SystemClock.elapsedRealtimeNanos()).
+  optional int64 merge_request_time_ns = 6;
+  // If the transition was aborted on the shell side, this is the time that
+  // occurred.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 shell_abort_time_ns = 7;
+  // If the transition was aborted on the wm side, this is the time that
+  // occurred.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 wm_abort_time_ns = 8;
+  // The time WM considers the transition to be complete.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 finish_time_ns = 9;
+
+  // The id of the transaction that WM proposed to use as the starting
+  // transaction. It contains all the layer changes required to setup the
+  // transition and should be executed right at the start of the transition
+  // by the transition handler.
+  optional uint64 start_transaction_id = 10;
+  // The if of the transaction that WM proposed to use as the finish
+  // transaction. It contains all the layer changes required to set the final
+  // state of the transition.
+  optional uint64 finish_transaction_id = 11;
+
+  // The id of the handler that executed the transition. A HandlerMappings
+  // message in the trace will contain the mapping of id to a string
+  // representation of the handler.
+  optional int32 handler = 12;
+  // The transition type of this transition (e.g. TO_FRONT, OPEN, CLOSE).
+  optional int32 type = 13;
+
+  // The list of targets that are part of this transition.
+  repeated Target targets = 14;
+  // The id of the transition we have requested to merge or have merged this
+  // transition into.
+  optional int32 merge_target = 15;
+
+  // The flags set on this transition.
+  optional int32 flags = 16;
+  // The time the starting window was removed. Tracked because this can
+  // happen after the transition finishes, but the app may not yet be visible
+  // until the starting window is removed. So in a sense the transition is not
+  // finished until the starting window is removed. (b/284302118)
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 starting_window_remove_time_ns = 17;
+
+  // Contains the information about the windows targeted in a transition.
+  message Target {
+    // The transition mode of this target (e.g. TO_FRONT, CLOSE...)
+    optional int32 mode = 1;
+    // The layer id of this target.
+    optional int32 layer_id = 2;
+    // The window id of this target.
+    optional int32 window_id = 3;
+    // The flags set on this target.
+    optional int32 flags = 4;
+  }
+}
+
+// Contains mappings from handler ids to string representation of the handlers.
+message ShellHandlerMappings {
+  repeated ShellHandlerMapping mapping = 1;
+}
+
+message ShellHandlerMapping {
+  // The id of the handler used in the ShellTransition message.
+  optional int32 id = 1;
+  // A human readable and meaningful string representation of the handler.
+  optional string name = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/surfaceflinger_common.proto b/src/libtracing/protos/perfetto/trace/android/surfaceflinger_common.proto
new file mode 100644
index 000000000..ef27e1125
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/surfaceflinger_common.proto
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message RegionProto {
+  // Previously: uint64 id
+  reserved 1;
+  repeated RectProto rect = 2;
+}
+
+message RectProto {
+  optional int32 left = 1;
+  optional int32 top = 2;
+  optional int32 right = 3;
+  optional int32 bottom = 4;
+}
+
+message SizeProto {
+  optional int32 w = 1;
+  optional int32 h = 2;
+}
+
+message TransformProto {
+  optional float dsdx = 1;
+  optional float dtdx = 2;
+  optional float dsdy = 3;
+  optional float dtdy = 4;
+  optional int32 type = 5;
+}
+
+message ColorProto {
+  optional float r = 1;
+  optional float g = 2;
+  optional float b = 3;
+  optional float a = 4;
+}
+
+message InputWindowInfoProto {
+  optional uint32 layout_params_flags = 1;
+  optional int32 layout_params_type = 2;
+  optional RectProto frame = 3;
+  optional RegionProto touchable_region = 4;
+
+  optional int32 surface_inset = 5;
+  optional bool visible = 6;
+  optional bool can_receive_keys = 7 [deprecated = true];
+  optional bool focusable = 8;
+  optional bool has_wallpaper = 9;
+
+  optional float global_scale_factor = 10;
+  optional float window_x_scale = 11 [deprecated = true];
+  optional float window_y_scale = 12 [deprecated = true];
+
+  optional int32 crop_layer_id = 13;
+  optional bool replace_touchable_region_with_crop = 14;
+  optional RectProto touchable_region_crop = 15;
+  optional TransformProto transform = 16;
+  optional uint32 input_config = 17;
+}
+
+message BlurRegion {
+  optional uint32 blur_radius = 1;
+  optional uint32 corner_radius_tl = 2;
+  optional uint32 corner_radius_tr = 3;
+  optional uint32 corner_radius_bl = 4;
+  optional float corner_radius_br = 5;
+  optional float alpha = 6;
+  optional int32 left = 7;
+  optional int32 top = 8;
+  optional int32 right = 9;
+  optional int32 bottom = 10;
+}
+
+message ColorTransformProto {
+  // This will be a 4x4 matrix of float values
+  repeated float val = 1 [packed = true];
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/surfaceflinger_layers.proto b/src/libtracing/protos/perfetto/trace/android/surfaceflinger_layers.proto
new file mode 100644
index 000000000..6640fa7b0
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/surfaceflinger_layers.proto
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/trace/android/surfaceflinger_common.proto";
+
+// Message used by Winscope to process legacy trace files.
+// Represents a file full of surface flinger trace entries.
+// Encoded, it should start with 0x4c 0x59 0x52 0x54 0x52 0x41 0x43 0x45
+// (.LYRTRACE), such that they can be easily identified.
+message LayersTraceFileProto {
+  // constant; MAGIC_NUMBER = (long) MAGIC_NUMBER_H << 32 |
+  // MagicNumber.MAGIC_NUMBER_L (this is needed because enums have to be 32 bits
+  // and there's no nice way to put 64bit constants into .proto files.
+  enum MagicNumber {
+    INVALID = 0;
+    // LYRT (little-endian ASCII)
+    MAGIC_NUMBER_L = 0x5452594c;
+    // RACE (little-endian ASCII)
+    MAGIC_NUMBER_H = 0x45434152;
+  }
+
+  // Must be the first field, set to value in MagicNumber
+  optional fixed64 magic_number = 1;
+
+  repeated LayersSnapshotProto entry = 2;
+
+  // Offset between real-time clock and elapsed time clock in nanoseconds.
+  // Calculated as: systemTime(SYSTEM_TIME_REALTIME) -
+  // systemTime(SYSTEM_TIME_MONOTONIC)
+  optional fixed64 real_to_elapsed_time_offset_nanos = 3;
+}
+
+message LayersSnapshotProto {
+  // elapsed realtime in nanos since boot of when this entry was logged
+  optional sfixed64 elapsed_realtime_nanos = 1;
+
+  // SurfaceFlinger's stage where the snapshot was triggered.
+  // Currently either "visibleRegionsDirty" or "bufferLatched".
+  optional string where = 2;
+
+  optional LayersProto layers = 3;
+
+  // Blob for the current HWC information for all layers, reported by dumpsys.
+  // Example:
+  //   "maxDownScale: 4, maxFullWidth: 8192, HWState: 1, AssignedState: 3, ..."
+  optional string hwc_blob = 4;
+
+  // Excludes state sent during composition like visible region and composition
+  // type.
+  optional bool excludes_composition_state = 5;
+
+  // Number of missed entries since the last entry was recorded.
+  optional uint32 missed_entries = 6;
+
+  repeated DisplayProto displays = 7;
+
+  optional int64 vsync_id = 8;
+}
+
+// Contains a list of all layers.
+message LayersProto {
+  repeated LayerProto layers = 1;
+}
+
+message DisplayProto {
+  optional uint64 id = 1;
+  // Display descriptor, e.g. "Built-In Screen"
+  optional string name = 2;
+  optional uint32 layer_stack = 3;
+  optional SizeProto size = 4;
+  optional RectProto layer_stack_space_rect = 5;
+  optional TransformProto transform = 6;
+  optional bool is_virtual = 7;
+  optional double dpi_x = 8;
+  optional double dpi_y = 9;
+}
+
+// Must match definition in the IComposerClient HAL
+enum HwcCompositionType {
+  // Invalid composition type
+  HWC_TYPE_UNSPECIFIED = 0;
+  // Layer was composited by the client into the client target buffer
+  HWC_TYPE_CLIENT = 1;
+  // Layer was composited by the device through hardware overlays
+  HWC_TYPE_DEVICE = 2;
+  // Layer was composited by the device using a color
+  HWC_TYPE_SOLID_COLOR = 3;
+  // Similar to DEVICE, but the layer position may have been asynchronously set
+  // through setCursorPosition
+  HWC_TYPE_CURSOR = 4;
+  // Layer was composited by the device via a sideband stream
+  HWC_TYPE_SIDEBAND = 5;
+   // Layer was composited by hardware optimized for display decoration
+  HWC_TYPE_DISPLAY_DECORATION = 6;
+}
+
+// Information about each layer.
+message LayerProto {
+  // unique id per layer.
+  optional int32 id = 1;
+  // unique name per layer.
+  // Example: "Wallpaper".
+  optional string name = 2;
+  // list of children this layer may have. May be empty.
+  repeated int32 children = 3 [packed = true];
+  // list of layers that are z order relative to this layer.
+  repeated int32 relatives = 4 [packed = true];
+  // The type of layer.
+  // Examples: "ContainerLayer", "BufferStateLayer".
+  optional string type = 5;
+  optional RegionProto transparent_region = 6;
+  optional RegionProto visible_region = 7;
+  optional RegionProto damage_region = 8;
+  optional uint32 layer_stack = 9;
+  // The layer's z order. Can be z order in layer stack, relative to parent,
+  // or relative to another layer specified in zOrderRelative.
+  optional int32 z = 10;
+  // The layer's position on the display.
+  optional PositionProto position = 11;
+  // The layer's requested position.
+  optional PositionProto requested_position = 12;
+  // The layer's size.
+  optional SizeProto size = 13;
+  // The layer's crop in its own bounds.
+  optional RectProto crop = 14;
+  // The layer's crop in its parent's bounds.
+  optional RectProto final_crop = 15 [deprecated = true];
+  optional bool is_opaque = 16;
+  optional bool invalidate = 17;
+  // Composition states's dataspace.
+  // Examples: "STANDARD_BT709", "STANDARD_BT601_625".
+  // See full enum in
+  // frameworks/native/libs/nativewindow/include/android/data_space.h
+  optional string dataspace = 18;
+  // Buffer's pixel format
+  // Examples: "PIXEL_FORMAT_TRANSLUCENT", "PIXEL_FORMAT_RGBA_8888".
+  // See full enum in frameworks/native/libs/ui/include/ui/PixelFormat.h
+  optional string pixel_format = 19;
+  // The layer's actual color.
+  optional ColorProto color = 20;
+  // The layer's requested color.
+  optional ColorProto requested_color = 21;
+  // Can be any combination of
+  //    hidden = 0x01
+  //    opaque = 0x02,
+  //    secure = 0x80,
+  optional uint32 flags = 22;
+  // The layer's actual transform
+  optional TransformProto transform = 23;
+  // The layer's requested transform.
+  optional TransformProto requested_transform = 24;
+  // The parent layer. This value can be null if there is no parent.
+  optional int32 parent = 25;
+  // The layer that this layer has a z order relative to. This value can be
+  // null.
+  optional int32 z_order_relative_of = 26;
+  // This value can be null if there's nothing to draw.
+  optional ActiveBufferProto active_buffer = 27;
+  // The number of frames available.
+  optional int32 queued_frames = 28;
+  optional bool refresh_pending = 29;
+  // The layer's composer backend destination frame
+  optional RectProto hwc_frame = 30;
+  // The layer's composer backend source crop
+  optional FloatRectProto hwc_crop = 31;
+  // The layer's composer backend transform
+  optional int32 hwc_transform = 32;
+  optional int32 window_type = 33 [deprecated = true];
+  optional int32 app_id = 34 [deprecated = true];
+  // The layer's composition type
+  optional HwcCompositionType hwc_composition_type = 35;
+  // If it's a buffer layer, indicate if the content is protected
+  optional bool is_protected = 36;
+  // Current frame number being rendered.
+  optional uint64 curr_frame = 37;
+  // A list of barriers that the layer is waiting to update state.
+  repeated BarrierLayerProto barrier_layer = 38;
+  // If active_buffer is not null, record its transform.
+  optional TransformProto buffer_transform = 39;
+  optional int32 effective_scaling_mode = 40;
+  // Layer's corner radius.
+  optional float corner_radius = 41;
+  // Metadata map. May be empty.
+  map<int32, string> metadata = 42;
+
+  optional TransformProto effective_transform = 43;
+  optional FloatRectProto source_bounds = 44;
+  optional FloatRectProto bounds = 45;
+  optional FloatRectProto screen_bounds = 46;
+
+  optional InputWindowInfoProto input_window_info = 47;
+
+  // Crop used to draw the rounded corner.
+  optional FloatRectProto corner_radius_crop = 48;
+
+  // length of the shadow to draw around the layer, it may be set on the
+  // layer or set by a parent layer.
+  optional float shadow_radius = 49;
+  optional ColorTransformProto color_transform = 50;
+
+  optional bool is_relative_of = 51;
+  // Layer's background blur radius in pixels.
+  optional int32 background_blur_radius = 52;
+
+  optional uint32 owner_uid = 53;
+
+  // Regions of a layer, where blur should be applied.
+  repeated BlurRegion blur_regions = 54;
+
+  optional bool is_trusted_overlay = 55;
+
+  // Corner radius explicitly set on layer rather than inherited
+  optional float requested_corner_radius = 56;
+
+  optional RectProto destination_frame = 57;
+
+  optional uint32 original_id = 58;
+}
+
+message PositionProto {
+  optional float x = 1;
+  optional float y = 2;
+}
+
+message FloatRectProto {
+  optional float left = 1;
+  optional float top = 2;
+  optional float right = 3;
+  optional float bottom = 4;
+}
+
+message ActiveBufferProto {
+  optional uint32 width = 1;
+  optional uint32 height = 2;
+  optional uint32 stride = 3;
+  optional int32 format = 4;
+  optional uint64 usage = 5;
+}
+
+message BarrierLayerProto {
+  // layer id the barrier is waiting on.
+  optional int32 id = 1;
+  // frame number the barrier is waiting on.
+  optional uint64 frame_number = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/surfaceflinger_transactions.proto b/src/libtracing/protos/perfetto/trace/android/surfaceflinger_transactions.proto
new file mode 100644
index 000000000..efc709c16
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/surfaceflinger_transactions.proto
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/trace/android/surfaceflinger_common.proto";
+
+// Message used by Winscope to process legacy trace files.
+// Represents a file full of surface flinger transactions.
+// Encoded, it should start with 0x54 0x4E 0x58 0x54 0x52 0x41 0x43 0x45
+// (.TNXTRACE), such that they can be easily identified.
+message TransactionTraceFile {
+  // constant; MAGIC_NUMBER = (long) MAGIC_NUMBER_H << 32 |
+  // MagicNumber.MAGIC_NUMBER_L (this is needed because enums have to be 32 bits
+  // and there's no nice way to put 64bit constants into .proto files.
+  enum MagicNumber {
+    INVALID = 0;
+    // TNXT (little-endian ASCII)
+    MAGIC_NUMBER_L = 0x54584E54;
+    // RACE (little-endian ASCII)
+    MAGIC_NUMBER_H = 0x45434152;
+  }
+
+  // Must be the first field, set to value in MagicNumber
+  optional fixed64 magic_number = 1;
+  repeated TransactionTraceEntry entry = 2;
+
+  // offset between real-time clock and elapsed time clock in nanoseconds.
+  // Calculated as: systemTime(SYSTEM_TIME_REALTIME) -
+  // systemTime(SYSTEM_TIME_MONOTONIC)
+  optional fixed64 real_to_elapsed_time_offset_nanos = 3;
+  optional uint32 version = 4;
+}
+
+message TransactionTraceEntry {
+  optional int64 elapsed_realtime_nanos = 1;
+  optional int64 vsync_id = 2;
+  repeated TransactionState transactions = 3;
+  repeated LayerCreationArgs added_layers = 4;
+  repeated uint32 destroyed_layers = 5;
+  repeated DisplayState added_displays = 6;
+  repeated int32 removed_displays = 7;
+  repeated uint32 destroyed_layer_handles = 8;
+  optional bool displays_changed = 9;
+  repeated DisplayInfo displays = 10;
+}
+
+message DisplayInfo {
+  optional uint32 layer_stack = 1;
+  optional int32 display_id = 2;
+  optional int32 logical_width = 3;
+  optional int32 logical_height = 4;
+  optional Transform transform_inverse = 5;
+  optional Transform transform = 6;
+  optional bool receives_input = 7;
+  optional bool is_secure = 8;
+  optional bool is_primary = 9;
+  optional bool is_virtual = 10;
+  optional int32 rotation_flags = 11;
+  optional int32 transform_hint = 12;
+}
+
+message LayerCreationArgs {
+  optional uint32 layer_id = 1;
+  optional string name = 2;
+  optional uint32 flags = 3;
+  optional uint32 parent_id = 4;
+  optional uint32 mirror_from_id = 5;
+  optional bool add_to_root = 6;
+  optional uint32 layer_stack_to_mirror = 7;
+}
+
+message Transform {
+  optional float dsdx = 1;
+  optional float dtdx = 2;
+  optional float dtdy = 3;
+  optional float dsdy = 4;
+  optional float tx = 5;
+  optional float ty = 6;
+}
+
+message TransactionState {
+  optional int32 pid = 1;
+  optional int32 uid = 2;
+  optional int64 vsync_id = 3;
+  optional int32 input_event_id = 4;
+  optional int64 post_time = 5;
+  optional uint64 transaction_id = 6;
+  repeated LayerState layer_changes = 7;
+  repeated DisplayState display_changes = 8;
+  repeated uint64 merged_transaction_ids = 9;
+}
+
+// Keep insync with layer_state_t
+message LayerState {
+  optional uint32 layer_id = 1;
+  // Changes are split into ChangesLsb and ChangesMsb. First 32 bits are in
+  // ChangesLsb and the next 32 bits are in ChangesMsb. This is needed because
+  // enums have to be 32 bits and there's no nice way to put 64bit constants
+  // into .proto files.
+  enum ChangesLsb {
+    eChangesLsbNone = 0;
+    ePositionChanged = 0x00000001;
+    eLayerChanged = 0x00000002;
+    // unused = 0x00000004;
+    eAlphaChanged = 0x00000008;
+
+    eMatrixChanged = 0x00000010;
+    eTransparentRegionChanged = 0x00000020;
+    eFlagsChanged = 0x00000040;
+    eLayerStackChanged = 0x00000080;
+
+    eReleaseBufferListenerChanged = 0x00000400;
+    eShadowRadiusChanged = 0x00000800;
+
+    eBufferCropChanged = 0x00002000;
+    eRelativeLayerChanged = 0x00004000;
+    eReparent = 0x00008000;
+
+    eColorChanged = 0x00010000;
+    eBufferTransformChanged = 0x00040000;
+    eTransformToDisplayInverseChanged = 0x00080000;
+
+    eCropChanged = 0x00100000;
+    eBufferChanged = 0x00200000;
+    eAcquireFenceChanged = 0x00400000;
+    eDataspaceChanged = 0x00800000;
+
+    eHdrMetadataChanged = 0x01000000;
+    eSurfaceDamageRegionChanged = 0x02000000;
+    eApiChanged = 0x04000000;
+    eSidebandStreamChanged = 0x08000000;
+
+    eColorTransformChanged = 0x10000000;
+    eHasListenerCallbacksChanged = 0x20000000;
+    eInputInfoChanged = 0x40000000;
+    // 0x80000000; (proto stores enums as signed int)
+    eCornerRadiusChanged = -2147483648;
+  };
+  enum ChangesMsb {
+    eChangesMsbNone = 0;
+    eDestinationFrameChanged = 0x1;
+    eCachedBufferChanged = 0x2;
+    eBackgroundColorChanged = 0x4;
+    eMetadataChanged = 0x8;
+    eColorSpaceAgnosticChanged = 0x10;
+    eFrameRateSelectionPriority = 0x20;
+    eFrameRateChanged = 0x40;
+    eBackgroundBlurRadiusChanged = 0x80;
+    eProducerDisconnect = 0x100;
+    eFixedTransformHintChanged = 0x200;
+    eFrameNumberChanged = 0x400;
+    eBlurRegionsChanged = 0x800;
+    eAutoRefreshChanged = 0x1000;
+    eStretchChanged = 0x2000;
+    eTrustedOverlayChanged = 0x4000;
+    eDropInputModeChanged = 0x8000;
+  };
+  optional uint64 what = 2;
+  optional float x = 3;
+  optional float y = 4;
+  optional int32 z = 5;
+  optional uint32 w = 6;
+  optional uint32 h = 7;
+  optional uint32 layer_stack = 8;
+
+  enum Flags {
+    eFlagsNone = 0;
+    eLayerHidden = 0x01;
+    eLayerOpaque = 0x02;
+    eLayerSkipScreenshot = 0x40;
+    eLayerSecure = 0x80;
+    eEnableBackpressure = 0x100;
+    eLayerIsDisplayDecoration = 0x200;
+  };
+  optional uint32 flags = 9;
+  optional uint32 mask = 10;
+
+  message Matrix22 {
+    optional float dsdx = 1;
+    optional float dtdx = 2;
+    optional float dtdy = 3;
+    optional float dsdy = 4;
+  };
+  optional Matrix22 matrix = 11;
+  optional float corner_radius = 12;
+  optional uint32 background_blur_radius = 13;
+  optional uint32 parent_id = 14;
+  optional uint32 relative_parent_id = 15;
+
+  optional float alpha = 16;
+  message Color3 {
+    optional float r = 1;
+    optional float g = 2;
+    optional float b = 3;
+  }
+  optional Color3 color = 17;
+  optional RegionProto transparent_region = 18;
+  optional uint32 transform = 19;
+  optional bool transform_to_display_inverse = 20;
+  optional RectProto crop = 21;
+
+  message BufferData {
+    optional uint64 buffer_id = 1;
+    optional uint32 width = 2;
+    optional uint32 height = 3;
+    optional uint64 frame_number = 4;
+
+    enum BufferDataChange {
+      BufferDataChangeNone = 0;
+      fenceChanged = 0x01;
+      frameNumberChanged = 0x02;
+      cachedBufferChanged = 0x04;
+    }
+    optional uint32 flags = 5;
+    optional uint64 cached_buffer_id = 6;
+
+    enum PixelFormat {
+      PIXEL_FORMAT_UNKNOWN = 0;
+      PIXEL_FORMAT_CUSTOM = -4;
+      PIXEL_FORMAT_TRANSLUCENT = -3;
+      PIXEL_FORMAT_TRANSPARENT = -2;
+      PIXEL_FORMAT_OPAQUE = -1;
+      PIXEL_FORMAT_RGBA_8888 = 1;
+      PIXEL_FORMAT_RGBX_8888 = 2;
+      PIXEL_FORMAT_RGB_888 = 3;
+      PIXEL_FORMAT_RGB_565 = 4;
+      PIXEL_FORMAT_BGRA_8888 = 5;
+      PIXEL_FORMAT_RGBA_5551 = 6;
+      PIXEL_FORMAT_RGBA_4444 = 7;
+      PIXEL_FORMAT_RGBA_FP16 = 22;
+      PIXEL_FORMAT_RGBA_1010102 = 43;
+      PIXEL_FORMAT_R_8 = 0x38;
+    }
+    optional PixelFormat pixel_format = 7;
+    optional uint64 usage = 8;
+  }
+  optional BufferData buffer_data = 22;
+  optional int32 api = 23;
+  optional bool has_sideband_stream = 24;
+  optional ColorTransformProto color_transform = 25;
+  repeated BlurRegion blur_regions = 26;
+
+  message WindowInfo {
+    optional uint32 layout_params_flags = 1;
+    optional int32 layout_params_type = 2;
+    optional RegionProto touchable_region = 3;
+    optional int32 surface_inset = 4;
+    // unused
+    optional bool focusable = 5;
+    // unused
+    optional bool has_wallpaper = 6;
+    optional float global_scale_factor = 7;
+    optional uint32 crop_layer_id = 8;
+    optional bool replace_touchable_region_with_crop = 9;
+    optional RectProto touchable_region_crop = 10;
+    optional Transform transform = 11;
+    optional uint32 input_config = 12;
+  }
+  optional WindowInfo window_info_handle = 27;
+  optional float bg_color_alpha = 28;
+  optional int32 bg_color_dataspace = 29;
+  optional bool color_space_agnostic = 30;
+  optional float shadow_radius = 31;
+  optional int32 frame_rate_selection_priority = 32;
+  optional float frame_rate = 33;
+  optional int32 frame_rate_compatibility = 34;
+  optional int32 change_frame_rate_strategy = 35;
+  optional uint32 fixed_transform_hint = 36;
+  optional uint64 frame_number = 37;
+  optional bool auto_refresh = 38;
+  optional bool is_trusted_overlay = 39;
+  optional RectProto buffer_crop = 40;
+  optional RectProto destination_frame = 41;
+
+  enum DropInputMode {
+    NONE = 0;
+    ALL = 1;
+    OBSCURED = 2;
+  };
+  optional DropInputMode drop_input_mode = 42;
+}
+
+message DisplayState {
+  enum Changes {
+    eChangesNone = 0;
+    eSurfaceChanged = 0x01;
+    eLayerStackChanged = 0x02;
+    eDisplayProjectionChanged = 0x04;
+    eDisplaySizeChanged = 0x08;
+    eFlagsChanged = 0x10;
+  };
+  optional int32 id = 1;
+  optional uint32 what = 2;
+  optional uint32 flags = 3;
+  optional uint32 layer_stack = 4;
+  optional uint32 orientation = 5;
+  optional RectProto layer_stack_space_rect = 6;
+  optional RectProto oriented_display_space_rect = 7;
+  optional uint32 width = 8;
+  optional uint32 height = 9;
+}
diff --git a/src/libtracing/protos/perfetto/trace/android/winscope.proto b/src/libtracing/protos/perfetto/trace/android/winscope.proto
new file mode 100644
index 000000000..a0c61f7ef
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/android/winscope.proto
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/trace/android/protolog.proto";
+import "protos/perfetto/trace/android/shell_transition.proto";
+import "protos/perfetto/trace/android/surfaceflinger_layers.proto";
+import "protos/perfetto/trace/android/surfaceflinger_transactions.proto";
+
+// This file is used to generated descriptors for all the winscope protos.
+// List all the winscope top-level trace messages here:
+message WinscopeTraceData {
+  optional LayersSnapshotProto layers_snapshot = 1;
+  optional TransactionTraceEntry transactions = 2;
+  optional ShellTransition shell_transition = 3;
+  optional ProtoLogMessage protolog_message = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/chrome/chrome_benchmark_metadata.proto b/src/libtracing/protos/perfetto/trace/chrome/chrome_benchmark_metadata.proto
new file mode 100644
index 000000000..af268920e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/chrome/chrome_benchmark_metadata.proto
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// This message is not intended to be written by the chrome on the device.
+// It's emitted on the host by the telemetry benchmark infrastructure (it's a
+// part of the trace that's written by the telemetry tracing agent).
+message ChromeBenchmarkMetadata {
+  // Time when the benchmark execution started (host unixtime in microseconds).
+  optional int64 benchmark_start_time_us = 1;
+
+  // Time when this particular story was run (host unixtime in microseconds).
+  optional int64 story_run_time_us = 2;
+
+  // Name of benchmark.
+  optional string benchmark_name = 3;
+
+  // Description of benchmark.
+  optional string benchmark_description = 4;
+
+  // Optional label.
+  optional string label = 5;
+
+  // Name of story.
+  optional string story_name = 6;
+
+  // List of story tags.
+  repeated string story_tags = 7;
+
+  // Index of the story run (>0 if the same story was run several times).
+  optional int32 story_run_index = 8;
+
+  // Whether this run failed.
+  optional bool had_failures = 9;
+}
diff --git a/src/libtracing/protos/perfetto/trace/chrome/chrome_metadata.proto b/src/libtracing/protos/perfetto/trace/chrome/chrome_metadata.proto
new file mode 100644
index 000000000..60e6070ff
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/chrome/chrome_metadata.proto
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Metadata for chrome traces.
+message ChromeMetadataPacket {
+  optional BackgroundTracingMetadata background_tracing_metadata = 1;
+
+  // Version code of Chrome used by Android's Play Store. This field is only set
+  // on Android.
+  optional int32 chrome_version_code = 2;
+
+  // Comma separated list of enabled categories for tracing. The list of
+  // possible category strings are listed in code
+  // base/trace_event/builtin_categories.h.
+  optional string enabled_categories = 3;
+
+  // Finch name and group based on the ActiveGroupId.
+  message FinchHash {
+    optional uint32 name = 1;
+    optional uint32 group = 2;
+  }
+
+  // List of Finch study/groups that apply to this trace.
+  repeated FinchHash field_trial_hashes = 4;
+}
+
+// Metadata related to background tracing scenarios, states and triggers.
+message BackgroundTracingMetadata {
+  // Information about a trigger rule defined in the experiment config.
+  message TriggerRule {
+    enum TriggerType {
+      TRIGGER_UNSPECIFIED = 0;
+
+      // Traces are triggered by specific range of values of an UMA histogram.
+      MONITOR_AND_DUMP_WHEN_SPECIFIC_HISTOGRAM_AND_VALUE = 1;
+
+      // Traces are triggered by specific named events in chromium codebase,
+      // like "second-update-failure".
+      MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED = 2;
+    }
+    optional TriggerType trigger_type = 1;
+
+    // Configuration of histogram trigger.
+    message HistogramRule {
+      // UMA histogram name hash, same as HistogramEventProto.name_hash.
+      optional fixed64 histogram_name_hash = 1;
+
+      // Range of values of the histogram that activates trigger.
+      optional int64 histogram_min_trigger = 2;
+      optional int64 histogram_max_trigger = 3;
+    }
+    optional HistogramRule histogram_rule = 2;
+
+    // Configuration of named trigger.
+    message NamedRule {
+      enum EventType {
+        UNSPECIFIED = 0;
+        SESSION_RESTORE = 1;
+        NAVIGATION = 2;
+        STARTUP = 3;
+        REACHED_CODE = 4;
+        CONTENT_TRIGGER = 5;
+
+        TEST_RULE = 1000;
+      }
+      optional EventType event_type = 1;
+
+      // If |event_type| is CONTENT_TRIGGER, then this stores the hash of the
+      // content-trigger that actually fired.
+      optional fixed64 content_trigger_name_hash = 2;
+    }
+    optional NamedRule named_rule = 3;
+
+    // Hash of the rule name.
+    optional fixed32 name_hash = 4;
+  }
+
+  // Specifies the rule that caused the trace to be uploaded.
+  optional TriggerRule triggered_rule = 1;
+
+  // List of all active triggers in current session, when trace was triggered.
+  repeated TriggerRule active_rules = 2;
+
+  // Hash of the scenario name.
+  optional fixed32 scenario_name_hash = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/chrome/chrome_trace_event.proto b/src/libtracing/protos/perfetto/trace/chrome/chrome_trace_event.proto
new file mode 100644
index 000000000..f4ed43f3d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/chrome/chrome_trace_event.proto
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message ChromeTracedValue {
+  enum NestedType {
+    DICT = 0;
+    ARRAY = 1;
+  }
+  optional NestedType nested_type = 1;
+
+  repeated string dict_keys = 2;
+  repeated ChromeTracedValue dict_values = 3;
+  repeated ChromeTracedValue array_values = 4;
+  optional int32 int_value = 5;
+  optional double double_value = 6;
+  optional bool bool_value = 7;
+  optional string string_value = 8;
+}
+
+message ChromeStringTableEntry {
+  optional string value = 1;
+  optional int32 index = 2;
+}
+
+// Deprecated, use TrackEvent protos instead.
+message ChromeTraceEvent {
+  message Arg {
+    optional string name = 1;
+
+    oneof value {
+      bool bool_value = 2;
+      uint64 uint_value = 3;
+      int64 int_value = 4;
+      double double_value = 5;
+      string string_value = 6;
+      // Pointers are stored in a separate type as the JSON output treats them
+      // differently from other uint64 values.
+      uint64 pointer_value = 7;
+      string json_value = 8;
+      ChromeTracedValue traced_value = 10;
+    }
+
+    // Takes precedence over |name| if set,
+    // and is an index into |string_table|.
+    optional uint32 name_index = 9;
+  }
+
+  optional string name = 1;
+  optional int64 timestamp = 2;
+  optional int32 phase = 3;
+  optional int32 thread_id = 4;
+  optional int64 duration = 5;
+  optional int64 thread_duration = 6;
+  optional string scope = 7;
+  optional uint64 id = 8;
+  optional uint32 flags = 9;
+  optional string category_group_name = 10;
+  optional int32 process_id = 11;
+  optional int64 thread_timestamp = 12;
+  optional uint64 bind_id = 13;
+
+  repeated Arg args = 14;
+
+  // Takes precedence over respectively |name| and
+  // |category_group_name_index| if set,
+  // and are indices into |string_table|.
+  optional uint32 name_index = 15;
+  optional uint32 category_group_name_index = 16;
+}
+
+message ChromeMetadata {
+  optional string name = 1;
+
+  oneof value {
+    string string_value = 2;
+    bool bool_value = 3;
+    int64 int_value = 4;
+    string json_value = 5;
+  }
+}
+
+// Subtraces produced in legacy json format by Chrome tracing agents not yet
+// updated to support the new binary format, e.g. ETW and CrOS ARC.
+// TODO(eseckler): Update these agents to become perfetto producers.
+message ChromeLegacyJsonTrace {
+  enum TraceType {
+    USER_TRACE = 0;
+
+    // Deprecated.
+    SYSTEM_TRACE = 1;
+  }
+  optional TraceType type = 1;
+  optional string data = 2;
+}
+
+message ChromeEventBundle {
+  // Deprecated, use TrackEvent protos instead.
+  repeated ChromeTraceEvent trace_events = 1 [deprecated = true];
+  // TODO(ssid): This should be deprecated in favor of ChromeMetadataPacket
+  // which contains typed fields.
+  repeated ChromeMetadata metadata = 2;
+  // ftrace output from CrOS and Cast system tracing agents.
+  // TODO(eseckler): Replace system traces with native perfetto service.
+  repeated string legacy_ftrace_output = 4;
+  repeated ChromeLegacyJsonTrace legacy_json_trace = 5;
+
+  // Contents of a string table that's valid for
+  // the whole ChromeEventBundle entry.
+  repeated ChromeStringTableEntry string_table = 3 [deprecated = true];
+}
diff --git a/src/libtracing/protos/perfetto/trace/chrome/chrome_trace_packet.proto b/src/libtracing/protos/perfetto/trace/chrome/chrome_trace_packet.proto
new file mode 100644
index 000000000..17f1e6812
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/chrome/chrome_trace_packet.proto
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Use proto3 syntax as an optimization. The difference is that proto2 stores
+// unknown fields seen while decoding in an internal buffer (std::string) while
+// proto3 completely drops them. Since during validation we only need to check
+// for the presence of the trusted fields below, we can use proto3 as a way to
+// speed up this process.
+//
+// See https://developers.google.com/protocol-buffers/docs/proto3#unknowns and
+// https://android-review.googlesource.com/c/platform/external/perfetto/+/
+// 591673#17 for details.
+syntax = "proto3";
+
+import "protos/perfetto/common/trace_stats.proto";
+import "protos/perfetto/config/trace_config.proto";
+import "protos/perfetto/trace/chrome/chrome_trace_event.proto";
+import "protos/perfetto/trace/chrome/chrome_trigger.proto";
+import "protos/perfetto/trace/clock_snapshot.proto";
+import "protos/perfetto/trace/interned_data/interned_data.proto";
+import "protos/perfetto/trace/profiling/profile_packet.proto";
+import "protos/perfetto/trace/profiling/profile_common.proto";
+import "protos/perfetto/trace/track_event/process_descriptor.proto";
+import "protos/perfetto/trace/track_event/thread_descriptor.proto";
+import "protos/perfetto/trace/track_event/track_event.proto";
+
+package perfetto.protos;
+
+// This proto contains only the TracePacket fields that Chrome needs.
+// Note that the field ids here must be kept in sync with TracePacket.
+// This protobuf is here to avoid bloating the Chrome binary with symbols
+// for all possible trace protos.
+// TODO(b/78898755): Try using weak bindings instead of a separate proto.
+message ChromeTracePacket {
+  ChromeEventBundle chrome_events = 5;
+
+  ClockSnapshot clock_snapshot = 6;
+  TrackEvent track_event = 11;
+  ProcessDescriptor process_descriptor = 43;
+  ThreadDescriptor thread_descriptor = 44;
+  StreamingProfilePacket streaming_profile_packet = 54;
+  ProfiledFrameSymbols profiled_frame_symbols = 55;
+  ChromeTrigger chrome_trigger = 109;
+
+  // The original trace config.
+  TraceConfig trace_config = 33;
+  TraceStats trace_stats = 35;
+
+  uint32 trusted_packet_sequence_id = 10;
+
+  InternedData interned_data = 12;
+
+  bool incremental_state_cleared = 41;
+  bool previous_packet_dropped = 42;
+}
diff --git a/src/libtracing/protos/perfetto/trace/chrome/chrome_trigger.proto b/src/libtracing/protos/perfetto/trace/chrome/chrome_trigger.proto
new file mode 100644
index 000000000..9662e9235
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/chrome/chrome_trigger.proto
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+// When a TracingSession receives a trigger it records the boot time
+// nanoseconds in the TracePacket's timestamp field. We emit this data so
+// filtering can be done on triggers received in the trace.
+message ChromeTrigger {
+  // Name of the trigger which was received.
+  optional string trigger_name = 1;
+  // MD5 hash of the trigger name.
+  optional string trigger_hash = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/chrome/v8.proto b/src/libtracing/protos/perfetto/trace/chrome/v8.proto
new file mode 100644
index 000000000..3e92bf7b3
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/chrome/v8.proto
@@ -0,0 +1,271 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+// These are the protos for the V8 data source.
+//
+// All events are associated to a V8 isolate instance. There can be multiple
+// instances associated to a given thread, although this is rare.
+//
+// Generated code in V8 is allocated in the V8 heap (in a special executeable
+// section), this means that code can be garbage collected (when no longer used)
+// or can be moved around (e.g. during heap compactation). This means that a
+// given callsite might correspond to function `A` at one point in time and to
+// function `B` later on.
+// In addition V8 code has various levels of optimization, so a function might
+// have multiple associated code snippets.
+//
+// V8 does not track code deletion, so we have to indirectly infer it by
+// detecting code overlaps, if a newer code creation event overlaps with older
+// code we need to asume that the old code was deleted. Code moves are logged,
+// and there is an event to track those.
+
+// Strings used by V8 can have different encodings, instead of coverting to a
+// common encoding (e.g. UTF-8) on device is expensive. Instead we send the
+// "raw" string and do the convestion at trace ingestion time.
+//
+// ATTENTION: There is some overhead in using a message (as opossed to having
+// the `oneof encoded_string`` direcly embedded in the message), so use this
+// message in places were these extra bytes don't matter that much.
+// Next id: 5
+message V8String {
+  oneof encoded_string {
+    // ISO/IEC 8859-1:1998 encoding aka latin1
+    // https://en.wikipedia.org/wiki/ISO/IEC_8859-1
+    bytes latin1 = 1;
+    // UTF-16 Little Endian Encoding
+    bytes utf16_le = 2;
+    // UTF-16 Big Endian Encoding
+    bytes utf16_be = 3;
+  }
+}
+
+// Interned version of V8String
+message InternedV8String {
+  optional uint64 iid = 1;
+  // We inline the fields in V8String here to save some bytes in the serialized
+  // proto format. Interning is about saving bytes so this makes sense here.
+  oneof encoded_string {
+    // ISO/IEC 8859-1:1998 encoding aka latin1
+    // https://en.wikipedia.org/wiki/ISO/IEC_8859-1
+    bytes latin1 = 2;
+    // UTF-16 Little Endian Encoding
+    bytes utf16_le = 3;
+    // UTF-16 Big Endian Encoding
+    bytes utf16_be = 4;
+  }
+}
+
+// Represents a script that was compiled to generate code. Some V8 code is
+// generated out of scripts and will reference a V8Script other types of code
+// will not (e.g. builtins).
+message InternedV8JsScript {
+  optional uint64 iid = 1;
+  // Unique in a given isolate
+  optional int32 script_id = 2;
+
+  enum Type {
+    TYPE_UNKNOWN = 0;
+    TYPE_NORMAL = 1;
+    TYPE_EVAL = 2;
+    TYPE_MODULE = 3;
+    TYPE_NATIVE = 4;
+    TYPE_EXTENSION = 5;
+    TYPE_INSPECTOR = 6;
+  }
+
+  optional Type type = 3;
+  optional V8String name = 4;
+  // Actual source of the script
+  optional V8String source = 5;
+}
+
+message InternedV8WasmScript {
+  optional uint64 iid = 1;
+  // Unique in a given isolate
+  optional int32 script_id = 2;
+
+  optional string url = 3;
+}
+
+message InternedV8JsFunction {
+  enum Kind {
+    KIND_UNKNOWN = 0;
+    KIND_NORMAL_FUNCTION = 1;
+    KIND_MODULE = 2;
+    KIND_ASYNC_MODULE = 3;
+    KIND_BASE_CONSTRUCTOR = 4;
+    KIND_DEFAULT_BASE_CONSTRUCTOR = 5;
+    KIND_DEFAULT_DERIVED_CONSTRUCTOR = 6;
+    KIND_DERIVED_CONSTRUCTOR = 7;
+    KIND_GETTER_FUNCTION = 8;
+    KIND_STATIC_GETTER_FUNCTION = 9;
+    KIND_SETTER_FUNCTION = 10;
+    KIND_STATIC_SETTER_FUNCTION = 11;
+    KIND_ARROW_FUNCTION = 12;
+    KIND_ASYNC_ARROW_FUNCTION = 13;
+    KIND_ASYNC_FUNCTION = 14;
+    KIND_ASYNC_CONCISE_METHOD = 15;
+    KIND_STATIC_ASYNC_CONCISE_METHOD = 16;
+    KIND_ASYNC_CONCISE_GENERATOR_METHOD = 17;
+    KIND_STATIC_ASYNC_CONCISE_GENERATOR_METHOD = 18;
+    KIND_ASYNC_GENERATOR_FUNCTION = 19;
+    KIND_GENERATOR_FUNCTION = 20;
+    KIND_CONCISE_GENERATOR_METHOD = 21;
+    KIND_STATIC_CONCISE_GENERATOR_METHOD = 22;
+    KIND_CONCISE_METHOD = 23;
+    KIND_STATIC_CONCISE_METHOD = 24;
+    KIND_CLASS_MEMBERS_INITIALIZER_FUNCTION = 25;
+    KIND_CLASS_STATIC_INITIALIZER_FUNCTION = 26;
+    KIND_INVALID = 27;
+  }
+  optional uint64 iid = 1;
+  optional uint64 v8_js_function_name_iid = 2;
+  optional uint64 v8_js_script_iid = 3;
+
+  optional bool is_toplevel = 4;
+  optional Kind kind = 5;
+
+  // Where in the script source this function is defined. This is counted in
+  // bytes not characters.
+  optional uint32 byte_offset = 6;
+}
+
+// A V8 Isolate instance. A V8 Isolate represents an isolated instance of the V8
+// engine.
+message InternedV8Isolate {
+  optional uint64 iid = 1;
+
+  optional uint32 pid = 2;
+
+  // Process unique isolate id.
+  optional int32 isolate_id = 3;
+
+  // A code range is a virtual memory cage that may contain executable code.
+  // Depending on the Isolate settings the Isolate might have one or not.
+  // See:
+  // https://source.chromium.org/chromium/chromium/src/+/main:v8/src/heap/code-range.h
+  // If the isolate defines code range this will be tracked here.
+  message CodeRange {
+    optional uint64 base_address = 1;
+    optional uint64 size = 2;
+    // Used when short builtin calls are enabled, where embedded builtins are
+    // copied into the CodeRange so calls can be nearer.
+    optional uint64 embedded_blob_code_copy_start_address = 3;
+    // Whether this code range is shared with other Isolates in the same process
+    optional bool is_process_wide = 4;
+  }
+  optional CodeRange code_range = 4;
+  // The embedded blob holds code for built in functions that are precompiled in
+  // the V8 library.
+  optional uint64 embedded_blob_code_start_address = 5;
+  optional uint64 embedded_blob_code_size = 6;
+}
+
+message V8JsCode {
+  enum Tier {
+    TIER_UNKNOWN = 0;
+    TIER_IGNITION = 1;
+    TIER_SPARKPLUG = 2;
+    TIER_MAGLEV = 3;
+    TIER_TURBOSHAFT = 4;
+    TIER_TURBOFAN = 5;
+  }
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional uint64 v8_js_function_iid = 3;
+  optional Tier tier = 4;
+
+  optional uint64 instruction_start = 5;
+  optional uint64 instruction_size_bytes = 6;
+  oneof instructions {
+    bytes machine_code = 7;
+    bytes bytecode = 8;
+  }
+}
+
+message V8InternalCode {
+  enum Type {
+    TYPE_UNKNOWN = 0;
+    TYPE_BYTECODE_HANDLER = 1;
+    TYPE_FOR_TESTING = 2;
+    TYPE_BUILTIN = 3;
+    TYPE_WASM_FUNCTION = 4;
+    TYPE_WASM_TO_CAPI_FUNCTION = 5;
+    TYPE_WASM_TO_JS_FUNCTION = 6;
+    TYPE_JS_TO_WASM_FUNCTION = 7;
+    TYPE_JS_TO_JS_FUNCTION = 8;
+    TYPE_C_WASM_ENTRY = 9;
+  }
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional string name = 3;
+  optional Type type = 4;
+  optional int32 builtin_id = 5;
+
+  optional uint64 instruction_start = 6;
+  optional uint64 instruction_size_bytes = 7;
+  optional bytes machine_code = 8;
+}
+
+message V8WasmCode {
+  enum Tier {
+    TIER_UNKNOWN = 0;
+    TIER_LIFTOFF = 1;
+    TIER_TURBOFAN = 2;
+  }
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional uint64 v8_wasm_script_iid = 3;
+  optional string function_name = 4;
+
+  optional Tier tier = 5;
+  optional int32 code_offset_in_module = 6;
+
+  optional uint64 instruction_start = 7;
+  optional uint64 instruction_size_bytes = 8;
+  optional bytes machine_code = 9;
+}
+
+message V8RegExpCode {
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional V8String pattern = 3;
+
+  optional uint64 instruction_start = 4;
+  optional uint64 instruction_size_bytes = 5;
+  optional bytes machine_code = 6;
+}
+
+// Move event for V8 code (JS / Wasm / Internal / Regexp) that was relocated in
+// memory by V8's GC.
+message V8CodeMove {
+  optional uint64 isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional uint64 from_instruction_start_address = 3;
+  optional uint64 to_instruction_start_address = 4;
+  optional uint64 instruction_size_bytes = 5;
+  oneof to_instructions {
+    bytes to_machine_code = 6;
+    bytes to_bytecode = 7;
+  }
+}
+
+message V8CodeDefaults {
+  optional uint32 tid = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/clock_snapshot.proto b/src/libtracing/protos/perfetto/trace/clock_snapshot.proto
new file mode 100644
index 000000000..08aa3768e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/clock_snapshot.proto
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/builtin_clock.proto";
+
+package perfetto.protos;
+
+// A snapshot of clock readings to allow for trace alignment.
+message ClockSnapshot {
+  message Clock {
+    // DEPRECATED. This enum has moved to ../common/builtin_clock.proto.
+    enum BuiltinClocks {
+      UNKNOWN = 0;
+      REALTIME = 1;
+      REALTIME_COARSE = 2;
+      MONOTONIC = 3;
+      MONOTONIC_COARSE = 4;
+      MONOTONIC_RAW = 5;
+      BOOTTIME = 6;
+      BUILTIN_CLOCK_MAX_ID = 63;
+
+      reserved 7, 8;
+    }
+
+    // Clock IDs have the following semantic:
+    // [1, 63]:    Builtin types, see BuiltinClock from
+    //             ../common/builtin_clock.proto.
+    // [64, 127]:  User-defined clocks. These clocks are sequence-scoped. They
+    //             are only valid within the same |trusted_packet_sequence_id|
+    //             (i.e. only for TracePacket(s) emitted by the same TraceWriter
+    //             that emitted the clock snapshot).
+    // [128, MAX]: Reserved for future use. The idea is to allow global clock
+    //             IDs and setting this ID to hash(full_clock_name) & ~127.
+    optional uint32 clock_id = 1;
+
+    // Absolute timestamp. Unit is ns unless specified otherwise by the
+    // unit_multiplier_ns field below.
+    optional uint64 timestamp = 2;
+
+    // When true each TracePacket's timestamp should be interpreted as a delta
+    // from the last TracePacket's timestamp (referencing this clock) emitted by
+    // the same packet_sequence_id. Should only be used for user-defined
+    // sequence-local clocks. The first packet timestamp after each
+    // ClockSnapshot that contains this clock is relative to the |timestamp| in
+    // the ClockSnapshot.
+    optional bool is_incremental = 3;
+
+    // Allows to specify a custom unit different than the default (ns) for this
+    // clock domain. A multiplier of 1000 means that a timestamp = 3 should be
+    // interpreted as 3000 ns = 3 us. All snapshots for the same clock within a
+    // trace need to use the same unit.
+    optional uint64 unit_multiplier_ns = 4;
+  }
+  repeated Clock clocks = 1;
+
+  // The authoritative clock domain for the trace. Defaults to BOOTTIME, but can
+  // be overridden in TraceConfig's builtin_data_sources. Trace processor will
+  // attempt to translate packet/event timestamps from various data sources (and
+  // their chosen clock domains) to this domain during import.
+  optional BuiltinClock primary_trace_clock = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/etw/all_protos.gni b/src/libtracing/protos/perfetto/trace/etw/all_protos.gni
new file mode 100644
index 000000000..e6c9e9a05
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/etw/all_protos.gni
@@ -0,0 +1,19 @@
+# Copyright (C) 2023 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+etw_proto_names = [
+  "etw.proto",
+  "etw_event.proto",
+  "etw_event_bundle.proto",
+]
diff --git a/src/libtracing/protos/perfetto/trace/etw/etw.proto b/src/libtracing/protos/perfetto/trace/etw/etw.proto
new file mode 100644
index 000000000..aa037dde5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/etw/etw.proto
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Proto definition based on the Thread_v2 CSwitch class definition
+// See: https://learn.microsoft.com/en-us/windows/win32/etw/cswitch
+message CSwitchEtwEvent {
+  // New thread ID after the switch.
+  optional uint32 new_thread_id = 1;
+
+  // Previous thread ID.
+  optional uint32 old_thread_id = 2;
+
+  // Thread priority of the new thread.
+  optional sint32 new_thread_priority = 3;
+
+  // Thread priority of the previous thread.
+  optional sint32 old_thread_priority = 4;
+
+  // The index of the C-state that was last used by the processor. A value of 0
+  // represents the lightest idle state with higher values representing deeper
+  // C-states.
+  optional uint32 previous_c_state = 5;
+
+  // Wait reason for the previous thread. The ordering is important as based on
+  // the OldThreadWaitReason definition from the link above. The following are
+  // the possible values:
+  enum OldThreadWaitReason {
+    EXECUTIVE = 0;
+    FREE_PAGE = 1;
+    PAGE_IN = 2;
+    POOL_ALLOCATION = 3;
+    DELAY_EXECUTION = 4;
+    SUSPEND = 5;
+    USER_REQUEST = 6;
+    WR_EXECUTIVE = 7;
+    WR_FREE_PAGE = 8;
+    WR_PAGE_IN = 9;
+    WR_POOL_ALLOCATION = 10;
+    WR_DELAY_EXECUTION = 11;
+    WR_SUSPENDED = 12;
+    WR_USER_REQUEST = 13;
+    WR_EVENT_PAIR = 14;
+    WR_QUEUE = 15;
+    WR_LPC_RECEIVER = 16;
+    WR_LPC_REPLY = 17;
+    WR_VIRTUAL_MEMORY = 18;
+    WR_PAGE_OUT = 19;
+    WR_RENDEZ_VOUS = 20;
+    WR_KEYED_EVENT = 21;
+    WR_TERMINATED = 22;
+    WR_PROCESS_IN_SWAP = 23;
+    WR_CPU_RATE_CONTROL = 24;
+    WR_CALLOUT_STACK = 25;
+    WR_KERNEL = 26;
+    WR_RESOURCE = 27;
+    WR_PUSH_LOCK = 28;
+    WR_MUTEX = 29;
+    WR_QUANTUM_END = 30;
+    WR_DISPATCH_INT = 31;
+    WR_PREEMPTED = 32;
+    WR_YIELD_EXECUTION = 33;
+    WR_FAST_MUTEX = 34;
+    WR_GUARD_MUTEX = 35;
+    WR_RUNDOWN = 36;
+    MAXIMUM_WAIT_REASON = 37;
+  }
+
+  optional OldThreadWaitReason old_thread_wait_reason = 6;
+
+  // Wait mode for the previous thread. The ordering is important as based on
+  // the OldThreadWaitMode definition from the link above. The following are the
+  // possible values:
+  enum OldThreadWaitMode {
+    KERNEL_MODE = 0;
+    USER_MODE = 1;
+  }
+
+  optional OldThreadWaitMode old_thread_wait_mode = 7;
+
+  // State of the previous thread. The ordering is important as based on the
+  // OldThreadState definition from the link above. The following are the
+  // possible state values:
+  enum OldThreadState {
+    INITIALIZED = 0;
+    READY = 1;
+    RUNNING = 2;
+    STANDBY = 3;
+    TERMINATED = 4;
+    WAITING = 5;
+    TRANSITION = 6;
+    DEFERRED_READY = 7;
+  }
+
+  optional OldThreadState old_thread_state = 8;
+
+  // Ideal wait time of the previous thread.
+  optional sint32 old_thread_wait_ideal_processor = 9;
+
+  // Wait time for the new thread.
+  optional uint32 new_thread_wait_time = 10;
+}
+
+// Proto definition based on the Thread_v2 CSwitch class definition
+// See: https://learn.microsoft.com/en-us/windows/win32/etw/readythread
+message ReadyThreadEtwEvent {
+  // The thread identifier of the thread being readied for execution.
+  optional uint32 t_thread_id = 1;
+
+  // The reason for the priority boost. The ordering is important as based on
+  // the AdjustReason definition from the link above.
+  enum AdjustReason {
+    IGNORE_THE_INCREMENT = 0;
+    // Apply the increment, which will decay incrementally at the end of each
+    // quantum.
+    APPLY_INCREMENT = 1;
+    // Apply the increment as a boost that will decay in its entirety at quantum
+    // (typically for priority donation).
+    APPLY_INCREMENT_BOOST = 2;
+  }
+
+  optional AdjustReason adjust_reason = 2;
+
+  //  The value by which the priority is being adjusted.
+  optional sint32 adjust_increment = 3;
+
+  enum TraceFlag {
+    TRACE_FLAG_UNSPECIFIED = 0;
+    // The thread has been readied from DPC (deferred procedure call).
+    THREAD_READIED = 0x1;
+    // The kernel stack is currently swapped out.
+    KERNEL_STACK_SWAPPED_OUT = 0x2;
+    // The process address space is swapped out.
+    PROCESS_ADDRESS_SWAPPED_OUT = 0x4;
+  }
+
+  optional TraceFlag flag = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/etw/etw_event.proto b/src/libtracing/protos/perfetto/trace/etw/etw_event.proto
new file mode 100644
index 000000000..a295bdf51
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/etw/etw_event.proto
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+import "protos/perfetto/trace/etw/etw.proto";
+
+message EtwTraceEvent {
+  optional uint64 timestamp = 1;
+  optional uint32 cpu = 4;
+
+  oneof event {
+    CSwitchEtwEvent c_switch = 2;
+    ReadyThreadEtwEvent ready_thread = 3;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/trace/etw/etw_event_bundle.proto b/src/libtracing/protos/perfetto/trace/etw/etw_event_bundle.proto
new file mode 100644
index 000000000..6e7a8d331
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/etw/etw_event_bundle.proto
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/etw/etw_event.proto";
+
+package perfetto.protos;
+
+// The result of tracing one or more etw event uses per-processor buffers where
+// an in-use buffer is assigned to each processor at all times. Therefore,
+// collecting multiple events they should already be synchronized.
+message EtwTraceEventBundle {
+  optional uint32 cpu = 1;
+  repeated EtwTraceEvent event = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/extension_descriptor.proto b/src/libtracing/protos/perfetto/trace/extension_descriptor.proto
new file mode 100644
index 000000000..beb65a062
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/extension_descriptor.proto
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/common/descriptor.proto";
+
+// This message contains descriptors used to parse extension fields of
+// TrackEvent.
+//
+// See docs/design-docs/extensions.md for more details.
+message ExtensionDescriptor {
+  optional FileDescriptorSet extension_set = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/filesystem/inode_file_map.proto b/src/libtracing/protos/perfetto/trace/filesystem/inode_file_map.proto
new file mode 100644
index 000000000..e1d4c98b3
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/filesystem/inode_file_map.proto
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Represents the mapping between inode numbers in a block device and their path
+// on the filesystem
+message InodeFileMap {
+  // Representation of Entry
+  message Entry {
+    optional uint64 inode_number = 1;
+
+    // The path to the file, e.g. "etc/file.xml"
+    // List of strings for multiple hardlinks
+    repeated string paths = 2;
+
+    // The file type
+    enum Type {
+      UNKNOWN = 0;
+      FILE = 1;
+      DIRECTORY = 2;
+    }
+    optional Type type = 3;
+  }
+
+  optional uint64 block_device_id = 1;
+
+  // The mount points of the block device, e.g. ["system"].
+  repeated string mount_points = 2;
+
+  // The list of all the entries from the block device
+  repeated Entry entries = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/all_protos.gni b/src/libtracing/protos/perfetto/trace/ftrace/all_protos.gni
new file mode 100644
index 000000000..39e5ba2da
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/all_protos.gni
@@ -0,0 +1,86 @@
+# Copyright (C) 2018 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Autogenerated by ftrace_proto_gen.
+
+ftrace_proto_names = [
+  "ftrace_event.proto",
+  "ftrace_event_bundle.proto",
+  "ftrace_stats.proto",
+  "test_bundle_wrapper.proto",
+  "generic.proto",
+  "android_fs.proto",
+  "binder.proto",
+  "block.proto",
+  "cgroup.proto",
+  "clk.proto",
+  "cma.proto",
+  "compaction.proto",
+  "cpuhp.proto",
+  "cros_ec.proto",
+  "dma_fence.proto",
+  "dmabuf_heap.proto",
+  "dpu.proto",
+  "drm.proto",
+  "ext4.proto",
+  "f2fs.proto",
+  "fastrpc.proto",
+  "fence.proto",
+  "filemap.proto",
+  "ftrace.proto",
+  "g2d.proto",
+  "gpu_mem.proto",
+  "gpu_scheduler.proto",
+  "hyp.proto",
+  "i2c.proto",
+  "ion.proto",
+  "ipi.proto",
+  "irq.proto",
+  "kmem.proto",
+  "kvm.proto",
+  "lowmemorykiller.proto",
+  "lwis.proto",
+  "mali.proto",
+  "mdss.proto",
+  "mm_event.proto",
+  "net.proto",
+  "oom.proto",
+  "panel.proto",
+  "perf_trace_counters.proto",
+  "power.proto",
+  "printk.proto",
+  "raw_syscalls.proto",
+  "regulator.proto",
+  "rpm.proto",
+  "samsung.proto",
+  "sched.proto",
+  "scm.proto",
+  "sde.proto",
+  "signal.proto",
+  "skb.proto",
+  "sock.proto",
+  "sync.proto",
+  "synthetic.proto",
+  "systrace.proto",
+  "task.proto",
+  "tcp.proto",
+  "thermal.proto",
+  "trusty.proto",
+  "ufs.proto",
+  "v4l2.proto",
+  "virtio_gpu.proto",
+  "virtio_video.proto",
+  "vmscan.proto",
+  "workqueue.proto",
+]
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/android_fs.proto b/src/libtracing/protos/perfetto/trace/ftrace/android_fs.proto
new file mode 100644
index 000000000..76d7216c2
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/android_fs.proto
@@ -0,0 +1,47 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message AndroidFsDatareadEndFtraceEvent {
+  optional int32 bytes = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+}
+message AndroidFsDatareadStartFtraceEvent {
+  optional int32 bytes = 1;
+  optional string cmdline = 2;
+  optional int64 i_size = 3;
+  optional uint64 ino = 4;
+  optional int64 offset = 5;
+  optional string pathbuf = 6;
+  optional int32 pid = 7;
+}
+message AndroidFsDatawriteEndFtraceEvent {
+  optional int32 bytes = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+}
+message AndroidFsDatawriteStartFtraceEvent {
+  optional int32 bytes = 1;
+  optional string cmdline = 2;
+  optional int64 i_size = 3;
+  optional uint64 ino = 4;
+  optional int64 offset = 5;
+  optional string pathbuf = 6;
+  optional int32 pid = 7;
+}
+message AndroidFsFsyncEndFtraceEvent {
+  optional int32 bytes = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+}
+message AndroidFsFsyncStartFtraceEvent {
+  optional string cmdline = 1;
+  optional int64 i_size = 2;
+  optional uint64 ino = 3;
+  optional string pathbuf = 4;
+  optional int32 pid = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/binder.proto b/src/libtracing/protos/perfetto/trace/ftrace/binder.proto
new file mode 100644
index 000000000..fce9c469c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/binder.proto
@@ -0,0 +1,47 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message BinderTransactionFtraceEvent {
+  optional int32 debug_id = 1;
+  optional int32 target_node = 2;
+  optional int32 to_proc = 3;
+  optional int32 to_thread = 4;
+  optional int32 reply = 5;
+  optional uint32 code = 6;
+  optional uint32 flags = 7;
+}
+message BinderTransactionReceivedFtraceEvent {
+  optional int32 debug_id = 1;
+}
+message BinderSetPriorityFtraceEvent {
+  optional int32 proc = 1;
+  optional int32 thread = 2;
+  optional uint32 old_prio = 3;
+  optional uint32 new_prio = 4;
+  optional uint32 desired_prio = 5;
+}
+message BinderLockFtraceEvent {
+  optional string tag = 1;
+}
+message BinderLockedFtraceEvent {
+  optional string tag = 1;
+}
+message BinderUnlockFtraceEvent {
+  optional string tag = 1;
+}
+message BinderTransactionAllocBufFtraceEvent {
+  optional uint64 data_size = 1;
+  optional int32 debug_id = 2;
+  optional uint64 offsets_size = 3;
+  optional uint64 extra_buffers_size = 4;
+}
+message BinderCommandFtraceEvent {
+  optional uint32 cmd = 1;
+}
+message BinderReturnFtraceEvent {
+  optional uint32 cmd = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/block.proto b/src/libtracing/protos/perfetto/trace/ftrace/block.proto
new file mode 100644
index 000000000..516f3c83c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/block.proto
@@ -0,0 +1,140 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message BlockRqIssueFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint32 bytes = 4;
+  optional string rwbs = 5;
+  optional string comm = 6;
+  optional string cmd = 7;
+}
+message BlockBioBackmergeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioBounceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioCompleteFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 error = 4;
+  optional string rwbs = 5;
+}
+message BlockBioFrontmergeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioQueueFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioRemapFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint64 old_dev = 4;
+  optional uint64 old_sector = 5;
+  optional string rwbs = 6;
+}
+message BlockDirtyBufferFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint64 size = 3;
+}
+message BlockGetrqFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockPlugFtraceEvent {
+  optional string comm = 1;
+}
+message BlockRqAbortFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 errors = 4;
+  optional string rwbs = 5;
+  optional string cmd = 6;
+}
+message BlockRqCompleteFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 errors = 4;
+  optional string rwbs = 5;
+  optional string cmd = 6;
+  optional int32 error = 7;
+}
+message BlockRqInsertFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint32 bytes = 4;
+  optional string rwbs = 5;
+  optional string comm = 6;
+  optional string cmd = 7;
+}
+message BlockRqRemapFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint64 old_dev = 4;
+  optional uint64 old_sector = 5;
+  optional uint32 nr_bios = 6;
+  optional string rwbs = 7;
+}
+message BlockRqRequeueFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 errors = 4;
+  optional string rwbs = 5;
+  optional string cmd = 6;
+}
+message BlockSleeprqFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockSplitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint64 new_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockTouchBufferFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint64 size = 3;
+}
+message BlockUnplugFtraceEvent {
+  optional int32 nr_rq = 1;
+  optional string comm = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/cgroup.proto b/src/libtracing/protos/perfetto/trace/ftrace/cgroup.proto
new file mode 100644
index 000000000..889e646cc
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/cgroup.proto
@@ -0,0 +1,68 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message CgroupAttachTaskFtraceEvent {
+  optional int32 dst_root = 1;
+  optional int32 dst_id = 2;
+  optional int32 pid = 3;
+  optional string comm = 4;
+  optional string cname = 5;
+  optional int32 dst_level = 6;
+  optional string dst_path = 7;
+}
+message CgroupMkdirFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupRemountFtraceEvent {
+  optional int32 root = 1;
+  optional uint32 ss_mask = 2;
+  optional string name = 3;
+}
+message CgroupRmdirFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupTransferTasksFtraceEvent {
+  optional int32 dst_root = 1;
+  optional int32 dst_id = 2;
+  optional int32 pid = 3;
+  optional string comm = 4;
+  optional string cname = 5;
+  optional int32 dst_level = 6;
+  optional string dst_path = 7;
+}
+message CgroupDestroyRootFtraceEvent {
+  optional int32 root = 1;
+  optional uint32 ss_mask = 2;
+  optional string name = 3;
+}
+message CgroupReleaseFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupRenameFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupSetupRootFtraceEvent {
+  optional int32 root = 1;
+  optional uint32 ss_mask = 2;
+  optional string name = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/clk.proto b/src/libtracing/protos/perfetto/trace/ftrace/clk.proto
new file mode 100644
index 000000000..f6571e95f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/clk.proto
@@ -0,0 +1,17 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message ClkEnableFtraceEvent {
+  optional string name = 1;
+}
+message ClkDisableFtraceEvent {
+  optional string name = 1;
+}
+message ClkSetRateFtraceEvent {
+  optional string name = 1;
+  optional uint64 rate = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/cma.proto b/src/libtracing/protos/perfetto/trace/ftrace/cma.proto
new file mode 100644
index 000000000..20f7a7fbf
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/cma.proto
@@ -0,0 +1,24 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message CmaAllocStartFtraceEvent {
+  optional uint32 align = 1;
+  optional uint32 count = 2;
+  optional string name = 3;
+}
+message CmaAllocInfoFtraceEvent {
+  optional uint32 align = 1;
+  optional uint32 count = 2;
+  optional uint32 err_iso = 3;
+  optional uint32 err_mig = 4;
+  optional uint32 err_test = 5;
+  optional string name = 6;
+  optional uint64 nr_mapped = 7;
+  optional uint64 nr_migrated = 8;
+  optional uint64 nr_reclaimed = 9;
+  optional uint64 pfn = 10;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/compaction.proto b/src/libtracing/protos/perfetto/trace/ftrace/compaction.proto
new file mode 100644
index 000000000..8e47b3794
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/compaction.proto
@@ -0,0 +1,95 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message MmCompactionBeginFtraceEvent {
+  optional uint64 zone_start = 1;
+  optional uint64 migrate_pfn = 2;
+  optional uint64 free_pfn = 3;
+  optional uint64 zone_end = 4;
+  optional uint32 sync = 5;
+}
+message MmCompactionDeferCompactionFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional uint32 considered = 4;
+  optional uint32 defer_shift = 5;
+  optional int32 order_failed = 6;
+}
+message MmCompactionDeferredFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional uint32 considered = 4;
+  optional uint32 defer_shift = 5;
+  optional int32 order_failed = 6;
+}
+message MmCompactionDeferResetFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional uint32 considered = 4;
+  optional uint32 defer_shift = 5;
+  optional int32 order_failed = 6;
+}
+message MmCompactionEndFtraceEvent {
+  optional uint64 zone_start = 1;
+  optional uint64 migrate_pfn = 2;
+  optional uint64 free_pfn = 3;
+  optional uint64 zone_end = 4;
+  optional uint32 sync = 5;
+  optional int32 status = 6;
+}
+message MmCompactionFinishedFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional int32 ret = 4;
+}
+message MmCompactionIsolateFreepagesFtraceEvent {
+  optional uint64 start_pfn = 1;
+  optional uint64 end_pfn = 2;
+  optional uint64 nr_scanned = 3;
+  optional uint64 nr_taken = 4;
+}
+message MmCompactionIsolateMigratepagesFtraceEvent {
+  optional uint64 start_pfn = 1;
+  optional uint64 end_pfn = 2;
+  optional uint64 nr_scanned = 3;
+  optional uint64 nr_taken = 4;
+}
+message MmCompactionKcompactdSleepFtraceEvent {
+  optional int32 nid = 1;
+}
+message MmCompactionKcompactdWakeFtraceEvent {
+  optional int32 nid = 1;
+  optional int32 order = 2;
+  optional uint32 classzone_idx = 3;
+  optional uint32 highest_zoneidx = 4;
+}
+message MmCompactionMigratepagesFtraceEvent {
+  optional uint64 nr_migrated = 1;
+  optional uint64 nr_failed = 2;
+}
+message MmCompactionSuitableFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional int32 ret = 4;
+}
+message MmCompactionTryToCompactPagesFtraceEvent {
+  optional int32 order = 1;
+  optional uint32 gfp_mask = 2;
+  optional uint32 mode = 3;
+  optional int32 prio = 4;
+}
+message MmCompactionWakeupKcompactdFtraceEvent {
+  optional int32 nid = 1;
+  optional int32 order = 2;
+  optional uint32 classzone_idx = 3;
+  optional uint32 highest_zoneidx = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/cpuhp.proto b/src/libtracing/protos/perfetto/trace/ftrace/cpuhp.proto
new file mode 100644
index 000000000..8735ba39f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/cpuhp.proto
@@ -0,0 +1,37 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message CpuhpExitFtraceEvent {
+  optional uint32 cpu = 1;
+  optional int32 idx = 2;
+  optional int32 ret = 3;
+  optional int32 state = 4;
+}
+message CpuhpMultiEnterFtraceEvent {
+  optional uint32 cpu = 1;
+  optional uint64 fun = 2;
+  optional int32 idx = 3;
+  optional int32 target = 4;
+}
+message CpuhpEnterFtraceEvent {
+  optional uint32 cpu = 1;
+  optional uint64 fun = 2;
+  optional int32 idx = 3;
+  optional int32 target = 4;
+}
+message CpuhpLatencyFtraceEvent {
+  optional uint32 cpu = 1;
+  optional int32 ret = 2;
+  optional uint32 state = 3;
+  optional uint64 time = 4;
+}
+message CpuhpPauseFtraceEvent {
+  optional uint32 active_cpus = 1;
+  optional uint32 cpus = 2;
+  optional uint32 pause = 3;
+  optional uint32 time = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/cros_ec.proto b/src/libtracing/protos/perfetto/trace/ftrace/cros_ec.proto
new file mode 100644
index 000000000..55f255f6c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/cros_ec.proto
@@ -0,0 +1,15 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message CrosEcSensorhubDataFtraceEvent {
+  optional int64 current_time = 1;
+  optional int64 current_timestamp = 2;
+  optional int64 delta = 3;
+  optional uint32 ec_fifo_timestamp = 4;
+  optional uint32 ec_sensor_num = 5;
+  optional int64 fifo_timestamp = 6;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/dma_fence.proto b/src/libtracing/protos/perfetto/trace/ftrace/dma_fence.proto
new file mode 100644
index 000000000..0f61c92a2
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/dma_fence.proto
@@ -0,0 +1,37 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message DmaFenceInitFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceEmitFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceSignaledFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceWaitStartFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceWaitEndFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/dmabuf_heap.proto b/src/libtracing/protos/perfetto/trace/ftrace/dmabuf_heap.proto
new file mode 100644
index 000000000..ac1aaa03c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/dmabuf_heap.proto
@@ -0,0 +1,12 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message DmaHeapStatFtraceEvent {
+  optional uint64 inode = 1;
+  optional int64 len = 2;
+  optional uint64 total_allocated = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/dpu.proto b/src/libtracing/protos/perfetto/trace/ftrace/dpu.proto
new file mode 100644
index 000000000..5ebd42964
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/dpu.proto
@@ -0,0 +1,29 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message DpuTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+  optional string name = 4;
+  optional uint32 type = 5;
+  optional int32 value = 6;
+}
+message DpuDsiCmdFifoStatusFtraceEvent {
+  optional uint32 header = 1;
+  optional uint32 payload = 2;
+}
+message DpuDsiRxFtraceEvent {
+  optional uint32 cmd = 1;
+  optional uint32 rx_buf = 2;
+}
+message DpuDsiTxFtraceEvent {
+  optional uint32 type = 1;
+  optional uint32 tx_buf = 2;
+  optional uint32 last = 3;
+  optional uint32 delay_ms = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/drm.proto b/src/libtracing/protos/perfetto/trace/ftrace/drm.proto
new file mode 100644
index 000000000..20fc6fb2a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/drm.proto
@@ -0,0 +1,18 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message DrmVblankEventFtraceEvent {
+  optional int32 crtc = 1;
+  optional uint32 high_prec = 2;
+  optional uint32 seq = 3;
+  optional int64 time = 4;
+}
+message DrmVblankEventDeliveredFtraceEvent {
+  optional int32 crtc = 1;
+  optional uint64 file = 2;
+  optional uint32 seq = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ext4.proto b/src/libtracing/protos/perfetto/trace/ftrace/ext4.proto
new file mode 100644
index 000000000..7f5e19c23
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ext4.proto
@@ -0,0 +1,696 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message Ext4DaWriteBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4DaWriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message Ext4SyncFileEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 parent = 3;
+  optional int32 datasync = 4;
+}
+message Ext4SyncFileExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message Ext4AllocDaBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 data_blocks = 3;
+  optional uint32 meta_blocks = 4;
+}
+message Ext4AllocateBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional uint32 len = 4;
+  optional uint32 logical = 5;
+  optional uint32 lleft = 6;
+  optional uint32 lright = 7;
+  optional uint64 goal = 8;
+  optional uint64 pleft = 9;
+  optional uint64 pright = 10;
+  optional uint32 flags = 11;
+}
+message Ext4AllocateInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 dir = 3;
+  optional uint32 mode = 4;
+}
+message Ext4BeginOrderedTruncateFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 new_size = 3;
+}
+message Ext4CollapseRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+}
+message Ext4DaReleaseSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 i_blocks = 3;
+  optional int32 freed_blocks = 4;
+  optional int32 reserved_data_blocks = 5;
+  optional int32 reserved_meta_blocks = 6;
+  optional int32 allocated_meta_blocks = 7;
+  optional uint32 mode = 8;
+}
+message Ext4DaReserveSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 i_blocks = 3;
+  optional int32 reserved_data_blocks = 4;
+  optional int32 reserved_meta_blocks = 5;
+  optional uint32 mode = 6;
+  optional int32 md_needed = 7;
+}
+message Ext4DaUpdateReserveSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 i_blocks = 3;
+  optional int32 used_blocks = 4;
+  optional int32 reserved_data_blocks = 5;
+  optional int32 reserved_meta_blocks = 6;
+  optional int32 allocated_meta_blocks = 7;
+  optional int32 quota_claim = 8;
+  optional uint32 mode = 9;
+}
+message Ext4DaWritePagesFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 first_page = 3;
+  optional int64 nr_to_write = 4;
+  optional int32 sync_mode = 5;
+  optional uint64 b_blocknr = 6;
+  optional uint32 b_size = 7;
+  optional uint32 b_state = 8;
+  optional int32 io_done = 9;
+  optional int32 pages_written = 10;
+}
+message Ext4DaWritePagesExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 lblk = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4DirectIOEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint64 len = 4;
+  optional int32 rw = 5;
+}
+message Ext4DirectIOExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint64 len = 4;
+  optional int32 rw = 5;
+  optional int32 ret = 6;
+}
+message Ext4DiscardBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 blk = 2;
+  optional uint64 count = 3;
+}
+message Ext4DiscardPreallocationsFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 len = 3;
+  optional uint32 needed = 4;
+}
+message Ext4DropInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 drop = 3;
+}
+message Ext4EsCacheExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint32 status = 6;
+}
+message Ext4EsFindDelayedExtentRangeEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+}
+message Ext4EsFindDelayedExtentRangeExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint64 status = 6;
+}
+message Ext4EsInsertExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint64 status = 6;
+}
+message Ext4EsLookupExtentEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+}
+message Ext4EsLookupExtentExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint64 status = 6;
+  optional int32 found = 7;
+}
+message Ext4EsRemoveExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 lblk = 3;
+  optional int64 len = 4;
+}
+message Ext4EsShrinkFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_shrunk = 2;
+  optional uint64 scan_time = 3;
+  optional int32 nr_skipped = 4;
+  optional int32 retried = 5;
+}
+message Ext4EsShrinkCountFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_to_scan = 2;
+  optional int32 cache_cnt = 3;
+}
+message Ext4EsShrinkScanEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_to_scan = 2;
+  optional int32 cache_cnt = 3;
+}
+message Ext4EsShrinkScanExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_shrunk = 2;
+  optional int32 cache_cnt = 3;
+}
+message Ext4EvictInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 nlink = 3;
+}
+message Ext4ExtConvertToInitializedEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 m_lblk = 3;
+  optional uint32 m_len = 4;
+  optional uint32 u_lblk = 5;
+  optional uint32 u_len = 6;
+  optional uint64 u_pblk = 7;
+}
+message Ext4ExtConvertToInitializedFastpathFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 m_lblk = 3;
+  optional uint32 m_len = 4;
+  optional uint32 u_lblk = 5;
+  optional uint32 u_len = 6;
+  optional uint64 u_pblk = 7;
+  optional uint32 i_lblk = 8;
+  optional uint32 i_len = 9;
+  optional uint64 i_pblk = 10;
+}
+message Ext4ExtHandleUnwrittenExtentsFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 flags = 3;
+  optional uint32 lblk = 4;
+  optional uint64 pblk = 5;
+  optional uint32 len = 6;
+  optional uint32 allocated = 7;
+  optional uint64 newblk = 8;
+}
+message Ext4ExtInCacheFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional int32 ret = 4;
+}
+message Ext4ExtLoadExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pblk = 3;
+  optional uint32 lblk = 4;
+}
+message Ext4ExtMapBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4ExtMapBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 flags = 3;
+  optional uint64 pblk = 4;
+  optional uint32 lblk = 5;
+  optional uint32 len = 6;
+  optional uint32 mflags = 7;
+  optional int32 ret = 8;
+}
+message Ext4ExtPutInCacheFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 start = 5;
+}
+message Ext4ExtRemoveSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 start = 3;
+  optional uint32 end = 4;
+  optional int32 depth = 5;
+}
+message Ext4ExtRemoveSpaceDoneFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 start = 3;
+  optional uint32 end = 4;
+  optional int32 depth = 5;
+  optional int64 partial = 6;
+  optional uint32 eh_entries = 7;
+  optional uint32 pc_lblk = 8;
+  optional uint64 pc_pclu = 9;
+  optional int32 pc_state = 10;
+}
+message Ext4ExtRmIdxFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pblk = 3;
+}
+message Ext4ExtRmLeafFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 partial = 3;
+  optional uint32 start = 4;
+  optional uint32 ee_lblk = 5;
+  optional uint64 ee_pblk = 6;
+  optional int32 ee_len = 7;
+  optional uint32 pc_lblk = 8;
+  optional uint64 pc_pclu = 9;
+  optional int32 pc_state = 10;
+}
+message Ext4ExtShowExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pblk = 3;
+  optional uint32 lblk = 4;
+  optional uint32 len = 5;
+}
+message Ext4FallocateEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+  optional int32 mode = 5;
+  optional int64 pos = 6;
+}
+message Ext4FallocateExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 blocks = 4;
+  optional int32 ret = 5;
+}
+message Ext4FindDelallocRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 from = 3;
+  optional uint32 to = 4;
+  optional int32 reverse = 5;
+  optional int32 found = 6;
+  optional uint32 found_blk = 7;
+}
+message Ext4ForgetFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional int32 is_metadata = 4;
+  optional uint32 mode = 5;
+}
+message Ext4FreeBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional uint64 count = 4;
+  optional int32 flags = 5;
+  optional uint32 mode = 6;
+}
+message Ext4FreeInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 uid = 3;
+  optional uint32 gid = 4;
+  optional uint64 blocks = 5;
+  optional uint32 mode = 6;
+}
+message Ext4GetImpliedClusterAllocExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 flags = 2;
+  optional uint32 lblk = 3;
+  optional uint64 pblk = 4;
+  optional uint32 len = 5;
+  optional int32 ret = 6;
+}
+message Ext4GetReservedClusterAllocFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+}
+message Ext4IndMapBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4IndMapBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 flags = 3;
+  optional uint64 pblk = 4;
+  optional uint32 lblk = 5;
+  optional uint32 len = 6;
+  optional uint32 mflags = 7;
+  optional int32 ret = 8;
+}
+message Ext4InsertRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+}
+message Ext4InvalidatepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+  optional uint64 offset = 4;
+  optional uint32 length = 5;
+}
+message Ext4JournalStartFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ip = 2;
+  optional int32 blocks = 3;
+  optional int32 rsv_blocks = 4;
+  optional int32 nblocks = 5;
+  optional int32 revoke_creds = 6;
+}
+message Ext4JournalStartReservedFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ip = 2;
+  optional int32 blocks = 3;
+}
+message Ext4JournalledInvalidatepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+  optional uint64 offset = 4;
+  optional uint32 length = 5;
+}
+message Ext4JournalledWriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message Ext4LoadInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+}
+message Ext4LoadInodeBitmapFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+}
+message Ext4MarkInodeDirtyFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 ip = 3;
+}
+message Ext4MbBitmapLoadFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+}
+message Ext4MbBuddyBitmapLoadFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+}
+message Ext4MbDiscardPreallocationsFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 needed = 2;
+}
+message Ext4MbNewGroupPaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pa_pstart = 3;
+  optional uint64 pa_lstart = 4;
+  optional uint32 pa_len = 5;
+}
+message Ext4MbNewInodePaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pa_pstart = 3;
+  optional uint64 pa_lstart = 4;
+  optional uint32 pa_len = 5;
+}
+message Ext4MbReleaseGroupPaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 pa_pstart = 2;
+  optional uint32 pa_len = 3;
+}
+message Ext4MbReleaseInodePaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional uint32 count = 4;
+}
+message Ext4MballocAllocFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 orig_logical = 3;
+  optional int32 orig_start = 4;
+  optional uint32 orig_group = 5;
+  optional int32 orig_len = 6;
+  optional uint32 goal_logical = 7;
+  optional int32 goal_start = 8;
+  optional uint32 goal_group = 9;
+  optional int32 goal_len = 10;
+  optional uint32 result_logical = 11;
+  optional int32 result_start = 12;
+  optional uint32 result_group = 13;
+  optional int32 result_len = 14;
+  optional uint32 found = 15;
+  optional uint32 groups = 16;
+  optional uint32 buddy = 17;
+  optional uint32 flags = 18;
+  optional uint32 tail = 19;
+  optional uint32 cr = 20;
+}
+message Ext4MballocDiscardFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 result_start = 3;
+  optional uint32 result_group = 4;
+  optional int32 result_len = 5;
+}
+message Ext4MballocFreeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 result_start = 3;
+  optional uint32 result_group = 4;
+  optional int32 result_len = 5;
+}
+message Ext4MballocPreallocFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 orig_logical = 3;
+  optional int32 orig_start = 4;
+  optional uint32 orig_group = 5;
+  optional int32 orig_len = 6;
+  optional uint32 result_logical = 7;
+  optional int32 result_start = 8;
+  optional uint32 result_group = 9;
+  optional int32 result_len = 10;
+}
+message Ext4OtherInodeUpdateTimeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 orig_ino = 3;
+  optional uint32 uid = 4;
+  optional uint32 gid = 5;
+  optional uint32 mode = 6;
+}
+message Ext4PunchHoleFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+  optional int32 mode = 5;
+}
+message Ext4ReadBlockBitmapLoadFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+  optional uint32 prefetch = 3;
+}
+message Ext4ReadpageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+}
+message Ext4ReleasepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+}
+message Ext4RemoveBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 from = 3;
+  optional uint32 to = 4;
+  optional int64 partial = 5;
+  optional uint64 ee_pblk = 6;
+  optional uint32 ee_lblk = 7;
+  optional uint32 ee_len = 8;
+  optional uint32 pc_lblk = 9;
+  optional uint64 pc_pclu = 10;
+  optional int32 pc_state = 11;
+}
+message Ext4RequestBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 len = 3;
+  optional uint32 logical = 4;
+  optional uint32 lleft = 5;
+  optional uint32 lright = 6;
+  optional uint64 goal = 7;
+  optional uint64 pleft = 8;
+  optional uint64 pright = 9;
+  optional uint32 flags = 10;
+}
+message Ext4RequestInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 dir = 2;
+  optional uint32 mode = 3;
+}
+message Ext4SyncFsFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 wait = 2;
+}
+message Ext4TrimAllFreeFtraceEvent {
+  optional int32 dev_major = 1;
+  optional int32 dev_minor = 2;
+  optional uint32 group = 3;
+  optional int32 start = 4;
+  optional int32 len = 5;
+}
+message Ext4TrimExtentFtraceEvent {
+  optional int32 dev_major = 1;
+  optional int32 dev_minor = 2;
+  optional uint32 group = 3;
+  optional int32 start = 4;
+  optional int32 len = 5;
+}
+message Ext4TruncateEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 blocks = 3;
+}
+message Ext4TruncateExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 blocks = 3;
+}
+message Ext4UnlinkEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 parent = 3;
+  optional int64 size = 4;
+}
+message Ext4UnlinkExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message Ext4WriteBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4WriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message Ext4WritepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+}
+message Ext4WritepagesFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 nr_to_write = 3;
+  optional int64 pages_skipped = 4;
+  optional int64 range_start = 5;
+  optional int64 range_end = 6;
+  optional uint64 writeback_index = 7;
+  optional int32 sync_mode = 8;
+  optional uint32 for_kupdate = 9;
+  optional uint32 range_cyclic = 10;
+}
+message Ext4WritepagesResultFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+  optional int32 pages_written = 4;
+  optional int64 pages_skipped = 5;
+  optional uint64 writeback_index = 6;
+  optional int32 sync_mode = 7;
+}
+message Ext4ZeroRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+  optional int32 mode = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/f2fs.proto b/src/libtracing/protos/perfetto/trace/ftrace/f2fs.proto
new file mode 100644
index 000000000..eb8be75c2
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/f2fs.proto
@@ -0,0 +1,324 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message F2fsDoSubmitBioFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 btype = 2;
+  optional uint32 sync = 3;
+  optional uint64 sector = 4;
+  optional uint32 size = 5;
+}
+message F2fsEvictInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsFallocateFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 mode = 3;
+  optional int64 offset = 4;
+  optional int64 len = 5;
+  optional int64 size = 6;
+  optional uint64 blocks = 7;
+  optional int32 ret = 8;
+}
+message F2fsGetDataBlockFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 iblock = 3;
+  optional uint64 bh_start = 4;
+  optional uint64 bh_size = 5;
+  optional int32 ret = 6;
+}
+message F2fsGetVictimFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 type = 2;
+  optional int32 gc_type = 3;
+  optional int32 alloc_mode = 4;
+  optional int32 gc_mode = 5;
+  optional uint32 victim = 6;
+  optional uint32 ofs_unit = 7;
+  optional uint32 pre_victim = 8;
+  optional uint32 prefree = 9;
+  optional uint32 free = 10;
+  optional uint32 cost = 11;
+}
+message F2fsIgetFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsIgetExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsNewInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsReadpageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+  optional uint64 blkaddr = 4;
+  optional int32 type = 5;
+  optional int32 dir = 6;
+  optional int32 dirty = 7;
+  optional int32 uptodate = 8;
+}
+message F2fsReserveNewBlockFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 nid = 2;
+  optional uint32 ofs_in_node = 3;
+}
+message F2fsSetPageDirtyFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 type = 3;
+  optional int32 dir = 4;
+  optional uint64 index = 5;
+  optional int32 dirty = 6;
+  optional int32 uptodate = 7;
+}
+message F2fsSubmitWritePageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 type = 3;
+  optional uint64 index = 4;
+  optional uint32 block = 5;
+}
+message F2fsSyncFileEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsSyncFileExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 need_cp = 3;
+  optional int32 datasync = 4;
+  optional int32 ret = 5;
+  optional int32 cp_reason = 6;
+}
+message F2fsSyncFsFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 dirty = 2;
+  optional int32 wait = 3;
+}
+message F2fsTruncateFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsTruncateBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 size = 3;
+  optional uint64 blocks = 4;
+  optional uint64 from = 5;
+}
+message F2fsTruncateBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsTruncateDataBlocksRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional uint32 ofs = 4;
+  optional int32 free = 5;
+}
+message F2fsTruncateInodeBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 size = 3;
+  optional uint64 blocks = 4;
+  optional uint64 from = 5;
+}
+message F2fsTruncateInodeBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsTruncateNodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional uint32 blk_addr = 4;
+}
+message F2fsTruncateNodesEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional uint32 blk_addr = 4;
+}
+message F2fsTruncateNodesExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsTruncatePartialNodesFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional int32 depth = 4;
+  optional int32 err = 5;
+}
+message F2fsUnlinkEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 size = 3;
+  optional uint64 blocks = 4;
+  optional string name = 5;
+}
+message F2fsUnlinkExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsVmPageMkwriteFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 type = 3;
+  optional int32 dir = 4;
+  optional uint64 index = 5;
+  optional int32 dirty = 6;
+  optional int32 uptodate = 7;
+}
+message F2fsWriteBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message F2fsWriteCheckpointFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 is_umount = 2;
+  optional string msg = 3;
+  optional int32 reason = 4;
+}
+message F2fsWriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message F2fsIostatFtraceEvent {
+  optional uint64 app_bio = 1;
+  optional uint64 app_brio = 2;
+  optional uint64 app_dio = 3;
+  optional uint64 app_drio = 4;
+  optional uint64 app_mio = 5;
+  optional uint64 app_mrio = 6;
+  optional uint64 app_rio = 7;
+  optional uint64 app_wio = 8;
+  optional uint64 dev = 9;
+  optional uint64 fs_cdrio = 10;
+  optional uint64 fs_cp_dio = 11;
+  optional uint64 fs_cp_mio = 12;
+  optional uint64 fs_cp_nio = 13;
+  optional uint64 fs_dio = 14;
+  optional uint64 fs_discard = 15;
+  optional uint64 fs_drio = 16;
+  optional uint64 fs_gc_dio = 17;
+  optional uint64 fs_gc_nio = 18;
+  optional uint64 fs_gdrio = 19;
+  optional uint64 fs_mio = 20;
+  optional uint64 fs_mrio = 21;
+  optional uint64 fs_nio = 22;
+  optional uint64 fs_nrio = 23;
+}
+message F2fsIostatLatencyFtraceEvent {
+  optional uint32 d_rd_avg = 1;
+  optional uint32 d_rd_cnt = 2;
+  optional uint32 d_rd_peak = 3;
+  optional uint32 d_wr_as_avg = 4;
+  optional uint32 d_wr_as_cnt = 5;
+  optional uint32 d_wr_as_peak = 6;
+  optional uint32 d_wr_s_avg = 7;
+  optional uint32 d_wr_s_cnt = 8;
+  optional uint32 d_wr_s_peak = 9;
+  optional uint64 dev = 10;
+  optional uint32 m_rd_avg = 11;
+  optional uint32 m_rd_cnt = 12;
+  optional uint32 m_rd_peak = 13;
+  optional uint32 m_wr_as_avg = 14;
+  optional uint32 m_wr_as_cnt = 15;
+  optional uint32 m_wr_as_peak = 16;
+  optional uint32 m_wr_s_avg = 17;
+  optional uint32 m_wr_s_cnt = 18;
+  optional uint32 m_wr_s_peak = 19;
+  optional uint32 n_rd_avg = 20;
+  optional uint32 n_rd_cnt = 21;
+  optional uint32 n_rd_peak = 22;
+  optional uint32 n_wr_as_avg = 23;
+  optional uint32 n_wr_as_cnt = 24;
+  optional uint32 n_wr_as_peak = 25;
+  optional uint32 n_wr_s_avg = 26;
+  optional uint32 n_wr_s_cnt = 27;
+  optional uint32 n_wr_s_peak = 28;
+}
+message F2fsBackgroundGcFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 wait_ms = 2;
+  optional uint32 prefree = 3;
+  optional uint32 free = 4;
+}
+message F2fsGcBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 sync = 2;
+  optional uint32 background = 3;
+  optional int64 dirty_nodes = 4;
+  optional int64 dirty_dents = 5;
+  optional int64 dirty_imeta = 6;
+  optional uint32 free_sec = 7;
+  optional uint32 free_seg = 8;
+  optional int32 reserved_seg = 9;
+  optional uint32 prefree_seg = 10;
+  optional int32 gc_type = 11;
+  optional uint32 no_bg_gc = 12;
+  optional uint32 nr_free_secs = 13;
+}
+message F2fsGcEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 ret = 2;
+  optional int32 seg_freed = 3;
+  optional int32 sec_freed = 4;
+  optional int64 dirty_nodes = 5;
+  optional int64 dirty_dents = 6;
+  optional int64 dirty_imeta = 7;
+  optional uint32 free_sec = 8;
+  optional uint32 free_seg = 9;
+  optional int32 reserved_seg = 10;
+  optional uint32 prefree_seg = 11;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/fastrpc.proto b/src/libtracing/protos/perfetto/trace/ftrace/fastrpc.proto
new file mode 100644
index 000000000..01ad8f944
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/fastrpc.proto
@@ -0,0 +1,38 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message FastrpcDmaStatFtraceEvent {
+  optional int32 cid = 1;
+  optional int64 len = 2;
+  optional uint64 total_allocated = 3;
+}
+message FastrpcDmaFreeFtraceEvent {
+  optional int32 cid = 1;
+  optional uint64 phys = 2;
+  optional uint64 size = 3;
+}
+message FastrpcDmaAllocFtraceEvent {
+  optional int32 cid = 1;
+  optional uint64 phys = 2;
+  optional uint64 size = 3;
+  optional uint64 attr = 4;
+  optional int32 mflags = 5;
+}
+message FastrpcDmaUnmapFtraceEvent {
+  optional int32 cid = 1;
+  optional uint64 phys = 2;
+  optional uint64 size = 3;
+}
+message FastrpcDmaMapFtraceEvent {
+  optional int32 cid = 1;
+  optional int32 fd = 2;
+  optional uint64 phys = 3;
+  optional uint64 size = 4;
+  optional uint64 len = 5;
+  optional uint32 attr = 6;
+  optional int32 mflags = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/fence.proto b/src/libtracing/protos/perfetto/trace/ftrace/fence.proto
new file mode 100644
index 000000000..c0dd726c5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/fence.proto
@@ -0,0 +1,31 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message FenceInitFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message FenceDestroyFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message FenceEnableSignalFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message FenceSignaledFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/filemap.proto b/src/libtracing/protos/perfetto/trace/ftrace/filemap.proto
new file mode 100644
index 000000000..0b1d81d10
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/filemap.proto
@@ -0,0 +1,21 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message MmFilemapAddToPageCacheFtraceEvent {
+  optional uint64 pfn = 1;
+  optional uint64 i_ino = 2;
+  optional uint64 index = 3;
+  optional uint64 s_dev = 4;
+  optional uint64 page = 5;
+}
+message MmFilemapDeleteFromPageCacheFtraceEvent {
+  optional uint64 pfn = 1;
+  optional uint64 i_ino = 2;
+  optional uint64 index = 3;
+  optional uint64 s_dev = 4;
+  optional uint64 page = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ftrace.proto b/src/libtracing/protos/perfetto/trace/ftrace/ftrace.proto
new file mode 100644
index 000000000..d114f647c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ftrace.proto
@@ -0,0 +1,22 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message PrintFtraceEvent {
+  optional uint64 ip = 1;
+  optional string buf = 2;
+}
+message FuncgraphEntryFtraceEvent {
+  optional int32 depth = 1;
+  optional uint64 func = 2;
+}
+message FuncgraphExitFtraceEvent {
+  optional uint64 calltime = 1;
+  optional int32 depth = 2;
+  optional uint64 func = 3;
+  optional uint64 overrun = 4;
+  optional uint64 rettime = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ftrace_event.proto b/src/libtracing/protos/perfetto/trace/ftrace/ftrace_event.proto
new file mode 100644
index 000000000..302de2afe
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ftrace_event.proto
@@ -0,0 +1,622 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/ftrace/android_fs.proto";
+import "protos/perfetto/trace/ftrace/binder.proto";
+import "protos/perfetto/trace/ftrace/block.proto";
+import "protos/perfetto/trace/ftrace/cgroup.proto";
+import "protos/perfetto/trace/ftrace/clk.proto";
+import "protos/perfetto/trace/ftrace/cma.proto";
+import "protos/perfetto/trace/ftrace/compaction.proto";
+import "protos/perfetto/trace/ftrace/cpuhp.proto";
+import "protos/perfetto/trace/ftrace/cros_ec.proto";
+import "protos/perfetto/trace/ftrace/dma_fence.proto";
+import "protos/perfetto/trace/ftrace/dmabuf_heap.proto";
+import "protos/perfetto/trace/ftrace/dpu.proto";
+import "protos/perfetto/trace/ftrace/drm.proto";
+import "protos/perfetto/trace/ftrace/ext4.proto";
+import "protos/perfetto/trace/ftrace/f2fs.proto";
+import "protos/perfetto/trace/ftrace/fastrpc.proto";
+import "protos/perfetto/trace/ftrace/fence.proto";
+import "protos/perfetto/trace/ftrace/filemap.proto";
+import "protos/perfetto/trace/ftrace/ftrace.proto";
+import "protos/perfetto/trace/ftrace/g2d.proto";
+import "protos/perfetto/trace/ftrace/gpu_mem.proto";
+import "protos/perfetto/trace/ftrace/gpu_scheduler.proto";
+import "protos/perfetto/trace/ftrace/hyp.proto";
+import "protos/perfetto/trace/ftrace/i2c.proto";
+import "protos/perfetto/trace/ftrace/ion.proto";
+import "protos/perfetto/trace/ftrace/ipi.proto";
+import "protos/perfetto/trace/ftrace/irq.proto";
+import "protos/perfetto/trace/ftrace/kmem.proto";
+import "protos/perfetto/trace/ftrace/kvm.proto";
+import "protos/perfetto/trace/ftrace/lowmemorykiller.proto";
+import "protos/perfetto/trace/ftrace/lwis.proto";
+import "protos/perfetto/trace/ftrace/mali.proto";
+import "protos/perfetto/trace/ftrace/mdss.proto";
+import "protos/perfetto/trace/ftrace/mm_event.proto";
+import "protos/perfetto/trace/ftrace/net.proto";
+import "protos/perfetto/trace/ftrace/oom.proto";
+import "protos/perfetto/trace/ftrace/panel.proto";
+import "protos/perfetto/trace/ftrace/perf_trace_counters.proto";
+import "protos/perfetto/trace/ftrace/power.proto";
+import "protos/perfetto/trace/ftrace/printk.proto";
+import "protos/perfetto/trace/ftrace/raw_syscalls.proto";
+import "protos/perfetto/trace/ftrace/regulator.proto";
+import "protos/perfetto/trace/ftrace/rpm.proto";
+import "protos/perfetto/trace/ftrace/samsung.proto";
+import "protos/perfetto/trace/ftrace/sched.proto";
+import "protos/perfetto/trace/ftrace/scm.proto";
+import "protos/perfetto/trace/ftrace/sde.proto";
+import "protos/perfetto/trace/ftrace/signal.proto";
+import "protos/perfetto/trace/ftrace/skb.proto";
+import "protos/perfetto/trace/ftrace/sock.proto";
+import "protos/perfetto/trace/ftrace/sync.proto";
+import "protos/perfetto/trace/ftrace/synthetic.proto";
+import "protos/perfetto/trace/ftrace/systrace.proto";
+import "protos/perfetto/trace/ftrace/task.proto";
+import "protos/perfetto/trace/ftrace/tcp.proto";
+import "protos/perfetto/trace/ftrace/thermal.proto";
+import "protos/perfetto/trace/ftrace/trusty.proto";
+import "protos/perfetto/trace/ftrace/ufs.proto";
+import "protos/perfetto/trace/ftrace/v4l2.proto";
+import "protos/perfetto/trace/ftrace/virtio_gpu.proto";
+import "protos/perfetto/trace/ftrace/virtio_video.proto";
+import "protos/perfetto/trace/ftrace/vmscan.proto";
+import "protos/perfetto/trace/ftrace/workqueue.proto";
+import "protos/perfetto/trace/ftrace/generic.proto";
+
+package perfetto.protos;
+
+message FtraceEvent {
+  // Timestamp in nanoseconds using .../tracing/trace_clock.
+  optional uint64 timestamp = 1;
+
+  // Kernel pid (do not confuse with userspace pid aka tgid).
+  optional uint32 pid = 2;
+
+  // Not populated in actual traces. Wire format might change.
+  // Placeholder declaration so that the ftrace parsing code accepts the
+  // existence of this common field. If this becomes needed for all events:
+  // consider merging with common_preempt_count to avoid extra proto tags.
+  optional uint32 common_flags = 5;
+
+  oneof event {
+    PrintFtraceEvent print = 3;
+    SchedSwitchFtraceEvent sched_switch = 4;
+    // removed field with id 5;
+    // removed field with id 6;
+    // removed field with id 7;
+    // removed field with id 8;
+    // removed field with id 9;
+    // removed field with id 10;
+    CpuFrequencyFtraceEvent cpu_frequency = 11;
+    CpuFrequencyLimitsFtraceEvent cpu_frequency_limits = 12;
+    CpuIdleFtraceEvent cpu_idle = 13;
+    ClockEnableFtraceEvent clock_enable = 14;
+    ClockDisableFtraceEvent clock_disable = 15;
+    ClockSetRateFtraceEvent clock_set_rate = 16;
+    SchedWakeupFtraceEvent sched_wakeup = 17;
+    SchedBlockedReasonFtraceEvent sched_blocked_reason = 18;
+    SchedCpuHotplugFtraceEvent sched_cpu_hotplug = 19;
+    SchedWakingFtraceEvent sched_waking = 20;
+    IpiEntryFtraceEvent ipi_entry = 21;
+    IpiExitFtraceEvent ipi_exit = 22;
+    IpiRaiseFtraceEvent ipi_raise = 23;
+    SoftirqEntryFtraceEvent softirq_entry = 24;
+    SoftirqExitFtraceEvent softirq_exit = 25;
+    SoftirqRaiseFtraceEvent softirq_raise = 26;
+    I2cReadFtraceEvent i2c_read = 27;
+    I2cWriteFtraceEvent i2c_write = 28;
+    I2cResultFtraceEvent i2c_result = 29;
+    I2cReplyFtraceEvent i2c_reply = 30;
+    SmbusReadFtraceEvent smbus_read = 31;
+    SmbusWriteFtraceEvent smbus_write = 32;
+    SmbusResultFtraceEvent smbus_result = 33;
+    SmbusReplyFtraceEvent smbus_reply = 34;
+    LowmemoryKillFtraceEvent lowmemory_kill = 35;
+    IrqHandlerEntryFtraceEvent irq_handler_entry = 36;
+    IrqHandlerExitFtraceEvent irq_handler_exit = 37;
+    SyncPtFtraceEvent sync_pt = 38;
+    SyncTimelineFtraceEvent sync_timeline = 39;
+    SyncWaitFtraceEvent sync_wait = 40;
+    Ext4DaWriteBeginFtraceEvent ext4_da_write_begin = 41;
+    Ext4DaWriteEndFtraceEvent ext4_da_write_end = 42;
+    Ext4SyncFileEnterFtraceEvent ext4_sync_file_enter = 43;
+    Ext4SyncFileExitFtraceEvent ext4_sync_file_exit = 44;
+    BlockRqIssueFtraceEvent block_rq_issue = 45;
+    MmVmscanDirectReclaimBeginFtraceEvent mm_vmscan_direct_reclaim_begin = 46;
+    MmVmscanDirectReclaimEndFtraceEvent mm_vmscan_direct_reclaim_end = 47;
+    MmVmscanKswapdWakeFtraceEvent mm_vmscan_kswapd_wake = 48;
+    MmVmscanKswapdSleepFtraceEvent mm_vmscan_kswapd_sleep = 49;
+    BinderTransactionFtraceEvent binder_transaction = 50;
+    BinderTransactionReceivedFtraceEvent binder_transaction_received = 51;
+    BinderSetPriorityFtraceEvent binder_set_priority = 52;
+    BinderLockFtraceEvent binder_lock = 53;
+    BinderLockedFtraceEvent binder_locked = 54;
+    BinderUnlockFtraceEvent binder_unlock = 55;
+    WorkqueueActivateWorkFtraceEvent workqueue_activate_work = 56;
+    WorkqueueExecuteEndFtraceEvent workqueue_execute_end = 57;
+    WorkqueueExecuteStartFtraceEvent workqueue_execute_start = 58;
+    WorkqueueQueueWorkFtraceEvent workqueue_queue_work = 59;
+    RegulatorDisableFtraceEvent regulator_disable = 60;
+    RegulatorDisableCompleteFtraceEvent regulator_disable_complete = 61;
+    RegulatorEnableFtraceEvent regulator_enable = 62;
+    RegulatorEnableCompleteFtraceEvent regulator_enable_complete = 63;
+    RegulatorEnableDelayFtraceEvent regulator_enable_delay = 64;
+    RegulatorSetVoltageFtraceEvent regulator_set_voltage = 65;
+    RegulatorSetVoltageCompleteFtraceEvent regulator_set_voltage_complete = 66;
+    CgroupAttachTaskFtraceEvent cgroup_attach_task = 67;
+    CgroupMkdirFtraceEvent cgroup_mkdir = 68;
+    CgroupRemountFtraceEvent cgroup_remount = 69;
+    CgroupRmdirFtraceEvent cgroup_rmdir = 70;
+    CgroupTransferTasksFtraceEvent cgroup_transfer_tasks = 71;
+    CgroupDestroyRootFtraceEvent cgroup_destroy_root = 72;
+    CgroupReleaseFtraceEvent cgroup_release = 73;
+    CgroupRenameFtraceEvent cgroup_rename = 74;
+    CgroupSetupRootFtraceEvent cgroup_setup_root = 75;
+    MdpCmdKickoffFtraceEvent mdp_cmd_kickoff = 76;
+    MdpCommitFtraceEvent mdp_commit = 77;
+    MdpPerfSetOtFtraceEvent mdp_perf_set_ot = 78;
+    MdpSsppChangeFtraceEvent mdp_sspp_change = 79;
+    TracingMarkWriteFtraceEvent tracing_mark_write = 80;
+    MdpCmdPingpongDoneFtraceEvent mdp_cmd_pingpong_done = 81;
+    MdpCompareBwFtraceEvent mdp_compare_bw = 82;
+    MdpPerfSetPanicLutsFtraceEvent mdp_perf_set_panic_luts = 83;
+    MdpSsppSetFtraceEvent mdp_sspp_set = 84;
+    MdpCmdReadptrDoneFtraceEvent mdp_cmd_readptr_done = 85;
+    MdpMisrCrcFtraceEvent mdp_misr_crc = 86;
+    MdpPerfSetQosLutsFtraceEvent mdp_perf_set_qos_luts = 87;
+    MdpTraceCounterFtraceEvent mdp_trace_counter = 88;
+    MdpCmdReleaseBwFtraceEvent mdp_cmd_release_bw = 89;
+    MdpMixerUpdateFtraceEvent mdp_mixer_update = 90;
+    MdpPerfSetWmLevelsFtraceEvent mdp_perf_set_wm_levels = 91;
+    MdpVideoUnderrunDoneFtraceEvent mdp_video_underrun_done = 92;
+    MdpCmdWaitPingpongFtraceEvent mdp_cmd_wait_pingpong = 93;
+    MdpPerfPrefillCalcFtraceEvent mdp_perf_prefill_calc = 94;
+    MdpPerfUpdateBusFtraceEvent mdp_perf_update_bus = 95;
+    RotatorBwAoAsContextFtraceEvent rotator_bw_ao_as_context = 96;
+    MmFilemapAddToPageCacheFtraceEvent mm_filemap_add_to_page_cache = 97;
+    MmFilemapDeleteFromPageCacheFtraceEvent mm_filemap_delete_from_page_cache =
+        98;
+    MmCompactionBeginFtraceEvent mm_compaction_begin = 99;
+    MmCompactionDeferCompactionFtraceEvent mm_compaction_defer_compaction = 100;
+    MmCompactionDeferredFtraceEvent mm_compaction_deferred = 101;
+    MmCompactionDeferResetFtraceEvent mm_compaction_defer_reset = 102;
+    MmCompactionEndFtraceEvent mm_compaction_end = 103;
+    MmCompactionFinishedFtraceEvent mm_compaction_finished = 104;
+    MmCompactionIsolateFreepagesFtraceEvent mm_compaction_isolate_freepages =
+        105;
+    MmCompactionIsolateMigratepagesFtraceEvent
+        mm_compaction_isolate_migratepages = 106;
+    MmCompactionKcompactdSleepFtraceEvent mm_compaction_kcompactd_sleep = 107;
+    MmCompactionKcompactdWakeFtraceEvent mm_compaction_kcompactd_wake = 108;
+    MmCompactionMigratepagesFtraceEvent mm_compaction_migratepages = 109;
+    MmCompactionSuitableFtraceEvent mm_compaction_suitable = 110;
+    MmCompactionTryToCompactPagesFtraceEvent
+        mm_compaction_try_to_compact_pages = 111;
+    MmCompactionWakeupKcompactdFtraceEvent mm_compaction_wakeup_kcompactd = 112;
+    SuspendResumeFtraceEvent suspend_resume = 113;
+    SchedWakeupNewFtraceEvent sched_wakeup_new = 114;
+    BlockBioBackmergeFtraceEvent block_bio_backmerge = 115;
+    BlockBioBounceFtraceEvent block_bio_bounce = 116;
+    BlockBioCompleteFtraceEvent block_bio_complete = 117;
+    BlockBioFrontmergeFtraceEvent block_bio_frontmerge = 118;
+    BlockBioQueueFtraceEvent block_bio_queue = 119;
+    BlockBioRemapFtraceEvent block_bio_remap = 120;
+    BlockDirtyBufferFtraceEvent block_dirty_buffer = 121;
+    BlockGetrqFtraceEvent block_getrq = 122;
+    BlockPlugFtraceEvent block_plug = 123;
+    BlockRqAbortFtraceEvent block_rq_abort = 124;
+    BlockRqCompleteFtraceEvent block_rq_complete = 125;
+    BlockRqInsertFtraceEvent block_rq_insert = 126;
+    // removed field with id 127;
+    BlockRqRemapFtraceEvent block_rq_remap = 128;
+    BlockRqRequeueFtraceEvent block_rq_requeue = 129;
+    BlockSleeprqFtraceEvent block_sleeprq = 130;
+    BlockSplitFtraceEvent block_split = 131;
+    BlockTouchBufferFtraceEvent block_touch_buffer = 132;
+    BlockUnplugFtraceEvent block_unplug = 133;
+    Ext4AllocDaBlocksFtraceEvent ext4_alloc_da_blocks = 134;
+    Ext4AllocateBlocksFtraceEvent ext4_allocate_blocks = 135;
+    Ext4AllocateInodeFtraceEvent ext4_allocate_inode = 136;
+    Ext4BeginOrderedTruncateFtraceEvent ext4_begin_ordered_truncate = 137;
+    Ext4CollapseRangeFtraceEvent ext4_collapse_range = 138;
+    Ext4DaReleaseSpaceFtraceEvent ext4_da_release_space = 139;
+    Ext4DaReserveSpaceFtraceEvent ext4_da_reserve_space = 140;
+    Ext4DaUpdateReserveSpaceFtraceEvent ext4_da_update_reserve_space = 141;
+    Ext4DaWritePagesFtraceEvent ext4_da_write_pages = 142;
+    Ext4DaWritePagesExtentFtraceEvent ext4_da_write_pages_extent = 143;
+    Ext4DirectIOEnterFtraceEvent ext4_direct_IO_enter = 144;
+    Ext4DirectIOExitFtraceEvent ext4_direct_IO_exit = 145;
+    Ext4DiscardBlocksFtraceEvent ext4_discard_blocks = 146;
+    Ext4DiscardPreallocationsFtraceEvent ext4_discard_preallocations = 147;
+    Ext4DropInodeFtraceEvent ext4_drop_inode = 148;
+    Ext4EsCacheExtentFtraceEvent ext4_es_cache_extent = 149;
+    Ext4EsFindDelayedExtentRangeEnterFtraceEvent
+        ext4_es_find_delayed_extent_range_enter = 150;
+    Ext4EsFindDelayedExtentRangeExitFtraceEvent
+        ext4_es_find_delayed_extent_range_exit = 151;
+    Ext4EsInsertExtentFtraceEvent ext4_es_insert_extent = 152;
+    Ext4EsLookupExtentEnterFtraceEvent ext4_es_lookup_extent_enter = 153;
+    Ext4EsLookupExtentExitFtraceEvent ext4_es_lookup_extent_exit = 154;
+    Ext4EsRemoveExtentFtraceEvent ext4_es_remove_extent = 155;
+    Ext4EsShrinkFtraceEvent ext4_es_shrink = 156;
+    Ext4EsShrinkCountFtraceEvent ext4_es_shrink_count = 157;
+    Ext4EsShrinkScanEnterFtraceEvent ext4_es_shrink_scan_enter = 158;
+    Ext4EsShrinkScanExitFtraceEvent ext4_es_shrink_scan_exit = 159;
+    Ext4EvictInodeFtraceEvent ext4_evict_inode = 160;
+    Ext4ExtConvertToInitializedEnterFtraceEvent
+        ext4_ext_convert_to_initialized_enter = 161;
+    Ext4ExtConvertToInitializedFastpathFtraceEvent
+        ext4_ext_convert_to_initialized_fastpath = 162;
+    Ext4ExtHandleUnwrittenExtentsFtraceEvent ext4_ext_handle_unwritten_extents =
+        163;
+    Ext4ExtInCacheFtraceEvent ext4_ext_in_cache = 164;
+    Ext4ExtLoadExtentFtraceEvent ext4_ext_load_extent = 165;
+    Ext4ExtMapBlocksEnterFtraceEvent ext4_ext_map_blocks_enter = 166;
+    Ext4ExtMapBlocksExitFtraceEvent ext4_ext_map_blocks_exit = 167;
+    Ext4ExtPutInCacheFtraceEvent ext4_ext_put_in_cache = 168;
+    Ext4ExtRemoveSpaceFtraceEvent ext4_ext_remove_space = 169;
+    Ext4ExtRemoveSpaceDoneFtraceEvent ext4_ext_remove_space_done = 170;
+    Ext4ExtRmIdxFtraceEvent ext4_ext_rm_idx = 171;
+    Ext4ExtRmLeafFtraceEvent ext4_ext_rm_leaf = 172;
+    Ext4ExtShowExtentFtraceEvent ext4_ext_show_extent = 173;
+    Ext4FallocateEnterFtraceEvent ext4_fallocate_enter = 174;
+    Ext4FallocateExitFtraceEvent ext4_fallocate_exit = 175;
+    Ext4FindDelallocRangeFtraceEvent ext4_find_delalloc_range = 176;
+    Ext4ForgetFtraceEvent ext4_forget = 177;
+    Ext4FreeBlocksFtraceEvent ext4_free_blocks = 178;
+    Ext4FreeInodeFtraceEvent ext4_free_inode = 179;
+    Ext4GetImpliedClusterAllocExitFtraceEvent
+        ext4_get_implied_cluster_alloc_exit = 180;
+    Ext4GetReservedClusterAllocFtraceEvent ext4_get_reserved_cluster_alloc =
+        181;
+    Ext4IndMapBlocksEnterFtraceEvent ext4_ind_map_blocks_enter = 182;
+    Ext4IndMapBlocksExitFtraceEvent ext4_ind_map_blocks_exit = 183;
+    Ext4InsertRangeFtraceEvent ext4_insert_range = 184;
+    Ext4InvalidatepageFtraceEvent ext4_invalidatepage = 185;
+    Ext4JournalStartFtraceEvent ext4_journal_start = 186;
+    Ext4JournalStartReservedFtraceEvent ext4_journal_start_reserved = 187;
+    Ext4JournalledInvalidatepageFtraceEvent ext4_journalled_invalidatepage =
+        188;
+    Ext4JournalledWriteEndFtraceEvent ext4_journalled_write_end = 189;
+    Ext4LoadInodeFtraceEvent ext4_load_inode = 190;
+    Ext4LoadInodeBitmapFtraceEvent ext4_load_inode_bitmap = 191;
+    Ext4MarkInodeDirtyFtraceEvent ext4_mark_inode_dirty = 192;
+    Ext4MbBitmapLoadFtraceEvent ext4_mb_bitmap_load = 193;
+    Ext4MbBuddyBitmapLoadFtraceEvent ext4_mb_buddy_bitmap_load = 194;
+    Ext4MbDiscardPreallocationsFtraceEvent ext4_mb_discard_preallocations = 195;
+    Ext4MbNewGroupPaFtraceEvent ext4_mb_new_group_pa = 196;
+    Ext4MbNewInodePaFtraceEvent ext4_mb_new_inode_pa = 197;
+    Ext4MbReleaseGroupPaFtraceEvent ext4_mb_release_group_pa = 198;
+    Ext4MbReleaseInodePaFtraceEvent ext4_mb_release_inode_pa = 199;
+    Ext4MballocAllocFtraceEvent ext4_mballoc_alloc = 200;
+    Ext4MballocDiscardFtraceEvent ext4_mballoc_discard = 201;
+    Ext4MballocFreeFtraceEvent ext4_mballoc_free = 202;
+    Ext4MballocPreallocFtraceEvent ext4_mballoc_prealloc = 203;
+    Ext4OtherInodeUpdateTimeFtraceEvent ext4_other_inode_update_time = 204;
+    Ext4PunchHoleFtraceEvent ext4_punch_hole = 205;
+    Ext4ReadBlockBitmapLoadFtraceEvent ext4_read_block_bitmap_load = 206;
+    Ext4ReadpageFtraceEvent ext4_readpage = 207;
+    Ext4ReleasepageFtraceEvent ext4_releasepage = 208;
+    Ext4RemoveBlocksFtraceEvent ext4_remove_blocks = 209;
+    Ext4RequestBlocksFtraceEvent ext4_request_blocks = 210;
+    Ext4RequestInodeFtraceEvent ext4_request_inode = 211;
+    Ext4SyncFsFtraceEvent ext4_sync_fs = 212;
+    Ext4TrimAllFreeFtraceEvent ext4_trim_all_free = 213;
+    Ext4TrimExtentFtraceEvent ext4_trim_extent = 214;
+    Ext4TruncateEnterFtraceEvent ext4_truncate_enter = 215;
+    Ext4TruncateExitFtraceEvent ext4_truncate_exit = 216;
+    Ext4UnlinkEnterFtraceEvent ext4_unlink_enter = 217;
+    Ext4UnlinkExitFtraceEvent ext4_unlink_exit = 218;
+    Ext4WriteBeginFtraceEvent ext4_write_begin = 219;
+    // removed field with id 220;
+    // removed field with id 221;
+    // removed field with id 222;
+    // removed field with id 223;
+    // removed field with id 224;
+    // removed field with id 225;
+    // removed field with id 226;
+    // removed field with id 227;
+    // removed field with id 228;
+    // removed field with id 229;
+    Ext4WriteEndFtraceEvent ext4_write_end = 230;
+    Ext4WritepageFtraceEvent ext4_writepage = 231;
+    Ext4WritepagesFtraceEvent ext4_writepages = 232;
+    Ext4WritepagesResultFtraceEvent ext4_writepages_result = 233;
+    Ext4ZeroRangeFtraceEvent ext4_zero_range = 234;
+    TaskNewtaskFtraceEvent task_newtask = 235;
+    TaskRenameFtraceEvent task_rename = 236;
+    SchedProcessExecFtraceEvent sched_process_exec = 237;
+    SchedProcessExitFtraceEvent sched_process_exit = 238;
+    SchedProcessForkFtraceEvent sched_process_fork = 239;
+    SchedProcessFreeFtraceEvent sched_process_free = 240;
+    SchedProcessHangFtraceEvent sched_process_hang = 241;
+    SchedProcessWaitFtraceEvent sched_process_wait = 242;
+    F2fsDoSubmitBioFtraceEvent f2fs_do_submit_bio = 243;
+    F2fsEvictInodeFtraceEvent f2fs_evict_inode = 244;
+    F2fsFallocateFtraceEvent f2fs_fallocate = 245;
+    F2fsGetDataBlockFtraceEvent f2fs_get_data_block = 246;
+    F2fsGetVictimFtraceEvent f2fs_get_victim = 247;
+    F2fsIgetFtraceEvent f2fs_iget = 248;
+    F2fsIgetExitFtraceEvent f2fs_iget_exit = 249;
+    F2fsNewInodeFtraceEvent f2fs_new_inode = 250;
+    F2fsReadpageFtraceEvent f2fs_readpage = 251;
+    F2fsReserveNewBlockFtraceEvent f2fs_reserve_new_block = 252;
+    F2fsSetPageDirtyFtraceEvent f2fs_set_page_dirty = 253;
+    F2fsSubmitWritePageFtraceEvent f2fs_submit_write_page = 254;
+    F2fsSyncFileEnterFtraceEvent f2fs_sync_file_enter = 255;
+    F2fsSyncFileExitFtraceEvent f2fs_sync_file_exit = 256;
+    F2fsSyncFsFtraceEvent f2fs_sync_fs = 257;
+    F2fsTruncateFtraceEvent f2fs_truncate = 258;
+    F2fsTruncateBlocksEnterFtraceEvent f2fs_truncate_blocks_enter = 259;
+    F2fsTruncateBlocksExitFtraceEvent f2fs_truncate_blocks_exit = 260;
+    F2fsTruncateDataBlocksRangeFtraceEvent f2fs_truncate_data_blocks_range =
+        261;
+    F2fsTruncateInodeBlocksEnterFtraceEvent f2fs_truncate_inode_blocks_enter =
+        262;
+    F2fsTruncateInodeBlocksExitFtraceEvent f2fs_truncate_inode_blocks_exit =
+        263;
+    F2fsTruncateNodeFtraceEvent f2fs_truncate_node = 264;
+    F2fsTruncateNodesEnterFtraceEvent f2fs_truncate_nodes_enter = 265;
+    F2fsTruncateNodesExitFtraceEvent f2fs_truncate_nodes_exit = 266;
+    F2fsTruncatePartialNodesFtraceEvent f2fs_truncate_partial_nodes = 267;
+    F2fsUnlinkEnterFtraceEvent f2fs_unlink_enter = 268;
+    F2fsUnlinkExitFtraceEvent f2fs_unlink_exit = 269;
+    F2fsVmPageMkwriteFtraceEvent f2fs_vm_page_mkwrite = 270;
+    F2fsWriteBeginFtraceEvent f2fs_write_begin = 271;
+    F2fsWriteCheckpointFtraceEvent f2fs_write_checkpoint = 272;
+    F2fsWriteEndFtraceEvent f2fs_write_end = 273;
+    AllocPagesIommuEndFtraceEvent alloc_pages_iommu_end = 274;
+    AllocPagesIommuFailFtraceEvent alloc_pages_iommu_fail = 275;
+    AllocPagesIommuStartFtraceEvent alloc_pages_iommu_start = 276;
+    AllocPagesSysEndFtraceEvent alloc_pages_sys_end = 277;
+    AllocPagesSysFailFtraceEvent alloc_pages_sys_fail = 278;
+    AllocPagesSysStartFtraceEvent alloc_pages_sys_start = 279;
+    DmaAllocContiguousRetryFtraceEvent dma_alloc_contiguous_retry = 280;
+    IommuMapRangeFtraceEvent iommu_map_range = 281;
+    IommuSecPtblMapRangeEndFtraceEvent iommu_sec_ptbl_map_range_end = 282;
+    IommuSecPtblMapRangeStartFtraceEvent iommu_sec_ptbl_map_range_start = 283;
+    IonAllocBufferEndFtraceEvent ion_alloc_buffer_end = 284;
+    IonAllocBufferFailFtraceEvent ion_alloc_buffer_fail = 285;
+    IonAllocBufferFallbackFtraceEvent ion_alloc_buffer_fallback = 286;
+    IonAllocBufferStartFtraceEvent ion_alloc_buffer_start = 287;
+    IonCpAllocRetryFtraceEvent ion_cp_alloc_retry = 288;
+    IonCpSecureBufferEndFtraceEvent ion_cp_secure_buffer_end = 289;
+    IonCpSecureBufferStartFtraceEvent ion_cp_secure_buffer_start = 290;
+    IonPrefetchingFtraceEvent ion_prefetching = 291;
+    IonSecureCmaAddToPoolEndFtraceEvent ion_secure_cma_add_to_pool_end = 292;
+    IonSecureCmaAddToPoolStartFtraceEvent ion_secure_cma_add_to_pool_start =
+        293;
+    IonSecureCmaAllocateEndFtraceEvent ion_secure_cma_allocate_end = 294;
+    IonSecureCmaAllocateStartFtraceEvent ion_secure_cma_allocate_start = 295;
+    IonSecureCmaShrinkPoolEndFtraceEvent ion_secure_cma_shrink_pool_end = 296;
+    IonSecureCmaShrinkPoolStartFtraceEvent ion_secure_cma_shrink_pool_start =
+        297;
+    KfreeFtraceEvent kfree = 298;
+    KmallocFtraceEvent kmalloc = 299;
+    KmallocNodeFtraceEvent kmalloc_node = 300;
+    KmemCacheAllocFtraceEvent kmem_cache_alloc = 301;
+    KmemCacheAllocNodeFtraceEvent kmem_cache_alloc_node = 302;
+    KmemCacheFreeFtraceEvent kmem_cache_free = 303;
+    MigratePagesEndFtraceEvent migrate_pages_end = 304;
+    MigratePagesStartFtraceEvent migrate_pages_start = 305;
+    MigrateRetryFtraceEvent migrate_retry = 306;
+    MmPageAllocFtraceEvent mm_page_alloc = 307;
+    MmPageAllocExtfragFtraceEvent mm_page_alloc_extfrag = 308;
+    MmPageAllocZoneLockedFtraceEvent mm_page_alloc_zone_locked = 309;
+    MmPageFreeFtraceEvent mm_page_free = 310;
+    MmPageFreeBatchedFtraceEvent mm_page_free_batched = 311;
+    MmPagePcpuDrainFtraceEvent mm_page_pcpu_drain = 312;
+    RssStatFtraceEvent rss_stat = 313;
+    IonHeapShrinkFtraceEvent ion_heap_shrink = 314;
+    IonHeapGrowFtraceEvent ion_heap_grow = 315;
+    FenceInitFtraceEvent fence_init = 316;
+    FenceDestroyFtraceEvent fence_destroy = 317;
+    FenceEnableSignalFtraceEvent fence_enable_signal = 318;
+    FenceSignaledFtraceEvent fence_signaled = 319;
+    ClkEnableFtraceEvent clk_enable = 320;
+    ClkDisableFtraceEvent clk_disable = 321;
+    ClkSetRateFtraceEvent clk_set_rate = 322;
+    BinderTransactionAllocBufFtraceEvent binder_transaction_alloc_buf = 323;
+    SignalDeliverFtraceEvent signal_deliver = 324;
+    SignalGenerateFtraceEvent signal_generate = 325;
+    OomScoreAdjUpdateFtraceEvent oom_score_adj_update = 326;
+    GenericFtraceEvent generic = 327;
+    MmEventRecordFtraceEvent mm_event_record = 328;
+    SysEnterFtraceEvent sys_enter = 329;
+    SysExitFtraceEvent sys_exit = 330;
+    ZeroFtraceEvent zero = 331;
+    GpuFrequencyFtraceEvent gpu_frequency = 332;
+    SdeTracingMarkWriteFtraceEvent sde_tracing_mark_write = 333;
+    MarkVictimFtraceEvent mark_victim = 334;
+    IonStatFtraceEvent ion_stat = 335;
+    IonBufferCreateFtraceEvent ion_buffer_create = 336;
+    IonBufferDestroyFtraceEvent ion_buffer_destroy = 337;
+    ScmCallStartFtraceEvent scm_call_start = 338;
+    ScmCallEndFtraceEvent scm_call_end = 339;
+    GpuMemTotalFtraceEvent gpu_mem_total = 340;
+    ThermalTemperatureFtraceEvent thermal_temperature = 341;
+    CdevUpdateFtraceEvent cdev_update = 342;
+    CpuhpExitFtraceEvent cpuhp_exit = 343;
+    CpuhpMultiEnterFtraceEvent cpuhp_multi_enter = 344;
+    CpuhpEnterFtraceEvent cpuhp_enter = 345;
+    CpuhpLatencyFtraceEvent cpuhp_latency = 346;
+    FastrpcDmaStatFtraceEvent fastrpc_dma_stat = 347;
+    DpuTracingMarkWriteFtraceEvent dpu_tracing_mark_write = 348;
+    G2dTracingMarkWriteFtraceEvent g2d_tracing_mark_write = 349;
+    MaliTracingMarkWriteFtraceEvent mali_tracing_mark_write = 350;
+    DmaHeapStatFtraceEvent dma_heap_stat = 351;
+    CpuhpPauseFtraceEvent cpuhp_pause = 352;
+    SchedPiSetprioFtraceEvent sched_pi_setprio = 353;
+    SdeSdeEvtlogFtraceEvent sde_sde_evtlog = 354;
+    SdeSdePerfCalcCrtcFtraceEvent sde_sde_perf_calc_crtc = 355;
+    SdeSdePerfCrtcUpdateFtraceEvent sde_sde_perf_crtc_update = 356;
+    SdeSdePerfSetQosLutsFtraceEvent sde_sde_perf_set_qos_luts = 357;
+    SdeSdePerfUpdateBusFtraceEvent sde_sde_perf_update_bus = 358;
+    RssStatThrottledFtraceEvent rss_stat_throttled = 359;
+    NetifReceiveSkbFtraceEvent netif_receive_skb = 360;
+    NetDevXmitFtraceEvent net_dev_xmit = 361;
+    InetSockSetStateFtraceEvent inet_sock_set_state = 362;
+    TcpRetransmitSkbFtraceEvent tcp_retransmit_skb = 363;
+    CrosEcSensorhubDataFtraceEvent cros_ec_sensorhub_data = 364;
+    NapiGroReceiveEntryFtraceEvent napi_gro_receive_entry = 365;
+    NapiGroReceiveExitFtraceEvent napi_gro_receive_exit = 366;
+    KfreeSkbFtraceEvent kfree_skb = 367;
+    KvmAccessFaultFtraceEvent kvm_access_fault = 368;
+    KvmAckIrqFtraceEvent kvm_ack_irq = 369;
+    KvmAgeHvaFtraceEvent kvm_age_hva = 370;
+    KvmAgePageFtraceEvent kvm_age_page = 371;
+    KvmArmClearDebugFtraceEvent kvm_arm_clear_debug = 372;
+    KvmArmSetDreg32FtraceEvent kvm_arm_set_dreg32 = 373;
+    KvmArmSetRegsetFtraceEvent kvm_arm_set_regset = 374;
+    KvmArmSetupDebugFtraceEvent kvm_arm_setup_debug = 375;
+    KvmEntryFtraceEvent kvm_entry = 376;
+    KvmExitFtraceEvent kvm_exit = 377;
+    KvmFpuFtraceEvent kvm_fpu = 378;
+    KvmGetTimerMapFtraceEvent kvm_get_timer_map = 379;
+    KvmGuestFaultFtraceEvent kvm_guest_fault = 380;
+    KvmHandleSysRegFtraceEvent kvm_handle_sys_reg = 381;
+    KvmHvcArm64FtraceEvent kvm_hvc_arm64 = 382;
+    KvmIrqLineFtraceEvent kvm_irq_line = 383;
+    KvmMmioFtraceEvent kvm_mmio = 384;
+    KvmMmioEmulateFtraceEvent kvm_mmio_emulate = 385;
+    KvmSetGuestDebugFtraceEvent kvm_set_guest_debug = 386;
+    KvmSetIrqFtraceEvent kvm_set_irq = 387;
+    KvmSetSpteHvaFtraceEvent kvm_set_spte_hva = 388;
+    KvmSetWayFlushFtraceEvent kvm_set_way_flush = 389;
+    KvmSysAccessFtraceEvent kvm_sys_access = 390;
+    KvmTestAgeHvaFtraceEvent kvm_test_age_hva = 391;
+    KvmTimerEmulateFtraceEvent kvm_timer_emulate = 392;
+    KvmTimerHrtimerExpireFtraceEvent kvm_timer_hrtimer_expire = 393;
+    KvmTimerRestoreStateFtraceEvent kvm_timer_restore_state = 394;
+    KvmTimerSaveStateFtraceEvent kvm_timer_save_state = 395;
+    KvmTimerUpdateIrqFtraceEvent kvm_timer_update_irq = 396;
+    KvmToggleCacheFtraceEvent kvm_toggle_cache = 397;
+    KvmUnmapHvaRangeFtraceEvent kvm_unmap_hva_range = 398;
+    KvmUserspaceExitFtraceEvent kvm_userspace_exit = 399;
+    KvmVcpuWakeupFtraceEvent kvm_vcpu_wakeup = 400;
+    KvmWfxArm64FtraceEvent kvm_wfx_arm64 = 401;
+    TrapRegFtraceEvent trap_reg = 402;
+    VgicUpdateIrqPendingFtraceEvent vgic_update_irq_pending = 403;
+    WakeupSourceActivateFtraceEvent wakeup_source_activate = 404;
+    WakeupSourceDeactivateFtraceEvent wakeup_source_deactivate = 405;
+    UfshcdCommandFtraceEvent ufshcd_command = 406;
+    UfshcdClkGatingFtraceEvent ufshcd_clk_gating = 407;
+    ConsoleFtraceEvent console = 408;
+    DrmVblankEventFtraceEvent drm_vblank_event = 409;
+    DrmVblankEventDeliveredFtraceEvent drm_vblank_event_delivered = 410;
+    DrmSchedJobFtraceEvent drm_sched_job = 411;
+    DrmRunJobFtraceEvent drm_run_job = 412;
+    DrmSchedProcessJobFtraceEvent drm_sched_process_job = 413;
+    DmaFenceInitFtraceEvent dma_fence_init = 414;
+    DmaFenceEmitFtraceEvent dma_fence_emit = 415;
+    DmaFenceSignaledFtraceEvent dma_fence_signaled = 416;
+    DmaFenceWaitStartFtraceEvent dma_fence_wait_start = 417;
+    DmaFenceWaitEndFtraceEvent dma_fence_wait_end = 418;
+    F2fsIostatFtraceEvent f2fs_iostat = 419;
+    F2fsIostatLatencyFtraceEvent f2fs_iostat_latency = 420;
+    SchedCpuUtilCfsFtraceEvent sched_cpu_util_cfs = 421;
+    V4l2QbufFtraceEvent v4l2_qbuf = 422;
+    V4l2DqbufFtraceEvent v4l2_dqbuf = 423;
+    Vb2V4l2BufQueueFtraceEvent vb2_v4l2_buf_queue = 424;
+    Vb2V4l2BufDoneFtraceEvent vb2_v4l2_buf_done = 425;
+    Vb2V4l2QbufFtraceEvent vb2_v4l2_qbuf = 426;
+    Vb2V4l2DqbufFtraceEvent vb2_v4l2_dqbuf = 427;
+    DsiCmdFifoStatusFtraceEvent dsi_cmd_fifo_status = 428;
+    DsiRxFtraceEvent dsi_rx = 429;
+    DsiTxFtraceEvent dsi_tx = 430;
+    AndroidFsDatareadEndFtraceEvent android_fs_dataread_end = 431;
+    AndroidFsDatareadStartFtraceEvent android_fs_dataread_start = 432;
+    AndroidFsDatawriteEndFtraceEvent android_fs_datawrite_end = 433;
+    AndroidFsDatawriteStartFtraceEvent android_fs_datawrite_start = 434;
+    AndroidFsFsyncEndFtraceEvent android_fs_fsync_end = 435;
+    AndroidFsFsyncStartFtraceEvent android_fs_fsync_start = 436;
+    FuncgraphEntryFtraceEvent funcgraph_entry = 437;
+    FuncgraphExitFtraceEvent funcgraph_exit = 438;
+    VirtioVideoCmdFtraceEvent virtio_video_cmd = 439;
+    VirtioVideoCmdDoneFtraceEvent virtio_video_cmd_done = 440;
+    VirtioVideoResourceQueueFtraceEvent virtio_video_resource_queue = 441;
+    VirtioVideoResourceQueueDoneFtraceEvent virtio_video_resource_queue_done =
+        442;
+    MmShrinkSlabStartFtraceEvent mm_shrink_slab_start = 443;
+    MmShrinkSlabEndFtraceEvent mm_shrink_slab_end = 444;
+    TrustySmcFtraceEvent trusty_smc = 445;
+    TrustySmcDoneFtraceEvent trusty_smc_done = 446;
+    TrustyStdCall32FtraceEvent trusty_std_call32 = 447;
+    TrustyStdCall32DoneFtraceEvent trusty_std_call32_done = 448;
+    TrustyShareMemoryFtraceEvent trusty_share_memory = 449;
+    TrustyShareMemoryDoneFtraceEvent trusty_share_memory_done = 450;
+    TrustyReclaimMemoryFtraceEvent trusty_reclaim_memory = 451;
+    TrustyReclaimMemoryDoneFtraceEvent trusty_reclaim_memory_done = 452;
+    TrustyIrqFtraceEvent trusty_irq = 453;
+    TrustyIpcHandleEventFtraceEvent trusty_ipc_handle_event = 454;
+    TrustyIpcConnectFtraceEvent trusty_ipc_connect = 455;
+    TrustyIpcConnectEndFtraceEvent trusty_ipc_connect_end = 456;
+    TrustyIpcWriteFtraceEvent trusty_ipc_write = 457;
+    TrustyIpcPollFtraceEvent trusty_ipc_poll = 458;
+    // removed field with id 459;
+    TrustyIpcReadFtraceEvent trusty_ipc_read = 460;
+    TrustyIpcReadEndFtraceEvent trusty_ipc_read_end = 461;
+    TrustyIpcRxFtraceEvent trusty_ipc_rx = 462;
+    // removed field with id 463;
+    TrustyEnqueueNopFtraceEvent trusty_enqueue_nop = 464;
+    CmaAllocStartFtraceEvent cma_alloc_start = 465;
+    CmaAllocInfoFtraceEvent cma_alloc_info = 466;
+    LwisTracingMarkWriteFtraceEvent lwis_tracing_mark_write = 467;
+    VirtioGpuCmdQueueFtraceEvent virtio_gpu_cmd_queue = 468;
+    VirtioGpuCmdResponseFtraceEvent virtio_gpu_cmd_response = 469;
+    MaliMaliKCPUCQSSETFtraceEvent mali_mali_KCPU_CQS_SET = 470;
+    MaliMaliKCPUCQSWAITSTARTFtraceEvent mali_mali_KCPU_CQS_WAIT_START = 471;
+    MaliMaliKCPUCQSWAITENDFtraceEvent mali_mali_KCPU_CQS_WAIT_END = 472;
+    MaliMaliKCPUFENCESIGNALFtraceEvent mali_mali_KCPU_FENCE_SIGNAL = 473;
+    MaliMaliKCPUFENCEWAITSTARTFtraceEvent mali_mali_KCPU_FENCE_WAIT_START = 474;
+    MaliMaliKCPUFENCEWAITENDFtraceEvent mali_mali_KCPU_FENCE_WAIT_END = 475;
+    HypEnterFtraceEvent hyp_enter = 476;
+    HypExitFtraceEvent hyp_exit = 477;
+    HostHcallFtraceEvent host_hcall = 478;
+    HostSmcFtraceEvent host_smc = 479;
+    HostMemAbortFtraceEvent host_mem_abort = 480;
+    SuspendResumeMinimalFtraceEvent suspend_resume_minimal = 481;
+    MaliMaliCSFINTERRUPTSTARTFtraceEvent mali_mali_CSF_INTERRUPT_START = 482;
+    MaliMaliCSFINTERRUPTENDFtraceEvent mali_mali_CSF_INTERRUPT_END = 483;
+    SamsungTracingMarkWriteFtraceEvent samsung_tracing_mark_write = 484;
+    BinderCommandFtraceEvent binder_command = 485;
+    BinderReturnFtraceEvent binder_return = 486;
+    SchedSwitchWithCtrsFtraceEvent sched_switch_with_ctrs = 487;
+    GpuWorkPeriodFtraceEvent gpu_work_period = 488;
+    RpmStatusFtraceEvent rpm_status = 489;
+    PanelWriteGenericFtraceEvent panel_write_generic = 490;
+    SchedMigrateTaskFtraceEvent sched_migrate_task = 491;
+    DpuDsiCmdFifoStatusFtraceEvent dpu_dsi_cmd_fifo_status = 492;
+    DpuDsiRxFtraceEvent dpu_dsi_rx = 493;
+    DpuDsiTxFtraceEvent dpu_dsi_tx = 494;
+    F2fsBackgroundGcFtraceEvent f2fs_background_gc = 495;
+    F2fsGcBeginFtraceEvent f2fs_gc_begin = 496;
+    F2fsGcEndFtraceEvent f2fs_gc_end = 497;
+    FastrpcDmaFreeFtraceEvent fastrpc_dma_free = 498;
+    FastrpcDmaAllocFtraceEvent fastrpc_dma_alloc = 499;
+    FastrpcDmaUnmapFtraceEvent fastrpc_dma_unmap = 500;
+    FastrpcDmaMapFtraceEvent fastrpc_dma_map = 501;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto b/src/libtracing/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
new file mode 100644
index 000000000..2bc2cd381
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
@@ -0,0 +1,135 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/ftrace/ftrace_event.proto";
+import "protos/perfetto/trace/ftrace/ftrace_stats.proto";
+
+package perfetto.protos;
+
+// The result of tracing one or more ftrace data pages from a single per-cpu
+// kernel ring buffer. If collating multiple pages' worth of events, all of
+// them come from contiguous pages, with no kernel data loss in between.
+message FtraceEventBundle {
+  optional uint32 cpu = 1;
+  repeated FtraceEvent event = 2;
+
+  // Set to true if there was data loss between the last time we've read from
+  // the corresponding per-cpu kernel buffer, and the earliest event recorded
+  // in this bundle.
+  optional bool lost_events = 3;
+
+  // Optionally-enabled compact encoding of a batch of scheduling events. Only
+  // a subset of events & their fields is recorded.
+  // All fields (except comms) are stored in a structure-of-arrays form, one
+  // entry in each repeated field per event.
+  message CompactSched {
+    // Interned table of unique strings for this bundle.
+    repeated string intern_table = 5;
+
+    // Delta-encoded timestamps across all sched_switch events within this
+    // bundle. The first is absolute, each next one is relative to its
+    // predecessor.
+    repeated uint64 switch_timestamp = 1 [packed = true];
+    repeated int64 switch_prev_state = 2 [packed = true];
+    repeated int32 switch_next_pid = 3 [packed = true];
+    repeated int32 switch_next_prio = 4 [packed = true];
+    // One per event, index into |intern_table| corresponding to the
+    // next_comm field of the event.
+    repeated uint32 switch_next_comm_index = 6 [packed = true];
+
+    // Delta-encoded timestamps across all sched_waking events within this
+    // bundle. The first is absolute, each next one is relative to its
+    // predecessor.
+    repeated uint64 waking_timestamp = 7 [packed = true];
+    repeated int32 waking_pid = 8 [packed = true];
+    repeated int32 waking_target_cpu = 9 [packed = true];
+    repeated int32 waking_prio = 10 [packed = true];
+    // One per event, index into |intern_table| corresponding to the
+    // comm field of the event.
+    repeated uint32 waking_comm_index = 11 [packed = true];
+    repeated uint32 waking_common_flags = 12 [packed = true];
+  }
+  optional CompactSched compact_sched = 4;
+
+  // traced_probes always sets the ftrace_clock to "boot". That is not available
+  // in older kernels (v3.x). In that case we fallback on "global" or "local".
+  // When we do that, we report the fallback clock in each bundle so we can do
+  // proper clock syncing at parsing time in TraceProcessor. We cannot use the
+  // TracePacket timestamp_clock_id because: (1) there is no per-packet
+  // timestamp for ftrace bundles; (2) "global" does not match CLOCK_MONOTONIC.
+  // Having a dedicated and explicit flag allows us to correct further misakes
+  // in future by looking at the kernel version.
+  // This field has been introduced in perfetto v19 / Android T (13).
+  // This field is omitted when the ftrace clock is just "boot", as that is the
+  // default assumption (and for consistency with the past).
+  optional FtraceClock ftrace_clock = 5;
+
+  // The timestamp according to the ftrace clock, taken at the same instant
+  // as |boot_timestamp|. This is used to sync ftrace events when a non-boot
+  // clock is used as the ftrace clock. We don't use the ClockSnapshot packet
+  // because the ftrace global/local clocks don't match any of the clock_gettime
+  // domains and can be only read by traced_probes.
+  //
+  // Only set when |ftrace_clock| != FTRACE_CLOCK_UNSPECIFIED.
+  //
+  // Implementation note: Populated by reading the 'now ts:' field in
+  // tracefs/per_cpu/cpuX/stat.
+  optional int64 ftrace_timestamp = 6;
+
+  // The timestamp according to CLOCK_BOOTTIME, taken at the same instant as
+  // |ftrace_timestamp|. See documentation of |ftrace_timestamp| for
+  // more info.
+  //
+  // Only set when |ftrace_clock| != FTRACE_CLOCK_UNSPECIFIED.
+  optional int64 boot_timestamp = 7;
+
+  // Errors encountered during parsing of the raw ftrace data. In case of ring
+  // buffer layout errors, the parser skips the rest of the offending kernel
+  // buffer page and continues from the next page.
+  // See also FtraceStats.ftrace_parse_errors, which collates all unique errors
+  // seen within the duration of the trace (even if the affected bundles get
+  // overwritten in ring buffer mode).
+  message FtraceError {
+    // Timestamp of the data that we're unable to parse, in the ftrace clock
+    // domain. Currently, we use the base timestamp of the tracing page
+    // containing the bad record rather than the time of the record itself.
+    optional uint64 timestamp = 1;
+    optional FtraceParseStatus status = 2;
+  }
+  repeated FtraceError error = 8;
+
+  // The timestamp (ftrace clock) of the last event consumed from this per-cpu
+  // kernel buffer prior to starting this bundle. In other words: the last
+  // event in the previous bundle.
+  // Lets the trace processing find an initial timestamp after which ftrace
+  // data is known to be valid across all cpus. Of particular importance when
+  // the perfetto trace buffer is a ring buffer as well, as the overwriting of
+  // oldest bundles can skew the first valid timestamp per cpu significantly.
+  // Added in: perfetto v44.
+  optional uint64 last_read_event_timestamp = 9;
+}
+
+enum FtraceClock {
+  // There is no FTRACE_CLOCK_BOOT entry as that's the default assumption. When
+  // the ftrace clock is "boot", it's just omitted (so UNSPECIFIED == BOOT).
+  FTRACE_CLOCK_UNSPECIFIED = 0;
+  FTRACE_CLOCK_UNKNOWN = 1;
+  FTRACE_CLOCK_GLOBAL = 2;
+  FTRACE_CLOCK_LOCAL = 3;
+  FTRACE_CLOCK_MONO_RAW = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ftrace_stats.proto b/src/libtracing/protos/perfetto/trace/ftrace/ftrace_stats.proto
new file mode 100644
index 000000000..f921779d1
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ftrace_stats.proto
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Per-CPU kernel buffer stats for the ftrace data source gathered from
+// /sys/kernel/tracing/per_cpu/cpuX/stats.
+message FtraceCpuStats {
+  // CPU index.
+  optional uint64 cpu = 1;
+
+  // Number of entries currently in the kernel buffer.
+  optional uint64 entries = 2;
+
+  // Number of events lost in kernel buffers due to overwriting of old events
+  // before userspace had a chance to drain them. Valid if the buffer is in
+  // "overwrite" mode, otherwise see |dropped_events|.
+  optional uint64 overrun = 3;
+
+  // This should always be zero. If not the buffer size is way too small or
+  // something went wrong with the tracer. Quoting the kernel: "number of
+  // commits failing due to the buffer wrapping around while there are
+  // uncommitted events, such as during an interrupt storm".
+  optional uint64 commit_overrun = 4;
+
+  // Size of entries currently in the kernel buffer (see |entries|) in bytes.
+  // The field should be named "bytes", but is misnamed for historical reasons.
+  // This value has known inaccuracies before Linux v6.6:
+  // https://github.com/torvalds/linux/commit/45d99ea
+  optional uint64 bytes_read = 5;
+
+  // The timestamp for the oldest event still in the ring buffer.
+  // Unit: seconds for typical trace clocks (i.e. not tsc/counter).
+  optional double oldest_event_ts = 6;
+
+  // The current timestamp.
+  // Unit: seconds for typical trace clocks (i.e. not tsc/counter).
+  optional double now_ts = 7;
+
+  // If the kernel buffer has overwrite mode disabled, this will show the number
+  // of new events that were lost because the buffer was full. This is similar
+  // to |overrun| but only for the overwrite=false case.
+  optional uint64 dropped_events = 8;
+
+  // The number of events read (consumed) from the buffer by userspace.
+  optional uint64 read_events = 9;
+}
+
+// Errors and kernel buffer stats for the ftrace data source.
+message FtraceStats {
+  enum Phase {
+    UNSPECIFIED = 0;
+    START_OF_TRACE = 1;
+    END_OF_TRACE = 2;
+  }
+
+  // A pair of FtraceStats is written on every trace flush:
+  // * START_OF_TRACE - stats recorded at the beginning of the trace.
+  // * END_OF_TRACE - stats recorded during the flush. In other words shortly
+  //                  before this packet was written. For simple traces this
+  //                  will be once at the end of the trace.
+  optional Phase phase = 1;
+
+  // Per-CPU stats (one entry for each CPU).
+  repeated FtraceCpuStats cpu_stats = 2;
+
+  // When FtraceConfig.symbolize_ksyms = true, this records the number of
+  // symbols parsed from /proc/kallsyms, whether they have been seen in the
+  // trace or not. It can be used to debug kptr_restrict or security-related
+  // errors.
+  // Note: this will be valid only when phase = END_OF_TRACE. The symbolizer is
+  // initialized. When START_OF_TRACE is emitted it is not ready yet.
+  optional uint32 kernel_symbols_parsed = 3;
+
+  // The memory used by the kernel symbolizer (KernelSymbolMap.size_bytes()).
+  optional uint32 kernel_symbols_mem_kb = 4;
+
+  // Atrace errors (even non-fatal ones) are reported here. A typical example is
+  // one or more atrace categories not available on the device.
+  optional string atrace_errors = 5;
+
+  // Ftrace events requested by the config but not present on device.
+  repeated string unknown_ftrace_events = 6;
+
+  // Ftrace events requested by the config and present on device, but which we
+  // failed to enable due to permissions, or due to a conflicting option
+  // (currently FtraceConfig.disable_generic_events).
+  repeated string failed_ftrace_events = 7;
+
+  // The data source was configured to preserve existing events in the ftrace
+  // buffer before the start of the trace.
+  optional bool preserve_ftrace_buffer = 8;
+
+  // Unique errors encountered during reading and parsing of the raw ftrace
+  // data. Ring buffer ABI related errors will also be recorded in the
+  // affected FtraceEventBundles with a timestamp.
+  // Any traces with entries in this field should be investigated, as they
+  // indicate a bug in perfetto or the kernel.
+  repeated FtraceParseStatus ftrace_parse_errors = 9;
+}
+
+enum FtraceParseStatus {
+  FTRACE_STATUS_UNSPECIFIED = 0;
+  // Not written, used for convenience of implementation:
+  FTRACE_STATUS_OK = 1;
+  // Issues with reading data out of the ftrace ring buffer:
+  FTRACE_STATUS_UNEXPECTED_READ_ERROR = 2;
+  FTRACE_STATUS_PARTIAL_PAGE_READ = 3;
+  // Ring buffer binary data not matching our understanding of the layout:
+  FTRACE_STATUS_ABI_INVALID_PAGE_HEADER = 4;
+  FTRACE_STATUS_ABI_SHORT_EVENT_HEADER = 5;
+  FTRACE_STATUS_ABI_NULL_PADDING = 6;
+  FTRACE_STATUS_ABI_SHORT_PADDING_LENGTH = 7;
+  FTRACE_STATUS_ABI_INVALID_PADDING_LENGTH = 8;
+  FTRACE_STATUS_ABI_SHORT_TIME_EXTEND = 9;
+  FTRACE_STATUS_ABI_SHORT_TIME_STAMP = 10;
+  FTRACE_STATUS_ABI_SHORT_DATA_LENGTH = 11;
+  FTRACE_STATUS_ABI_ZERO_DATA_LENGTH = 12;
+  FTRACE_STATUS_ABI_INVALID_DATA_LENGTH = 13;
+  FTRACE_STATUS_ABI_SHORT_EVENT_ID = 14;
+  FTRACE_STATUS_ABI_END_OVERFLOW = 15;
+  // Issues with parsing the event payload:
+  FTRACE_STATUS_SHORT_COMPACT_EVENT = 16;
+  FTRACE_STATUS_INVALID_EVENT = 17;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/g2d.proto b/src/libtracing/protos/perfetto/trace/ftrace/g2d.proto
new file mode 100644
index 000000000..3cff7f752
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/g2d.proto
@@ -0,0 +1,13 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message G2dTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string name = 4;
+  optional uint32 type = 5;
+  optional int32 value = 6;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/generic.proto b/src/libtracing/protos/perfetto/trace/ftrace/generic.proto
new file mode 100644
index 000000000..65d5c95f1
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/generic.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This generic proto is used to output events in the trace
+// when a specific proto for that event does not exist.
+message GenericFtraceEvent {
+  message Field {
+    optional string name = 1;
+    oneof value {
+      string str_value = 3;
+      int64 int_value = 4;
+      uint64 uint_value = 5;
+    }
+  }
+
+  optional string event_name = 1;
+  repeated Field field = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/gpu_mem.proto b/src/libtracing/protos/perfetto/trace/ftrace/gpu_mem.proto
new file mode 100644
index 000000000..776bf261f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/gpu_mem.proto
@@ -0,0 +1,12 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message GpuMemTotalFtraceEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 pid = 2;
+  optional uint64 size = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/gpu_scheduler.proto b/src/libtracing/protos/perfetto/trace/ftrace/gpu_scheduler.proto
new file mode 100644
index 000000000..5eb080189
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/gpu_scheduler.proto
@@ -0,0 +1,26 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message DrmSchedJobFtraceEvent {
+  optional uint64 entity = 1;
+  optional uint64 fence = 2;
+  optional int32 hw_job_count = 3;
+  optional uint64 id = 4;
+  optional uint32 job_count = 5;
+  optional string name = 6;
+}
+message DrmRunJobFtraceEvent {
+  optional uint64 entity = 1;
+  optional uint64 fence = 2;
+  optional int32 hw_job_count = 3;
+  optional uint64 id = 4;
+  optional uint32 job_count = 5;
+  optional string name = 6;
+}
+message DrmSchedProcessJobFtraceEvent {
+  optional uint64 fence = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/hyp.proto b/src/libtracing/protos/perfetto/trace/ftrace/hyp.proto
new file mode 100644
index 000000000..3b91a3fda
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/hyp.proto
@@ -0,0 +1,21 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message HypEnterFtraceEvent {}
+message HypExitFtraceEvent {}
+message HostHcallFtraceEvent {
+  optional uint32 id = 1;
+  optional uint32 invalid = 2;
+}
+message HostSmcFtraceEvent {
+  optional uint64 id = 1;
+  optional uint32 forwarded = 2;
+}
+message HostMemAbortFtraceEvent {
+  optional uint64 esr = 1;
+  optional uint64 addr = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/i2c.proto b/src/libtracing/protos/perfetto/trace/ftrace/i2c.proto
new file mode 100644
index 000000000..35d618574
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/i2c.proto
@@ -0,0 +1,67 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message I2cReadFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 msg_nr = 2;
+  optional uint32 addr = 3;
+  optional uint32 flags = 4;
+  optional uint32 len = 5;
+}
+message I2cWriteFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 msg_nr = 2;
+  optional uint32 addr = 3;
+  optional uint32 flags = 4;
+  optional uint32 len = 5;
+  optional uint32 buf = 6;
+}
+message I2cResultFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 nr_msgs = 2;
+  optional int32 ret = 3;
+}
+message I2cReplyFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 msg_nr = 2;
+  optional uint32 addr = 3;
+  optional uint32 flags = 4;
+  optional uint32 len = 5;
+  optional uint32 buf = 6;
+}
+message SmbusReadFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 flags = 2;
+  optional uint32 addr = 3;
+  optional uint32 command = 4;
+  optional uint32 protocol = 5;
+}
+message SmbusWriteFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 addr = 2;
+  optional uint32 flags = 3;
+  optional uint32 command = 4;
+  optional uint32 len = 5;
+  optional uint32 protocol = 6;
+}
+message SmbusResultFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 addr = 2;
+  optional uint32 flags = 3;
+  optional uint32 read_write = 4;
+  optional uint32 command = 5;
+  optional int32 res = 6;
+  optional uint32 protocol = 7;
+}
+message SmbusReplyFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 addr = 2;
+  optional uint32 flags = 3;
+  optional uint32 command = 4;
+  optional uint32 len = 5;
+  optional uint32 protocol = 6;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ion.proto b/src/libtracing/protos/perfetto/trace/ftrace/ion.proto
new file mode 100644
index 000000000..b67d93006
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ion.proto
@@ -0,0 +1,12 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message IonStatFtraceEvent {
+  optional uint32 buffer_id = 1;
+  optional int64 len = 2;
+  optional uint64 total_allocated = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ipi.proto b/src/libtracing/protos/perfetto/trace/ftrace/ipi.proto
new file mode 100644
index 000000000..bff9cbd1e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ipi.proto
@@ -0,0 +1,17 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message IpiEntryFtraceEvent {
+  optional string reason = 1;
+}
+message IpiExitFtraceEvent {
+  optional string reason = 1;
+}
+message IpiRaiseFtraceEvent {
+  optional uint32 target_cpus = 1;
+  optional string reason = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/irq.proto b/src/libtracing/protos/perfetto/trace/ftrace/irq.proto
new file mode 100644
index 000000000..3d5f2cb11
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/irq.proto
@@ -0,0 +1,25 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SoftirqEntryFtraceEvent {
+  optional uint32 vec = 1;
+}
+message SoftirqExitFtraceEvent {
+  optional uint32 vec = 1;
+}
+message SoftirqRaiseFtraceEvent {
+  optional uint32 vec = 1;
+}
+message IrqHandlerEntryFtraceEvent {
+  optional int32 irq = 1;
+  optional string name = 2;
+  optional uint32 handler = 3;
+}
+message IrqHandlerExitFtraceEvent {
+  optional int32 irq = 1;
+  optional int32 ret = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/kfree.proto b/src/libtracing/protos/perfetto/trace/ftrace/kfree.proto
new file mode 100644
index 000000000..3a5ce0040
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/kfree.proto
@@ -0,0 +1,11 @@
+// Autogenerated by:
+// ../../tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message KfreeFtraceEvent {
+  optional uint64 call_site = 1;
+  optional uint64 ptr = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/kmalloc.proto b/src/libtracing/protos/perfetto/trace/ftrace/kmalloc.proto
new file mode 100644
index 000000000..81d7d9970
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/kmalloc.proto
@@ -0,0 +1,14 @@
+// Autogenerated by:
+// ../../tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message KmallocFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional uint64 ptr = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/kmem.proto b/src/libtracing/protos/perfetto/trace/ftrace/kmem.proto
new file mode 100644
index 000000000..c19c91ace
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/kmem.proto
@@ -0,0 +1,241 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message AllocPagesIommuEndFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesIommuFailFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesIommuStartFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesSysEndFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesSysFailFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesSysStartFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message DmaAllocContiguousRetryFtraceEvent {
+  optional int32 tries = 1;
+}
+message IommuMapRangeFtraceEvent {
+  optional uint64 chunk_size = 1;
+  optional uint64 len = 2;
+  optional uint64 pa = 3;
+  optional uint64 va = 4;
+}
+message IommuSecPtblMapRangeEndFtraceEvent {
+  optional uint64 len = 1;
+  optional int32 num = 2;
+  optional uint32 pa = 3;
+  optional int32 sec_id = 4;
+  optional uint64 va = 5;
+}
+message IommuSecPtblMapRangeStartFtraceEvent {
+  optional uint64 len = 1;
+  optional int32 num = 2;
+  optional uint32 pa = 3;
+  optional int32 sec_id = 4;
+  optional uint64 va = 5;
+}
+message IonAllocBufferEndFtraceEvent {
+  optional string client_name = 1;
+  optional uint32 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+  optional uint32 mask = 5;
+}
+message IonAllocBufferFailFtraceEvent {
+  optional string client_name = 1;
+  optional int64 error = 2;
+  optional uint32 flags = 3;
+  optional string heap_name = 4;
+  optional uint64 len = 5;
+  optional uint32 mask = 6;
+}
+message IonAllocBufferFallbackFtraceEvent {
+  optional string client_name = 1;
+  optional int64 error = 2;
+  optional uint32 flags = 3;
+  optional string heap_name = 4;
+  optional uint64 len = 5;
+  optional uint32 mask = 6;
+}
+message IonAllocBufferStartFtraceEvent {
+  optional string client_name = 1;
+  optional uint32 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+  optional uint32 mask = 5;
+}
+message IonCpAllocRetryFtraceEvent {
+  optional int32 tries = 1;
+}
+message IonCpSecureBufferEndFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonCpSecureBufferStartFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonPrefetchingFtraceEvent {
+  optional uint64 len = 1;
+}
+message IonSecureCmaAddToPoolEndFtraceEvent {
+  optional uint32 is_prefetch = 1;
+  optional uint64 len = 2;
+  optional int32 pool_total = 3;
+}
+message IonSecureCmaAddToPoolStartFtraceEvent {
+  optional uint32 is_prefetch = 1;
+  optional uint64 len = 2;
+  optional int32 pool_total = 3;
+}
+message IonSecureCmaAllocateEndFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonSecureCmaAllocateStartFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonSecureCmaShrinkPoolEndFtraceEvent {
+  optional uint64 drained_size = 1;
+  optional uint64 skipped_size = 2;
+}
+message IonSecureCmaShrinkPoolStartFtraceEvent {
+  optional uint64 drained_size = 1;
+  optional uint64 skipped_size = 2;
+}
+message KfreeFtraceEvent {
+  optional uint64 call_site = 1;
+  optional uint64 ptr = 2;
+}
+message KmallocFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional uint64 ptr = 5;
+}
+message KmallocNodeFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional int32 node = 5;
+  optional uint64 ptr = 6;
+}
+message KmemCacheAllocFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional uint64 ptr = 5;
+}
+message KmemCacheAllocNodeFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional int32 node = 5;
+  optional uint64 ptr = 6;
+}
+message KmemCacheFreeFtraceEvent {
+  optional uint64 call_site = 1;
+  optional uint64 ptr = 2;
+}
+message MigratePagesEndFtraceEvent {
+  optional int32 mode = 1;
+}
+message MigratePagesStartFtraceEvent {
+  optional int32 mode = 1;
+}
+message MigrateRetryFtraceEvent {
+  optional int32 tries = 1;
+}
+message MmPageAllocFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional int32 migratetype = 2;
+  optional uint32 order = 3;
+  optional uint64 page = 4;
+  optional uint64 pfn = 5;
+}
+message MmPageAllocExtfragFtraceEvent {
+  optional int32 alloc_migratetype = 1;
+  optional int32 alloc_order = 2;
+  optional int32 fallback_migratetype = 3;
+  optional int32 fallback_order = 4;
+  optional uint64 page = 5;
+  optional int32 change_ownership = 6;
+  optional uint64 pfn = 7;
+}
+message MmPageAllocZoneLockedFtraceEvent {
+  optional int32 migratetype = 1;
+  optional uint32 order = 2;
+  optional uint64 page = 3;
+  optional uint64 pfn = 4;
+}
+message MmPageFreeFtraceEvent {
+  optional uint32 order = 1;
+  optional uint64 page = 2;
+  optional uint64 pfn = 3;
+}
+message MmPageFreeBatchedFtraceEvent {
+  optional int32 cold = 1;
+  optional uint64 page = 2;
+  optional uint64 pfn = 3;
+}
+message MmPagePcpuDrainFtraceEvent {
+  optional int32 migratetype = 1;
+  optional uint32 order = 2;
+  optional uint64 page = 3;
+  optional uint64 pfn = 4;
+}
+message RssStatFtraceEvent {
+  optional int32 member = 1;
+  optional int64 size = 2;
+  optional uint32 curr = 3;
+  optional uint32 mm_id = 4;
+}
+message IonHeapShrinkFtraceEvent {
+  optional string heap_name = 1;
+  optional uint64 len = 2;
+  optional int64 total_allocated = 3;
+}
+message IonHeapGrowFtraceEvent {
+  optional string heap_name = 1;
+  optional uint64 len = 2;
+  optional int64 total_allocated = 3;
+}
+message IonBufferCreateFtraceEvent {
+  optional uint64 addr = 1;
+  optional uint64 len = 2;
+}
+message IonBufferDestroyFtraceEvent {
+  optional uint64 addr = 1;
+  optional uint64 len = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/kvm.proto b/src/libtracing/protos/perfetto/trace/ftrace/kvm.proto
new file mode 100644
index 000000000..0d05f1e5c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/kvm.proto
@@ -0,0 +1,170 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message KvmAccessFaultFtraceEvent {
+  optional uint64 ipa = 1;
+}
+message KvmAckIrqFtraceEvent {
+  optional uint32 irqchip = 1;
+  optional uint32 pin = 2;
+}
+message KvmAgeHvaFtraceEvent {
+  optional uint64 end = 1;
+  optional uint64 start = 2;
+}
+message KvmAgePageFtraceEvent {
+  optional uint64 gfn = 1;
+  optional uint64 hva = 2;
+  optional uint32 level = 3;
+  optional uint32 referenced = 4;
+}
+message KvmArmClearDebugFtraceEvent {
+  optional uint32 guest_debug = 1;
+}
+message KvmArmSetDreg32FtraceEvent {
+  optional string name = 1;
+  optional uint32 value = 2;
+}
+message KvmArmSetRegsetFtraceEvent {
+  optional int32 len = 1;
+  optional string name = 2;
+}
+message KvmArmSetupDebugFtraceEvent {
+  optional uint32 guest_debug = 1;
+  optional uint64 vcpu = 2;
+}
+message KvmEntryFtraceEvent {
+  optional uint64 vcpu_pc = 1;
+}
+message KvmExitFtraceEvent {
+  optional uint32 esr_ec = 1;
+  optional int32 ret = 2;
+  optional uint64 vcpu_pc = 3;
+}
+message KvmFpuFtraceEvent {
+  optional uint32 load = 1;
+}
+message KvmGetTimerMapFtraceEvent {
+  optional int32 direct_ptimer = 1;
+  optional int32 direct_vtimer = 2;
+  optional int32 emul_ptimer = 3;
+  optional uint64 vcpu_id = 4;
+}
+message KvmGuestFaultFtraceEvent {
+  optional uint64 hsr = 1;
+  optional uint64 hxfar = 2;
+  optional uint64 ipa = 3;
+  optional uint64 vcpu_pc = 4;
+}
+message KvmHandleSysRegFtraceEvent {
+  optional uint64 hsr = 1;
+}
+message KvmHvcArm64FtraceEvent {
+  optional uint64 imm = 1;
+  optional uint64 r0 = 2;
+  optional uint64 vcpu_pc = 3;
+}
+message KvmIrqLineFtraceEvent {
+  optional int32 irq_num = 1;
+  optional int32 level = 2;
+  optional uint32 type = 3;
+  optional int32 vcpu_idx = 4;
+}
+message KvmMmioFtraceEvent {
+  optional uint64 gpa = 1;
+  optional uint32 len = 2;
+  optional uint32 type = 3;
+  optional uint64 val = 4;
+}
+message KvmMmioEmulateFtraceEvent {
+  optional uint64 cpsr = 1;
+  optional uint64 instr = 2;
+  optional uint64 vcpu_pc = 3;
+}
+message KvmSetGuestDebugFtraceEvent {
+  optional uint32 guest_debug = 1;
+  optional uint64 vcpu = 2;
+}
+message KvmSetIrqFtraceEvent {
+  optional uint32 gsi = 1;
+  optional int32 irq_source_id = 2;
+  optional int32 level = 3;
+}
+message KvmSetSpteHvaFtraceEvent {
+  optional uint64 hva = 1;
+}
+message KvmSetWayFlushFtraceEvent {
+  optional uint32 cache = 1;
+  optional uint64 vcpu_pc = 2;
+}
+message KvmSysAccessFtraceEvent {
+  optional uint32 CRm = 1;
+  optional uint32 CRn = 2;
+  optional uint32 Op0 = 3;
+  optional uint32 Op1 = 4;
+  optional uint32 Op2 = 5;
+  optional uint32 is_write = 6;
+  optional string name = 7;
+  optional uint64 vcpu_pc = 8;
+}
+message KvmTestAgeHvaFtraceEvent {
+  optional uint64 hva = 1;
+}
+message KvmTimerEmulateFtraceEvent {
+  optional uint32 should_fire = 1;
+  optional int32 timer_idx = 2;
+}
+message KvmTimerHrtimerExpireFtraceEvent {
+  optional int32 timer_idx = 1;
+}
+message KvmTimerRestoreStateFtraceEvent {
+  optional uint64 ctl = 1;
+  optional uint64 cval = 2;
+  optional int32 timer_idx = 3;
+}
+message KvmTimerSaveStateFtraceEvent {
+  optional uint64 ctl = 1;
+  optional uint64 cval = 2;
+  optional int32 timer_idx = 3;
+}
+message KvmTimerUpdateIrqFtraceEvent {
+  optional uint32 irq = 1;
+  optional int32 level = 2;
+  optional uint64 vcpu_id = 3;
+}
+message KvmToggleCacheFtraceEvent {
+  optional uint32 now = 1;
+  optional uint64 vcpu_pc = 2;
+  optional uint32 was = 3;
+}
+message KvmUnmapHvaRangeFtraceEvent {
+  optional uint64 end = 1;
+  optional uint64 start = 2;
+}
+message KvmUserspaceExitFtraceEvent {
+  optional uint32 reason = 1;
+}
+message KvmVcpuWakeupFtraceEvent {
+  optional uint64 ns = 1;
+  optional uint32 valid = 2;
+  optional uint32 waited = 3;
+}
+message KvmWfxArm64FtraceEvent {
+  optional uint32 is_wfe = 1;
+  optional uint64 vcpu_pc = 2;
+}
+message TrapRegFtraceEvent {
+  optional string fn = 1;
+  optional uint32 is_write = 2;
+  optional int32 reg = 3;
+  optional uint64 write_value = 4;
+}
+message VgicUpdateIrqPendingFtraceEvent {
+  optional uint32 irq = 1;
+  optional uint32 level = 2;
+  optional uint64 vcpu_id = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/lowmemorykiller.proto b/src/libtracing/protos/perfetto/trace/ftrace/lowmemorykiller.proto
new file mode 100644
index 000000000..209a7d2b1
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/lowmemorykiller.proto
@@ -0,0 +1,14 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message LowmemoryKillFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int64 pagecache_size = 3;
+  optional int64 pagecache_limit = 4;
+  optional int64 free = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/lwis.proto b/src/libtracing/protos/perfetto/trace/ftrace/lwis.proto
new file mode 100644
index 000000000..d15fbb227
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/lwis.proto
@@ -0,0 +1,14 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message LwisTracingMarkWriteFtraceEvent {
+  optional string lwis_name = 1;
+  optional uint32 type = 2;
+  optional int32 pid = 3;
+  optional string func_name = 4;
+  optional int64 value = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/mali.proto b/src/libtracing/protos/perfetto/trace/ftrace/mali.proto
new file mode 100644
index 000000000..9d671666b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/mali.proto
@@ -0,0 +1,65 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message MaliTracingMarkWriteFtraceEvent {
+  optional string name = 1;
+  optional int32 pid = 2;
+  optional uint32 type = 3;
+  optional int32 value = 4;
+}
+message MaliMaliKCPUCQSSETFtraceEvent {
+  optional uint32 id = 1;
+  optional uint64 info_val1 = 2;
+  optional uint64 info_val2 = 3;
+  optional uint32 kctx_id = 4;
+  optional int32 kctx_tgid = 5;
+}
+message MaliMaliKCPUCQSWAITSTARTFtraceEvent {
+  optional uint32 id = 1;
+  optional uint64 info_val1 = 2;
+  optional uint64 info_val2 = 3;
+  optional uint32 kctx_id = 4;
+  optional int32 kctx_tgid = 5;
+}
+message MaliMaliKCPUCQSWAITENDFtraceEvent {
+  optional uint32 id = 1;
+  optional uint64 info_val1 = 2;
+  optional uint64 info_val2 = 3;
+  optional uint32 kctx_id = 4;
+  optional int32 kctx_tgid = 5;
+}
+message MaliMaliKCPUFENCESIGNALFtraceEvent {
+  optional uint64 info_val1 = 1;
+  optional uint64 info_val2 = 2;
+  optional int32 kctx_tgid = 3;
+  optional uint32 kctx_id = 4;
+  optional uint32 id = 5;
+}
+message MaliMaliKCPUFENCEWAITSTARTFtraceEvent {
+  optional uint64 info_val1 = 1;
+  optional uint64 info_val2 = 2;
+  optional int32 kctx_tgid = 3;
+  optional uint32 kctx_id = 4;
+  optional uint32 id = 5;
+}
+message MaliMaliKCPUFENCEWAITENDFtraceEvent {
+  optional uint64 info_val1 = 1;
+  optional uint64 info_val2 = 2;
+  optional int32 kctx_tgid = 3;
+  optional uint32 kctx_id = 4;
+  optional uint32 id = 5;
+}
+message MaliMaliCSFINTERRUPTSTARTFtraceEvent {
+  optional int32 kctx_tgid = 1;
+  optional uint32 kctx_id = 2;
+  optional uint64 info_val = 3;
+}
+message MaliMaliCSFINTERRUPTENDFtraceEvent {
+  optional int32 kctx_tgid = 1;
+  optional uint32 kctx_id = 2;
+  optional uint64 info_val = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/mdss.proto b/src/libtracing/protos/perfetto/trace/ftrace/mdss.proto
new file mode 100644
index 000000000..d73aec593
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/mdss.proto
@@ -0,0 +1,154 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message MdpCmdKickoffFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional int32 kickoff_cnt = 2;
+}
+message MdpCommitFtraceEvent {
+  optional uint32 num = 1;
+  optional uint32 play_cnt = 2;
+  optional uint32 clk_rate = 3;
+  optional uint64 bandwidth = 4;
+}
+message MdpPerfSetOtFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 xin_id = 2;
+  optional uint32 rd_lim = 3;
+  optional uint32 is_vbif_rt = 4;
+}
+message MdpSsppChangeFtraceEvent {
+  optional uint32 num = 1;
+  optional uint32 play_cnt = 2;
+  optional uint32 mixer = 3;
+  optional uint32 stage = 4;
+  optional uint32 flags = 5;
+  optional uint32 format = 6;
+  optional uint32 img_w = 7;
+  optional uint32 img_h = 8;
+  optional uint32 src_x = 9;
+  optional uint32 src_y = 10;
+  optional uint32 src_w = 11;
+  optional uint32 src_h = 12;
+  optional uint32 dst_x = 13;
+  optional uint32 dst_y = 14;
+  optional uint32 dst_w = 15;
+  optional uint32 dst_h = 16;
+}
+message TracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+}
+message MdpCmdPingpongDoneFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional uint32 intf_num = 2;
+  optional uint32 pp_num = 3;
+  optional int32 koff_cnt = 4;
+}
+message MdpCompareBwFtraceEvent {
+  optional uint64 new_ab = 1;
+  optional uint64 new_ib = 2;
+  optional uint64 new_wb = 3;
+  optional uint64 old_ab = 4;
+  optional uint64 old_ib = 5;
+  optional uint64 old_wb = 6;
+  optional uint32 params_changed = 7;
+  optional uint32 update_bw = 8;
+}
+message MdpPerfSetPanicLutsFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 fmt = 2;
+  optional uint32 mode = 3;
+  optional uint32 panic_lut = 4;
+  optional uint32 robust_lut = 5;
+}
+message MdpSsppSetFtraceEvent {
+  optional uint32 num = 1;
+  optional uint32 play_cnt = 2;
+  optional uint32 mixer = 3;
+  optional uint32 stage = 4;
+  optional uint32 flags = 5;
+  optional uint32 format = 6;
+  optional uint32 img_w = 7;
+  optional uint32 img_h = 8;
+  optional uint32 src_x = 9;
+  optional uint32 src_y = 10;
+  optional uint32 src_w = 11;
+  optional uint32 src_h = 12;
+  optional uint32 dst_x = 13;
+  optional uint32 dst_y = 14;
+  optional uint32 dst_w = 15;
+  optional uint32 dst_h = 16;
+}
+message MdpCmdReadptrDoneFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional int32 koff_cnt = 2;
+}
+message MdpMisrCrcFtraceEvent {
+  optional uint32 block_id = 1;
+  optional uint32 vsync_cnt = 2;
+  optional uint32 crc = 3;
+}
+message MdpPerfSetQosLutsFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 fmt = 2;
+  optional uint32 intf = 3;
+  optional uint32 rot = 4;
+  optional uint32 fl = 5;
+  optional uint32 lut = 6;
+  optional uint32 linear = 7;
+}
+message MdpTraceCounterFtraceEvent {
+  optional int32 pid = 1;
+  optional string counter_name = 2;
+  optional int32 value = 3;
+}
+message MdpCmdReleaseBwFtraceEvent {
+  optional uint32 ctl_num = 1;
+}
+message MdpMixerUpdateFtraceEvent {
+  optional uint32 mixer_num = 1;
+}
+message MdpPerfSetWmLevelsFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 use_space = 2;
+  optional uint32 priority_bytes = 3;
+  optional uint32 wm0 = 4;
+  optional uint32 wm1 = 5;
+  optional uint32 wm2 = 6;
+  optional uint32 mb_cnt = 7;
+  optional uint32 mb_size = 8;
+}
+message MdpVideoUnderrunDoneFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional uint32 underrun_cnt = 2;
+}
+message MdpCmdWaitPingpongFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional int32 kickoff_cnt = 2;
+}
+message MdpPerfPrefillCalcFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 latency_buf = 2;
+  optional uint32 ot = 3;
+  optional uint32 y_buf = 4;
+  optional uint32 y_scaler = 5;
+  optional uint32 pp_lines = 6;
+  optional uint32 pp_bytes = 7;
+  optional uint32 post_sc = 8;
+  optional uint32 fbc_bytes = 9;
+  optional uint32 prefill_bytes = 10;
+}
+message MdpPerfUpdateBusFtraceEvent {
+  optional int32 client = 1;
+  optional uint64 ab_quota = 2;
+  optional uint64 ib_quota = 3;
+}
+message RotatorBwAoAsContextFtraceEvent {
+  optional uint32 state = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/mm_event.proto b/src/libtracing/protos/perfetto/trace/ftrace/mm_event.proto
new file mode 100644
index 000000000..2c3edba67
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/mm_event.proto
@@ -0,0 +1,13 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message MmEventRecordFtraceEvent {
+  optional uint32 avg_lat = 1;
+  optional uint32 count = 2;
+  optional uint32 max_lat = 3;
+  optional uint32 type = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/net.proto b/src/libtracing/protos/perfetto/trace/ftrace/net.proto
new file mode 100644
index 000000000..4d6ed1934
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/net.proto
@@ -0,0 +1,42 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message NetifReceiveSkbFtraceEvent {
+  optional uint32 len = 1;
+  optional string name = 2;
+  optional uint64 skbaddr = 3;
+}
+message NetDevXmitFtraceEvent {
+  optional uint32 len = 1;
+  optional string name = 2;
+  optional int32 rc = 3;
+  optional uint64 skbaddr = 4;
+}
+message NapiGroReceiveEntryFtraceEvent {
+  optional uint32 data_len = 1;
+  optional uint32 gso_size = 2;
+  optional uint32 gso_type = 3;
+  optional uint32 hash = 4;
+  optional uint32 ip_summed = 5;
+  optional uint32 l4_hash = 6;
+  optional uint32 len = 7;
+  optional int32 mac_header = 8;
+  optional uint32 mac_header_valid = 9;
+  optional string name = 10;
+  optional uint32 napi_id = 11;
+  optional uint32 nr_frags = 12;
+  optional uint32 protocol = 13;
+  optional uint32 queue_mapping = 14;
+  optional uint64 skbaddr = 15;
+  optional uint32 truesize = 16;
+  optional uint32 vlan_proto = 17;
+  optional uint32 vlan_tagged = 18;
+  optional uint32 vlan_tci = 19;
+}
+message NapiGroReceiveExitFtraceEvent {
+  optional int32 ret = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/oom.proto b/src/libtracing/protos/perfetto/trace/ftrace/oom.proto
new file mode 100644
index 000000000..a94c0eeb5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/oom.proto
@@ -0,0 +1,15 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message OomScoreAdjUpdateFtraceEvent {
+  optional string comm = 1;
+  optional int32 oom_score_adj = 2;
+  optional int32 pid = 3;
+}
+message MarkVictimFtraceEvent {
+  optional int32 pid = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/panel.proto b/src/libtracing/protos/perfetto/trace/ftrace/panel.proto
new file mode 100644
index 000000000..fde72d922
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/panel.proto
@@ -0,0 +1,28 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message DsiCmdFifoStatusFtraceEvent {
+  optional uint32 header = 1;
+  optional uint32 payload = 2;
+}
+message DsiRxFtraceEvent {
+  optional uint32 cmd = 1;
+  optional uint32 rx_buf = 2;
+}
+message DsiTxFtraceEvent {
+  optional uint32 last = 1;
+  optional uint32 tx_buf = 2;
+  optional uint32 type = 3;
+}
+message PanelWriteGenericFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+  optional string name = 4;
+  optional uint32 type = 5;
+  optional int32 value = 6;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/perf_trace_counters.proto b/src/libtracing/protos/perfetto/trace/ftrace/perf_trace_counters.proto
new file mode 100644
index 000000000..0e3531c8c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/perf_trace_counters.proto
@@ -0,0 +1,26 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SchedSwitchWithCtrsFtraceEvent {
+  optional int32 old_pid = 1;
+  optional int32 new_pid = 2;
+  optional uint32 cctr = 3;
+  optional uint32 ctr0 = 4;
+  optional uint32 ctr1 = 5;
+  optional uint32 ctr2 = 6;
+  optional uint32 ctr3 = 7;
+  optional uint32 lctr0 = 8;
+  optional uint32 lctr1 = 9;
+  optional uint32 ctr4 = 10;
+  optional uint32 ctr5 = 11;
+  optional string prev_comm = 12;
+  optional int32 prev_pid = 13;
+  optional uint32 cyc = 14;
+  optional uint32 inst = 15;
+  optional uint32 stallbm = 16;
+  optional uint32 l3dm = 17;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/power.proto b/src/libtracing/protos/perfetto/trace/ftrace/power.proto
new file mode 100644
index 000000000..4460ba623
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/power.proto
@@ -0,0 +1,59 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message CpuFrequencyFtraceEvent {
+  optional uint32 state = 1;
+  optional uint32 cpu_id = 2;
+}
+message CpuFrequencyLimitsFtraceEvent {
+  optional uint32 min_freq = 1;
+  optional uint32 max_freq = 2;
+  optional uint32 cpu_id = 3;
+}
+message CpuIdleFtraceEvent {
+  optional uint32 state = 1;
+  optional uint32 cpu_id = 2;
+}
+message ClockEnableFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+  optional uint64 cpu_id = 3;
+}
+message ClockDisableFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+  optional uint64 cpu_id = 3;
+}
+message ClockSetRateFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+  optional uint64 cpu_id = 3;
+}
+message SuspendResumeFtraceEvent {
+  optional string action = 1;
+  optional int32 val = 2;
+  optional uint32 start = 3;
+}
+message GpuFrequencyFtraceEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 state = 2;
+}
+message WakeupSourceActivateFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+}
+message WakeupSourceDeactivateFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+}
+message GpuWorkPeriodFtraceEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 uid = 2;
+  optional uint64 start_time_ns = 3;
+  optional uint64 end_time_ns = 4;
+  optional uint64 total_active_duration_ns = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/print.proto b/src/libtracing/protos/perfetto/trace/ftrace/print.proto
new file mode 100644
index 000000000..9fc6f562a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/print.proto
@@ -0,0 +1,11 @@
+// Autogenerated by:
+// ../../tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message PrintFtraceEvent {
+  optional uint64 ip = 1;
+  optional string buf = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/printk.proto b/src/libtracing/protos/perfetto/trace/ftrace/printk.proto
new file mode 100644
index 000000000..f49997fc8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/printk.proto
@@ -0,0 +1,10 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message ConsoleFtraceEvent {
+  optional string msg = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/raw_syscalls.proto b/src/libtracing/protos/perfetto/trace/ftrace/raw_syscalls.proto
new file mode 100644
index 000000000..475ab31b6
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/raw_syscalls.proto
@@ -0,0 +1,15 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SysEnterFtraceEvent {
+  optional int64 id = 1;
+  repeated uint64 args = 2;
+}
+message SysExitFtraceEvent {
+  optional int64 id = 1;
+  optional int64 ret = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/regulator.proto b/src/libtracing/protos/perfetto/trace/ftrace/regulator.proto
new file mode 100644
index 000000000..997a64bdc
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/regulator.proto
@@ -0,0 +1,31 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message RegulatorDisableFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorDisableCompleteFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorEnableFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorEnableCompleteFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorEnableDelayFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorSetVoltageFtraceEvent {
+  optional string name = 1;
+  optional int32 min = 2;
+  optional int32 max = 3;
+}
+message RegulatorSetVoltageCompleteFtraceEvent {
+  optional string name = 1;
+  optional uint32 val = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/rpm.proto b/src/libtracing/protos/perfetto/trace/ftrace/rpm.proto
new file mode 100644
index 000000000..dd542bb20
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/rpm.proto
@@ -0,0 +1,11 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message RpmStatusFtraceEvent {
+  optional string name = 1;
+  optional int32 status = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/samsung.proto b/src/libtracing/protos/perfetto/trace/ftrace/samsung.proto
new file mode 100644
index 000000000..5da0b4c11
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/samsung.proto
@@ -0,0 +1,14 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SamsungTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+  optional uint32 trace_type = 4;
+  optional int32 value = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/sched.proto b/src/libtracing/protos/perfetto/trace/ftrace/sched.proto
new file mode 100644
index 000000000..fb4e2fb8e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/sched.proto
@@ -0,0 +1,110 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SchedSwitchFtraceEvent {
+  optional string prev_comm = 1;
+  optional int32 prev_pid = 2;
+  optional int32 prev_prio = 3;
+  optional int64 prev_state = 4;
+  optional string next_comm = 5;
+  optional int32 next_pid = 6;
+  optional int32 next_prio = 7;
+}
+message SchedWakeupFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 success = 4;
+  optional int32 target_cpu = 5;
+}
+message SchedBlockedReasonFtraceEvent {
+  optional int32 pid = 1;
+  optional uint64 caller = 2;
+  optional uint32 io_wait = 3;
+}
+message SchedCpuHotplugFtraceEvent {
+  optional int32 affected_cpu = 1;
+  optional int32 error = 2;
+  optional int32 status = 3;
+}
+message SchedWakingFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 success = 4;
+  optional int32 target_cpu = 5;
+}
+message SchedWakeupNewFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 success = 4;
+  optional int32 target_cpu = 5;
+}
+message SchedProcessExecFtraceEvent {
+  optional string filename = 1;
+  optional int32 pid = 2;
+  optional int32 old_pid = 3;
+}
+message SchedProcessExitFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 tgid = 3;
+  optional int32 prio = 4;
+}
+message SchedProcessForkFtraceEvent {
+  optional string parent_comm = 1;
+  optional int32 parent_pid = 2;
+  optional string child_comm = 3;
+  optional int32 child_pid = 4;
+}
+message SchedProcessFreeFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+}
+message SchedProcessHangFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+}
+message SchedProcessWaitFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+}
+message SchedPiSetprioFtraceEvent {
+  optional string comm = 1;
+  optional int32 newprio = 2;
+  optional int32 oldprio = 3;
+  optional int32 pid = 4;
+}
+message SchedCpuUtilCfsFtraceEvent {
+  optional int32 active = 1;
+  optional uint64 capacity = 2;
+  optional uint64 capacity_orig = 3;
+  optional uint32 cpu = 4;
+  optional uint64 cpu_importance = 5;
+  optional uint64 cpu_util = 6;
+  optional uint32 exit_lat = 7;
+  optional uint64 group_capacity = 8;
+  optional uint32 grp_overutilized = 9;
+  optional uint32 idle_cpu = 10;
+  optional uint32 nr_running = 11;
+  optional int64 spare_cap = 12;
+  optional uint32 task_fits = 13;
+  optional uint64 wake_group_util = 14;
+  optional uint64 wake_util = 15;
+}
+message SchedMigrateTaskFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 orig_cpu = 4;
+  optional int32 dest_cpu = 5;
+  optional int32 running = 6;
+  optional uint32 load = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/scm.proto b/src/libtracing/protos/perfetto/trace/ftrace/scm.proto
new file mode 100644
index 000000000..cc4e12282
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/scm.proto
@@ -0,0 +1,13 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message ScmCallStartFtraceEvent {
+  optional uint32 arginfo = 1;
+  optional uint64 x0 = 2;
+  optional uint64 x5 = 3;
+}
+message ScmCallEndFtraceEvent {}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/sde.proto b/src/libtracing/protos/perfetto/trace/ftrace/sde.proto
new file mode 100644
index 000000000..5509a7e0b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/sde.proto
@@ -0,0 +1,57 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SdeTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_type = 3;
+  optional int32 value = 4;
+  optional uint32 trace_begin = 5;
+}
+message SdeSdeEvtlogFtraceEvent {
+  optional string evtlog_tag = 1;
+  optional int32 pid = 2;
+  optional uint32 tag_id = 3;
+}
+message SdeSdePerfCalcCrtcFtraceEvent {
+  optional uint64 bw_ctl_ebi = 1;
+  optional uint64 bw_ctl_llcc = 2;
+  optional uint64 bw_ctl_mnoc = 3;
+  optional uint32 core_clk_rate = 4;
+  optional uint32 crtc = 5;
+  optional uint64 ib_ebi = 6;
+  optional uint64 ib_llcc = 7;
+  optional uint64 ib_mnoc = 8;
+}
+message SdeSdePerfCrtcUpdateFtraceEvent {
+  optional uint64 bw_ctl_ebi = 1;
+  optional uint64 bw_ctl_llcc = 2;
+  optional uint64 bw_ctl_mnoc = 3;
+  optional uint32 core_clk_rate = 4;
+  optional uint32 crtc = 5;
+  optional int32 params = 6;
+  optional uint64 per_pipe_ib_ebi = 7;
+  optional uint64 per_pipe_ib_llcc = 8;
+  optional uint64 per_pipe_ib_mnoc = 9;
+  optional uint32 stop_req = 10;
+  optional uint32 update_bus = 11;
+  optional uint32 update_clk = 12;
+}
+message SdeSdePerfSetQosLutsFtraceEvent {
+  optional uint32 fl = 1;
+  optional uint32 fmt = 2;
+  optional uint64 lut = 3;
+  optional uint32 lut_usage = 4;
+  optional uint32 pnum = 5;
+  optional uint32 rt = 6;
+}
+message SdeSdePerfUpdateBusFtraceEvent {
+  optional uint64 ab_quota = 1;
+  optional uint32 bus_id = 2;
+  optional int32 client = 3;
+  optional uint64 ib_quota = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/signal.proto b/src/libtracing/protos/perfetto/trace/ftrace/signal.proto
new file mode 100644
index 000000000..37f688aa6
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/signal.proto
@@ -0,0 +1,20 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SignalDeliverFtraceEvent {
+  optional int32 code = 1;
+  optional uint64 sa_flags = 2;
+  optional int32 sig = 3;
+}
+message SignalGenerateFtraceEvent {
+  optional int32 code = 1;
+  optional string comm = 2;
+  optional int32 group = 3;
+  optional int32 pid = 4;
+  optional int32 result = 5;
+  optional int32 sig = 6;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/skb.proto b/src/libtracing/protos/perfetto/trace/ftrace/skb.proto
new file mode 100644
index 000000000..1d7c0d91d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/skb.proto
@@ -0,0 +1,12 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message KfreeSkbFtraceEvent {
+  optional uint64 location = 1;
+  optional uint32 protocol = 2;
+  optional uint64 skbaddr = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/sock.proto b/src/libtracing/protos/perfetto/trace/ftrace/sock.proto
new file mode 100644
index 000000000..db368e504
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/sock.proto
@@ -0,0 +1,18 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message InetSockSetStateFtraceEvent {
+  optional uint32 daddr = 1;
+  optional uint32 dport = 2;
+  optional uint32 family = 3;
+  optional int32 newstate = 4;
+  optional int32 oldstate = 5;
+  optional uint32 protocol = 6;
+  optional uint32 saddr = 7;
+  optional uint64 skaddr = 8;
+  optional uint32 sport = 9;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/sync.proto b/src/libtracing/protos/perfetto/trace/ftrace/sync.proto
new file mode 100644
index 000000000..e7edeff5e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/sync.proto
@@ -0,0 +1,20 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message SyncPtFtraceEvent {
+  optional string timeline = 1;
+  optional string value = 2;
+}
+message SyncTimelineFtraceEvent {
+  optional string name = 1;
+  optional string value = 2;
+}
+message SyncWaitFtraceEvent {
+  optional string name = 1;
+  optional int32 status = 2;
+  optional uint32 begin = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/synthetic.proto b/src/libtracing/protos/perfetto/trace/ftrace/synthetic.proto
new file mode 100644
index 000000000..7039fa231
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/synthetic.proto
@@ -0,0 +1,16 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message RssStatThrottledFtraceEvent {
+  optional uint32 curr = 1;
+  optional int32 member = 2;
+  optional uint32 mm_id = 3;
+  optional int64 size = 4;
+}
+message SuspendResumeMinimalFtraceEvent {
+  optional uint32 start = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/systrace.proto b/src/libtracing/protos/perfetto/trace/ftrace/systrace.proto
new file mode 100644
index 000000000..7fa87ecf4
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/systrace.proto
@@ -0,0 +1,13 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message ZeroFtraceEvent {
+  optional int32 flag = 1;
+  optional string name = 2;
+  optional int32 pid = 3;
+  optional int64 value = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/task.proto b/src/libtracing/protos/perfetto/trace/ftrace/task.proto
new file mode 100644
index 000000000..39b6c90cd
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/task.proto
@@ -0,0 +1,19 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message TaskNewtaskFtraceEvent {
+  optional int32 pid = 1;
+  optional string comm = 2;
+  optional uint64 clone_flags = 3;
+  optional int32 oom_score_adj = 4;
+}
+message TaskRenameFtraceEvent {
+  optional int32 pid = 1;
+  optional string oldcomm = 2;
+  optional string newcomm = 3;
+  optional int32 oom_score_adj = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/tcp.proto b/src/libtracing/protos/perfetto/trace/ftrace/tcp.proto
new file mode 100644
index 000000000..ebc5ec652
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/tcp.proto
@@ -0,0 +1,16 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message TcpRetransmitSkbFtraceEvent {
+  optional uint32 daddr = 1;
+  optional uint32 dport = 2;
+  optional uint32 saddr = 3;
+  optional uint64 skaddr = 4;
+  optional uint64 skbaddr = 5;
+  optional uint32 sport = 6;
+  optional int32 state = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/test_bundle_wrapper.proto b/src/libtracing/protos/perfetto/trace/ftrace/test_bundle_wrapper.proto
new file mode 100644
index 000000000..72c1344c7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/test_bundle_wrapper.proto
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+import "protos/perfetto/trace/ftrace/ftrace_event_bundle.proto";
+
+// TODO(hjd): Move this to ftrace_reader/test/protos.
+message TestBundleWrapper {
+  optional string before = 1;
+  repeated FtraceEventBundle bundle = 2;
+  optional string after = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/thermal.proto b/src/libtracing/protos/perfetto/trace/ftrace/thermal.proto
new file mode 100644
index 000000000..d3ee88d1c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/thermal.proto
@@ -0,0 +1,17 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message ThermalTemperatureFtraceEvent {
+  optional int32 id = 1;
+  optional int32 temp = 2;
+  optional int32 temp_prev = 3;
+  optional string thermal_zone = 4;
+}
+message CdevUpdateFtraceEvent {
+  optional uint64 target = 1;
+  optional string type = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/trusty.proto b/src/libtracing/protos/perfetto/trace/ftrace/trusty.proto
new file mode 100644
index 000000000..6237e7f40
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/trusty.proto
@@ -0,0 +1,96 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message TrustySmcFtraceEvent {
+  optional uint64 r0 = 1;
+  optional uint64 r1 = 2;
+  optional uint64 r2 = 3;
+  optional uint64 r3 = 4;
+}
+message TrustySmcDoneFtraceEvent {
+  optional uint64 ret = 1;
+}
+message TrustyStdCall32FtraceEvent {
+  optional uint64 r0 = 1;
+  optional uint64 r1 = 2;
+  optional uint64 r2 = 3;
+  optional uint64 r3 = 4;
+}
+message TrustyStdCall32DoneFtraceEvent {
+  optional int64 ret = 1;
+}
+message TrustyShareMemoryFtraceEvent {
+  optional uint64 len = 1;
+  optional uint32 lend = 2;
+  optional uint32 nents = 3;
+}
+message TrustyShareMemoryDoneFtraceEvent {
+  optional uint64 handle = 1;
+  optional uint64 len = 2;
+  optional uint32 lend = 3;
+  optional uint32 nents = 4;
+  optional int32 ret = 5;
+}
+message TrustyReclaimMemoryFtraceEvent {
+  optional uint64 id = 1;
+}
+message TrustyReclaimMemoryDoneFtraceEvent {
+  optional uint64 id = 1;
+  optional int32 ret = 2;
+}
+message TrustyIrqFtraceEvent {
+  optional int32 irq = 1;
+}
+message TrustyIpcHandleEventFtraceEvent {
+  optional uint32 chan = 1;
+  optional uint32 event_id = 2;
+  optional string srv_name = 3;
+}
+message TrustyIpcConnectFtraceEvent {
+  optional uint32 chan = 1;
+  optional string port = 2;
+  optional int32 state = 3;
+}
+message TrustyIpcConnectEndFtraceEvent {
+  optional uint32 chan = 1;
+  optional int32 err = 2;
+  optional int32 state = 3;
+}
+message TrustyIpcWriteFtraceEvent {
+  optional uint64 buf_id = 1;
+  optional uint32 chan = 2;
+  optional int32 kind_shm = 3;
+  optional int32 len_or_err = 4;
+  optional uint64 shm_cnt = 5;
+  optional string srv_name = 6;
+}
+message TrustyIpcPollFtraceEvent {
+  optional uint32 chan = 1;
+  optional uint32 poll_mask = 2;
+  optional string srv_name = 3;
+}
+message TrustyIpcReadFtraceEvent {
+  optional uint32 chan = 1;
+  optional string srv_name = 2;
+}
+message TrustyIpcReadEndFtraceEvent {
+  optional uint64 buf_id = 1;
+  optional uint32 chan = 2;
+  optional int32 len_or_err = 3;
+  optional uint64 shm_cnt = 4;
+  optional string srv_name = 5;
+}
+message TrustyIpcRxFtraceEvent {
+  optional uint64 buf_id = 1;
+  optional uint32 chan = 2;
+  optional string srv_name = 3;
+}
+message TrustyEnqueueNopFtraceEvent {
+  optional uint32 arg1 = 1;
+  optional uint32 arg2 = 2;
+  optional uint32 arg3 = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/ufs.proto b/src/libtracing/protos/perfetto/trace/ftrace/ufs.proto
new file mode 100644
index 000000000..c46ab3628
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/ufs.proto
@@ -0,0 +1,23 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message UfshcdCommandFtraceEvent {
+  optional string dev_name = 1;
+  optional uint32 doorbell = 2;
+  optional uint32 intr = 3;
+  optional uint64 lba = 4;
+  optional uint32 opcode = 5;
+  optional string str = 6;
+  optional uint32 tag = 7;
+  optional int32 transfer_len = 8;
+  optional uint32 group_id = 9;
+  optional uint32 str_t = 10;
+}
+message UfshcdClkGatingFtraceEvent {
+  optional string dev_name = 1;
+  optional int32 state = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/v4l2.proto b/src/libtracing/protos/perfetto/trace/ftrace/v4l2.proto
new file mode 100644
index 000000000..d381a4724
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/v4l2.proto
@@ -0,0 +1,115 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message V4l2QbufFtraceEvent {
+  optional uint32 bytesused = 1;
+  optional uint32 field = 2;
+  optional uint32 flags = 3;
+  optional uint32 index = 4;
+  optional int32 minor = 5;
+  optional uint32 sequence = 6;
+  optional uint32 timecode_flags = 7;
+  optional uint32 timecode_frames = 8;
+  optional uint32 timecode_hours = 9;
+  optional uint32 timecode_minutes = 10;
+  optional uint32 timecode_seconds = 11;
+  optional uint32 timecode_type = 12;
+  optional uint32 timecode_userbits0 = 13;
+  optional uint32 timecode_userbits1 = 14;
+  optional uint32 timecode_userbits2 = 15;
+  optional uint32 timecode_userbits3 = 16;
+  optional int64 timestamp = 17;
+  optional uint32 type = 18;
+}
+message V4l2DqbufFtraceEvent {
+  optional uint32 bytesused = 1;
+  optional uint32 field = 2;
+  optional uint32 flags = 3;
+  optional uint32 index = 4;
+  optional int32 minor = 5;
+  optional uint32 sequence = 6;
+  optional uint32 timecode_flags = 7;
+  optional uint32 timecode_frames = 8;
+  optional uint32 timecode_hours = 9;
+  optional uint32 timecode_minutes = 10;
+  optional uint32 timecode_seconds = 11;
+  optional uint32 timecode_type = 12;
+  optional uint32 timecode_userbits0 = 13;
+  optional uint32 timecode_userbits1 = 14;
+  optional uint32 timecode_userbits2 = 15;
+  optional uint32 timecode_userbits3 = 16;
+  optional int64 timestamp = 17;
+  optional uint32 type = 18;
+}
+message Vb2V4l2BufQueueFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
+message Vb2V4l2BufDoneFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
+message Vb2V4l2QbufFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
+message Vb2V4l2DqbufFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/virtio_gpu.proto b/src/libtracing/protos/perfetto/trace/ftrace/virtio_gpu.proto
new file mode 100644
index 000000000..eca727209
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/virtio_gpu.proto
@@ -0,0 +1,29 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message VirtioGpuCmdQueueFtraceEvent {
+  optional uint32 ctx_id = 1;
+  optional int32 dev = 2;
+  optional uint64 fence_id = 3;
+  optional uint32 flags = 4;
+  optional string name = 5;
+  optional uint32 num_free = 6;
+  optional uint32 seqno = 7;
+  optional uint32 type = 8;
+  optional uint32 vq = 9;
+}
+message VirtioGpuCmdResponseFtraceEvent {
+  optional uint32 ctx_id = 1;
+  optional int32 dev = 2;
+  optional uint64 fence_id = 3;
+  optional uint32 flags = 4;
+  optional string name = 5;
+  optional uint32 num_free = 6;
+  optional uint32 seqno = 7;
+  optional uint32 type = 8;
+  optional uint32 vq = 9;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/virtio_video.proto b/src/libtracing/protos/perfetto/trace/ftrace/virtio_video.proto
new file mode 100644
index 000000000..8c1b9f2a8
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/virtio_video.proto
@@ -0,0 +1,35 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message VirtioVideoCmdFtraceEvent {
+  optional uint32 stream_id = 1;
+  optional uint32 type = 2;
+}
+message VirtioVideoCmdDoneFtraceEvent {
+  optional uint32 stream_id = 1;
+  optional uint32 type = 2;
+}
+message VirtioVideoResourceQueueFtraceEvent {
+  optional uint32 data_size0 = 1;
+  optional uint32 data_size1 = 2;
+  optional uint32 data_size2 = 3;
+  optional uint32 data_size3 = 4;
+  optional uint32 queue_type = 5;
+  optional int32 resource_id = 6;
+  optional int32 stream_id = 7;
+  optional uint64 timestamp = 8;
+}
+message VirtioVideoResourceQueueDoneFtraceEvent {
+  optional uint32 data_size0 = 1;
+  optional uint32 data_size1 = 2;
+  optional uint32 data_size2 = 3;
+  optional uint32 data_size3 = 4;
+  optional uint32 queue_type = 5;
+  optional int32 resource_id = 6;
+  optional int32 stream_id = 7;
+  optional uint64 timestamp = 8;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/vmscan.proto b/src/libtracing/protos/perfetto/trace/ftrace/vmscan.proto
new file mode 100644
index 000000000..b0fc88d20
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/vmscan.proto
@@ -0,0 +1,45 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message MmVmscanDirectReclaimBeginFtraceEvent {
+  optional int32 order = 1;
+  optional int32 may_writepage = 2;
+  optional uint32 gfp_flags = 3;
+}
+message MmVmscanDirectReclaimEndFtraceEvent {
+  optional uint64 nr_reclaimed = 1;
+}
+message MmVmscanKswapdWakeFtraceEvent {
+  optional int32 nid = 1;
+  optional int32 order = 2;
+  optional int32 zid = 3;
+}
+message MmVmscanKswapdSleepFtraceEvent {
+  optional int32 nid = 1;
+}
+message MmShrinkSlabStartFtraceEvent {
+  optional uint64 cache_items = 1;
+  optional uint64 delta = 2;
+  optional uint32 gfp_flags = 3;
+  optional uint64 lru_pgs = 4;
+  optional int64 nr_objects_to_shrink = 5;
+  optional uint64 pgs_scanned = 6;
+  optional uint64 shr = 7;
+  optional uint64 shrink = 8;
+  optional uint64 total_scan = 9;
+  optional int32 nid = 10;
+  optional int32 priority = 11;
+}
+message MmShrinkSlabEndFtraceEvent {
+  optional int64 new_scan = 1;
+  optional int32 retval = 2;
+  optional uint64 shr = 3;
+  optional uint64 shrink = 4;
+  optional int64 total_scan = 5;
+  optional int64 unused_scan = 6;
+  optional int32 nid = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ftrace/workqueue.proto b/src/libtracing/protos/perfetto/trace/ftrace/workqueue.proto
new file mode 100644
index 000000000..756a8f1ec
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ftrace/workqueue.proto
@@ -0,0 +1,25 @@
+// Autogenerated by:
+// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message WorkqueueActivateWorkFtraceEvent {
+  optional uint64 work = 1;
+}
+message WorkqueueExecuteEndFtraceEvent {
+  optional uint64 work = 1;
+  optional uint64 function = 2;
+}
+message WorkqueueExecuteStartFtraceEvent {
+  optional uint64 work = 1;
+  optional uint64 function = 2;
+}
+message WorkqueueQueueWorkFtraceEvent {
+  optional uint64 work = 1;
+  optional uint64 function = 2;
+  optional uint64 workqueue = 3;
+  optional uint32 req_cpu = 4;
+  optional uint32 cpu = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/gpu/gpu_counter_event.proto b/src/libtracing/protos/perfetto/trace/gpu/gpu_counter_event.proto
new file mode 100644
index 000000000..ee109b2ab
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/gpu/gpu_counter_event.proto
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/common/gpu_counter_descriptor.proto";
+
+message GpuCounterEvent {
+  // The first trace packet of each session should include counter_spec.
+  optional GpuCounterDescriptor counter_descriptor = 1;
+
+  message GpuCounter {
+    // required. Identifier for counter.
+    optional uint32 counter_id = 1;
+    // required. Value of the counter.
+    oneof value {
+      int64 int_value = 2;
+      double double_value = 3;
+    }
+  }
+  repeated GpuCounter counters = 2;
+
+  // optional. Identifier for GPU in a multi-gpu device.
+  optional int32 gpu_id = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/gpu/gpu_log.proto b/src/libtracing/protos/perfetto/trace/gpu/gpu_log.proto
new file mode 100644
index 000000000..3c10e366a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/gpu/gpu_log.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Message for logging events GPU data producer.
+message GpuLog {
+  enum Severity {
+    LOG_SEVERITY_UNSPECIFIED = 0;
+    LOG_SEVERITY_VERBOSE = 1;
+    LOG_SEVERITY_DEBUG = 2;
+    LOG_SEVERITY_INFO = 3;
+    LOG_SEVERITY_WARNING = 4;
+    LOG_SEVERITY_ERROR = 5;
+  };
+  optional Severity severity = 1;
+
+  optional string tag = 2;
+
+  optional string log_message = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/gpu/gpu_render_stage_event.proto b/src/libtracing/protos/perfetto/trace/gpu/gpu_render_stage_event.proto
new file mode 100644
index 000000000..e00b39e06
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/gpu/gpu_render_stage_event.proto
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// next id: 15
+message GpuRenderStageEvent {
+  // required. Unique ID for the event.
+  optional uint64 event_id = 1;
+
+  // optional. Duration of the event in nanoseconds. If unset, this is a
+  // single time point event.
+  optional uint64 duration = 2;
+
+  // required. ID to a hardware queue description in the specifications.
+  // InternedGpuRenderStageSpecification
+  optional uint64 hw_queue_iid = 13;
+
+  // required. ID to a render stage description in the specifications.
+  // InternedGpuRenderStageSpecification
+  optional uint64 stage_iid = 14;
+
+  // optional. Identifier for GPU in a multi-gpu device.
+  optional int32 gpu_id = 11;
+
+  // required. Graphics context for the event.
+  // For OpenGL, this is the GL context.
+  // For Vulkan, this is the VkDevice.
+  optional uint64 context = 5;
+
+  // optional. The render target for this event.
+  // For OpenGL, this is the GL frame buffer handle.
+  // For Vulkan, this is the VkFrameBuffer handle.
+  optional uint64 render_target_handle = 8;
+
+  // optional. Submission ID generated by the UMD.
+  // For OpenGL, the ID should map to an API submission (e.g., glFlush,
+  // glFinish, eglSwapBufffers) event.  The set of submissions to the HW due
+  // to a single API submission should share the same ID.
+  // For Vulkan, it should map 1:1 with a vkQueueSubmit.
+  optional uint32 submission_id = 10;
+
+  // optional. Additional data for the user. This may include attributes for
+  // the event like resource ids, shaders, etc.
+  message ExtraData {
+    optional string name = 1;
+    optional string value = 2;
+  }
+  repeated ExtraData extra_data = 6;
+
+  // VULKAN SPECIFICS
+
+  // optional. The Vulkan render pass handle.
+  optional uint64 render_pass_handle = 9;
+
+  // optional. A bit mask representing which render subpasses contributed to
+  // this render stage event.  Subpass index 0 is represented by setting the
+  // LSB of the mask.  Additional mask can be added for subpass index greater
+  // than 63.
+  repeated uint64 render_subpass_index_mask = 15;
+
+  // optional. The Vulkan command buffer handle.
+  optional uint64 command_buffer_handle = 12;
+
+  // DEPRECATED
+
+  // Deprecated.  Use InternedGpuRenderStageSpecification instead.
+  // The first trace packet of each session should include a Specifications
+  // to enumerate *all* IDs that will be used. The timestamp of this packet
+  // must be earlier than all other packets. Only one packet with Specifications
+  // is expected.
+  message Specifications {
+    message ContextSpec {
+      optional uint64 context = 1;
+      optional int32 pid = 2;
+    }
+    optional ContextSpec context_spec = 1;
+
+    message Description {
+      optional string name = 1;
+      optional string description = 2;
+    }
+
+    // Labels to categorize the hw Queue this event goes on.
+    repeated Description hw_queue = 2;
+
+    // Labels to categorize render stage(binning, render, compute etc).
+    repeated Description stage = 3;
+  }
+  // Deprecated.  Use hw_queue_iid and stage_iid to refer to
+  // InternedGpuRenderStageSpecification instead.
+  optional Specifications specifications = 7 [deprecated = true];
+
+  // Deprecated. Use hw_queue_iid instead;
+  optional int32 hw_queue_id = 3 [deprecated = true];
+
+  // Deprecated. Use stage_iid instead;
+  optional int32 stage_id = 4 [deprecated = true];
+
+  // Extension for vendor's custom proto.
+  extensions 100;
+}
+
+// Interned data.
+
+// The iid is the numeric value of either the GL Context or the VkDevice
+// handle.
+message InternedGraphicsContext {
+  optional uint64 iid = 1;
+  optional int32 pid = 2;
+  enum Api {
+    UNDEFINED = 0;
+    OPEN_GL = 1;
+    VULKAN = 2;
+    OPEN_CL = 3;
+  }
+  optional Api api = 3;
+}
+
+message InternedGpuRenderStageSpecification {
+  optional uint64 iid = 1;
+  optional string name = 2;
+  optional string description = 3;
+
+  enum RenderStageCategory {
+    OTHER = 0;
+    GRAPHICS = 1;
+    COMPUTE = 2;
+  }
+  optional RenderStageCategory category = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/gpu/vulkan_api_event.proto b/src/libtracing/protos/perfetto/trace/gpu/vulkan_api_event.proto
new file mode 100644
index 000000000..08d9947d7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/gpu/vulkan_api_event.proto
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Message for recording the Vulkan call.
+message VulkanApiEvent {
+  oneof event {
+    VkDebugUtilsObjectName vk_debug_utils_object_name = 1;
+    VkQueueSubmit vk_queue_submit = 2;
+  }
+
+  // For recording vkSetDebugUtilsObjectNameEXT and
+  // vkDebugMarkerSetObjectNameEXT
+  message VkDebugUtilsObjectName {
+    optional uint32 pid = 1;
+    optional uint64 vk_device = 2;
+    // VkObjectType.  Value must match
+    // https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkObjectType.html.
+    optional int32 object_type = 3;
+    optional uint64 object = 4;
+    optional string object_name = 5;
+  }
+
+  // For recording vkQueueSubmit call.
+  message VkQueueSubmit {
+    optional uint64 duration_ns = 1;
+    optional uint32 pid = 2;
+    optional uint32 tid = 3;
+    optional uint64 vk_queue = 4;
+    repeated uint64 vk_command_buffers = 5;
+    // Submission ID.  An identifier unique to each vkQueueSubmit call.  This
+    // submission_id must match GpuRenderStageEvent.submission_id if the
+    // GpuRenderStageEvent is created due to this vkQueueSubmit.
+    optional uint32 submission_id = 6;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/trace/gpu/vulkan_memory_event.proto b/src/libtracing/protos/perfetto/trace/gpu/vulkan_memory_event.proto
new file mode 100644
index 000000000..bdb379c48
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/gpu/vulkan_memory_event.proto
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// All the information that cannot be sent within a VulkanMemoryEvent message,
+// are sent as annotations to the main memory event. One example is the
+// properties of the object that consumes the allocated memory, for example, a
+// buffer or an image.
+// key_iid and string_iid are both interned strings. Original string value is
+// stored in vulkan_memory_keys from
+// protos/perfetto/trace/interned_data/interned_data.proto.
+message VulkanMemoryEventAnnotation {
+  optional uint64 key_iid = 1;
+  oneof value {
+    int64 int_value = 2;
+    double double_value = 3;
+    uint64 string_iid = 4;
+  }
+}
+
+// Each VulkanMemoryEvent encompasses information regarding one single function
+// call that results in reserving, binding or freeing host or GPU memory. There
+// is a special message type, ANNOTATIONS, which is used to communicate
+// information that are not directly related to a memory event, nonetheless are
+// essential to understand the memory usage. An example is the size and memory
+// types of the memory heaps.
+//
+// Next reserved id: 10 (up to 15).
+// Next id: 21.
+message VulkanMemoryEvent {
+  enum Source {
+    SOURCE_UNSPECIFIED = 0;
+    SOURCE_DRIVER = 1;
+    SOURCE_DEVICE = 2;
+    SOURCE_DEVICE_MEMORY = 3;
+    SOURCE_BUFFER = 4;
+    SOURCE_IMAGE = 5;
+  }
+
+  enum Operation {
+    OP_UNSPECIFIED = 0;
+
+    // alloc, create
+    OP_CREATE = 1;
+
+    // free, destroy(non-bound)
+    OP_DESTROY = 2;
+
+    // bind buffer and image
+    OP_BIND = 3;
+
+    // destroy (bound)
+    OP_DESTROY_BOUND = 4;
+
+    // only annotations
+    OP_ANNOTATIONS = 5;
+  }
+
+  enum AllocationScope {
+    SCOPE_UNSPECIFIED = 0;
+    SCOPE_COMMAND = 1;
+    SCOPE_OBJECT = 2;
+    SCOPE_CACHE = 3;
+    SCOPE_DEVICE = 4;
+    SCOPE_INSTANCE = 5;
+  }
+
+  optional Source source = 1;
+  optional Operation operation = 2;
+  optional int64 timestamp = 3;
+  optional uint32 pid = 4;
+  optional fixed64 memory_address = 5;
+  optional uint64 memory_size = 6;
+  // Interned string. Original string value is stored in function_names from
+  // protos/perfetto/trace/interned_data/interned_data.proto.
+  optional uint64 caller_iid = 7;
+  optional AllocationScope allocation_scope = 8;
+  // Extra related information, e.g., create configs, etc.
+  repeated VulkanMemoryEventAnnotation annotations = 9;
+
+  // Field IDs used for device memory (low sampling rate)
+  optional fixed64 device = 16;
+  optional fixed64 device_memory = 17;
+  optional uint32 memory_type = 18;
+  optional uint32 heap = 19;
+  optional fixed64 object_handle = 20;
+}
diff --git a/src/libtracing/protos/perfetto/trace/interned_data/interned_data.proto b/src/libtracing/protos/perfetto/trace/interned_data/interned_data.proto
new file mode 100644
index 000000000..2cae9c60e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/interned_data/interned_data.proto
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/android/network_trace.proto";
+import "protos/perfetto/trace/chrome/v8.proto";
+import "protos/perfetto/trace/gpu/gpu_render_stage_event.proto";
+import "protos/perfetto/trace/track_event/chrome_histogram_sample.proto";
+import "protos/perfetto/trace/track_event/debug_annotation.proto";
+import "protos/perfetto/trace/track_event/log_message.proto";
+import "protos/perfetto/trace/track_event/track_event.proto";
+import "protos/perfetto/trace/track_event/source_location.proto";
+import "protos/perfetto/trace/profiling/profile_common.proto";
+
+package perfetto.protos;
+
+// ------------------------------ DATA INTERNING: ------------------------------
+// Interning indexes are built up gradually by adding the entries contained in
+// each TracePacket of the same packet sequence (packets emitted by the same
+// producer and TraceWriter, see |trusted_packet_sequence_id|). Thus, packets
+// can only refer to interned data from other packets in the same sequence.
+//
+// The writer will emit new entries when it encounters new internable values
+// that aren't yet in the index. Data in current and subsequent TracePackets can
+// then refer to the entry by its position (interning ID, abbreviated "iid") in
+// its index. An interning ID with value 0 is considered invalid (not set).
+//
+// Because of the incremental build-up, the interning index will miss data when
+// TracePackets are lost, e.g. because a chunk was overridden in the central
+// ring buffer. To avoid invalidation of the whole trace in such a case, the
+// index is periodically reset (see SEQ_INCREMENTAL_STATE_CLEARED).
+// When packet loss occurs, the reader will only lose interning data up to the
+// next reset.
+// -----------------------------------------------------------------------------
+
+// Message that contains new entries for the interning indices of a packet
+// sequence.
+//
+// The writer will usually emit new entries in the same TracePacket that first
+// refers to them (since the last reset of interning state). They may also be
+// emitted proactively in advance of referring to them in later packets.
+//
+// Next reserved id: 8 (up to 15).
+// Next id: 36.
+message InternedData {
+  // TODO(eseckler): Replace iid fields inside interned messages with
+  // map<iid, message> type fields in InternedData.
+
+  // Each field's message type needs to specify an |iid| field, which is the ID
+  // of the entry in the field's interning index. Each field constructs its own
+  // index, thus interning IDs are scoped to the tracing session and field
+  // (usually as a counter for efficient var-int encoding), and optionally to
+  // the incremental state generation of the packet sequence.
+  repeated EventCategory event_categories = 1;
+  repeated EventName event_names = 2;
+  repeated DebugAnnotationName debug_annotation_names = 3;
+  repeated DebugAnnotationValueTypeName debug_annotation_value_type_names = 27;
+  repeated SourceLocation source_locations = 4;
+  repeated UnsymbolizedSourceLocation unsymbolized_source_locations = 28;
+  repeated LogMessageBody log_message_body = 20;
+  repeated HistogramName histogram_names = 25;
+
+  // Note: field IDs up to 15 should be used for frequent data only.
+
+  // Build IDs of exectuable files.
+  repeated InternedString build_ids = 16;
+  // Paths to executable files.
+  repeated InternedString mapping_paths = 17;
+  // Paths to source files.
+  repeated InternedString source_paths = 18;
+  // Names of functions used in frames below.
+  repeated InternedString function_names = 5;
+  // Symbols that were added to this trace after the fact.
+  repeated ProfiledFrameSymbols profiled_frame_symbols = 21;
+
+  // Executable files mapped into processes.
+  repeated Mapping mappings = 19;
+  // Frames of callstacks of a program.
+  repeated Frame frames = 6;
+  // A callstack of a program.
+  repeated Callstack callstacks = 7;
+
+  // Additional Vulkan information sent in a VulkanMemoryEvent message
+  repeated InternedString vulkan_memory_keys = 22;
+
+  // Graphics context of a render stage event.  This represent the GL
+  // context for an OpenGl app or the VkDevice for a Vulkan app.
+  repeated InternedGraphicsContext graphics_contexts = 23;
+
+  // Description of a GPU hardware queue or render stage.
+  repeated InternedGpuRenderStageSpecification gpu_specifications = 24;
+
+  // This is set when FtraceConfig.symbolize_ksyms = true.
+  // The id of each symbol the number that will be reported in ftrace events
+  // like sched_block_reason.caller and is obtained from a monotonic counter.
+  // The same symbol can have different indexes in different bundles.
+  // This is is NOT the real address. This is to avoid disclosing KASLR through
+  // traces.
+  repeated InternedString kernel_symbols = 26;
+
+  // Interned string values in the DebugAnnotation proto.
+  repeated InternedString debug_annotation_string_values = 29;
+
+  // Interned packet context for android.network_packets.
+  repeated NetworkPacketContext packet_context = 30;
+
+  // Interned name of a js function. We only intern js functions as there is a
+  // lot of duplication for them, but less so for other strings in the V8 data
+  // source.
+  repeated InternedV8String v8_js_function_name = 31;
+  // Js functions can be emitted multiple times for various compilation tiers,
+  // so it makes sense to deduplicate all this.
+  repeated InternedV8JsFunction v8_js_function = 32;
+  // Interned JS script (there is one associated with each JS function)
+  repeated InternedV8JsScript v8_js_script = 33;
+  // Interned Wasm script (there is one associated with each Wasm function)
+  repeated InternedV8WasmScript v8_wasm_script = 34;
+  // Every V8 event is associated with an isolate, intern the isolate to remove
+  // duplication.
+  repeated InternedV8Isolate v8_isolate = 35;
+
+  // Interned protolog strings args.
+  repeated InternedString protolog_string_args = 36;
+  // Interned protolog stacktraces.
+  repeated InternedString protolog_stacktrace = 37;
+}
diff --git a/src/libtracing/protos/perfetto/trace/memory_graph.proto b/src/libtracing/protos/perfetto/trace/memory_graph.proto
new file mode 100644
index 000000000..ec315fbc1
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/memory_graph.proto
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Message definitions for app-reported memory breakdowns. At the moment, this
+// is a Chrome-only tracing feature, historically known as 'memory-infra'. See
+// https://chromium.googlesource.com/chromium/src/+/master/docs/memory-infra/ .
+// This is unrelated to the native or java heap profilers (those protos live
+// in //protos/perfetto/trace/profiling/).
+
+message MemoryTrackerSnapshot {
+  // Memory snapshot of a process. The snapshot contains memory data that is
+  // from 2 different sources, namely system stats and instrumentation stats.
+  // The system memory usage stats come from the OS based on standard API
+  // available in the platform to query memory usage. The instrumentation stats
+  // are added by instrumenting specific piece of code which tracks memory
+  // allocations and deallocations made by a small sub-system within the
+  // application.
+  // The system stats of the global memory snapshot are recorded as part of
+  // ProcessStats and SmapsPacket fields in trace packet with the same
+  // timestamp.
+  message ProcessSnapshot {
+    // Process ID of the process
+    optional int32 pid = 1;
+
+    // Memory dumps are represented as a graph of memory nodes which contain
+    // statistics. To avoid double counting the same memory across different
+    // nodes, edges are used to mark nodes that account for the same memory. See
+    // this doc for examples of the usage:
+    // https://docs.google.com/document/d/1WGQRJ1sjJrfVkNcgPVY6frm64UqPc94tsxUOXImZUZI
+
+    // A single node in the memory graph.
+    message MemoryNode {
+      // Unique ID of the node across all processes involved in the global
+      // memory dump. The ID is only unique within this particular global dump
+      // identified by GlobalMemoryDumpPacket.global_dump_id.
+      optional uint64 id = 1;
+
+      // Absolute name is a unique name for the memory node within the process
+      // with ProcessMemoryDump.pid. The name can contain multiple parts
+      // separated by '/', which traces the edges of the node from the root
+      // node.
+      // Eg: "partition_allocator/array_buffers/buffer1" refers to the child
+      // node "buffer1" in a graph structure of:
+      //   root -> partition_allocator -> array_buffers -> buffer1.
+      optional string absolute_name = 2;
+
+      // A weak node means that the instrumentation that added the current node
+      // is unsure about the existence of the actual memory. Unless a "strong"
+      // (non-weak is default) node that has an edge to the current node exists
+      // in the current global dump, the current node will be discarded.
+      optional bool weak = 3;
+
+      // Size of the node in bytes, used to compute the effective size of the
+      // nodes without double counting.
+      optional uint64 size_bytes = 4;
+
+      // Entries in the memory node that contain statistics and additional
+      // debuggable information about the memory. The size of the node is
+      // tracked separately in the |size_bytes| field.
+      message MemoryNodeEntry {
+        optional string name = 1;
+
+        enum Units {
+          UNSPECIFIED = 0;
+          BYTES = 1;
+          COUNT = 2;
+        }
+        optional Units units = 2;
+
+        // Contains either one of uint64 or string value.
+        optional uint64 value_uint64 = 3;
+        optional string value_string = 4;
+      }
+      repeated MemoryNodeEntry entries = 5;
+    }
+    repeated MemoryNode allocator_dumps = 2;
+
+    // A directed edge that connects any 2 nodes in the graph above. These are
+    // in addition to the inherent edges added due to the tree structure of the
+    // node's absolute names.
+    // Node with id |source_id| owns the node with id |target_id|, and has the
+    // effect of attributing the memory usage of target to source. |importance|
+    // is optional and relevant only for the cases of co-ownership, where it
+    // acts as a z-index: the owner with the highest importance will be
+    // attributed target's memory.
+    message MemoryEdge {
+      optional uint64 source_id = 1;
+      optional uint64 target_id = 2;
+      optional uint32 importance = 3;
+      optional bool overridable = 4;
+    }
+    repeated MemoryEdge memory_edges = 3;
+  }
+
+  // Unique ID that represents the global memory dump.
+  optional uint64 global_dump_id = 1;
+
+  enum LevelOfDetail {
+    DETAIL_FULL = 0;
+    DETAIL_LIGHT = 1;
+    DETAIL_BACKGROUND = 2;
+  }
+  optional LevelOfDetail level_of_detail = 2;
+
+  repeated ProcessSnapshot process_memory_dumps = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/perfetto/perfetto_metatrace.proto b/src/libtracing/protos/perfetto/trace/perfetto/perfetto_metatrace.proto
new file mode 100644
index 000000000..56caf9f72
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/perfetto/perfetto_metatrace.proto
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Used to trace the execution of perfetto itself.
+message PerfettoMetatrace {
+  // See base/metatrace_events.h for definitions.
+  oneof record_type {
+    uint32 event_id = 1;
+    uint32 counter_id = 2;
+
+    // For trace processor metatracing.
+    string event_name = 8;
+    uint64 event_name_iid = 11;
+
+    string counter_name = 9;
+  }
+  message Arg {
+    oneof key_or_interned_key {
+      string key = 1;
+      uint64 key_iid = 3;
+    }
+    oneof value_or_interned_value {
+      string value = 2;
+      uint64 value_iid = 4;
+    }
+  }
+
+  // Only when using |event_id|.
+  optional uint64 event_duration_ns = 3;
+
+  // Only when using |counter_id|.
+  optional int32 counter_value = 4;
+
+  // ID of the thread that emitted the event.
+  optional uint32 thread_id = 5;
+
+  // If true the meta-tracing ring buffer had overruns and hence some data is
+  // missing from this point.
+  optional bool has_overruns = 6;
+
+  // Args for the event.
+  repeated Arg args = 7;
+
+  // Interned strings corresponding to the |event_name_iid|, |key_iid| and
+  // |value_iid| above.
+  message InternedString {
+    optional uint64 iid = 1;
+    optional string value = 2;
+  };
+  repeated InternedString interned_strings = 10;
+}
diff --git a/src/libtracing/protos/perfetto/trace/perfetto/tracing_service_event.proto b/src/libtracing/protos/perfetto/trace/perfetto/tracing_service_event.proto
new file mode 100644
index 000000000..0573be073
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/perfetto/tracing_service_event.proto
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Events emitted by the tracing service.
+message TracingServiceEvent {
+  oneof event_type {
+    // When each of the following booleans are set to true, they report the
+    // point in time (through TracePacket's timestamp) where the condition
+    // they describe happened.
+    // The order of the booleans below matches the timestamp ordering
+    // they would generally be expected to have.
+
+    // Emitted when we start tracing and specifically, this will be before any
+    // producer is notified about the existence of this trace. This is always
+    // emitted before the all_data_sources_started event. This event is also
+    // guaranteed to be seen (byte-offset wise) before any data packets from
+    // producers.
+    bool tracing_started = 2;
+
+    // Emitted after all data sources saw the start event and ACKed it.
+    // This identifies the point in time when it's safe to assume that all data
+    // sources have been recording events.
+    bool all_data_sources_started = 1;
+
+    // Emitted when all data sources have been flushed successfully or with an
+    // error (including timeouts). This can generally happen many times over the
+    // course of the trace.
+    bool all_data_sources_flushed = 3;
+
+    // Emitted when reading back the central tracing buffers has been completed.
+    // If |write_into_file| is specified, this can happen many times over the
+    // course of the trace.
+    bool read_tracing_buffers_completed = 4;
+
+    // Emitted after tracing has been disabled and specifically, this will be
+    // after all packets from producers have been included in the central
+    // tracing buffer.
+    bool tracing_disabled = 5;
+
+    // Emitted if perfetto --save-for-bugreport was invoked while the current
+    // tracing session was running and it had the highest bugreport_score. In
+    // this case the original consumer will see a nearly empty trace, because
+    // the contents are routed onto the bugreport file. This event flags the
+    // situation explicitly. Traces that contain this marker should be discarded
+    // by test infrastructures / pipelines.
+    // Deprecated since Android U, where --save-for-bugreport uses
+    // non-destructive cloning.
+    bool seized_for_bugreport = 6;
+  }
+}
diff --git a/src/libtracing/protos/perfetto/trace/perfetto_trace.proto b/src/libtracing/protos/perfetto/trace/perfetto_trace.proto
new file mode 100644
index 000000000..70cf40379
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/perfetto_trace.proto
@@ -0,0 +1,14990 @@
+// AUTOGENERATED - DO NOT EDIT
+// ---------------------------
+// This file has been generated by
+// AOSP://external/perfetto/tools/gen_merged_protos
+// merging the perfetto config protos.
+// This fused proto is intended to be copied in:
+//  - Android tree, for statsd.
+//  - Google internal repos.
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+option go_package = "github.com/google/perfetto/perfetto_proto";
+
+// Begin of protos/perfetto/common/ftrace_descriptor.proto
+
+message FtraceDescriptor {
+  message AtraceCategory {
+    optional string name = 1;
+    optional string description = 2;
+  }
+
+  // Report the available atrace categories.
+  //
+  // Used by Traceur via `perfetto --query`.
+  repeated AtraceCategory atrace_categories = 1;
+}
+
+// End of protos/perfetto/common/ftrace_descriptor.proto
+
+// Begin of protos/perfetto/common/gpu_counter_descriptor.proto
+
+// Description of GPU counters.
+// This message is sent by a GPU counter producer to specify the counters
+// available in the hardware.
+/*
+message GpuCounterDescriptor {
+  // Logical groups for a counter.  This is used in the UI to present the
+  // related counters together.
+  enum GpuCounterGroup {
+    UNCLASSIFIED = 0;
+    SYSTEM = 1;
+    VERTICES = 2;
+    FRAGMENTS = 3;
+    PRIMITIVES = 4;
+    // Includes counters relating to caching and bandwidth.
+    MEMORY = 5;
+    COMPUTE = 6;
+  }
+
+  message GpuCounterSpec {
+    optional uint32 counter_id = 1;
+    optional string name = 2;
+    optional string description = 3;
+    // MeasureUnit unit (deprecated)
+    reserved 4;
+    oneof peak_value {
+      int64 int_peak_value = 5;
+      double double_peak_value = 6;
+    }
+    repeated MeasureUnit numerator_units = 7;
+    repeated MeasureUnit denominator_units = 8;
+    optional bool select_by_default = 9;
+    repeated GpuCounterGroup groups = 10;
+  }
+  repeated GpuCounterSpec specs = 1;
+
+  // Allow producer to group counters into block to represent counter islands.
+  // A capacity may be specified to indicate the number of counters that can be
+  // enable simultaneously in that block.
+  message GpuCounterBlock {
+    // required. Unique ID for the counter group.
+    optional uint32 block_id = 1;
+    // optional. Number of counters supported by the block. No limit if unset.
+    optional uint32 block_capacity = 2;
+    // optional. Name of block.
+    optional string name = 3;
+    // optional. Description for the block.
+    optional string description = 4;
+    // list of counters that are part of the block.
+    repeated uint32 counter_ids = 5;
+  }
+  repeated GpuCounterBlock blocks = 2;
+
+  // optional.  Minimum sampling period supported by the producer in
+  // nanoseconds.
+  optional uint64 min_sampling_period_ns = 3;
+
+  // optional.  Maximum sampling period supported by the producer in
+  // nanoseconds.
+  optional uint64 max_sampling_period_ns = 4;
+
+  // optional.  The producer supports counter sampling by instrumenting the
+  // command buffer.
+  optional bool supports_instrumented_sampling = 5;
+
+  // next id: 41
+  enum MeasureUnit {
+    NONE = 0;
+
+    BIT = 1;
+    KILOBIT = 2;
+    MEGABIT = 3;
+    GIGABIT = 4;
+    TERABIT = 5;
+    PETABIT = 6;
+
+    BYTE = 7;
+    KILOBYTE = 8;
+    MEGABYTE = 9;
+    GIGABYTE = 10;
+    TERABYTE = 11;
+    PETABYTE = 12;
+
+    HERTZ = 13;
+    KILOHERTZ = 14;
+    MEGAHERTZ = 15;
+    GIGAHERTZ = 16;
+    TERAHERTZ = 17;
+    PETAHERTZ = 18;
+
+    NANOSECOND = 19;
+    MICROSECOND = 20;
+    MILLISECOND = 21;
+    SECOND = 22;
+    MINUTE = 23;
+    HOUR = 24;
+
+    VERTEX = 25;
+    PIXEL = 26;
+    TRIANGLE = 27;
+    PRIMITIVE = 38;
+    FRAGMENT = 39;
+
+    MILLIWATT = 28;
+    WATT = 29;
+    KILOWATT = 30;
+
+    JOULE = 31;
+    VOLT = 32;
+    AMPERE = 33;
+
+    CELSIUS = 34;
+    FAHRENHEIT = 35;
+    KELVIN = 36;
+
+    // Values should be out of 100.
+    PERCENT = 37;
+
+    INSTRUCTION = 40;
+  }
+}
+*/
+
+// End of protos/perfetto/common/gpu_counter_descriptor.proto
+
+// Begin of protos/perfetto/common/track_event_descriptor.proto
+
+message TrackEventCategory {
+  optional string name = 1;
+  optional string description = 2;
+  repeated string tags = 3;
+}
+
+message TrackEventDescriptor {
+  repeated TrackEventCategory available_categories = 1;
+}
+
+// End of protos/perfetto/common/track_event_descriptor.proto
+
+// Begin of protos/perfetto/common/data_source_descriptor.proto
+
+// This message is sent from Producer(s) to the tracing Service when registering
+// to advertise their capabilities. It describes the structure of tracing
+// protos that will be produced by the data source and the supported filters.
+message DataSourceDescriptor {
+  // e.g., "linux.ftrace", "chromium.tracing"
+  optional string name = 1;
+
+  // When non-zero, this is a unique ID within the scope of the Producer for
+  // this data source (it is NOT globally unique). This is useful to
+  // differentiate between data sources with matching names when calling
+  // UpdateDataSource(). This field has been introduced in November 2021
+  // (v22, Android T) and is not supported on older versions.
+  optional uint64 id = 7;
+
+  // When true the data source is expected to ack the stop request through the
+  // NotifyDataSourceStopped() IPC. This field has been introduced after
+  // Android P in Jul 2018 and is not supported on older versions.
+  optional bool will_notify_on_stop = 2;
+
+  // When true the data source is expected to ack the start request through the
+  // NotifyDataSourceStarted() IPC. This field has been introduced after
+  // Android P in March 2019 and is not supported on older versions.
+  optional bool will_notify_on_start = 3;
+
+  // If true, opt into receiving the ClearIncrementalState() IPC. This should be
+  // set if the data source writes packets that refer to previous trace
+  // contents, and knows how to stop referring to the already-emitted data.
+  optional bool handles_incremental_state_clear = 4;
+
+  // If true, indicates that the data source does nothing upon Flush. This
+  // allows the service to reduce the flush-related IPC traffic and better deal
+  // with frozen producers (see go/perfetto-frozen). This is usually the case
+  // for data sources like 'track_event' that don't have access to the various
+  // thread task runners to post a flush task and rely purely on server-side
+  // scraping.
+  // Introduced in v39 / Android V.
+  optional bool no_flush = 9;
+
+  // Optional specification about available GPU counters.
+  // optional GpuCounterDescriptor gpu_counter_descriptor = 5 [lazy = true];
+
+  optional TrackEventDescriptor track_event_descriptor = 6 [lazy = true];
+
+  optional FtraceDescriptor ftrace_descriptor = 8 [lazy = true];
+}
+
+// End of protos/perfetto/common/data_source_descriptor.proto
+
+// Begin of protos/perfetto/common/tracing_service_state.proto
+
+// Reports the state of the tracing service. Used to gather details about the
+// data sources connected.
+// See ConsumerPort::QueryServiceState().
+message TracingServiceState {
+  // Describes a producer process.
+  message Producer {
+    // Unique ID of the producer (monotonic counter).
+    optional int32 id = 1;
+
+    // Typically matches the process name.
+    optional string name = 2;
+
+    // Unix pid of the remote process. Supported only on Linux-based systems.
+    // Introduced in v24 / Android T.
+    optional int32 pid = 5;
+
+    // Unix uid of the remote process.
+    optional int32 uid = 3;
+
+    // The version of the client library used by the producer.
+    // This is a human readable string with and its format varies depending on
+    // the build system and the repo (standalone vs AOSP).
+    // This is intended for human debugging only.
+    optional string sdk_version = 4;
+  }
+
+  // Describes a data source registered by a producer. Data sources are listed
+  // regardless of the fact that they are being used or not.
+  message DataSource {
+    // Descriptor passed by the data source when calling RegisterDataSource().
+    optional DataSourceDescriptor ds_descriptor = 1;
+
+    // ID of the producer, as per Producer.id.
+    optional int32 producer_id = 2;
+  }
+
+  message TracingSession {
+    // The TracingSessionID.
+    optional uint64 id = 1;
+
+    // The Unix uid of the consumer that started the session.
+    // This is meaningful only if the caller is root. In all other cases only
+    // tracing sessions that match the caller UID will be displayed.
+    optional int32 consumer_uid = 2;
+
+    // Internal state of the tracing session.
+    // These strings are FYI only and subjected to change.
+    optional string state = 3;
+
+    // The unique_session_name as set in the trace config (might be empty).
+    optional string unique_session_name = 4;
+
+    // The number and size of each buffer.
+    repeated uint32 buffer_size_kb = 5;
+
+    // Duration, as specified in the TraceConfig.duration_ms.
+    optional uint32 duration_ms = 6;
+
+    // Number of data sources involved in the session.
+    optional uint32 num_data_sources = 7;
+
+    // Time when the session was started, in the CLOCK_REALTIME domain.
+    // Available only on Linux-based systems.
+    optional int64 start_realtime_ns = 8;
+
+    // The fields below have been introduced in v42.
+
+    // The bugreport_score, as set in TraceConfig.bugreport_score.
+    optional int32 bugreport_score = 9;
+
+    // As per TraceConfig.bugreport_filename.
+    optional string bugreport_filename = 10;
+
+    // If true, the session is in the STARTED state. If false the session is in
+    // any other state (see `state` field).
+    optional bool is_started = 11;
+  }
+
+  // Lists all the producers connected.
+  repeated Producer producers = 1;
+
+  // Lists the data sources available.
+  repeated DataSource data_sources = 2;
+
+  // Lists the tracing sessions active AND owned by a consumer that has the same
+  // UID of the caller (or all of them if the caller is root).
+  // Introduced in v24 / Android T.
+  repeated TracingSession tracing_sessions = 6;
+
+  // This is always set to true from v24 and beyond. This flag is only used to
+  // tell the difference between: (1) talking to a recent service which happens
+  // to have no tracing session active; (2) talking to an older version of the
+  // service which will never report any tracing session.
+  optional bool supports_tracing_sessions = 7;
+
+  // Total number of tracing sessions.
+  optional int32 num_sessions = 3;
+
+  // Number of tracing sessions in the started state. Always <= num_sessions.
+  optional int32 num_sessions_started = 4;
+
+  // The version of traced (the same returned by `traced --version`).
+  // This is a human readable string with and its format varies depending on
+  // the build system and the repo (standalone vs AOSP).
+  // This is intended for human debugging only.
+  optional string tracing_service_version = 5;
+}
+
+// End of protos/perfetto/common/tracing_service_state.proto
+
+// Begin of protos/perfetto/common/builtin_clock.proto
+
+enum BuiltinClock {
+  BUILTIN_CLOCK_UNKNOWN = 0;
+  BUILTIN_CLOCK_REALTIME = 1;
+  BUILTIN_CLOCK_REALTIME_COARSE = 2;
+  BUILTIN_CLOCK_MONOTONIC = 3;
+  BUILTIN_CLOCK_MONOTONIC_COARSE = 4;
+  BUILTIN_CLOCK_MONOTONIC_RAW = 5;
+  BUILTIN_CLOCK_BOOTTIME = 6;
+  BUILTIN_CLOCK_TSC = 9;
+  BUILTIN_CLOCK_MAX_ID = 63;
+
+  reserved 7, 8;
+}
+
+// End of protos/perfetto/common/builtin_clock.proto
+
+// Begin of protos/perfetto/config/android/android_game_intervention_list_config.proto
+
+// Data source that lists game modes and game interventions of games
+// on an Android device.
+message AndroidGameInterventionListConfig {
+  // If not empty, emit info about only the following list of package names
+  // (exact match, no regex). Otherwise, emit info about all packages.
+  repeated string package_name_filter = 1;
+}
+
+// End of protos/perfetto/config/android/android_game_intervention_list_config.proto
+
+// Begin of protos/perfetto/config/android/android_input_event_config.proto
+
+// Custom configuration for the "android.input.inputevent" data source.
+//
+// NOTE: Input traces can only be taken on debuggable (userdebug/eng) builds!
+//
+// Next ID: 5
+message AndroidInputEventConfig {
+
+    // Trace modes are tracing presets that are included in the system.
+    enum TraceMode {
+        // Preset mode for maximal tracing.
+        // WARNING: This will bypass all privacy measures on debuggable builds, and will record all
+        //          input events processed by the system, regardless of the context in which they
+        //          were processed. It should only be used for tracing on a local device or for
+        //          tests. It should NEVER be used for field tracing.
+        TRACE_MODE_TRACE_ALL = 0;
+        // Use the tracing rules defined in this config to specify what events to trace.
+        TRACE_MODE_USE_RULES = 1;
+    }
+
+    // The tracing mode to use. If unspecified, it will default to TRACE_MODE_USE_RULES.
+    optional TraceMode mode = 1;
+
+    // The level of tracing that should be applied to an event.
+    enum TraceLevel {
+        // Do not trace the input event.
+        TRACE_LEVEL_NONE = 0;
+        // Trace the event as a redacted event, where certain sensitive fields are omitted from
+        // the trace, including the coordinates of pointer events and the key/scan codes of key
+        // events.
+        TRACE_LEVEL_REDACTED = 1;
+        // Trace the complete event.
+        TRACE_LEVEL_COMPLETE = 2;
+    }
+
+    // A rule that specifies the TraceLevel for an event based on matching conditions.
+    // All matchers in the rule are optional. To trigger this rule, an event must match all
+    // of its specified matchers (i.e. the matchers function like a series of conditions connected
+    // by a logical 'AND' operator). A rule with no specified matchers will match all events.
+    // Next ID: 6
+    message TraceRule {
+        // The trace level to be used for events that trigger this rule.
+        // If unspecified, TRACE_LEVEL_NONE will be used by default.
+        optional TraceLevel trace_level = 1;
+
+        // --- Optional Matchers ---
+
+        // Package matchers
+        //
+        // Respectively matches if all or any of the target apps for this event are contained in
+        // the specified list of package names.
+        //
+        // Intended usage:
+        //   - Use match_all_packages to selectively allow tracing for the listed packages.
+        //   - Use match_any_packages to selectively deny tracing for certain packages.
+        //
+        // WARNING: Great care must be taken when designing rules for field tracing!
+        //          This is because each event is almost always sent to more than one app.
+        //              For example, when allowing tracing for a package that has a spy window
+        //          over the display (e.g. SystemUI) using match_any_packages, essentially all
+        //          input will be recorded on that display. This is because the events will be sent
+        //          to the spy as well as the foreground app, and regardless of what the foreground
+        //          app is, the event will end up being traced.
+        //              Alternatively, when attempting to block tracing for specific packages using
+        //          match_all_packages, no events will likely be blocked. This is because the event
+        //          will also be sent to other apps (such as, but not limited to, ones with spy
+        //          windows), so the matcher will not match unless all other targets are also
+        //          listed under the match_all_packages list.
+        repeated string match_all_packages = 2;
+        repeated string match_any_packages = 3;
+
+        // Matches if the event is secure, which means that at least one of the targets of
+        // this event is using the window flag FLAG_SECURE.
+        optional bool match_secure = 4;
+
+        // Matches if there was an active IME connection while this event was being processed.
+        optional bool match_ime_connection_active = 5;
+    }
+
+    // The list of rules to use to determine the trace level of events.
+    // Each event will be traced using the TraceLevel of the first rule that it triggers
+    // from this list. The rules are evaluated in the order in which they are specified.
+    // If an event does not match any of the rules, TRACE_LEVEL_NONE will be used by default.
+    repeated TraceRule rules = 2;
+
+    // --- Control flags ---
+
+    // Trace input events processed by the system as they are being dispatched
+    // to application windows. All trace rules will apply.
+    //   - If this flag is used without enabling trace_dispatcher_window_dispatch, it will
+    //     trace InputDispatcher's inbound events (which does not include events synthesized
+    //     within InputDispatcher) that match the rules.
+    //   - If used with trace_dispatcher_window_dispatch, all inbound and outbound events
+    //     matching the rules, including all events synthesized within InputDispatcher,
+    //     will be traced.
+    optional bool trace_dispatcher_input_events = 3;
+
+    // Trace details about which windows the system is sending each input event to.
+    // All trace rules will apply.
+    optional bool trace_dispatcher_window_dispatch = 4;
+}
+
+// End of protos/perfetto/config/android/android_input_event_config.proto
+
+// Begin of protos/perfetto/common/android_log_constants.proto
+
+// Values from NDK's android/log.h.
+enum AndroidLogId {
+  // MAIN.
+  LID_DEFAULT = 0;
+
+  LID_RADIO = 1;
+  LID_EVENTS = 2;
+  LID_SYSTEM = 3;
+  LID_CRASH = 4;
+  LID_STATS = 5;
+  LID_SECURITY = 6;
+  LID_KERNEL = 7;
+}
+
+enum AndroidLogPriority {
+  PRIO_UNSPECIFIED = 0;
+
+  // _DEFAULT, but should never be seen in logs.
+  PRIO_UNUSED = 1;
+
+  PRIO_VERBOSE = 2;
+  PRIO_DEBUG = 3;
+  PRIO_INFO = 4;
+  PRIO_WARN = 5;
+  PRIO_ERROR = 6;
+  PRIO_FATAL = 7;
+}
+
+// End of protos/perfetto/common/android_log_constants.proto
+
+// Begin of protos/perfetto/config/android/android_log_config.proto
+
+message AndroidLogConfig {
+  repeated AndroidLogId log_ids = 1;
+
+  // Was |poll_ms|, deprecated.
+  reserved 2;
+
+  // If set ignores all log messages whose prio is < the given value.
+  optional AndroidLogPriority min_prio = 3;
+
+  // If non-empty ignores all log messages whose tag doesn't match one of the
+  // specified values.
+  repeated string filter_tags = 4;
+}
+
+// End of protos/perfetto/config/android/android_log_config.proto
+
+// Begin of protos/perfetto/config/android/android_polled_state_config.proto
+
+// Data source that polls for display state. This should only be used for
+// backward-compatibility; AndroidSystemPropertyConfig should be preferred.
+message AndroidPolledStateConfig {
+  // Frequency of polling. If absent the state will be recorded once, at the
+  // start of the trace.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 poll_ms = 1;
+}
+
+// End of protos/perfetto/config/android/android_polled_state_config.proto
+
+// Begin of protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto
+
+// Data source that controls the system properties used to guard initialization
+// of track_event producers (i.e. Skia) in apps using HWUI, and certain
+// processes like SurfaceFlinger.
+//
+// This data source only tells Skia to initialized the Perfetto SDK and start
+// routing data to the Track Event system instead of ATrace. For those events
+// to actually show up in a trace, the track_event data source must be used as
+// well. The Perfetto SDK cannot be de-initialized, so some long-lived apps and
+// processes may need to be restarted for Skia to revert to using ATrace if
+// Track Events are no longer desired.
+//
+// In addition to switching Skia to use Perfetto's track_event data source,
+// this "guard" also controls Skia's "broad tracing", which removes Skia's
+// internal tracing constraints and allows the track_event config to specify
+// which categories should be traced. Filtering to the "skia.always" category
+// *tag* in a track_event config can be used to re-enable the standard
+// constraints typically used with ATrace.
+//
+// Data source name: android.sdk_sysprop_guard
+// Introduced in Android 14 (U) QPR1.
+// Next id: 4
+message AndroidSdkSyspropGuardConfig {
+  // If true, configures SurfaceFlinger to initialize Skia's Perfetto
+  // integration with the track_event data source in RenderEngine.
+  // If false or omitted, the simpler ATrace fallback is used.
+  //
+  // NOTE: once enabled, Skia will only revert to ATrace if SurfaceFlinger is
+  // restarted.
+  //
+  // Specifically this sets the following system properties:
+  //   - debug.tracing.ctl.renderengine.skia_tracing_enabled
+  //   - debug.tracing.ctl.renderengine.skia_use_perfetto_track_events
+  //
+  // Does not affect actual track_event data *collection*, which must be
+  // configured seperately.
+  optional bool surfaceflinger_skia_track_events = 1;
+
+  // If true, configures HWUI apps to initialize Skia's Perfetto integration
+  // with the track_event data source. hwui_package_name_filter
+  // can be used to control which apps are affected.
+  // If false or omitted, the simpler ATrace fallback is used.
+  //
+  // NOTE: once enabled, Skia will only revert to ATrace if the app is
+  // restarted.
+  //
+  // ATTENTION: affects ALL HWUI APPS if hwui_package_name_filter is not set!
+  // If filtering is NOT set, this controls these GLOBAL system properties:
+  //   - debug.tracing.ctl.hwui.skia_tracing_enabled
+  //   - debug.tracing.ctl.hwui.skia_use_perfetto_track_events
+  // If filtering IS set, this controls these APP-SPECIFIC system properties,
+  // for each package listed in the filter:
+  //   - debug.tracing.ctl.hwui.skia_tracing_enabled.<package.name>
+  //   - debug.tracing.ctl.hwui.skia_use_perfetto_track_events.<package.name>
+  //
+  // Does not affect actual track_event data *collection*, which must be
+  // configured seperately.
+  optional bool hwui_skia_track_events = 2;
+
+  // If non-empty, hwui_skia_track_events applies to only the packages listed.
+  // Otherwise, hwui_skia_track_events applies globally to all HWUI apps.
+  repeated string hwui_package_name_filter = 3;
+}
+
+// End of protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto
+
+// Begin of protos/perfetto/config/android/android_system_property_config.proto
+
+// Data source that polls for system properties.
+message AndroidSystemPropertyConfig {
+  // Frequency of polling. If absent the state will be recorded once, at the
+  // start of the trace.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 poll_ms = 1;
+
+  // Properties to poll. All property names must start with "debug.tracing.".
+  repeated string property_name = 2;
+}
+
+// End of protos/perfetto/config/android/android_system_property_config.proto
+
+// Begin of protos/perfetto/config/android/network_trace_config.proto
+
+// Network tracing data source that records details on all packets sent or
+// received by the network.
+message NetworkPacketTraceConfig {
+  // Polling frequency in milliseconds. Network tracing writes to a fixed size
+  // ring buffer. The polling interval should be such that the ring buffer is
+  // unlikely to fill in that interval (or that filling is an acceptable risk).
+  // The minimum polling rate is 100ms (values below this are ignored).
+  // Introduced in Android 14 (U).
+  optional uint32 poll_ms = 1;
+
+  // The aggregation_threshold is the number of packets at which an event will
+  // switch from per-packet details to aggregate details. For example, a value
+  // of 50 means that if a particular event (grouped by the unique combinations
+  // of metadata fields: {interface, direction, uid, etc}) has fewer than 50
+  // packets, the exact timestamp and length are recorded for each packet. If
+  // there were 50 or more packets in an event, it would only record the total
+  // duration, packets, and length. A value of zero or unspecified will always
+  /// record per-packet details. A value of 1 always records aggregate details.
+  optional uint32 aggregation_threshold = 2;
+
+  // Specifies the maximum number of packet contexts to intern at a time. This
+  // prevents the interning table from growing too large and controls whether
+  // interning is enabled or disabled (a value of zero disables interning and
+  // is the default). When a data sources interning table reaches this amount,
+  // packet contexts will be inlined into NetworkPacketEvents.
+  optional uint32 intern_limit = 3;
+
+  // The following fields specify whether certain fields should be dropped from
+  // the output. Dropping fields improves normalization results, reduces the
+  // size of the interning table, and slightly reduces event size.
+  optional bool drop_local_port = 4;
+  optional bool drop_remote_port = 5;
+  optional bool drop_tcp_flags = 6;
+}
+
+// End of protos/perfetto/config/android/network_trace_config.proto
+
+// Begin of protos/perfetto/config/android/packages_list_config.proto
+
+// Data source that lists details (such as version code) about packages on an
+// Android device.
+message PackagesListConfig {
+  // If not empty, emit info about only the following list of package names
+  // (exact match, no regex). Otherwise, emit info about all packages.
+  repeated string package_name_filter = 1;
+}
+
+// End of protos/perfetto/config/android/packages_list_config.proto
+
+// Begin of protos/perfetto/common/protolog_common.proto
+
+enum ProtoLogLevel {
+  PROTOLOG_LEVEL_UNDEFINED = 0;
+  PROTOLOG_LEVEL_DEBUG = 1;
+  PROTOLOG_LEVEL_VERBOSE = 2;
+  PROTOLOG_LEVEL_INFO = 3;
+  PROTOLOG_LEVEL_WARN = 4;
+  PROTOLOG_LEVEL_ERROR = 5;
+  PROTOLOG_LEVEL_WTF = 6;
+}
+// End of protos/perfetto/common/protolog_common.proto
+
+// Begin of protos/perfetto/config/android/protolog_config.proto
+
+// Custom configuration for the "android.protolog" data source.
+// ProtoLog is a logging mechanism that is intented to be more efficient than
+// logcat. This configures what logs to capture in the tracing instance.
+message ProtoLogConfig {
+  enum TracingMode {
+    // When using the DEFAULT tracing mode, only log groups and levels specified
+    // in the group_overrides are traced.
+    DEFAULT = 0;
+    // When using the ENABLE_ALL tracing mode, all log groups and levels are
+    // traced, unless specified in the group_overrides.
+    ENABLE_ALL = 1;
+  }
+
+  // Specified the configurations for each of the logging groups. If none is
+  // specified for a group the defaults will be used.
+  repeated ProtoLogGroup group_overrides = 1;
+  // Specified what tracing mode to use for the tracing instance.
+  optional TracingMode tracing_mode = 2;
+}
+
+message ProtoLogGroup {
+  // The ProtoLog group name this configuration entry applies to.
+  optional string group_name = 1;
+  // Specify the level from which to start capturing protologs.
+  // e.g. if ProtoLogLevel.WARN is specified only warning, errors and fatal log
+  // message will be traced.
+  optional ProtoLogLevel log_from = 2;
+  // When set to true we will collect the stacktrace for each protolog message
+  // in this group that we are tracing.
+  optional bool collect_stacktrace = 3;
+}
+
+// End of protos/perfetto/config/android/protolog_config.proto
+
+// Begin of protos/perfetto/config/android/surfaceflinger_layers_config.proto
+
+// Custom configuration for the "android.surfaceflinger.layers" data source.
+message SurfaceFlingerLayersConfig {
+  enum Mode {
+    MODE_UNSPECIFIED = 0;
+
+    // Trace layers snapshots. A snapshot is taken every time a layers change
+    // occurs.
+    MODE_ACTIVE = 1;
+
+    // Generate layers snapshots from the transactions kept in the
+    // SurfaceFlinger's internal ring buffer.
+    // The layers snapshots generation occurs when this data source is flushed.
+    MODE_GENERATED = 2;
+
+    // Trace a single layers snapshot.
+    MODE_DUMP = 3;
+
+    // Default mode (applied by SurfaceFlinger if no mode is specified).
+    // Same as MODE_GENERATED, but triggers the layers snapshots generation only when a bugreport
+    // is taken.
+    MODE_GENERATED_BUGREPORT_ONLY = 4;
+  }
+  optional Mode mode = 1;
+
+  enum TraceFlag {
+    TRACE_FLAG_UNSPECIFIED = 0;
+    TRACE_FLAG_INPUT = 0x02;
+    TRACE_FLAG_COMPOSITION = 0x04;
+    TRACE_FLAG_EXTRA = 0x08;
+    TRACE_FLAG_HWC = 0x10;
+    TRACE_FLAG_BUFFERS = 0x20;
+    TRACE_FLAG_VIRTUAL_DISPLAYS = 0x40;
+
+    // INPUT | COMPOSITION | EXTRA
+    TRACE_FLAG_ALL = 0x0e;
+  }
+  repeated TraceFlag trace_flags = 2;
+}
+
+// End of protos/perfetto/config/android/surfaceflinger_layers_config.proto
+
+// Begin of protos/perfetto/config/android/surfaceflinger_transactions_config.proto
+
+// Custom configuration for the "android.surfaceflinger.transactions" data
+// source.
+message SurfaceFlingerTransactionsConfig {
+  enum Mode {
+    MODE_UNSPECIFIED = 0;
+
+    // Default mode (applied by SurfaceFlinger if no mode is specified).
+    // SurfaceFlinger writes its internal ring buffer of transactions every time
+    // the data source is flushed. The ring buffer contains the SurfaceFlinger's
+    // initial state and the latest transactions.
+    MODE_CONTINUOUS = 1;
+
+    // SurfaceFlinger writes the initial state and then each incoming
+    // transaction until the data source is stopped.
+    MODE_ACTIVE = 2;
+  }
+  optional Mode mode = 1;
+}
+
+// End of protos/perfetto/config/android/surfaceflinger_transactions_config.proto
+
+// Begin of protos/perfetto/config/chrome/chrome_config.proto
+
+message ChromeConfig {
+  optional string trace_config = 1;
+
+  // When enabled, the data source should only fill in fields in the output that
+  // are not potentially privacy sensitive.
+  optional bool privacy_filtering_enabled = 2;
+
+  // Instead of emitting binary protobuf, convert the trace data to the legacy
+  // JSON format. Note that the trace data will still be returned as a series of
+  // TracePackets, but the embedded data will be JSON instead of serialized
+  // protobuf.
+  optional bool convert_to_legacy_json = 3;
+
+  // Priority of the tracing session client. A higher priority session may
+  // preempt a lower priority one in configurations where concurrent sessions
+  // aren't supported.
+  enum ClientPriority {
+    UNKNOWN = 0;
+    BACKGROUND = 1;
+    USER_INITIATED = 2;
+  }
+  optional ClientPriority client_priority = 4;
+
+  // Applicable only when using legacy JSON format.
+  // If |json_agent_label_filter| is not empty, only data pertaining to
+  // the specified tracing agent label (e.g. "traceEvents") will be returned.
+  optional string json_agent_label_filter = 5;
+}
+
+// End of protos/perfetto/config/chrome/chrome_config.proto
+
+// Begin of protos/perfetto/config/chrome/v8_config.proto
+
+message V8Config {
+  // Whether to log the actual content of scripts (e.g. content of the JS file
+  // that was compiled to generate code).
+  // ATTENTION: This could considerably increase the size of the resuling trace
+  //            file.
+  optional bool log_script_sources = 1;
+  // Whether to log the generated code for jitted functions (machine code or
+  // bytecode).
+  // ATTENTION: This could considerably increase the size of the resuling trace
+  //            file.
+  optional bool log_instructions = 2;
+}
+
+// End of protos/perfetto/config/chrome/v8_config.proto
+
+// Begin of protos/perfetto/config/etw/etw_config.proto
+
+// Proto definition based on the struct _EVENT_TRACE_PROPERTIES definition
+// See: https://learn.microsoft.com/en-us/windows/win32/api/evntrace/
+// ns-evntrace-event_trace_properties
+message EtwConfig {
+  // The KernelFlag represent list of kernel flags that we are intrested in.
+  // To get a more extensive list run 'xperf -providers k'.
+  enum KernelFlag {
+    CSWITCH = 0;
+    DISPATCHER = 1;
+  }
+
+  // The kernel_flags determines the flags that will be used by the etw tracing
+  // session. These kernel flags have been built to expose the useful events
+  // captured from the kernel mode only.
+  repeated KernelFlag kernel_flags = 1;
+}
+// End of protos/perfetto/config/etw/etw_config.proto
+
+// Begin of protos/perfetto/config/ftrace/ftrace_config.proto
+
+// Next id: 28
+message FtraceConfig {
+  // Ftrace events to record, example: "sched/sched_switch".
+  repeated string ftrace_events = 1;
+  // Android-specific event categories:
+  repeated string atrace_categories = 2;
+  repeated string atrace_apps = 3;
+
+  // Size of each per-cpu kernel ftrace ring buffer.
+  // Not guaranteed if there are multiple concurrent tracing sessions, as the
+  // buffers cannot be resized without pausing recording in the kernel.
+  optional uint32 buffer_size_kb = 10;
+
+  // If set, specifies how often the tracing daemon reads from the kernel ring
+  // buffer. Not guaranteed if there are multiple concurrent tracing sessions.
+  // Leave unset unless you're fine-tuning a local config.
+  optional uint32 drain_period_ms = 11;
+
+  // If set, the tracing daemon will read kernel ring buffers as soon as
+  // they're filled past this percentage of occupancy. In other words, a value
+  // of 50 means that a read pass is triggered as soon as any per-cpu buffer is
+  // half-full. Not guaranteed if there are multiple concurrent tracing
+  // sessions.
+  // Currently does nothing on Linux kernels below v6.1.
+  // Introduced in: perfetto v43.
+  optional uint32 drain_buffer_percent = 26;
+
+  // Configuration for compact encoding of scheduler events. When enabled (and
+  // recording the relevant ftrace events), specific high-volume events are
+  // encoded in a denser format than normal.
+  message CompactSchedConfig {
+    // If true, and sched_switch or sched_waking ftrace events are enabled,
+    // record those events in the compact format.
+    //
+    // If the field is unset, the default is:
+    // * perfetto v42.0+: enabled
+    // * before: disabled
+    optional bool enabled = 1;
+  }
+  optional CompactSchedConfig compact_sched = 12;
+
+  // Optional filter for "ftrace/print" events.
+  //
+  // The filter consists of multiple rules. As soon as a rule matches (the rules
+  // are processed in order), its `allow` field will be used as the outcome: if
+  // `allow` is true, the event will be included in the trace, otherwise it will
+  // be discarded. If an event does not match any rule, it will be allowed by
+  // default (a rule with an empty prefix and allow=false, disallows everything
+  // by default).
+  message PrintFilter {
+    message Rule {
+      // Matches an atrace message of the form:
+      // <type>|pid|<prefix>...
+      message AtraceMessage {
+        optional string type = 1;
+        optional string prefix = 2;
+      }
+      oneof match {
+        // This rule matches if `prefix` matches exactly with the beginning of
+        // the "ftrace/print" "buf" field.
+        string prefix = 1;
+        // This rule matches if the "buf" field contains an atrace-style print
+        // message as specified in `atrace_msg`.
+        AtraceMessage atrace_msg = 3;
+      }
+      optional bool allow = 2;
+    }
+    repeated Rule rules = 1;
+  }
+  optional PrintFilter print_filter = 22;
+
+  // Enables symbol name resolution against /proc/kallsyms.
+  // It requires that either traced_probes is running as root or that
+  // kptr_restrict has been manually lowered.
+  // It does not disclose KASLR, symbol addresses are mangled.
+  optional bool symbolize_ksyms = 13;
+
+  // When symbolize_ksyms=true, determines whether the traced_probes daemon
+  // should keep the symbol map in memory (and reuse it for future tracing
+  // sessions) or clear it (saving memory) and re-create it on each tracing
+  // session (wasting cpu and wall time).
+  // The tradeoff is roughly:
+  //  KSYMS_RETAIN: pay a fixed ~1.2 MB cost after the first trace.
+  //  KSYMS_CLEANUP_ON_STOP: pay a ~300-500ms cost when starting each trace.
+  // Default behavior: KSYMS_CLEANUP_ON_STOP.
+  enum KsymsMemPolicy {
+    KSYMS_UNSPECIFIED = 0;
+    KSYMS_CLEANUP_ON_STOP = 1;
+    KSYMS_RETAIN = 2;
+  }
+  optional KsymsMemPolicy ksyms_mem_policy = 17;
+
+  // By default the kernel symbolizer is lazily initialized on a deferred task
+  // to reduce ftrace's time-to-start-recording. Unfortunately that makes
+  // ksyms integration tests hard. This flag forces the kernel symbolizer to be
+  // initialized synchronously on the data source start and hence avoiding
+  // timing races in tests.
+  // DEPRECATED in v28 / Android U. This is now the default behavior, setting it
+  // to true is a no-op.
+  optional bool initialize_ksyms_synchronously_for_testing = 14
+      [deprecated = true];
+
+  // When this boolean is true AND the ftrace_events contains "kmem/rss_stat",
+  // this option causes traced_probes to enable the "kmem/rss_stat_throttled"
+  // event instead if present, and fall back to "kmem/rss_stat" if not present.
+  // The historical context for this is the following:
+  // - Up to Android S (12), the rss_stat was internally throttled in its
+  //   kernel implementation.
+  // - A change introduced in the kernels after S has introduced a new
+  //   "rss_stat_throttled" making the original "rss_stat" event unthrottled
+  //   (hence very spammy).
+  // - Not all Android T/13 devices will receive a new kernel though, hence we
+  //   need to deal with both cases.
+  // For more context: go/rss-stat-throttled.
+  optional bool throttle_rss_stat = 15;
+
+  // If true, avoid enabling events that aren't statically known by
+  // traced_probes. Otherwise, the default is to emit such events as
+  // GenericFtraceEvent protos.
+  // Prefer to keep this flag at its default. This was added for Android
+  // tracing, where atrace categories and/or atrace HAL requested events can
+  // expand to events that aren't of interest to the tracing user.
+  // Introduced in: Android T.
+  optional bool disable_generic_events = 16;
+
+  // The subset of syscalls to record. To record all syscalls, leave this unset
+  // and add "ftrace_events: raw_syscalls/sys_{enter,exit}" to the config.
+  // * before perfetto v43, requires the config to also enable
+  //   raw_syscalls/sys_{enter,exit}.
+  // * perfetto v43+ does the right thing if you set only this field.
+  // Example: ["sys_read", "sys_open"].
+  // Introduced in: Android U.
+  repeated string syscall_events = 18;
+
+  // If true, enable the "function_graph" kernel tracer that emits events
+  // whenever a kernel function is entered and exited
+  // (funcgraph_entry/funcgraph_exit).
+  // Notes on use:
+  // * Requires |symbolize_ksyms| for function name resolution.
+  // * Use |function_filters| or |function_graph_roots| to constrain the traced
+  //   set of functions, otherwise the event bandwidth will be too high for
+  //   practical use.
+  // * The data source might be rejected if there is already a concurrent
+  //   ftrace data source that does not use function graph itself, as we do not
+  //   support switching kernel tracers mid-trace.
+  // * Requires a kernel compiled with CONFIG_FUNCTION_GRAPH_TRACER. This is
+  //   enabled if "cat /sys/kernel/tracing/available_tracers" includes
+  //   "function_graph".
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  optional bool enable_function_graph = 19;
+
+  // Constrains the set of functions traced when |enable_function_graph| is
+  // true. Supports globs, e.g. "sched*". You can specify multiple filters,
+  // in which case all matching functions will be traced. See kernel
+  // documentation on ftrace "set_ftrace_filter" file for more details.
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  repeated string function_filters = 20;
+
+  // If |enable_function_graph| is true, trace this set of functions *and* all
+  // of its callees. Supports globs. Can be set together with
+  // |function_filters|, in which case only callees matching the filter will be
+  // traced. If setting both, you most likely want all roots to also be
+  // included in |function_filters|.
+  // Android:
+  // * Available only on debuggable builds.
+  // * Introduced in: Android U.
+  repeated string function_graph_roots = 21;
+
+  // If true, does not clear ftrace buffers before the start of the program.
+  // This makes sense only if this is the first ftrace data source instance
+  // created after the daemon has been started. Can be useful for gathering boot
+  // traces, if ftrace has been separately configured (e.g. via kernel
+  // commandline).
+  optional bool preserve_ftrace_buffer = 23;
+
+  // If true, overrides the default timestamp clock and uses a raw hardware
+  // based monotonic clock for getting timestamps.
+  // * Introduced in: Android U.
+  optional bool use_monotonic_raw_clock = 24;
+
+  // If |instance_name| is not empty, then attempt to use that tracefs instance
+  // for event recording. Normally, this means
+  // `/sys/kernel/tracing/instances/$instance_name`.
+  //
+  // The name "hyp" is reserved.
+  //
+  // The instance must already exist, the tracing daemon *will not* create it
+  // for you as it typically doesn't have such permissions.
+  // Only a subset of features is guaranteed to work with non-default instances,
+  // at the time of writing:
+  //  * ftrace_events
+  //  * buffer_size_kb
+  optional string instance_name = 25;
+
+  // If true, |buffer_size_kb| is interpreted as a lower bound, allowing the
+  // implementation to choose a bigger buffer size.
+  //
+  // Most configs for perfetto v43+ should simply leave both fields unset.
+  //
+  // If you need a config compatible with a range of perfetto builds and you
+  // used to set a non-default buffer_size_kb, consider setting both fields.
+  // Example:
+  //   buffer_size_kb: 4096
+  //   buffer_size_lower_bound: true
+  // On older builds, the per-cpu buffers will be exactly 4 MB.
+  // On v43+, buffers will be at least 4 MB.
+  // In both cases, neither is guaranteed if there are other concurrent
+  // perfetto ftrace sessions, as the buffers cannot be resized without pausing
+  // the recording in the kernel.
+  // Introduced in: perfetto v43.
+  optional bool buffer_size_lower_bound = 27;
+}
+
+// End of protos/perfetto/config/ftrace/ftrace_config.proto
+
+// Begin of protos/perfetto/config/gpu/gpu_counter_config.proto
+
+message GpuCounterConfig {
+  // Desired sampling interval for counters.
+  optional uint64 counter_period_ns = 1;
+
+  // List of counters to be sampled. Counter IDs correspond to the ones
+  // described in GpuCounterSpec in the data source descriptor.
+  repeated uint32 counter_ids = 2;
+
+  // Sample counters by instrumenting command buffers.
+  optional bool instrumented_sampling = 3;
+
+  // Fix gpu clock rate during trace session.
+  optional bool fix_gpu_clock = 4;
+}
+
+// End of protos/perfetto/config/gpu/gpu_counter_config.proto
+
+// Begin of protos/perfetto/config/gpu/vulkan_memory_config.proto
+
+message VulkanMemoryConfig {
+  // Tracking driver memory usage events
+  optional bool track_driver_memory_usage = 1;
+
+  // Tracking device memory usage events
+  optional bool track_device_memory_usage = 2;
+}
+
+// End of protos/perfetto/config/gpu/vulkan_memory_config.proto
+
+// Begin of protos/perfetto/config/inode_file/inode_file_config.proto
+
+message InodeFileConfig {
+  message MountPointMappingEntry {
+    optional string mountpoint = 1;
+    repeated string scan_roots = 2;
+  }
+
+  // How long to pause between batches.
+  optional uint32 scan_interval_ms = 1;
+
+  // How long to wait before the first scan in order to accumulate inodes.
+  optional uint32 scan_delay_ms = 2;
+
+  // How many inodes to scan in one batch.
+  optional uint32 scan_batch_size = 3;
+
+  // Do not scan for inodes not found in the static map.
+  optional bool do_not_scan = 4;
+
+  // If non-empty, only scan inodes corresponding to block devices named in
+  // this list.
+  repeated string scan_mount_points = 5;
+
+  // When encountering an inode belonging to a block device corresponding
+  // to one of the mount points in this map, scan its scan_roots instead.
+  repeated MountPointMappingEntry mount_point_mapping = 6;
+}
+
+// End of protos/perfetto/config/inode_file/inode_file_config.proto
+
+// Begin of protos/perfetto/config/interceptors/console_config.proto
+
+message ConsoleConfig {
+  enum Output {
+    OUTPUT_UNSPECIFIED = 0;
+    OUTPUT_STDOUT = 1;
+    OUTPUT_STDERR = 2;
+  }
+  optional Output output = 1;
+  optional bool enable_colors = 2;
+}
+
+// End of protos/perfetto/config/interceptors/console_config.proto
+
+// Begin of protos/perfetto/config/interceptor_config.proto
+
+// Configuration for trace packet interception. Used for diverting trace data to
+// non-Perfetto sources (e.g., logging to the console, ETW) when using the
+// Perfetto SDK.
+message InterceptorConfig {
+  // Matches the name given to RegisterInterceptor().
+  optional string name = 1;
+
+  optional ConsoleConfig console_config = 100;
+}
+
+// End of protos/perfetto/config/interceptor_config.proto
+
+// Begin of protos/perfetto/config/power/android_power_config.proto
+
+message AndroidPowerConfig {
+  enum BatteryCounters {
+    BATTERY_COUNTER_UNSPECIFIED = 0;
+
+    // Coulomb counter.
+    BATTERY_COUNTER_CHARGE = 1;
+
+    // Charge (%).
+    BATTERY_COUNTER_CAPACITY_PERCENT = 2;
+
+    // Instantaneous current.
+    BATTERY_COUNTER_CURRENT = 3;
+
+    // Avg current.
+    BATTERY_COUNTER_CURRENT_AVG = 4;
+
+    // Instantaneous voltage.
+    BATTERY_COUNTER_VOLTAGE = 5;
+  }
+  optional uint32 battery_poll_ms = 1;
+  repeated BatteryCounters battery_counters = 2;
+
+  // Where available enables per-power-rail measurements.
+  optional bool collect_power_rails = 3;
+
+  // Provides a breakdown of energy estimation for various subsystem (e.g. GPU).
+  // Available from Android S.
+  optional bool collect_energy_estimation_breakdown = 4;
+
+  // Provides a breakdown of time in state for various subsystems.
+  // Available from Android U.
+  optional bool collect_entity_state_residency = 5;
+}
+
+// End of protos/perfetto/config/power/android_power_config.proto
+
+// Begin of protos/perfetto/config/process_stats/process_stats_config.proto
+
+message ProcessStatsConfig {
+  enum Quirks {
+    QUIRKS_UNSPECIFIED = 0;
+
+    // This has been deprecated and ignored as per 2018-05-01. Full scan at
+    // startup is now disabled by default and can be re-enabled using the
+    // |scan_all_processes_on_start| arg.
+    DISABLE_INITIAL_DUMP = 1 [deprecated = true];
+
+    DISABLE_ON_DEMAND = 2;
+  }
+  repeated Quirks quirks = 1;
+
+  // If enabled all processes will be scanned and dumped when the trace starts.
+  optional bool scan_all_processes_on_start = 2;
+
+  // If enabled thread names are also recoded (this is redundant if sched_switch
+  // is enabled).
+  optional bool record_thread_names = 3;
+
+  // If > 0 samples counters (see process_stats.proto) from
+  // /proc/pid/status and oom_score_adj every X ms.
+  // It will also sample /proc/pid/smaps_rollup if scan_smaps_rollup = true.
+  // This is required to be > 100ms to avoid excessive CPU usage.
+  optional uint32 proc_stats_poll_ms = 4;
+
+  // id 5 never used
+
+  // This is required to be either = 0 or a multiple of |proc_stats_poll_ms|
+  // (default: |proc_stats_poll_ms|). If = 0, will be set to
+  // |proc_stats_poll_ms|. Non-multiples will be rounded down to the nearest
+  // multiple.
+  optional uint32 proc_stats_cache_ttl_ms = 6;
+
+  // Niche feature: If true this will resolve file descriptors for each process
+  // so these can be mapped to their actual device or file.
+  // Requires raw_syscalls/sys_{enter,exit} ftrace events to be enabled or
+  // new fds opened after initially scanning a process will not be
+  // recognized.
+  optional bool resolve_process_fds = 9;
+
+  // If true, output will include memory stats from /proc/pid/smaps_rollup.
+  optional bool scan_smaps_rollup = 10;
+
+  // If true: process descriptions will include process age (starttime in
+  // /proc/pid/stat).
+  // Introduced in: perfetto v44.
+  optional bool record_process_age = 11;
+
+  // If true and |proc_stats_poll_ms| is true, process stats will include time
+  // spent running in user/kernel mode (utime/stime in /proc/pid/stat).
+  // Introduced in: perfetto v44.
+  optional bool record_process_runtime = 12;
+
+  // record_thread_time_in_state
+  reserved 7;
+  // thread_time_in_state_cache_size
+  reserved 8;
+}
+
+// End of protos/perfetto/config/process_stats/process_stats_config.proto
+
+// Begin of protos/perfetto/config/profiling/heapprofd_config.proto
+
+// Configuration for go/heapprofd.
+// Next id: 28
+message HeapprofdConfig {
+  message ContinuousDumpConfig {
+    // ms to wait before first dump.
+    optional uint32 dump_phase_ms = 5;
+    // ms to wait between following dumps.
+    optional uint32 dump_interval_ms = 6;
+  }
+
+  // Sampling rate for all heaps not specified via heap_sampling_intervals.
+  //
+  // These are:
+  // * All heaps if heap_sampling_intervals is empty.
+  // * Those profiled due to all_heaps and not named in heaps if
+  //   heap_sampling_intervals is not empty.
+  // * The implicit libc.malloc heap if heaps is empty.
+  //
+  // Set to 1 for perfect accuracy.
+  // Otherwise, sample every sample_interval_bytes on average.
+  //
+  // See
+  // https://perfetto.dev/docs/data-sources/native-heap-profiler#sampling-interval
+  // for more details.
+  //
+  // BUGS
+  // Before Android 12, setting this to 0 would crash the target process.
+  //
+  // N.B. This must be explicitly set to a non-zero value for all heaps (with
+  // this field or with heap_sampling_intervals), otherwise the producer will
+  // not start.
+  optional uint64 sampling_interval_bytes = 1;
+
+  // If less than the given numbers of bytes are left free in the shared
+  // memory buffer, increase sampling interval by a factor of two.
+  // Adaptive sampling is disabled when set to 0.
+  optional uint64 adaptive_sampling_shmem_threshold = 24;
+  // Stop doubling the sampling_interval once the sampling interval has reached
+  // this value.
+  optional uint64 adaptive_sampling_max_sampling_interval_bytes = 25;
+
+  // E.g. surfaceflinger, com.android.phone
+  // This input is normalized in the following way: if it contains slashes,
+  // everything up to the last slash is discarded. If it contains "@",
+  // everything after the first @ is discared.
+  // E.g. /system/bin/surfaceflinger@1.0 normalizes to surfaceflinger.
+  // This transformation is also applied to the processes' command lines when
+  // matching.
+  repeated string process_cmdline = 2;
+
+  // For watermark based triggering or local debugging.
+  repeated uint64 pid = 4;
+
+  // Only profile target if it was installed by one of the packages given.
+  // Special values are:
+  // * @system: installed on the system partition
+  // * @product: installed on the product partition
+  // * @null: sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 26;
+
+  // Which heaps to sample, e.g. "libc.malloc". If left empty, only samples
+  // "malloc".
+  //
+  // Introduced in Android 12.
+  repeated string heaps = 20;
+
+  // Which heaps not to sample, e.g. "libc.malloc". This is useful when used in
+  // combination with all_heaps;
+  //
+  // Introduced in Android 12.
+  repeated string exclude_heaps = 27;
+
+  optional bool stream_allocations = 23;
+
+  // If given, needs to be the same length as heaps and gives the sampling
+  // interval for the respective entry in heaps.
+  //
+  // Otherwise, sampling_interval_bytes is used.
+  //
+  // It is recommended to set sampling_interval_bytes to a reasonable default
+  // value when using this, as a value of 0 for sampling_interval_bytes will
+  // crash the target process before Android 12.
+  //
+  // Introduced in Android 12.
+  //
+  // All values must be non-zero or the producer will not start.
+  repeated uint64 heap_sampling_intervals = 22;
+
+  // Sample all heaps registered by target process. Introduced in Android 12.
+  optional bool all_heaps = 21;
+
+  // Profile all processes eligible for profiling on the system.
+  // See
+  // https://perfetto.dev/docs/data-sources/native-heap-profiler#heapprofd-targets
+  // for which processes are eligible.
+  //
+  // On unmodified userdebug builds, this will lead to system crashes. Zygote
+  // will crash when trying to launch a new process as it will have an
+  // unexpected open socket to heapprofd.
+  //
+  // heapprofd will likely be overloaded by the amount of data for low
+  // sampling intervals.
+  optional bool all = 5;
+
+  // Do not profile processes whose anon RSS + swap < given value.
+  // Introduced in Android 11.
+  optional uint32 min_anonymous_memory_kb = 15;
+
+  // Stop profile if heapprofd memory usage goes beyond the given value.
+  // Introduced in Android 11.
+  optional uint32 max_heapprofd_memory_kb = 16;
+
+  // Stop profile if heapprofd CPU time since start of this data-source
+  // goes beyond given value.
+  // Introduced in Android 11.
+  optional uint64 max_heapprofd_cpu_secs = 17;
+
+  // Do not emit function names for mappings starting with this prefix.
+  // E.g. /system to not emit symbols for any system libraries.
+  repeated string skip_symbol_prefix = 7;
+
+  // Dump at a predefined interval.
+  optional ContinuousDumpConfig continuous_dump_config = 6;
+
+  // Size of the shared memory buffer between the profiled processes and
+  // heapprofd. Defaults to 8 MiB. If larger than 500 MiB, truncated to 500
+  // MiB.
+  //
+  // Needs to be:
+  // * at least 8192,
+  // * a power of two,
+  // * a multiple of 4096.
+  optional uint64 shmem_size_bytes = 8;
+
+  // When the shmem buffer is full, block the client instead of ending the
+  // trace. Use with caution as this will significantly slow down the target
+  // process.
+  optional bool block_client = 9;
+
+  // If set, stop the trace session after blocking the client for this
+  // timeout. Needs to be larger than 100 us, otherwise no retries are done.
+  // Introduced in Android 11.
+  optional uint32 block_client_timeout_us = 14;
+
+  // Do not profile processes from startup, only match already running
+  // processes.
+  //
+  // Can not be set at the same time as no_running.
+  // Introduced in Android 11.
+  optional bool no_startup = 10;
+
+  // Do not profile running processes. Only match processes on startup.
+  //
+  // Can not be set at the same time as no_startup.
+  // Introduced in Android 11.
+  optional bool no_running = 11;
+
+  // deprecated idle_allocations.
+  reserved 12;
+
+  // Cause heapprofd to emit a single dump at the end, showing the memory usage
+  // at the point in time when the sampled heap usage of the process was at its
+  // maximum. This causes ProfilePacket.HeapSample.self_max to be set, and
+  // self_allocated and self_freed to not be set.
+  // Introduced in Android 11.
+  optional bool dump_at_max = 13;
+
+  // FEATURE FLAGS. THERE BE DRAGONS.
+
+  // Escape hatch if the session is being torn down because of a forked child
+  // that shares memory space, but is not correctly identified as a vforked
+  // child.
+  // Introduced in Android 11.
+  optional bool disable_fork_teardown = 18;
+
+  // We try to automatically detect when a target applicatation vforks but then
+  // does a memory allocation (or free). This auto-detection can be disabled
+  // with this.
+  // Introduced in Android 11.
+  optional bool disable_vfork_detection = 19;
+}
+
+// End of protos/perfetto/config/profiling/heapprofd_config.proto
+
+// Begin of protos/perfetto/config/profiling/java_hprof_config.proto
+
+// Configuration for managed app heap graph snapshots.
+message JavaHprofConfig {
+  // If dump_interval_ms != 0, the following configuration is used.
+  message ContinuousDumpConfig {
+    // ms to wait before first continuous dump.
+    // A dump is always created at the beginning of the trace.
+    optional uint32 dump_phase_ms = 1;
+    // ms to wait between following dumps.
+    optional uint32 dump_interval_ms = 2;
+    // If true, scans all the processes to find `process_cmdline` and filter by
+    // `min_anonymous_memory_kb` only at data source start. Default on Android
+    // S-.
+    //
+    // If false, rescans all the processes to find on every dump. Default on
+    // Android T+.
+    optional bool scan_pids_only_on_start = 3;
+  }
+
+  // Command line allowlist, matched against the /proc/<pid>/cmdline (not the
+  // comm string). The semantics of this field were changed since its original
+  // introduction.
+  //
+  // On Android T+ (13+), this field can specify a single wildcard (*), and
+  // the profiler will attempt to match it in two possible ways:
+  // * if the pattern starts with a '/', then it is matched against the first
+  //   segment of the cmdline (i.e. argv0). For example "/bin/e*" would match
+  //   "/bin/echo".
+  // * otherwise the pattern is matched against the part of argv0
+  //   corresponding to the binary name (this is unrelated to /proc/pid/exe).
+  //   For example "echo" would match "/bin/echo".
+  //
+  // On Android S (12) and below, both this pattern and /proc/pid/cmdline get
+  // normalized prior to an exact string comparison. Normalization is as
+  // follows: (1) trim everything beyond the first null or "@" byte; (2) if
+  // the string contains forward slashes, trim everything up to and including
+  // the last one.
+  //
+  // Implementation note: in either case, at most 511 characters of cmdline
+  // are considered.
+  repeated string process_cmdline = 1;
+
+  // For watermark based triggering or local debugging.
+  repeated uint64 pid = 2;
+
+  // Only profile target if it was installed by one of the packages given.
+  // Special values are:
+  // * @system: installed on the system partition
+  // * @product: installed on the product partition
+  // * @null: sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 7;
+
+  // Dump at a predefined interval.
+  optional ContinuousDumpConfig continuous_dump_config = 3;
+
+  // Do not profile processes whose anon RSS + swap < given value.
+  optional uint32 min_anonymous_memory_kb = 4;
+
+  // Include the process' /proc/self/smaps.
+  // This only shows maps that:
+  // * start with /system
+  // * start with /vendor
+  // * start with /data/app
+  // * contain "extracted in memory from Y", where Y matches any of the above
+  optional bool dump_smaps = 5;
+
+  // Exclude objects of the following types from the profile. This can be
+  // useful if lots of uninteresting objects, e.g. "sun.misc.Cleaner".
+  repeated string ignored_types = 6;
+}
+
+// End of protos/perfetto/config/profiling/java_hprof_config.proto
+
+// Begin of protos/perfetto/common/perf_events.proto
+
+// Next id: 12
+message PerfEvents {
+  // What event to sample on, and how often. Commented from the perspective of
+  // its use in |PerfEventConfig|.
+  message Timebase {
+    // How often the per-cpu sampling will occur. Not guaranteed to be honored
+    // as the kernel can throttle the sampling rate if it's too high.
+    // If unset, an implementation-defined default is used.
+    oneof interval {
+      // Per-cpu sampling frequency in Hz, as requested from the kernel. Not the
+      // same as 1/period.
+      // Details: the actual sampling will still be based on a period, but the
+      // kernel will dynamically adjust it based on the observed event rate, to
+      // approximate this frequency. Works best with steady-rate events like
+      // timers.
+      uint64 frequency = 2;
+
+      // Per-cpu sampling will occur every |period| counts of |event|.
+      // Prefer |frequency| by default, as it's easier to oversample with a
+      // fixed period.
+      uint64 period = 1;
+    }
+
+    // Counting event to use as a timebase for the sampling.
+    // If unset, implies the CPU timer (SW_CPU_CLOCK) as the event,
+    // which is what you usually want.
+    // See common/perf_events.proto for the definitions.
+    oneof event {
+      Counter counter = 4;
+      Tracepoint tracepoint = 3;
+      RawEvent raw_event = 5;
+    }
+
+    // If set, samples will be timestamped with the given clock.
+    // If unset, the clock is chosen by the implementation.
+    // For software events, prefer PERF_CLOCK_BOOTTIME. However it cannot be
+    // used for hardware events (due to interrupt safety), for which the
+    // recommendation is to use one of the monotonic clocks.
+    optional PerfClock timestamp_clock = 11;
+
+    // Optional arbitrary name for the event, to identify it in the parsed
+    // trace. Does *not* affect the profiling itself. If unset, the trace
+    // parser will choose a suitable name.
+    optional string name = 10;
+  }
+
+  // Builtin counter names from the uapi header. Commented with their perf tool
+  // aliases.
+  // TODO(rsavitski): consider generating enums for cache events (should be
+  // finite), and generally make this list as extensive as possible. Excluding
+  // things like dynamic PMUs since those don't fit into a static enum.
+  // Next id: 21
+  enum Counter {
+    UNKNOWN_COUNTER = 0;
+
+    // cpu-clock
+    SW_CPU_CLOCK = 1;
+    // page-faults, faults
+    SW_PAGE_FAULTS = 2;
+    // task-clock
+    SW_TASK_CLOCK = 3;
+    // context-switches, cs
+    SW_CONTEXT_SWITCHES = 4;
+    // cpu-migrations, migrations
+    SW_CPU_MIGRATIONS = 5;
+    // minor-faults
+    SW_PAGE_FAULTS_MIN = 6;
+    // major-faults
+    SW_PAGE_FAULTS_MAJ = 7;
+    // alignment-faults
+    SW_ALIGNMENT_FAULTS = 8;
+    // emulation-faults
+    SW_EMULATION_FAULTS = 9;
+    // dummy
+    SW_DUMMY = 20;
+
+    // cpu-cycles, cycles
+    HW_CPU_CYCLES = 10;
+    // instructions
+    HW_INSTRUCTIONS = 11;
+    // cache-references
+    HW_CACHE_REFERENCES = 12;
+    // cache-misses
+    HW_CACHE_MISSES = 13;
+    // branch-instructions, branches
+    HW_BRANCH_INSTRUCTIONS = 14;
+    // branch-misses
+    HW_BRANCH_MISSES = 15;
+    // bus-cycles
+    HW_BUS_CYCLES = 16;
+    // stalled-cycles-frontend, idle-cycles-frontend
+    HW_STALLED_CYCLES_FRONTEND = 17;
+    // stalled-cycles-backend, idle-cycles-backend
+    HW_STALLED_CYCLES_BACKEND = 18;
+    // ref-cycles
+    HW_REF_CPU_CYCLES = 19;
+  }
+
+  message Tracepoint {
+    // Group and name for the tracepoint, acceptable forms:
+    // * "sched/sched_switch"
+    // * "sched:sched_switch"
+    optional string name = 1;
+
+    // Optional field-level filter for the tracepoint. Only events matching this
+    // filter will be counted (and therefore contribute to the sampling period).
+    // Example: "prev_pid >= 42 && next_pid == 0".
+    // For full syntax, see kernel documentation on "Event filtering":
+    // https://www.kernel.org/doc/Documentation/trace/events.txt
+    optional string filter = 2;
+  }
+
+  // Syscall-level description of the event, propagated to the perf_event_attr
+  // struct. Primarily for local use-cases, since the event availability and
+  // encoding is hardware-specific.
+  message RawEvent {
+    optional uint32 type = 1;
+    optional uint64 config = 2;
+    optional uint64 config1 = 3;
+    optional uint64 config2 = 4;
+  }
+
+  // Subset of clocks that is supported by perf timestamping.
+  // CLOCK_TAI is excluded since it's not expected to be used in practice, but
+  // would require additions to the trace clock synchronisation logic.
+  enum PerfClock {
+    UNKNOWN_PERF_CLOCK = 0;
+    PERF_CLOCK_REALTIME = 1;
+    PERF_CLOCK_MONOTONIC = 2;
+    PERF_CLOCK_MONOTONIC_RAW = 3;
+    PERF_CLOCK_BOOTTIME = 4;
+  }
+}
+
+// End of protos/perfetto/common/perf_events.proto
+
+// Begin of protos/perfetto/config/profiling/perf_event_config.proto
+
+// Configuration for the traced_perf profiler.
+//
+// Example config for basic cpu profiling:
+//   perf_event_config {
+//     timebase {
+//       frequency: 80
+//     }
+//     callstack_sampling {
+//       scope {
+//         target_cmdline: "surfaceflinger"
+//         target_cmdline: "system_server"
+//       }
+//       kernel_frames: true
+//     }
+//   }
+//
+// Next id: 19
+message PerfEventConfig {
+  // What event to sample on, and how often.
+  // Defined in common/perf_events.proto.
+  optional PerfEvents.Timebase timebase = 15;
+
+  // If set, the profiler will sample userspace processes' callstacks at the
+  // interval specified by the |timebase|.
+  // If unset, the profiler will record only the event counts.
+  optional CallstackSampling callstack_sampling = 16;
+
+  //
+  // Kernel <-> userspace ring buffer options:
+  //
+
+  // How often the per-cpu ring buffers are read by the producer.
+  // If unset, an implementation-defined default is used.
+  optional uint32 ring_buffer_read_period_ms = 8;
+
+  // Size (in 4k pages) of each per-cpu ring buffer that is filled by the
+  // kernel. If set, must be a power of two.
+  // If unset, an implementation-defined default is used.
+  optional uint32 ring_buffer_pages = 3;
+
+  //
+  // Daemon's resource usage limits:
+  //
+
+  // Drop samples if the heap memory held by the samples in the unwinder queue
+  // is above the given limit. This counts the memory across all concurrent data
+  // sources (not just this one's), and there is no fairness guarantee - the
+  // whole quota might be used up by a concurrent source.
+  optional uint64 max_enqueued_footprint_kb = 17;
+
+  // Stop the data source if traced_perf's combined {RssAnon + Swap} memory
+  // footprint exceeds this value.
+  optional uint32 max_daemon_memory_kb = 13;
+
+  //
+  // Uncommon options:
+  //
+
+  // Timeout for the remote /proc/<pid>/{maps,mem} file descriptors for a
+  // sampled process. This is primarily for Android, where this lookup is
+  // asynchronous. As long as the producer is waiting, the associated samples
+  // will be kept enqueued (putting pressure on the capacity of the shared
+  // unwinding queue). Once a lookup for a process expires, all associated
+  // samples are discarded. However, if the lookup still succeeds after the
+  // timeout, future samples will be handled normally.
+  // If unset, an implementation-defined default is used.
+  optional uint32 remote_descriptor_timeout_ms = 9;
+
+  // Optional period for clearing state cached by the unwinder. This is a heavy
+  // operation that is only necessary for traces that target a wide set of
+  // processes, and require the memory footprint to be reset periodically.
+  // If unset, the cached state will not be cleared.
+  optional uint32 unwind_state_clear_period_ms = 10;
+
+  // If set, only profile target if it was installed by a package with one of
+  // these names. Special values:
+  // * "@system": installed on the system partition
+  // * "@product": installed on the product partition
+  // * "@null": sideloaded
+  // Supported on Android 12+.
+  repeated string target_installed_by = 18;
+
+  //
+  // Deprecated (superseded by options above):
+  //
+  // Do not set *any* of these fields in new configs.
+  //
+
+  // Note: legacy configs had to set |all_cpus| to true to pass parsing.
+  // We rely on this to detect such configs.
+  optional bool all_cpus = 1;
+  optional uint32 sampling_frequency = 2;
+  optional bool kernel_frames = 12;
+  repeated int32 target_pid = 4;
+  repeated string target_cmdline = 5;
+  repeated int32 exclude_pid = 6;
+  repeated string exclude_cmdline = 7;
+  optional uint32 additional_cmdline_count = 11;
+  // previously |tracepoint|
+  reserved 14;
+
+  //
+  // Sub-messages (nested for generated code namespacing).
+  //
+
+  message CallstackSampling {
+    // Defines a set of processes for which samples are retained/skipped. If
+    // unset, all samples are kept, but beware that it will be very heavy on the
+    // stack unwinder, which might start dropping samples due to overload.
+    optional Scope scope = 1;
+
+    // If true, callstacks will include the kernel-space frames. Such frames can
+    // be identified by a magical "kernel" string as their mapping name.
+    // Requires traced_perf to be running as root, or kptr_restrict to have been
+    // manually unrestricted. On Android, the platform should do the right thing
+    // on debug builds.
+    // This does *not* disclose KASLR, as only the function names are emitted.
+    optional bool kernel_frames = 2;
+
+    // Whether to record and unwind userspace callstacks. If unset, defaults to
+    // including userspace (UNWIND_DWARF) both for backwards compatibility and
+    // as the most common default (this defaulting is only applicable if the
+    // outer CallstackSampling message is explicitly set).
+    optional UnwindMode user_frames = 3;
+  }
+
+  message Scope {
+    // Process ID (TGID) allowlist. If this list is not empty, only matching
+    // samples will be retained. If multiple allow/deny-lists are
+    // specified by the config, then all of them are evaluated for each sampled
+    // process.
+    repeated int32 target_pid = 1;
+
+    // Command line allowlist, matched against the /proc/<pid>/cmdline (not the
+    // comm string). The semantics of this field were changed since its original
+    // introduction.
+    //
+    // On Android T+ (13+), this field can specify a single wildcard (*), and
+    // the profiler will attempt to match it in two possible ways:
+    // * if the pattern starts with a '/', then it is matched against the first
+    //   segment of the cmdline (i.e. argv0). For example "/bin/e*" would match
+    //   "/bin/echo".
+    // * otherwise the pattern is matched against the part of argv0
+    //   corresponding to the binary name (this is unrelated to /proc/pid/exe).
+    //   For example "echo" would match "/bin/echo".
+    //
+    // On Android S (12) and below, both this pattern and /proc/pid/cmdline get
+    // normalized prior to an exact string comparison. Normalization is as
+    // follows: (1) trim everything beyond the first null or "@" byte; (2) if
+    // the string contains forward slashes, trim everything up to and including
+    // the last one.
+    //
+    // Implementation note: in either case, at most 511 characters of cmdline
+    // are considered.
+    repeated string target_cmdline = 2;
+
+    // List of excluded pids.
+    repeated int32 exclude_pid = 3;
+
+    // List of excluded cmdlines. See description of |target_cmdline| for how
+    // this is handled.
+    repeated string exclude_cmdline = 4;
+
+    // Niche features for systemwide callstacks:
+
+    // Number of additional command lines to sample. Only those which are
+    // neither explicitly included nor excluded will be considered. Processes
+    // are accepted on a first come, first served basis.
+    optional uint32 additional_cmdline_count = 5;
+
+    // If set to N, all encountered processes will be put into one of the N
+    // possible bins, and only one randomly-chosen bin will be selected for
+    // unwinding. The binning is simply "pid % N", under the assumption that
+    // low-order bits of pids are roughly uniformly distributed. Other explicit
+    // inclusions/exclusions in this |Scope| message are still respected.
+    //
+    // The profiler will report the chosen shard in PerfSampleDefaults, and the
+    // values will be queryable in trace processor under the "stats" table as
+    // "perf_process_shard_count" and "perf_chosen_process_shard".
+    //
+    // NB: all data sources in a config that set |process_shard_count| must set
+    // it to the same value. The profiler will choose one bin for all those data
+    // sources.
+    optional uint32 process_shard_count = 6;
+  }
+
+  // Userspace unwinding mode. A possible future addition is kernel-unwound
+  // callchains for frame pointer based systems.
+  enum UnwindMode {
+    UNWIND_UNKNOWN = 0;
+    // Do not unwind userspace:
+    UNWIND_SKIP = 1;
+    // Use libunwindstack (default):
+    UNWIND_DWARF = 2;
+  }
+}
+
+// End of protos/perfetto/config/profiling/perf_event_config.proto
+
+// Begin of protos/perfetto/config/statsd/atom_ids.proto
+
+// This enum is obtained by post-processing
+// AOSP/frameworks/proto_logging/stats/atoms.proto through
+// AOSP/external/perfetto/tools/update-statsd-descriptor, which extracts one
+// enum value for each proto field defined in the upstream atoms.proto.
+enum AtomId {
+  ATOM_UNSPECIFIED = 0;
+  ATOM_BLE_SCAN_STATE_CHANGED = 2;
+  ATOM_PROCESS_STATE_CHANGED = 3;
+  ATOM_BLE_SCAN_RESULT_RECEIVED = 4;
+  ATOM_SENSOR_STATE_CHANGED = 5;
+  ATOM_GPS_SCAN_STATE_CHANGED = 6;
+  ATOM_SYNC_STATE_CHANGED = 7;
+  ATOM_SCHEDULED_JOB_STATE_CHANGED = 8;
+  ATOM_SCREEN_BRIGHTNESS_CHANGED = 9;
+  ATOM_WAKELOCK_STATE_CHANGED = 10;
+  ATOM_LONG_PARTIAL_WAKELOCK_STATE_CHANGED = 11;
+  ATOM_MOBILE_RADIO_POWER_STATE_CHANGED = 12;
+  ATOM_WIFI_RADIO_POWER_STATE_CHANGED = 13;
+  ATOM_ACTIVITY_MANAGER_SLEEP_STATE_CHANGED = 14;
+  ATOM_MEMORY_FACTOR_STATE_CHANGED = 15;
+  ATOM_EXCESSIVE_CPU_USAGE_REPORTED = 16;
+  ATOM_CACHED_KILL_REPORTED = 17;
+  ATOM_PROCESS_MEMORY_STAT_REPORTED = 18;
+  ATOM_LAUNCHER_EVENT = 19;
+  ATOM_BATTERY_SAVER_MODE_STATE_CHANGED = 20;
+  ATOM_DEVICE_IDLE_MODE_STATE_CHANGED = 21;
+  ATOM_DEVICE_IDLING_MODE_STATE_CHANGED = 22;
+  ATOM_AUDIO_STATE_CHANGED = 23;
+  ATOM_MEDIA_CODEC_STATE_CHANGED = 24;
+  ATOM_CAMERA_STATE_CHANGED = 25;
+  ATOM_FLASHLIGHT_STATE_CHANGED = 26;
+  ATOM_UID_PROCESS_STATE_CHANGED = 27;
+  ATOM_PROCESS_LIFE_CYCLE_STATE_CHANGED = 28;
+  ATOM_SCREEN_STATE_CHANGED = 29;
+  ATOM_BATTERY_LEVEL_CHANGED = 30;
+  ATOM_CHARGING_STATE_CHANGED = 31;
+  ATOM_PLUGGED_STATE_CHANGED = 32;
+  ATOM_INTERACTIVE_STATE_CHANGED = 33;
+  ATOM_TOUCH_EVENT_REPORTED = 34;
+  ATOM_WAKEUP_ALARM_OCCURRED = 35;
+  ATOM_KERNEL_WAKEUP_REPORTED = 36;
+  ATOM_WIFI_LOCK_STATE_CHANGED = 37;
+  ATOM_WIFI_SIGNAL_STRENGTH_CHANGED = 38;
+  ATOM_WIFI_SCAN_STATE_CHANGED = 39;
+  ATOM_PHONE_SIGNAL_STRENGTH_CHANGED = 40;
+  ATOM_SETTING_CHANGED = 41;
+  ATOM_ACTIVITY_FOREGROUND_STATE_CHANGED = 42;
+  ATOM_ISOLATED_UID_CHANGED = 43;
+  ATOM_PACKET_WAKEUP_OCCURRED = 44;
+  ATOM_WALL_CLOCK_TIME_SHIFTED = 45;
+  ATOM_ANOMALY_DETECTED = 46;
+  ATOM_APP_BREADCRUMB_REPORTED = 47;
+  ATOM_APP_START_OCCURRED = 48;
+  ATOM_APP_START_CANCELED = 49;
+  ATOM_APP_START_FULLY_DRAWN = 50;
+  ATOM_LMK_KILL_OCCURRED = 51;
+  ATOM_PICTURE_IN_PICTURE_STATE_CHANGED = 52;
+  ATOM_WIFI_MULTICAST_LOCK_STATE_CHANGED = 53;
+  ATOM_LMK_STATE_CHANGED = 54;
+  ATOM_APP_START_MEMORY_STATE_CAPTURED = 55;
+  ATOM_SHUTDOWN_SEQUENCE_REPORTED = 56;
+  ATOM_BOOT_SEQUENCE_REPORTED = 57;
+  ATOM_DAVEY_OCCURRED = 58;
+  ATOM_OVERLAY_STATE_CHANGED = 59;
+  ATOM_FOREGROUND_SERVICE_STATE_CHANGED = 60;
+  ATOM_CALL_STATE_CHANGED = 61;
+  ATOM_KEYGUARD_STATE_CHANGED = 62;
+  ATOM_KEYGUARD_BOUNCER_STATE_CHANGED = 63;
+  ATOM_KEYGUARD_BOUNCER_PASSWORD_ENTERED = 64;
+  ATOM_APP_DIED = 65;
+  ATOM_RESOURCE_CONFIGURATION_CHANGED = 66;
+  ATOM_BLUETOOTH_ENABLED_STATE_CHANGED = 67;
+  ATOM_BLUETOOTH_CONNECTION_STATE_CHANGED = 68;
+  ATOM_GPS_SIGNAL_QUALITY_CHANGED = 69;
+  ATOM_USB_CONNECTOR_STATE_CHANGED = 70;
+  ATOM_SPEAKER_IMPEDANCE_REPORTED = 71;
+  ATOM_HARDWARE_FAILED = 72;
+  ATOM_PHYSICAL_DROP_DETECTED = 73;
+  ATOM_CHARGE_CYCLES_REPORTED = 74;
+  ATOM_MOBILE_CONNECTION_STATE_CHANGED = 75;
+  ATOM_MOBILE_RADIO_TECHNOLOGY_CHANGED = 76;
+  ATOM_USB_DEVICE_ATTACHED = 77;
+  ATOM_APP_CRASH_OCCURRED = 78;
+  ATOM_ANR_OCCURRED = 79;
+  ATOM_WTF_OCCURRED = 80;
+  ATOM_LOW_MEM_REPORTED = 81;
+  ATOM_GENERIC_ATOM = 82;
+  ATOM_VIBRATOR_STATE_CHANGED = 84;
+  ATOM_DEFERRED_JOB_STATS_REPORTED = 85;
+  ATOM_THERMAL_THROTTLING = 86;
+  ATOM_BIOMETRIC_ACQUIRED = 87;
+  ATOM_BIOMETRIC_AUTHENTICATED = 88;
+  ATOM_BIOMETRIC_ERROR_OCCURRED = 89;
+  ATOM_UI_EVENT_REPORTED = 90;
+  ATOM_BATTERY_HEALTH_SNAPSHOT = 91;
+  ATOM_SLOW_IO = 92;
+  ATOM_BATTERY_CAUSED_SHUTDOWN = 93;
+  ATOM_PHONE_SERVICE_STATE_CHANGED = 94;
+  ATOM_PHONE_STATE_CHANGED = 95;
+  ATOM_USER_RESTRICTION_CHANGED = 96;
+  ATOM_SETTINGS_UI_CHANGED = 97;
+  ATOM_CONNECTIVITY_STATE_CHANGED = 98;
+  ATOM_SERVICE_STATE_CHANGED = 99;
+  ATOM_SERVICE_LAUNCH_REPORTED = 100;
+  ATOM_FLAG_FLIP_UPDATE_OCCURRED = 101;
+  ATOM_BINARY_PUSH_STATE_CHANGED = 102;
+  ATOM_DEVICE_POLICY_EVENT = 103;
+  ATOM_DOCS_UI_FILE_OP_CANCELED = 104;
+  ATOM_DOCS_UI_FILE_OP_COPY_MOVE_MODE_REPORTED = 105;
+  ATOM_DOCS_UI_FILE_OP_FAILURE = 106;
+  ATOM_DOCS_UI_PROVIDER_FILE_OP = 107;
+  ATOM_DOCS_UI_INVALID_SCOPED_ACCESS_REQUEST = 108;
+  ATOM_DOCS_UI_LAUNCH_REPORTED = 109;
+  ATOM_DOCS_UI_ROOT_VISITED = 110;
+  ATOM_DOCS_UI_STARTUP_MS = 111;
+  ATOM_DOCS_UI_USER_ACTION_REPORTED = 112;
+  ATOM_WIFI_ENABLED_STATE_CHANGED = 113;
+  ATOM_WIFI_RUNNING_STATE_CHANGED = 114;
+  ATOM_APP_COMPACTED = 115;
+  ATOM_NETWORK_DNS_EVENT_REPORTED = 116;
+  ATOM_DOCS_UI_PICKER_LAUNCHED_FROM_REPORTED = 117;
+  ATOM_DOCS_UI_PICK_RESULT_REPORTED = 118;
+  ATOM_DOCS_UI_SEARCH_MODE_REPORTED = 119;
+  ATOM_DOCS_UI_SEARCH_TYPE_REPORTED = 120;
+  ATOM_DATA_STALL_EVENT = 121;
+  ATOM_RESCUE_PARTY_RESET_REPORTED = 122;
+  ATOM_SIGNED_CONFIG_REPORTED = 123;
+  ATOM_GNSS_NI_EVENT_REPORTED = 124;
+  ATOM_BLUETOOTH_LINK_LAYER_CONNECTION_EVENT = 125;
+  ATOM_BLUETOOTH_ACL_CONNECTION_STATE_CHANGED = 126;
+  ATOM_BLUETOOTH_SCO_CONNECTION_STATE_CHANGED = 127;
+  ATOM_APP_DOWNGRADED = 128;
+  ATOM_APP_OPTIMIZED_AFTER_DOWNGRADED = 129;
+  ATOM_LOW_STORAGE_STATE_CHANGED = 130;
+  ATOM_GNSS_NFW_NOTIFICATION_REPORTED = 131;
+  ATOM_GNSS_CONFIGURATION_REPORTED = 132;
+  ATOM_USB_PORT_OVERHEAT_EVENT_REPORTED = 133;
+  ATOM_NFC_ERROR_OCCURRED = 134;
+  ATOM_NFC_STATE_CHANGED = 135;
+  ATOM_NFC_BEAM_OCCURRED = 136;
+  ATOM_NFC_CARDEMULATION_OCCURRED = 137;
+  ATOM_NFC_TAG_OCCURRED = 138;
+  ATOM_NFC_HCE_TRANSACTION_OCCURRED = 139;
+  ATOM_SE_STATE_CHANGED = 140;
+  ATOM_SE_OMAPI_REPORTED = 141;
+  ATOM_BROADCAST_DISPATCH_LATENCY_REPORTED = 142;
+  ATOM_ATTENTION_MANAGER_SERVICE_RESULT_REPORTED = 143;
+  ATOM_ADB_CONNECTION_CHANGED = 144;
+  ATOM_SPEECH_DSP_STAT_REPORTED = 145;
+  ATOM_USB_CONTAMINANT_REPORTED = 146;
+  ATOM_WATCHDOG_ROLLBACK_OCCURRED = 147;
+  ATOM_BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED = 148;
+  ATOM_BUBBLE_UI_CHANGED = 149;
+  ATOM_SCHEDULED_JOB_CONSTRAINT_CHANGED = 150;
+  ATOM_BLUETOOTH_ACTIVE_DEVICE_CHANGED = 151;
+  ATOM_BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED = 152;
+  ATOM_BLUETOOTH_A2DP_CODEC_CONFIG_CHANGED = 153;
+  ATOM_BLUETOOTH_A2DP_CODEC_CAPABILITY_CHANGED = 154;
+  ATOM_BLUETOOTH_A2DP_AUDIO_UNDERRUN_REPORTED = 155;
+  ATOM_BLUETOOTH_A2DP_AUDIO_OVERRUN_REPORTED = 156;
+  ATOM_BLUETOOTH_DEVICE_RSSI_REPORTED = 157;
+  ATOM_BLUETOOTH_DEVICE_FAILED_CONTACT_COUNTER_REPORTED = 158;
+  ATOM_BLUETOOTH_DEVICE_TX_POWER_LEVEL_REPORTED = 159;
+  ATOM_BLUETOOTH_HCI_TIMEOUT_REPORTED = 160;
+  ATOM_BLUETOOTH_QUALITY_REPORT_REPORTED = 161;
+  ATOM_BLUETOOTH_DEVICE_INFO_REPORTED = 162;
+  ATOM_BLUETOOTH_REMOTE_VERSION_INFO_REPORTED = 163;
+  ATOM_BLUETOOTH_SDP_ATTRIBUTE_REPORTED = 164;
+  ATOM_BLUETOOTH_BOND_STATE_CHANGED = 165;
+  ATOM_BLUETOOTH_CLASSIC_PAIRING_EVENT_REPORTED = 166;
+  ATOM_BLUETOOTH_SMP_PAIRING_EVENT_REPORTED = 167;
+  ATOM_SCREEN_TIMEOUT_EXTENSION_REPORTED = 168;
+  ATOM_PROCESS_START_TIME = 169;
+  ATOM_PERMISSION_GRANT_REQUEST_RESULT_REPORTED = 170;
+  ATOM_BLUETOOTH_SOCKET_CONNECTION_STATE_CHANGED = 171;
+  ATOM_DEVICE_IDENTIFIER_ACCESS_DENIED = 172;
+  ATOM_BUBBLE_DEVELOPER_ERROR_REPORTED = 173;
+  ATOM_ASSIST_GESTURE_STAGE_REPORTED = 174;
+  ATOM_ASSIST_GESTURE_FEEDBACK_REPORTED = 175;
+  ATOM_ASSIST_GESTURE_PROGRESS_REPORTED = 176;
+  ATOM_TOUCH_GESTURE_CLASSIFIED = 177;
+  ATOM_HIDDEN_API_USED = 178;
+  ATOM_STYLE_UI_CHANGED = 179;
+  ATOM_PRIVACY_INDICATORS_INTERACTED = 180;
+  ATOM_APP_INSTALL_ON_EXTERNAL_STORAGE_REPORTED = 181;
+  ATOM_NETWORK_STACK_REPORTED = 182;
+  ATOM_APP_MOVED_STORAGE_REPORTED = 183;
+  ATOM_BIOMETRIC_ENROLLED = 184;
+  ATOM_SYSTEM_SERVER_WATCHDOG_OCCURRED = 185;
+  ATOM_TOMB_STONE_OCCURRED = 186;
+  ATOM_BLUETOOTH_CLASS_OF_DEVICE_REPORTED = 187;
+  ATOM_INTELLIGENCE_EVENT_REPORTED = 188;
+  ATOM_THERMAL_THROTTLING_SEVERITY_STATE_CHANGED = 189;
+  ATOM_ROLE_REQUEST_RESULT_REPORTED = 190;
+  ATOM_MEDIAMETRICS_AUDIOPOLICY_REPORTED = 191;
+  ATOM_MEDIAMETRICS_AUDIORECORD_REPORTED = 192;
+  ATOM_MEDIAMETRICS_AUDIOTHREAD_REPORTED = 193;
+  ATOM_MEDIAMETRICS_AUDIOTRACK_REPORTED = 194;
+  ATOM_MEDIAMETRICS_CODEC_REPORTED = 195;
+  ATOM_MEDIAMETRICS_DRM_WIDEVINE_REPORTED = 196;
+  ATOM_MEDIAMETRICS_EXTRACTOR_REPORTED = 197;
+  ATOM_MEDIAMETRICS_MEDIADRM_REPORTED = 198;
+  ATOM_MEDIAMETRICS_NUPLAYER_REPORTED = 199;
+  ATOM_MEDIAMETRICS_RECORDER_REPORTED = 200;
+  ATOM_MEDIAMETRICS_DRMMANAGER_REPORTED = 201;
+  ATOM_CAR_POWER_STATE_CHANGED = 203;
+  ATOM_GARAGE_MODE_INFO = 204;
+  ATOM_TEST_ATOM_REPORTED = 205;
+  ATOM_CONTENT_CAPTURE_CALLER_MISMATCH_REPORTED = 206;
+  ATOM_CONTENT_CAPTURE_SERVICE_EVENTS = 207;
+  ATOM_CONTENT_CAPTURE_SESSION_EVENTS = 208;
+  ATOM_CONTENT_CAPTURE_FLUSHED = 209;
+  ATOM_LOCATION_MANAGER_API_USAGE_REPORTED = 210;
+  ATOM_REVIEW_PERMISSIONS_FRAGMENT_RESULT_REPORTED = 211;
+  ATOM_RUNTIME_PERMISSIONS_UPGRADE_RESULT = 212;
+  ATOM_GRANT_PERMISSIONS_ACTIVITY_BUTTON_ACTIONS = 213;
+  ATOM_LOCATION_ACCESS_CHECK_NOTIFICATION_ACTION = 214;
+  ATOM_APP_PERMISSION_FRAGMENT_ACTION_REPORTED = 215;
+  ATOM_APP_PERMISSION_FRAGMENT_VIEWED = 216;
+  ATOM_APP_PERMISSIONS_FRAGMENT_VIEWED = 217;
+  ATOM_PERMISSION_APPS_FRAGMENT_VIEWED = 218;
+  ATOM_TEXT_SELECTION_EVENT = 219;
+  ATOM_TEXT_LINKIFY_EVENT = 220;
+  ATOM_CONVERSATION_ACTIONS_EVENT = 221;
+  ATOM_LANGUAGE_DETECTION_EVENT = 222;
+  ATOM_EXCLUSION_RECT_STATE_CHANGED = 223;
+  ATOM_BACK_GESTURE_REPORTED_REPORTED = 224;
+  ATOM_UPDATE_ENGINE_UPDATE_ATTEMPT_REPORTED = 225;
+  ATOM_UPDATE_ENGINE_SUCCESSFUL_UPDATE_REPORTED = 226;
+  ATOM_CAMERA_ACTION_EVENT = 227;
+  ATOM_APP_COMPATIBILITY_CHANGE_REPORTED = 228;
+  ATOM_PERFETTO_UPLOADED = 229;
+  ATOM_VMS_CLIENT_CONNECTION_STATE_CHANGED = 230;
+  ATOM_MEDIA_PROVIDER_SCAN_OCCURRED = 233;
+  ATOM_MEDIA_CONTENT_DELETED = 234;
+  ATOM_MEDIA_PROVIDER_PERMISSION_REQUESTED = 235;
+  ATOM_MEDIA_PROVIDER_SCHEMA_CHANGED = 236;
+  ATOM_MEDIA_PROVIDER_IDLE_MAINTENANCE_FINISHED = 237;
+  ATOM_REBOOT_ESCROW_RECOVERY_REPORTED = 238;
+  ATOM_BOOT_TIME_EVENT_DURATION_REPORTED = 239;
+  ATOM_BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED = 240;
+  ATOM_BOOT_TIME_EVENT_UTC_TIME_REPORTED = 241;
+  ATOM_BOOT_TIME_EVENT_ERROR_CODE_REPORTED = 242;
+  ATOM_USERSPACE_REBOOT_REPORTED = 243;
+  ATOM_NOTIFICATION_REPORTED = 244;
+  ATOM_NOTIFICATION_PANEL_REPORTED = 245;
+  ATOM_NOTIFICATION_CHANNEL_MODIFIED = 246;
+  ATOM_INTEGRITY_CHECK_RESULT_REPORTED = 247;
+  ATOM_INTEGRITY_RULES_PUSHED = 248;
+  ATOM_CB_MESSAGE_REPORTED = 249;
+  ATOM_CB_MESSAGE_ERROR = 250;
+  ATOM_WIFI_HEALTH_STAT_REPORTED = 251;
+  ATOM_WIFI_FAILURE_STAT_REPORTED = 252;
+  ATOM_WIFI_CONNECTION_RESULT_REPORTED = 253;
+  ATOM_APP_FREEZE_CHANGED = 254;
+  ATOM_SNAPSHOT_MERGE_REPORTED = 255;
+  ATOM_FOREGROUND_SERVICE_APP_OP_SESSION_ENDED = 256;
+  ATOM_DISPLAY_JANK_REPORTED = 257;
+  ATOM_APP_STANDBY_BUCKET_CHANGED = 258;
+  ATOM_SHARESHEET_STARTED = 259;
+  ATOM_RANKING_SELECTED = 260;
+  ATOM_TVSETTINGS_UI_INTERACTED = 261;
+  ATOM_LAUNCHER_SNAPSHOT = 262;
+  ATOM_PACKAGE_INSTALLER_V2_REPORTED = 263;
+  ATOM_USER_LIFECYCLE_JOURNEY_REPORTED = 264;
+  ATOM_USER_LIFECYCLE_EVENT_OCCURRED = 265;
+  ATOM_ACCESSIBILITY_SHORTCUT_REPORTED = 266;
+  ATOM_ACCESSIBILITY_SERVICE_REPORTED = 267;
+  ATOM_DOCS_UI_DRAG_AND_DROP_REPORTED = 268;
+  ATOM_APP_USAGE_EVENT_OCCURRED = 269;
+  ATOM_AUTO_REVOKE_NOTIFICATION_CLICKED = 270;
+  ATOM_AUTO_REVOKE_FRAGMENT_APP_VIEWED = 271;
+  ATOM_AUTO_REVOKED_APP_INTERACTION = 272;
+  ATOM_APP_PERMISSION_GROUPS_FRAGMENT_AUTO_REVOKE_ACTION = 273;
+  ATOM_EVS_USAGE_STATS_REPORTED = 274;
+  ATOM_AUDIO_POWER_USAGE_DATA_REPORTED = 275;
+  ATOM_TV_TUNER_STATE_CHANGED = 276;
+  ATOM_MEDIAOUTPUT_OP_SWITCH_REPORTED = 277;
+  ATOM_CB_MESSAGE_FILTERED = 278;
+  ATOM_TV_TUNER_DVR_STATUS = 279;
+  ATOM_TV_CAS_SESSION_OPEN_STATUS = 280;
+  ATOM_ASSISTANT_INVOCATION_REPORTED = 281;
+  ATOM_DISPLAY_WAKE_REPORTED = 282;
+  ATOM_CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED = 283;
+  ATOM_CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED = 284;
+  ATOM_CAR_USER_HAL_POST_SWITCH_RESPONSE_REPORTED = 285;
+  ATOM_CAR_USER_HAL_INITIAL_USER_INFO_REQUEST_REPORTED = 286;
+  ATOM_CAR_USER_HAL_INITIAL_USER_INFO_RESPONSE_REPORTED = 287;
+  ATOM_CAR_USER_HAL_USER_ASSOCIATION_REQUEST_REPORTED = 288;
+  ATOM_CAR_USER_HAL_SET_USER_ASSOCIATION_RESPONSE_REPORTED = 289;
+  ATOM_NETWORK_IP_PROVISIONING_REPORTED = 290;
+  ATOM_NETWORK_DHCP_RENEW_REPORTED = 291;
+  ATOM_NETWORK_VALIDATION_REPORTED = 292;
+  ATOM_NETWORK_STACK_QUIRK_REPORTED = 293;
+  ATOM_MEDIAMETRICS_AUDIORECORDDEVICEUSAGE_REPORTED = 294;
+  ATOM_MEDIAMETRICS_AUDIOTHREADDEVICEUSAGE_REPORTED = 295;
+  ATOM_MEDIAMETRICS_AUDIOTRACKDEVICEUSAGE_REPORTED = 296;
+  ATOM_MEDIAMETRICS_AUDIODEVICECONNECTION_REPORTED = 297;
+  ATOM_BLOB_COMMITTED = 298;
+  ATOM_BLOB_LEASED = 299;
+  ATOM_BLOB_OPENED = 300;
+  ATOM_CONTACTS_PROVIDER_STATUS_REPORTED = 301;
+  ATOM_KEYSTORE_KEY_EVENT_REPORTED = 302;
+  ATOM_NETWORK_TETHERING_REPORTED = 303;
+  ATOM_IME_TOUCH_REPORTED = 304;
+  ATOM_UI_INTERACTION_FRAME_INFO_REPORTED = 305;
+  ATOM_UI_ACTION_LATENCY_REPORTED = 306;
+  ATOM_WIFI_DISCONNECT_REPORTED = 307;
+  ATOM_WIFI_CONNECTION_STATE_CHANGED = 308;
+  ATOM_HDMI_CEC_ACTIVE_SOURCE_CHANGED = 309;
+  ATOM_HDMI_CEC_MESSAGE_REPORTED = 310;
+  ATOM_AIRPLANE_MODE = 311;
+  ATOM_MODEM_RESTART = 312;
+  ATOM_CARRIER_ID_MISMATCH_REPORTED = 313;
+  ATOM_CARRIER_ID_TABLE_UPDATED = 314;
+  ATOM_DATA_STALL_RECOVERY_REPORTED = 315;
+  ATOM_MEDIAMETRICS_MEDIAPARSER_REPORTED = 316;
+  ATOM_TLS_HANDSHAKE_REPORTED = 317;
+  ATOM_TEXT_CLASSIFIER_API_USAGE_REPORTED = 318;
+  ATOM_CAR_WATCHDOG_KILL_STATS_REPORTED = 319;
+  ATOM_MEDIAMETRICS_PLAYBACK_REPORTED = 320;
+  ATOM_MEDIA_NETWORK_INFO_CHANGED = 321;
+  ATOM_MEDIA_PLAYBACK_STATE_CHANGED = 322;
+  ATOM_MEDIA_PLAYBACK_ERROR_REPORTED = 323;
+  ATOM_MEDIA_PLAYBACK_TRACK_CHANGED = 324;
+  ATOM_WIFI_SCAN_REPORTED = 325;
+  ATOM_WIFI_PNO_SCAN_REPORTED = 326;
+  ATOM_TIF_TUNE_CHANGED = 327;
+  ATOM_AUTO_ROTATE_REPORTED = 328;
+  ATOM_PERFETTO_TRIGGER = 329;
+  ATOM_TRANSCODING_DATA = 330;
+  ATOM_IMS_SERVICE_ENTITLEMENT_UPDATED = 331;
+  ATOM_DEVICE_ROTATED = 333;
+  ATOM_SIM_SPECIFIC_SETTINGS_RESTORED = 334;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_REPORTED = 335;
+  ATOM_PIN_STORAGE_EVENT = 336;
+  ATOM_FACE_DOWN_REPORTED = 337;
+  ATOM_BLUETOOTH_HAL_CRASH_REASON_REPORTED = 338;
+  ATOM_REBOOT_ESCROW_PREPARATION_REPORTED = 339;
+  ATOM_REBOOT_ESCROW_LSKF_CAPTURE_REPORTED = 340;
+  ATOM_REBOOT_ESCROW_REBOOT_REPORTED = 341;
+  ATOM_BINDER_LATENCY_REPORTED = 342;
+  ATOM_MEDIAMETRICS_AAUDIOSTREAM_REPORTED = 343;
+  ATOM_MEDIA_TRANSCODING_SESSION_ENDED = 344;
+  ATOM_MAGNIFICATION_USAGE_REPORTED = 345;
+  ATOM_MAGNIFICATION_MODE_WITH_IME_ON_REPORTED = 346;
+  ATOM_APP_SEARCH_CALL_STATS_REPORTED = 347;
+  ATOM_APP_SEARCH_PUT_DOCUMENT_STATS_REPORTED = 348;
+  ATOM_DEVICE_CONTROL_CHANGED = 349;
+  ATOM_DEVICE_STATE_CHANGED = 350;
+  ATOM_INPUTDEVICE_REGISTERED = 351;
+  ATOM_SMARTSPACE_CARD_REPORTED = 352;
+  ATOM_AUTH_PROMPT_AUTHENTICATE_INVOKED = 353;
+  ATOM_AUTH_MANAGER_CAN_AUTHENTICATE_INVOKED = 354;
+  ATOM_AUTH_ENROLL_ACTION_INVOKED = 355;
+  ATOM_AUTH_DEPRECATED_API_USED = 356;
+  ATOM_UNATTENDED_REBOOT_OCCURRED = 357;
+  ATOM_LONG_REBOOT_BLOCKING_REPORTED = 358;
+  ATOM_LOCATION_TIME_ZONE_PROVIDER_STATE_CHANGED = 359;
+  ATOM_FDTRACK_EVENT_OCCURRED = 364;
+  ATOM_TIMEOUT_AUTO_EXTENDED_REPORTED = 365;
+  ATOM_ALARM_BATCH_DELIVERED = 367;
+  ATOM_ALARM_SCHEDULED = 368;
+  ATOM_CAR_WATCHDOG_IO_OVERUSE_STATS_REPORTED = 369;
+  ATOM_USER_LEVEL_HIBERNATION_STATE_CHANGED = 370;
+  ATOM_APP_SEARCH_INITIALIZE_STATS_REPORTED = 371;
+  ATOM_APP_SEARCH_QUERY_STATS_REPORTED = 372;
+  ATOM_APP_PROCESS_DIED = 373;
+  ATOM_NETWORK_IP_REACHABILITY_MONITOR_REPORTED = 374;
+  ATOM_SLOW_INPUT_EVENT_REPORTED = 375;
+  ATOM_ANR_OCCURRED_PROCESSING_STARTED = 376;
+  ATOM_APP_SEARCH_REMOVE_STATS_REPORTED = 377;
+  ATOM_MEDIA_CODEC_REPORTED = 378;
+  ATOM_PERMISSION_USAGE_FRAGMENT_INTERACTION = 379;
+  ATOM_PERMISSION_DETAILS_INTERACTION = 380;
+  ATOM_PRIVACY_SENSOR_TOGGLE_INTERACTION = 381;
+  ATOM_PRIVACY_TOGGLE_DIALOG_INTERACTION = 382;
+  ATOM_APP_SEARCH_OPTIMIZE_STATS_REPORTED = 383;
+  ATOM_NON_A11Y_TOOL_SERVICE_WARNING_REPORT = 384;
+  ATOM_APP_SEARCH_SET_SCHEMA_STATS_REPORTED = 385;
+  ATOM_APP_COMPAT_STATE_CHANGED = 386;
+  ATOM_SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED = 387;
+  ATOM_SPLITSCREEN_UI_CHANGED = 388;
+  ATOM_NETWORK_DNS_HANDSHAKE_REPORTED = 389;
+  ATOM_BLUETOOTH_CODE_PATH_COUNTER = 390;
+  ATOM_BLUETOOTH_LE_BATCH_SCAN_REPORT_DELAY = 392;
+  ATOM_ACCESSIBILITY_FLOATING_MENU_UI_CHANGED = 393;
+  ATOM_NEURALNETWORKS_COMPILATION_COMPLETED = 394;
+  ATOM_NEURALNETWORKS_EXECUTION_COMPLETED = 395;
+  ATOM_NEURALNETWORKS_COMPILATION_FAILED = 396;
+  ATOM_NEURALNETWORKS_EXECUTION_FAILED = 397;
+  ATOM_CONTEXT_HUB_BOOTED = 398;
+  ATOM_CONTEXT_HUB_RESTARTED = 399;
+  ATOM_CONTEXT_HUB_LOADED_NANOAPP_SNAPSHOT_REPORTED = 400;
+  ATOM_CHRE_CODE_DOWNLOAD_TRANSACTED = 401;
+  ATOM_UWB_SESSION_INITED = 402;
+  ATOM_UWB_SESSION_CLOSED = 403;
+  ATOM_UWB_FIRST_RANGING_RECEIVED = 404;
+  ATOM_UWB_RANGING_MEASUREMENT_RECEIVED = 405;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_WORK_SCHEDULED = 406;
+  ATOM_TEXT_CLASSIFIER_DOWNLOAD_WORK_COMPLETED = 407;
+  ATOM_CLIPBOARD_CLEARED = 408;
+  ATOM_VM_CREATION_REQUESTED = 409;
+  ATOM_NEARBY_DEVICE_SCAN_STATE_CHANGED = 410;
+  ATOM_CAMERA_COMPAT_CONTROL_EVENT_REPORTED = 411;
+  ATOM_APPLICATION_LOCALES_CHANGED = 412;
+  ATOM_MEDIAMETRICS_AUDIOTRACKSTATUS_REPORTED = 413;
+  ATOM_FOLD_STATE_DURATION_REPORTED = 414;
+  ATOM_LOCATION_TIME_ZONE_PROVIDER_CONTROLLER_STATE_CHANGED = 415;
+  ATOM_DISPLAY_HBM_STATE_CHANGED = 416;
+  ATOM_DISPLAY_HBM_BRIGHTNESS_CHANGED = 417;
+  ATOM_PERSISTENT_URI_PERMISSIONS_FLUSHED = 418;
+  ATOM_EARLY_BOOT_COMP_OS_ARTIFACTS_CHECK_REPORTED = 419;
+  ATOM_VBMETA_DIGEST_REPORTED = 420;
+  ATOM_APEX_INFO_GATHERED = 421;
+  ATOM_PVM_INFO_GATHERED = 422;
+  ATOM_WEAR_SETTINGS_UI_INTERACTED = 423;
+  ATOM_TRACING_SERVICE_REPORT_EVENT = 424;
+  ATOM_MEDIAMETRICS_AUDIORECORDSTATUS_REPORTED = 425;
+  ATOM_LAUNCHER_LATENCY = 426;
+  ATOM_DROPBOX_ENTRY_DROPPED = 427;
+  ATOM_WIFI_P2P_CONNECTION_REPORTED = 428;
+  ATOM_GAME_STATE_CHANGED = 429;
+  ATOM_HOTWORD_DETECTOR_CREATE_REQUESTED = 430;
+  ATOM_HOTWORD_DETECTION_SERVICE_INIT_RESULT_REPORTED = 431;
+  ATOM_HOTWORD_DETECTION_SERVICE_RESTARTED = 432;
+  ATOM_HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED = 433;
+  ATOM_HOTWORD_DETECTOR_EVENTS = 434;
+  ATOM_AD_SERVICES_API_CALLED = 435;
+  ATOM_AD_SERVICES_MESUREMENT_REPORTS_UPLOADED = 436;
+  ATOM_BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED = 437;
+  ATOM_CONTACTS_INDEXER_UPDATE_STATS_REPORTED = 440;
+  ATOM_APP_BACKGROUND_RESTRICTIONS_INFO = 441;
+  ATOM_MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED = 442;
+  ATOM_MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED = 443;
+  ATOM_PERMISSION_REMINDER_NOTIFICATION_INTERACTED = 444;
+  ATOM_RECENT_PERMISSION_DECISIONS_INTERACTED = 445;
+  ATOM_GNSS_PSDS_DOWNLOAD_REPORTED = 446;
+  ATOM_LE_AUDIO_CONNECTION_SESSION_REPORTED = 447;
+  ATOM_LE_AUDIO_BROADCAST_SESSION_REPORTED = 448;
+  ATOM_DREAM_UI_EVENT_REPORTED = 449;
+  ATOM_TASK_MANAGER_EVENT_REPORTED = 450;
+  ATOM_CDM_ASSOCIATION_ACTION = 451;
+  ATOM_MAGNIFICATION_TRIPLE_TAP_AND_HOLD_ACTIVATED_SESSION_REPORTED = 452;
+  ATOM_MAGNIFICATION_FOLLOW_TYPING_FOCUS_ACTIVATED_SESSION_REPORTED = 453;
+  ATOM_ACCESSIBILITY_TEXT_READING_OPTIONS_CHANGED = 454;
+  ATOM_WIFI_SETUP_FAILURE_CRASH_REPORTED = 455;
+  ATOM_UWB_DEVICE_ERROR_REPORTED = 456;
+  ATOM_ISOLATED_COMPILATION_SCHEDULED = 457;
+  ATOM_ISOLATED_COMPILATION_ENDED = 458;
+  ATOM_ONS_OPPORTUNISTIC_ESIM_PROVISIONING_COMPLETE = 459;
+  ATOM_SYSTEM_SERVER_PRE_WATCHDOG_OCCURRED = 460;
+  ATOM_TELEPHONY_ANOMALY_DETECTED = 461;
+  ATOM_LETTERBOX_POSITION_CHANGED = 462;
+  ATOM_REMOTE_KEY_PROVISIONING_ATTEMPT = 463;
+  ATOM_REMOTE_KEY_PROVISIONING_NETWORK_INFO = 464;
+  ATOM_REMOTE_KEY_PROVISIONING_TIMING = 465;
+  ATOM_MEDIAOUTPUT_OP_INTERACTION_REPORT = 466;
+  ATOM_SYNC_EXEMPTION_OCCURRED = 468;
+  ATOM_AUTOFILL_PRESENTATION_EVENT_REPORTED = 469;
+  ATOM_DOCK_STATE_CHANGED = 470;
+  ATOM_SAFETY_SOURCE_STATE_COLLECTED = 471;
+  ATOM_SAFETY_CENTER_SYSTEM_EVENT_REPORTED = 472;
+  ATOM_SAFETY_CENTER_INTERACTION_REPORTED = 473;
+  ATOM_SETTINGS_PROVIDER_SETTING_CHANGED = 474;
+  ATOM_BROADCAST_DELIVERY_EVENT_REPORTED = 475;
+  ATOM_SERVICE_REQUEST_EVENT_REPORTED = 476;
+  ATOM_PROVIDER_ACQUISITION_EVENT_REPORTED = 477;
+  ATOM_BLUETOOTH_DEVICE_NAME_REPORTED = 478;
+  ATOM_CB_CONFIG_UPDATED = 479;
+  ATOM_CB_MODULE_ERROR_REPORTED = 480;
+  ATOM_CB_SERVICE_FEATURE_CHANGED = 481;
+  ATOM_CB_RECEIVER_FEATURE_CHANGED = 482;
+  ATOM_JSSCRIPTENGINE_LATENCY_REPORTED = 483;
+  ATOM_PRIVACY_SIGNAL_NOTIFICATION_INTERACTION = 484;
+  ATOM_PRIVACY_SIGNAL_ISSUE_CARD_INTERACTION = 485;
+  ATOM_PRIVACY_SIGNALS_JOB_FAILURE = 486;
+  ATOM_VIBRATION_REPORTED = 487;
+  ATOM_UWB_RANGING_START = 489;
+  ATOM_MOBILE_DATA_DOWNLOAD_FILE_GROUP_STATUS_REPORTED = 490;
+  ATOM_APP_COMPACTED_V2 = 491;
+  ATOM_AD_SERVICES_SETTINGS_USAGE_REPORTED = 493;
+  ATOM_DISPLAY_BRIGHTNESS_CHANGED = 494;
+  ATOM_ACTIVITY_ACTION_BLOCKED = 495;
+  ATOM_BACKGROUND_FETCH_PROCESS_REPORTED = 496;
+  ATOM_UPDATE_CUSTOM_AUDIENCE_PROCESS_REPORTED = 497;
+  ATOM_RUN_AD_BIDDING_PROCESS_REPORTED = 498;
+  ATOM_RUN_AD_SCORING_PROCESS_REPORTED = 499;
+  ATOM_RUN_AD_SELECTION_PROCESS_REPORTED = 500;
+  ATOM_RUN_AD_BIDDING_PER_CA_PROCESS_REPORTED = 501;
+  ATOM_MOBILE_DATA_DOWNLOAD_DOWNLOAD_RESULT_REPORTED = 502;
+  ATOM_MOBILE_DATA_DOWNLOAD_FILE_GROUP_STORAGE_STATS_REPORTED = 503;
+  ATOM_NETWORK_DNS_SERVER_SUPPORT_REPORTED = 504;
+  ATOM_VM_BOOTED = 505;
+  ATOM_VM_EXITED = 506;
+  ATOM_AMBIENT_BRIGHTNESS_STATS_REPORTED = 507;
+  ATOM_MEDIAMETRICS_SPATIALIZERCAPABILITIES_REPORTED = 508;
+  ATOM_MEDIAMETRICS_SPATIALIZERDEVICEENABLED_REPORTED = 509;
+  ATOM_MEDIAMETRICS_HEADTRACKERDEVICEENABLED_REPORTED = 510;
+  ATOM_MEDIAMETRICS_HEADTRACKERDEVICESUPPORTED_REPORTED = 511;
+  ATOM_AD_SERVICES_MEASUREMENT_REGISTRATIONS = 512;
+  ATOM_HEARING_AID_INFO_REPORTED = 513;
+  ATOM_DEVICE_WIDE_JOB_CONSTRAINT_CHANGED = 514;
+  ATOM_AMBIENT_MODE_CHANGED = 515;
+  ATOM_ANR_LATENCY_REPORTED = 516;
+  ATOM_RESOURCE_API_INFO = 517;
+  ATOM_SYSTEM_DEFAULT_NETWORK_CHANGED = 518;
+  ATOM_IWLAN_SETUP_DATA_CALL_RESULT_REPORTED = 519;
+  ATOM_IWLAN_PDN_DISCONNECTED_REASON_REPORTED = 520;
+  ATOM_AIRPLANE_MODE_SESSION_REPORTED = 521;
+  ATOM_VM_CPU_STATUS_REPORTED = 522;
+  ATOM_VM_MEM_STATUS_REPORTED = 523;
+  ATOM_PACKAGE_INSTALLATION_SESSION_REPORTED = 524;
+  ATOM_DEFAULT_NETWORK_REMATCH_INFO = 525;
+  ATOM_NETWORK_SELECTION_PERFORMANCE = 526;
+  ATOM_NETWORK_NSD_REPORTED = 527;
+  ATOM_BLUETOOTH_DISCONNECTION_REASON_REPORTED = 529;
+  ATOM_BLUETOOTH_LOCAL_VERSIONS_REPORTED = 530;
+  ATOM_BLUETOOTH_REMOTE_SUPPORTED_FEATURES_REPORTED = 531;
+  ATOM_BLUETOOTH_LOCAL_SUPPORTED_FEATURES_REPORTED = 532;
+  ATOM_BLUETOOTH_GATT_APP_INFO = 533;
+  ATOM_BRIGHTNESS_CONFIGURATION_UPDATED = 534;
+  ATOM_AD_SERVICES_GET_TOPICS_REPORTED = 535;
+  ATOM_AD_SERVICES_EPOCH_COMPUTATION_GET_TOP_TOPICS_REPORTED = 536;
+  ATOM_AD_SERVICES_EPOCH_COMPUTATION_CLASSIFIER_REPORTED = 537;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_LAUNCHED = 538;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_FINISHED = 539;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_CONNECTION_REPORTED = 540;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_DEVICE_SCAN_TRIGGERED = 541;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_FIRST_DEVICE_SCAN_LATENCY = 542;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_CONNECT_DEVICE_LATENCY = 543;
+  ATOM_PACKAGE_MANAGER_SNAPSHOT_REPORTED = 544;
+  ATOM_PACKAGE_MANAGER_APPS_FILTER_CACHE_BUILD_REPORTED = 545;
+  ATOM_PACKAGE_MANAGER_APPS_FILTER_CACHE_UPDATE_REPORTED = 546;
+  ATOM_LAUNCHER_IMPRESSION_EVENT = 547;
+  ATOM_WEAR_MEDIA_OUTPUT_SWITCHER_ALL_DEVICES_SCAN_LATENCY = 549;
+  ATOM_WS_WATCH_FACE_EDITED = 551;
+  ATOM_WS_WATCH_FACE_FAVORITE_ACTION_REPORTED = 552;
+  ATOM_WS_WATCH_FACE_SET_ACTION_REPORTED = 553;
+  ATOM_PACKAGE_UNINSTALLATION_REPORTED = 554;
+  ATOM_GAME_MODE_CHANGED = 555;
+  ATOM_GAME_MODE_CONFIGURATION_CHANGED = 556;
+  ATOM_BEDTIME_MODE_STATE_CHANGED = 557;
+  ATOM_NETWORK_SLICE_SESSION_ENDED = 558;
+  ATOM_NETWORK_SLICE_DAILY_DATA_USAGE_REPORTED = 559;
+  ATOM_NFC_TAG_TYPE_OCCURRED = 560;
+  ATOM_NFC_AID_CONFLICT_OCCURRED = 561;
+  ATOM_NFC_READER_CONFLICT_OCCURRED = 562;
+  ATOM_WS_TILE_LIST_CHANGED = 563;
+  ATOM_GET_TYPE_ACCESSED_WITHOUT_PERMISSION = 564;
+  ATOM_MOBILE_BUNDLED_APP_INFO_GATHERED = 566;
+  ATOM_WS_WATCH_FACE_COMPLICATION_SET_CHANGED = 567;
+  ATOM_MEDIA_DRM_CREATED = 568;
+  ATOM_MEDIA_DRM_ERRORED = 569;
+  ATOM_MEDIA_DRM_SESSION_OPENED = 570;
+  ATOM_MEDIA_DRM_SESSION_CLOSED = 571;
+  ATOM_USER_SELECTED_RESOLUTION = 572;
+  ATOM_UNSAFE_INTENT_EVENT_REPORTED = 573;
+  ATOM_PERFORMANCE_HINT_SESSION_REPORTED = 574;
+  ATOM_MEDIAMETRICS_MIDI_DEVICE_CLOSE_REPORTED = 576;
+  ATOM_BIOMETRIC_TOUCH_REPORTED = 577;
+  ATOM_HOTWORD_AUDIO_EGRESS_EVENT_REPORTED = 578;
+  ATOM_APP_SEARCH_SCHEMA_MIGRATION_STATS_REPORTED = 579;
+  ATOM_LOCATION_ENABLED_STATE_CHANGED = 580;
+  ATOM_IME_REQUEST_FINISHED = 581;
+  ATOM_USB_COMPLIANCE_WARNINGS_REPORTED = 582;
+  ATOM_APP_SUPPORTED_LOCALES_CHANGED = 583;
+  ATOM_GRAMMATICAL_INFLECTION_CHANGED = 584;
+  ATOM_MEDIA_PROVIDER_VOLUME_RECOVERY_REPORTED = 586;
+  ATOM_BIOMETRIC_PROPERTIES_COLLECTED = 587;
+  ATOM_KERNEL_WAKEUP_ATTRIBUTED = 588;
+  ATOM_SCREEN_STATE_CHANGED_V2 = 589;
+  ATOM_WS_BACKUP_ACTION_REPORTED = 590;
+  ATOM_WS_RESTORE_ACTION_REPORTED = 591;
+  ATOM_DEVICE_LOG_ACCESS_EVENT_REPORTED = 592;
+  ATOM_MEDIA_SESSION_UPDATED = 594;
+  ATOM_WEAR_OOBE_STATE_CHANGED = 595;
+  ATOM_WS_NOTIFICATION_UPDATED = 596;
+  ATOM_NETWORK_VALIDATION_FAILURE_STATS_DAILY_REPORTED = 601;
+  ATOM_WS_COMPLICATION_TAPPED = 602;
+  ATOM_WS_WEAR_TIME_SESSION = 610;
+  ATOM_WIFI_BYTES_TRANSFER = 10000;
+  ATOM_WIFI_BYTES_TRANSFER_BY_FG_BG = 10001;
+  ATOM_MOBILE_BYTES_TRANSFER = 10002;
+  ATOM_MOBILE_BYTES_TRANSFER_BY_FG_BG = 10003;
+  ATOM_BLUETOOTH_BYTES_TRANSFER = 10006;
+  ATOM_KERNEL_WAKELOCK = 10004;
+  ATOM_SUBSYSTEM_SLEEP_STATE = 10005;
+  ATOM_CPU_TIME_PER_UID = 10009;
+  ATOM_CPU_TIME_PER_UID_FREQ = 10010;
+  ATOM_WIFI_ACTIVITY_INFO = 10011;
+  ATOM_MODEM_ACTIVITY_INFO = 10012;
+  ATOM_BLUETOOTH_ACTIVITY_INFO = 10007;
+  ATOM_PROCESS_MEMORY_STATE = 10013;
+  ATOM_SYSTEM_ELAPSED_REALTIME = 10014;
+  ATOM_SYSTEM_UPTIME = 10015;
+  ATOM_CPU_ACTIVE_TIME = 10016;
+  ATOM_CPU_CLUSTER_TIME = 10017;
+  ATOM_DISK_SPACE = 10018;
+  ATOM_REMAINING_BATTERY_CAPACITY = 10019;
+  ATOM_FULL_BATTERY_CAPACITY = 10020;
+  ATOM_TEMPERATURE = 10021;
+  ATOM_BINDER_CALLS = 10022;
+  ATOM_BINDER_CALLS_EXCEPTIONS = 10023;
+  ATOM_LOOPER_STATS = 10024;
+  ATOM_DISK_STATS = 10025;
+  ATOM_DIRECTORY_USAGE = 10026;
+  ATOM_APP_SIZE = 10027;
+  ATOM_CATEGORY_SIZE = 10028;
+  ATOM_PROC_STATS = 10029;
+  ATOM_BATTERY_VOLTAGE = 10030;
+  ATOM_NUM_FINGERPRINTS_ENROLLED = 10031;
+  ATOM_DISK_IO = 10032;
+  ATOM_POWER_PROFILE = 10033;
+  ATOM_PROC_STATS_PKG_PROC = 10034;
+  ATOM_PROCESS_CPU_TIME = 10035;
+  ATOM_CPU_TIME_PER_THREAD_FREQ = 10037;
+  ATOM_ON_DEVICE_POWER_MEASUREMENT = 10038;
+  ATOM_DEVICE_CALCULATED_POWER_USE = 10039;
+  ATOM_PROCESS_MEMORY_HIGH_WATER_MARK = 10042;
+  ATOM_BATTERY_LEVEL = 10043;
+  ATOM_BUILD_INFORMATION = 10044;
+  ATOM_BATTERY_CYCLE_COUNT = 10045;
+  ATOM_DEBUG_ELAPSED_CLOCK = 10046;
+  ATOM_DEBUG_FAILING_ELAPSED_CLOCK = 10047;
+  ATOM_NUM_FACES_ENROLLED = 10048;
+  ATOM_ROLE_HOLDER = 10049;
+  ATOM_DANGEROUS_PERMISSION_STATE = 10050;
+  ATOM_TRAIN_INFO = 10051;
+  ATOM_TIME_ZONE_DATA_INFO = 10052;
+  ATOM_EXTERNAL_STORAGE_INFO = 10053;
+  ATOM_GPU_STATS_GLOBAL_INFO = 10054;
+  ATOM_GPU_STATS_APP_INFO = 10055;
+  ATOM_SYSTEM_ION_HEAP_SIZE = 10056;
+  ATOM_APPS_ON_EXTERNAL_STORAGE_INFO = 10057;
+  ATOM_FACE_SETTINGS = 10058;
+  ATOM_COOLING_DEVICE = 10059;
+  ATOM_APP_OPS = 10060;
+  ATOM_PROCESS_SYSTEM_ION_HEAP_SIZE = 10061;
+  ATOM_SURFACEFLINGER_STATS_GLOBAL_INFO = 10062;
+  ATOM_SURFACEFLINGER_STATS_LAYER_INFO = 10063;
+  ATOM_PROCESS_MEMORY_SNAPSHOT = 10064;
+  ATOM_VMS_CLIENT_STATS = 10065;
+  ATOM_NOTIFICATION_REMOTE_VIEWS = 10066;
+  ATOM_DANGEROUS_PERMISSION_STATE_SAMPLED = 10067;
+  ATOM_GRAPHICS_STATS = 10068;
+  ATOM_RUNTIME_APP_OP_ACCESS = 10069;
+  ATOM_ION_HEAP_SIZE = 10070;
+  ATOM_PACKAGE_NOTIFICATION_PREFERENCES = 10071;
+  ATOM_PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES = 10072;
+  ATOM_PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES = 10073;
+  ATOM_GNSS_STATS = 10074;
+  ATOM_ATTRIBUTED_APP_OPS = 10075;
+  ATOM_VOICE_CALL_SESSION = 10076;
+  ATOM_VOICE_CALL_RAT_USAGE = 10077;
+  ATOM_SIM_SLOT_STATE = 10078;
+  ATOM_SUPPORTED_RADIO_ACCESS_FAMILY = 10079;
+  ATOM_SETTING_SNAPSHOT = 10080;
+  ATOM_BLOB_INFO = 10081;
+  ATOM_DATA_USAGE_BYTES_TRANSFER = 10082;
+  ATOM_BYTES_TRANSFER_BY_TAG_AND_METERED = 10083;
+  ATOM_DND_MODE_RULE = 10084;
+  ATOM_GENERAL_EXTERNAL_STORAGE_ACCESS_STATS = 10085;
+  ATOM_INCOMING_SMS = 10086;
+  ATOM_OUTGOING_SMS = 10087;
+  ATOM_CARRIER_ID_TABLE_VERSION = 10088;
+  ATOM_DATA_CALL_SESSION = 10089;
+  ATOM_CELLULAR_SERVICE_STATE = 10090;
+  ATOM_CELLULAR_DATA_SERVICE_SWITCH = 10091;
+  ATOM_SYSTEM_MEMORY = 10092;
+  ATOM_IMS_REGISTRATION_TERMINATION = 10093;
+  ATOM_IMS_REGISTRATION_STATS = 10094;
+  ATOM_CPU_TIME_PER_CLUSTER_FREQ = 10095;
+  ATOM_CPU_CYCLES_PER_UID_CLUSTER = 10096;
+  ATOM_DEVICE_ROTATED_DATA = 10097;
+  ATOM_CPU_CYCLES_PER_THREAD_GROUP_CLUSTER = 10098;
+  ATOM_MEDIA_DRM_ACTIVITY_INFO = 10099;
+  ATOM_OEM_MANAGED_BYTES_TRANSFER = 10100;
+  ATOM_GNSS_POWER_STATS = 10101;
+  ATOM_TIME_ZONE_DETECTOR_STATE = 10102;
+  ATOM_KEYSTORE2_STORAGE_STATS = 10103;
+  ATOM_RKP_POOL_STATS = 10104;
+  ATOM_PROCESS_DMABUF_MEMORY = 10105;
+  ATOM_PENDING_ALARM_INFO = 10106;
+  ATOM_USER_LEVEL_HIBERNATED_APPS = 10107;
+  ATOM_LAUNCHER_LAYOUT_SNAPSHOT = 10108;
+  ATOM_GLOBAL_HIBERNATED_APPS = 10109;
+  ATOM_INPUT_EVENT_LATENCY_SKETCH = 10110;
+  ATOM_BATTERY_USAGE_STATS_BEFORE_RESET = 10111;
+  ATOM_BATTERY_USAGE_STATS_SINCE_RESET = 10112;
+  ATOM_BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL = 10113;
+  ATOM_INSTALLED_INCREMENTAL_PACKAGE = 10114;
+  ATOM_TELEPHONY_NETWORK_REQUESTS = 10115;
+  ATOM_APP_SEARCH_STORAGE_INFO = 10116;
+  ATOM_VMSTAT = 10117;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO = 10118;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO = 10119;
+  ATOM_KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO = 10120;
+  ATOM_KEYSTORE2_ATOM_WITH_OVERFLOW = 10121;
+  ATOM_KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO = 10122;
+  ATOM_KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO = 10123;
+  ATOM_RKP_ERROR_STATS = 10124;
+  ATOM_KEYSTORE2_CRASH_STATS = 10125;
+  ATOM_VENDOR_APEX_INFO = 10126;
+  ATOM_ACCESSIBILITY_SHORTCUT_STATS = 10127;
+  ATOM_ACCESSIBILITY_FLOATING_MENU_STATS = 10128;
+  ATOM_DATA_USAGE_BYTES_TRANSFER_V2 = 10129;
+  ATOM_MEDIA_CAPABILITIES = 10130;
+  ATOM_CAR_WATCHDOG_SYSTEM_IO_USAGE_SUMMARY = 10131;
+  ATOM_CAR_WATCHDOG_UID_IO_USAGE_SUMMARY = 10132;
+  ATOM_IMS_REGISTRATION_FEATURE_TAG_STATS = 10133;
+  ATOM_RCS_CLIENT_PROVISIONING_STATS = 10134;
+  ATOM_RCS_ACS_PROVISIONING_STATS = 10135;
+  ATOM_SIP_DELEGATE_STATS = 10136;
+  ATOM_SIP_TRANSPORT_FEATURE_TAG_STATS = 10137;
+  ATOM_SIP_MESSAGE_RESPONSE = 10138;
+  ATOM_SIP_TRANSPORT_SESSION = 10139;
+  ATOM_IMS_DEDICATED_BEARER_LISTENER_EVENT = 10140;
+  ATOM_IMS_DEDICATED_BEARER_EVENT = 10141;
+  ATOM_IMS_REGISTRATION_SERVICE_DESC_STATS = 10142;
+  ATOM_UCE_EVENT_STATS = 10143;
+  ATOM_PRESENCE_NOTIFY_EVENT = 10144;
+  ATOM_GBA_EVENT = 10145;
+  ATOM_PER_SIM_STATUS = 10146;
+  ATOM_GPU_WORK_PER_UID = 10147;
+  ATOM_PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE = 10148;
+  ATOM_SIGNED_PARTITION_INFO = 10149;
+  ATOM_PINNED_FILE_SIZES_PER_PACKAGE = 10150;
+  ATOM_PENDING_INTENTS_PER_PACKAGE = 10151;
+  ATOM_USER_INFO = 10152;
+  ATOM_TELEPHONY_NETWORK_REQUESTS_V2 = 10153;
+  ATOM_DEVICE_TELEPHONY_PROPERTIES = 10154;
+  ATOM_REMOTE_KEY_PROVISIONING_ERROR_COUNTS = 10155;
+  ATOM_SAFETY_STATE = 10156;
+  ATOM_INCOMING_MMS = 10157;
+  ATOM_OUTGOING_MMS = 10158;
+  ATOM_MULTI_USER_INFO = 10160;
+  ATOM_NETWORK_BPF_MAP_INFO = 10161;
+  ATOM_OUTGOING_SHORT_CODE_SMS = 10162;
+  ATOM_CONNECTIVITY_STATE_SAMPLE = 10163;
+  ATOM_NETWORK_SELECTION_REMATCH_REASONS_INFO = 10164;
+  ATOM_GAME_MODE_INFO = 10165;
+  ATOM_GAME_MODE_CONFIGURATION = 10166;
+  ATOM_GAME_MODE_LISTENER = 10167;
+  ATOM_NETWORK_SLICE_REQUEST_COUNT = 10168;
+  ATOM_WS_TILE_SNAPSHOT = 10169;
+  ATOM_WS_ACTIVE_WATCH_FACE_COMPLICATION_SET_SNAPSHOT = 10170;
+  ATOM_PROCESS_STATE = 10171;
+  ATOM_PROCESS_ASSOCIATION = 10172;
+  ATOM_ADPF_SYSTEM_COMPONENT_INFO = 10173;
+  ATOM_NOTIFICATION_MEMORY_USE = 10174;
+  ATOM_HDR_CAPABILITIES = 10175;
+  ATOM_WS_FAVOURITE_WATCH_FACE_LIST_SNAPSHOT = 10176;
+  ATOM_WIFI_AWARE_NDP_REPORTED = 638;
+  ATOM_WIFI_AWARE_ATTACH_REPORTED = 639;
+  ATOM_WIFI_SELF_RECOVERY_TRIGGERED = 661;
+  ATOM_SOFT_AP_STARTED = 680;
+  ATOM_SOFT_AP_STOPPED = 681;
+  ATOM_WIFI_LOCK_RELEASED = 687;
+  ATOM_WIFI_LOCK_DEACTIVATED = 688;
+  ATOM_WIFI_CONFIG_SAVED = 689;
+  ATOM_WIFI_AWARE_RESOURCE_USING_CHANGED = 690;
+  ATOM_WIFI_AWARE_HAL_API_CALLED = 691;
+  ATOM_WIFI_LOCAL_ONLY_REQUEST_RECEIVED = 692;
+  ATOM_WIFI_LOCAL_ONLY_REQUEST_SCAN_TRIGGERED = 693;
+  ATOM_WIFI_THREAD_TASK_EXECUTED = 694;
+  ATOM_WIFI_STATE_CHANGED = 700;
+  ATOM_WIFI_AWARE_CAPABILITIES = 10190;
+  ATOM_WIFI_MODULE_INFO = 10193;
+  ATOM_SETTINGS_SPA_REPORTED = 622;
+  ATOM_EXPRESS_EVENT_REPORTED = 528;
+  ATOM_EXPRESS_HISTOGRAM_SAMPLE_REPORTED = 593;
+  ATOM_EXPRESS_UID_EVENT_REPORTED = 644;
+  ATOM_EXPRESS_UID_HISTOGRAM_SAMPLE_REPORTED = 658;
+  ATOM_PERMISSION_RATIONALE_DIALOG_VIEWED = 645;
+  ATOM_PERMISSION_RATIONALE_DIALOG_ACTION_REPORTED = 646;
+  ATOM_APP_DATA_SHARING_UPDATES_NOTIFICATION_INTERACTION = 647;
+  ATOM_APP_DATA_SHARING_UPDATES_FRAGMENT_VIEWED = 648;
+  ATOM_APP_DATA_SHARING_UPDATES_FRAGMENT_ACTION_REPORTED = 649;
+  ATOM_WS_INCOMING_CALL_ACTION_REPORTED = 626;
+  ATOM_WS_CALL_DISCONNECTION_REPORTED = 627;
+  ATOM_WS_CALL_DURATION_REPORTED = 628;
+  ATOM_WS_CALL_USER_EXPERIENCE_LATENCY_REPORTED = 629;
+  ATOM_WS_CALL_INTERACTION_REPORTED = 630;
+  ATOM_FULL_SCREEN_INTENT_LAUNCHED = 631;
+  ATOM_BAL_ALLOWED = 632;
+  ATOM_IN_TASK_ACTIVITY_STARTED = 685;
+  ATOM_CACHED_APPS_HIGH_WATERMARK = 10189;
+  ATOM_ODREFRESH_REPORTED = 366;
+  ATOM_ODSIGN_REPORTED = 548;
+  ATOM_ART_DATUM_REPORTED = 332;
+  ATOM_ART_DEVICE_DATUM_REPORTED = 550;
+  ATOM_ART_DATUM_DELTA_REPORTED = 565;
+  ATOM_BACKGROUND_DEXOPT_JOB_ENDED = 467;
+  ATOM_WEAR_ADAPTIVE_SUSPEND_STATS_REPORTED = 619;
+  ATOM_WEAR_POWER_ANOMALY_SERVICE_OPERATIONAL_STATS_REPORTED = 620;
+  ATOM_WEAR_POWER_ANOMALY_SERVICE_EVENT_STATS_REPORTED = 621;
+  ATOM_EMERGENCY_STATE_CHANGED = 633;
+  ATOM_DND_STATE_CHANGED = 657;
+  ATOM_MTE_STATE = 10181;
+  ATOM_AD_SERVICES_BACK_COMPAT_GET_TOPICS_REPORTED = 598;
+  ATOM_AD_SERVICES_BACK_COMPAT_EPOCH_COMPUTATION_CLASSIFIER_REPORTED = 599;
+  ATOM_AD_SERVICES_MEASUREMENT_DEBUG_KEYS = 640;
+  ATOM_AD_SERVICES_ERROR_REPORTED = 662;
+  ATOM_AD_SERVICES_BACKGROUND_JOBS_EXECUTION_REPORTED = 663;
+  ATOM_AD_SERVICES_MEASUREMENT_DELAYED_SOURCE_REGISTRATION = 673;
+  ATOM_AD_SERVICES_MEASUREMENT_ATTRIBUTION = 674;
+  ATOM_AD_SERVICES_MEASUREMENT_JOBS = 675;
+  ATOM_AD_SERVICES_MEASUREMENT_WIPEOUT = 676;
+  ATOM_AD_SERVICES_CONSENT_MIGRATED = 702;
+  ATOM_RKPD_POOL_STATS = 664;
+  ATOM_RKPD_CLIENT_OPERATION = 665;
+  ATOM_AUTOFILL_UI_EVENT_REPORTED = 603;
+  ATOM_AUTOFILL_FILL_REQUEST_REPORTED = 604;
+  ATOM_AUTOFILL_FILL_RESPONSE_REPORTED = 605;
+  ATOM_AUTOFILL_SAVE_EVENT_REPORTED = 606;
+  ATOM_AUTOFILL_SESSION_COMMITTED = 607;
+  ATOM_AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED = 659;
+  ATOM_TEST_EXTENSION_ATOM_REPORTED = 660;
+  ATOM_TEST_RESTRICTED_ATOM_REPORTED = 672;
+  ATOM_STATS_SOCKET_LOSS_REPORTED = 752;
+  ATOM_PLUGIN_INITIALIZED = 655;
+  ATOM_TV_LOW_POWER_STANDBY_POLICY = 679;
+  ATOM_LOCKSCREEN_SHORTCUT_SELECTED = 611;
+  ATOM_LOCKSCREEN_SHORTCUT_TRIGGERED = 612;
+  ATOM_EMERGENCY_NUMBERS_INFO = 10180;
+  ATOM_QUALIFIED_RAT_LIST_CHANGED = 634;
+  ATOM_QNS_IMS_CALL_DROP_STATS = 635;
+  ATOM_QNS_FALLBACK_RESTRICTION_CHANGED = 636;
+  ATOM_QNS_RAT_PREFERENCE_MISMATCH_INFO = 10177;
+  ATOM_QNS_HANDOVER_TIME_MILLIS = 10178;
+  ATOM_QNS_HANDOVER_PINGPONG = 10179;
+  ATOM_SATELLITE_CONTROLLER = 10182;
+  ATOM_SATELLITE_SESSION = 10183;
+  ATOM_SATELLITE_INCOMING_DATAGRAM = 10184;
+  ATOM_SATELLITE_OUTGOING_DATAGRAM = 10185;
+  ATOM_SATELLITE_PROVISION = 10186;
+  ATOM_SATELLITE_SOS_MESSAGE_RECOMMENDER = 10187;
+  ATOM_IKE_SESSION_TERMINATED = 678;
+  ATOM_IKE_LIVENESS_CHECK_SESSION_VALIDATED = 760;
+  ATOM_BLUETOOTH_HASHED_DEVICE_NAME_REPORTED = 613;
+  ATOM_BLUETOOTH_L2CAP_COC_CLIENT_CONNECTION = 614;
+  ATOM_BLUETOOTH_L2CAP_COC_SERVER_CONNECTION = 615;
+  ATOM_BLUETOOTH_LE_SESSION_CONNECTED = 656;
+  ATOM_RESTRICTED_BLUETOOTH_DEVICE_NAME_REPORTED = 666;
+  ATOM_BLUETOOTH_PROFILE_CONNECTION_ATTEMPTED = 696;
+  ATOM_HEALTH_CONNECT_UI_IMPRESSION = 623;
+  ATOM_HEALTH_CONNECT_UI_INTERACTION = 624;
+  ATOM_HEALTH_CONNECT_APP_OPENED_REPORTED = 625;
+  ATOM_HEALTH_CONNECT_API_CALLED = 616;
+  ATOM_HEALTH_CONNECT_USAGE_STATS = 617;
+  ATOM_HEALTH_CONNECT_STORAGE_STATS = 618;
+  ATOM_HEALTH_CONNECT_API_INVOKED = 643;
+  ATOM_EXERCISE_ROUTE_API_CALLED = 654;
+  ATOM_ATOM_9999 = 9999;
+  ATOM_ATOM_99999 = 99999;
+  ATOM_THREADNETWORK_TELEMETRY_DATA_REPORTED = 738;
+  ATOM_THREADNETWORK_TOPO_ENTRY_REPEATED = 739;
+  ATOM_THREADNETWORK_DEVICE_INFO_REPORTED = 740;
+  ATOM_EMERGENCY_NUMBER_DIALED = 637;
+  ATOM_SANDBOX_API_CALLED = 488;
+  ATOM_SANDBOX_ACTIVITY_EVENT_OCCURRED = 735;
+  ATOM_SANDBOX_SDK_STORAGE = 10159;
+  ATOM_CRONET_ENGINE_CREATED = 703;
+  ATOM_CRONET_TRAFFIC_REPORTED = 704;
+  ATOM_CRONET_ENGINE_BUILDER_INITIALIZED = 762;
+  ATOM_CRONET_HTTP_FLAGS_INITIALIZED = 763;
+  ATOM_CRONET_INITIALIZED = 764;
+  ATOM_DAILY_KEEPALIVE_INFO_REPORTED = 650;
+  ATOM_IP_CLIENT_RA_INFO_REPORTED = 778;
+  ATOM_APF_SESSION_INFO_REPORTED = 777;
+  ATOM_CREDENTIAL_MANAGER_API_CALLED = 585;
+  ATOM_CREDENTIAL_MANAGER_INIT_PHASE_REPORTED = 651;
+  ATOM_CREDENTIAL_MANAGER_CANDIDATE_PHASE_REPORTED = 652;
+  ATOM_CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED = 653;
+  ATOM_CREDENTIAL_MANAGER_TOTAL_REPORTED = 667;
+  ATOM_CREDENTIAL_MANAGER_FINALNOUID_REPORTED = 668;
+  ATOM_CREDENTIAL_MANAGER_GET_REPORTED = 669;
+  ATOM_CREDENTIAL_MANAGER_AUTH_CLICK_REPORTED = 670;
+  ATOM_CREDENTIAL_MANAGER_APIV2_CALLED = 671;
+  ATOM_UWB_ACTIVITY_INFO = 10188;
+  ATOM_MEDIA_ACTION_REPORTED = 608;
+  ATOM_MEDIA_CONTROLS_LAUNCHED = 609;
+  ATOM_MEDIA_CODEC_RECLAIM_REQUEST_COMPLETED = 600;
+  ATOM_MEDIA_CODEC_STARTED = 641;
+  ATOM_MEDIA_CODEC_STOPPED = 642;
+  ATOM_MEDIA_CODEC_RENDERED = 684;
+}
+// End of protos/perfetto/config/statsd/atom_ids.proto
+
+// Begin of protos/perfetto/config/statsd/statsd_tracing_config.proto
+
+// This file is named 'statsd_tracing_config.proto' rather than
+// 'statsd_config.proto' (which would be more consistent with the other
+// config protos) so it doesn't show up and confuse folks looking for
+// the existing statsd_config.proto for configuring statsd itself.
+// Same for the config proto itself.
+message StatsdTracingConfig {
+  // This is for the common case of the atom id being known in the enum AtomId.
+  repeated AtomId push_atom_id = 1;
+
+  // Escape hatch for Atom IDs that are not yet in the AtomId enum
+  // (e.g. non-upstream atoms that don't exist in AOSP).
+  repeated int32 raw_push_atom_id = 2;
+  repeated StatsdPullAtomConfig pull_config = 3;
+}
+
+message StatsdPullAtomConfig {
+  repeated AtomId pull_atom_id = 1;
+  repeated int32 raw_pull_atom_id = 2;
+
+  optional int32 pull_frequency_ms = 3;
+  repeated string packages = 4;
+}
+
+// End of protos/perfetto/config/statsd/statsd_tracing_config.proto
+
+// Begin of protos/perfetto/common/sys_stats_counters.proto
+
+// When editing entries here remember also to update "sys_stats_counters.h" with
+// the corresponding string definitions for the actual /proc files parser.
+
+// Counter definitions for Linux's /proc/meminfo.
+enum MeminfoCounters {
+  MEMINFO_UNSPECIFIED = 0;
+  MEMINFO_MEM_TOTAL = 1;
+  MEMINFO_MEM_FREE = 2;
+  MEMINFO_MEM_AVAILABLE = 3;
+  MEMINFO_BUFFERS = 4;
+  MEMINFO_CACHED = 5;
+  MEMINFO_SWAP_CACHED = 6;
+  MEMINFO_ACTIVE = 7;
+  MEMINFO_INACTIVE = 8;
+  MEMINFO_ACTIVE_ANON = 9;
+  MEMINFO_INACTIVE_ANON = 10;
+  MEMINFO_ACTIVE_FILE = 11;
+  MEMINFO_INACTIVE_FILE = 12;
+  MEMINFO_UNEVICTABLE = 13;
+  MEMINFO_MLOCKED = 14;
+  MEMINFO_SWAP_TOTAL = 15;
+  MEMINFO_SWAP_FREE = 16;
+  MEMINFO_DIRTY = 17;
+  MEMINFO_WRITEBACK = 18;
+  MEMINFO_ANON_PAGES = 19;
+  MEMINFO_MAPPED = 20;
+  MEMINFO_SHMEM = 21;
+  MEMINFO_SLAB = 22;
+  MEMINFO_SLAB_RECLAIMABLE = 23;
+  MEMINFO_SLAB_UNRECLAIMABLE = 24;
+  MEMINFO_KERNEL_STACK = 25;
+  MEMINFO_PAGE_TABLES = 26;
+  MEMINFO_COMMIT_LIMIT = 27;
+  MEMINFO_COMMITED_AS = 28;
+  MEMINFO_VMALLOC_TOTAL = 29;
+  MEMINFO_VMALLOC_USED = 30;
+  MEMINFO_VMALLOC_CHUNK = 31;
+  MEMINFO_CMA_TOTAL = 32;
+  MEMINFO_CMA_FREE = 33;
+}
+
+// Counter definitions for Linux's /proc/vmstat.
+enum VmstatCounters {
+  VMSTAT_UNSPECIFIED = 0;
+  VMSTAT_NR_FREE_PAGES = 1;
+  VMSTAT_NR_ALLOC_BATCH = 2;
+  VMSTAT_NR_INACTIVE_ANON = 3;
+  VMSTAT_NR_ACTIVE_ANON = 4;
+  VMSTAT_NR_INACTIVE_FILE = 5;
+  VMSTAT_NR_ACTIVE_FILE = 6;
+  VMSTAT_NR_UNEVICTABLE = 7;
+  VMSTAT_NR_MLOCK = 8;
+  VMSTAT_NR_ANON_PAGES = 9;
+  VMSTAT_NR_MAPPED = 10;
+  VMSTAT_NR_FILE_PAGES = 11;
+  VMSTAT_NR_DIRTY = 12;
+  VMSTAT_NR_WRITEBACK = 13;
+  VMSTAT_NR_SLAB_RECLAIMABLE = 14;
+  VMSTAT_NR_SLAB_UNRECLAIMABLE = 15;
+  VMSTAT_NR_PAGE_TABLE_PAGES = 16;
+  VMSTAT_NR_KERNEL_STACK = 17;
+  VMSTAT_NR_OVERHEAD = 18;
+  VMSTAT_NR_UNSTABLE = 19;
+  VMSTAT_NR_BOUNCE = 20;
+  VMSTAT_NR_VMSCAN_WRITE = 21;
+  VMSTAT_NR_VMSCAN_IMMEDIATE_RECLAIM = 22;
+  VMSTAT_NR_WRITEBACK_TEMP = 23;
+  VMSTAT_NR_ISOLATED_ANON = 24;
+  VMSTAT_NR_ISOLATED_FILE = 25;
+  VMSTAT_NR_SHMEM = 26;
+  VMSTAT_NR_DIRTIED = 27;
+  VMSTAT_NR_WRITTEN = 28;
+  VMSTAT_NR_PAGES_SCANNED = 29;
+  VMSTAT_WORKINGSET_REFAULT = 30;
+  VMSTAT_WORKINGSET_ACTIVATE = 31;
+  VMSTAT_WORKINGSET_NODERECLAIM = 32;
+  VMSTAT_NR_ANON_TRANSPARENT_HUGEPAGES = 33;
+  VMSTAT_NR_FREE_CMA = 34;
+  VMSTAT_NR_SWAPCACHE = 35;
+  VMSTAT_NR_DIRTY_THRESHOLD = 36;
+  VMSTAT_NR_DIRTY_BACKGROUND_THRESHOLD = 37;
+  VMSTAT_PGPGIN = 38;
+  VMSTAT_PGPGOUT = 39;
+  VMSTAT_PGPGOUTCLEAN = 40;
+  VMSTAT_PSWPIN = 41;
+  VMSTAT_PSWPOUT = 42;
+  VMSTAT_PGALLOC_DMA = 43;
+  VMSTAT_PGALLOC_NORMAL = 44;
+  VMSTAT_PGALLOC_MOVABLE = 45;
+  VMSTAT_PGFREE = 46;
+  VMSTAT_PGACTIVATE = 47;
+  VMSTAT_PGDEACTIVATE = 48;
+  VMSTAT_PGFAULT = 49;
+  VMSTAT_PGMAJFAULT = 50;
+  VMSTAT_PGREFILL_DMA = 51;
+  VMSTAT_PGREFILL_NORMAL = 52;
+  VMSTAT_PGREFILL_MOVABLE = 53;
+  VMSTAT_PGSTEAL_KSWAPD_DMA = 54;
+  VMSTAT_PGSTEAL_KSWAPD_NORMAL = 55;
+  VMSTAT_PGSTEAL_KSWAPD_MOVABLE = 56;
+  VMSTAT_PGSTEAL_DIRECT_DMA = 57;
+  VMSTAT_PGSTEAL_DIRECT_NORMAL = 58;
+  VMSTAT_PGSTEAL_DIRECT_MOVABLE = 59;
+  VMSTAT_PGSCAN_KSWAPD_DMA = 60;
+  VMSTAT_PGSCAN_KSWAPD_NORMAL = 61;
+  VMSTAT_PGSCAN_KSWAPD_MOVABLE = 62;
+  VMSTAT_PGSCAN_DIRECT_DMA = 63;
+  VMSTAT_PGSCAN_DIRECT_NORMAL = 64;
+  VMSTAT_PGSCAN_DIRECT_MOVABLE = 65;
+  VMSTAT_PGSCAN_DIRECT_THROTTLE = 66;
+  VMSTAT_PGINODESTEAL = 67;
+  VMSTAT_SLABS_SCANNED = 68;
+  VMSTAT_KSWAPD_INODESTEAL = 69;
+  VMSTAT_KSWAPD_LOW_WMARK_HIT_QUICKLY = 70;
+  VMSTAT_KSWAPD_HIGH_WMARK_HIT_QUICKLY = 71;
+  VMSTAT_PAGEOUTRUN = 72;
+  VMSTAT_ALLOCSTALL = 73;
+  VMSTAT_PGROTATED = 74;
+  VMSTAT_DROP_PAGECACHE = 75;
+  VMSTAT_DROP_SLAB = 76;
+  VMSTAT_PGMIGRATE_SUCCESS = 77;
+  VMSTAT_PGMIGRATE_FAIL = 78;
+  VMSTAT_COMPACT_MIGRATE_SCANNED = 79;
+  VMSTAT_COMPACT_FREE_SCANNED = 80;
+  VMSTAT_COMPACT_ISOLATED = 81;
+  VMSTAT_COMPACT_STALL = 82;
+  VMSTAT_COMPACT_FAIL = 83;
+  VMSTAT_COMPACT_SUCCESS = 84;
+  VMSTAT_COMPACT_DAEMON_WAKE = 85;
+  VMSTAT_UNEVICTABLE_PGS_CULLED = 86;
+  VMSTAT_UNEVICTABLE_PGS_SCANNED = 87;
+  VMSTAT_UNEVICTABLE_PGS_RESCUED = 88;
+  VMSTAT_UNEVICTABLE_PGS_MLOCKED = 89;
+  VMSTAT_UNEVICTABLE_PGS_MUNLOCKED = 90;
+  VMSTAT_UNEVICTABLE_PGS_CLEARED = 91;
+  VMSTAT_UNEVICTABLE_PGS_STRANDED = 92;
+  VMSTAT_NR_ZSPAGES = 93;
+  VMSTAT_NR_ION_HEAP = 94;
+  VMSTAT_NR_GPU_HEAP = 95;
+  VMSTAT_ALLOCSTALL_DMA = 96;
+  VMSTAT_ALLOCSTALL_MOVABLE = 97;
+  VMSTAT_ALLOCSTALL_NORMAL = 98;
+  VMSTAT_COMPACT_DAEMON_FREE_SCANNED = 99;
+  VMSTAT_COMPACT_DAEMON_MIGRATE_SCANNED = 100;
+  VMSTAT_NR_FASTRPC = 101;
+  VMSTAT_NR_INDIRECTLY_RECLAIMABLE = 102;
+  VMSTAT_NR_ION_HEAP_POOL = 103;
+  VMSTAT_NR_KERNEL_MISC_RECLAIMABLE = 104;
+  VMSTAT_NR_SHADOW_CALL_STACK_BYTES = 105;
+  VMSTAT_NR_SHMEM_HUGEPAGES = 106;
+  VMSTAT_NR_SHMEM_PMDMAPPED = 107;
+  VMSTAT_NR_UNRECLAIMABLE_PAGES = 108;
+  VMSTAT_NR_ZONE_ACTIVE_ANON = 109;
+  VMSTAT_NR_ZONE_ACTIVE_FILE = 110;
+  VMSTAT_NR_ZONE_INACTIVE_ANON = 111;
+  VMSTAT_NR_ZONE_INACTIVE_FILE = 112;
+  VMSTAT_NR_ZONE_UNEVICTABLE = 113;
+  VMSTAT_NR_ZONE_WRITE_PENDING = 114;
+  VMSTAT_OOM_KILL = 115;
+  VMSTAT_PGLAZYFREE = 116;
+  VMSTAT_PGLAZYFREED = 117;
+  VMSTAT_PGREFILL = 118;
+  VMSTAT_PGSCAN_DIRECT = 119;
+  VMSTAT_PGSCAN_KSWAPD = 120;
+  VMSTAT_PGSKIP_DMA = 121;
+  VMSTAT_PGSKIP_MOVABLE = 122;
+  VMSTAT_PGSKIP_NORMAL = 123;
+  VMSTAT_PGSTEAL_DIRECT = 124;
+  VMSTAT_PGSTEAL_KSWAPD = 125;
+  VMSTAT_SWAP_RA = 126;
+  VMSTAT_SWAP_RA_HIT = 127;
+  VMSTAT_WORKINGSET_RESTORE = 128;
+  VMSTAT_ALLOCSTALL_DEVICE = 129;
+  VMSTAT_ALLOCSTALL_DMA32 = 130;
+  VMSTAT_BALLOON_DEFLATE = 131;
+  VMSTAT_BALLOON_INFLATE = 132;
+  VMSTAT_BALLOON_MIGRATE = 133;
+  VMSTAT_CMA_ALLOC_FAIL = 134;
+  VMSTAT_CMA_ALLOC_SUCCESS = 135;
+  VMSTAT_NR_FILE_HUGEPAGES = 136;
+  VMSTAT_NR_FILE_PMDMAPPED = 137;
+  VMSTAT_NR_FOLL_PIN_ACQUIRED = 138;
+  VMSTAT_NR_FOLL_PIN_RELEASED = 139;
+  VMSTAT_NR_SEC_PAGE_TABLE_PAGES = 140;
+  VMSTAT_NR_SHADOW_CALL_STACK = 141;
+  VMSTAT_NR_SWAPCACHED = 142;
+  VMSTAT_NR_THROTTLED_WRITTEN = 143;
+  VMSTAT_PGALLOC_DEVICE = 144;
+  VMSTAT_PGALLOC_DMA32 = 145;
+  VMSTAT_PGDEMOTE_DIRECT = 146;
+  VMSTAT_PGDEMOTE_KSWAPD = 147;
+  VMSTAT_PGREUSE = 148;
+  VMSTAT_PGSCAN_ANON = 149;
+  VMSTAT_PGSCAN_FILE = 150;
+  VMSTAT_PGSKIP_DEVICE = 151;
+  VMSTAT_PGSKIP_DMA32 = 152;
+  VMSTAT_PGSTEAL_ANON = 153;
+  VMSTAT_PGSTEAL_FILE = 154;
+  VMSTAT_THP_COLLAPSE_ALLOC = 155;
+  VMSTAT_THP_COLLAPSE_ALLOC_FAILED = 156;
+  VMSTAT_THP_DEFERRED_SPLIT_PAGE = 157;
+  VMSTAT_THP_FAULT_ALLOC = 158;
+  VMSTAT_THP_FAULT_FALLBACK = 159;
+  VMSTAT_THP_FAULT_FALLBACK_CHARGE = 160;
+  VMSTAT_THP_FILE_ALLOC = 161;
+  VMSTAT_THP_FILE_FALLBACK = 162;
+  VMSTAT_THP_FILE_FALLBACK_CHARGE = 163;
+  VMSTAT_THP_FILE_MAPPED = 164;
+  VMSTAT_THP_MIGRATION_FAIL = 165;
+  VMSTAT_THP_MIGRATION_SPLIT = 166;
+  VMSTAT_THP_MIGRATION_SUCCESS = 167;
+  VMSTAT_THP_SCAN_EXCEED_NONE_PTE = 168;
+  VMSTAT_THP_SCAN_EXCEED_SHARE_PTE = 169;
+  VMSTAT_THP_SCAN_EXCEED_SWAP_PTE = 170;
+  VMSTAT_THP_SPLIT_PAGE = 171;
+  VMSTAT_THP_SPLIT_PAGE_FAILED = 172;
+  VMSTAT_THP_SPLIT_PMD = 173;
+  VMSTAT_THP_SWPOUT = 174;
+  VMSTAT_THP_SWPOUT_FALLBACK = 175;
+  VMSTAT_THP_ZERO_PAGE_ALLOC = 176;
+  VMSTAT_THP_ZERO_PAGE_ALLOC_FAILED = 177;
+  VMSTAT_VMA_LOCK_ABORT = 178;
+  VMSTAT_VMA_LOCK_MISS = 179;
+  VMSTAT_VMA_LOCK_RETRY = 180;
+  VMSTAT_VMA_LOCK_SUCCESS = 181;
+  VMSTAT_WORKINGSET_ACTIVATE_ANON = 182;
+  VMSTAT_WORKINGSET_ACTIVATE_FILE = 183;
+  VMSTAT_WORKINGSET_NODES = 184;
+  VMSTAT_WORKINGSET_REFAULT_ANON = 185;
+  VMSTAT_WORKINGSET_REFAULT_FILE = 186;
+  VMSTAT_WORKINGSET_RESTORE_ANON = 187;
+  VMSTAT_WORKINGSET_RESTORE_FILE = 188;
+}
+
+// End of protos/perfetto/common/sys_stats_counters.proto
+
+// Begin of protos/perfetto/config/sys_stats/sys_stats_config.proto
+
+// This file defines the configuration for the Linux /proc poller data source,
+// which injects counters in the trace.
+// Counters that are needed in the trace must be explicitly listed in the
+// *_counters fields. This is to avoid spamming the trace with all counters
+// at all times.
+// The sampling rate is configurable. All polling rates (*_period_ms) need
+// to be integer multiples of each other.
+// OK:     [10ms, 10ms, 10ms],  [10ms, 20ms, 10ms],  [10ms, 20ms, 60ms]
+// Not OK: [10ms, 10ms, 11ms],  [10ms, 15ms, 20ms]
+message SysStatsConfig {
+  // Polls /proc/meminfo every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 0.3 ms [read] + 0.07 ms [parse + trace injection]
+  optional uint32 meminfo_period_ms = 1;
+
+  // If empty all known counters are reported. Otherwise, only the counters
+  // specified below are reported.
+  repeated MeminfoCounters meminfo_counters = 2;
+
+  // Polls /proc/vmstat every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 0.2 ms [read] + 0.3 ms [parse + trace injection]
+  optional uint32 vmstat_period_ms = 3;
+  repeated VmstatCounters vmstat_counters = 4;
+
+  // Pols /proc/stat every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // Cost: 4.1 ms [read] + 1.9 ms [parse + trace injection]
+  optional uint32 stat_period_ms = 5;
+  enum StatCounters {
+    STAT_UNSPECIFIED = 0;
+    STAT_CPU_TIMES = 1;
+    STAT_IRQ_COUNTS = 2;
+    STAT_SOFTIRQ_COUNTS = 3;
+    STAT_FORK_COUNT = 4;
+  }
+  repeated StatCounters stat_counters = 6;
+
+  // Polls /sys/devfreq/*/curfreq every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  // This option can be used to record unchanging values.
+  // Updates from frequency changes can come from ftrace/set_clock_rate.
+  optional uint32 devfreq_period_ms = 7;
+
+  // Polls /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_cur_freq every X ms.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 cpufreq_period_ms = 8;
+
+  // Polls /proc/buddyinfo every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 buddyinfo_period_ms = 9;
+
+  // Polls /proc/diskstats every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 diskstat_period_ms = 10;
+
+  // Polls /proc/pressure/* every X ms, if non-zero.
+  // This is required to be > 10ms to avoid excessive CPU usage.
+  optional uint32 psi_period_ms = 11;
+}
+
+// End of protos/perfetto/config/sys_stats/sys_stats_config.proto
+
+// Begin of protos/perfetto/config/system_info/system_info.proto
+
+// This data-source does a one-off recording of system information when
+// the trace starts.
+// Currently this includes:
+// - Values of
+// /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_frequencies This
+// datasource has no configuration options at present.
+message SystemInfoConfig {}
+
+// End of protos/perfetto/config/system_info/system_info.proto
+
+// Begin of protos/perfetto/config/test_config.proto
+
+// The configuration for a fake producer used in tests.
+message TestConfig {
+  message DummyFields {
+    optional uint32 field_uint32 = 1;
+    optional int32 field_int32 = 2;
+    optional uint64 field_uint64 = 3;
+    optional int64 field_int64 = 4;
+    optional fixed64 field_fixed64 = 5;
+    optional sfixed64 field_sfixed64 = 6;
+    optional fixed32 field_fixed32 = 7;
+    optional sfixed32 field_sfixed32 = 8;
+    optional double field_double = 9;
+    optional float field_float = 10;
+    optional sint64 field_sint64 = 11;
+    optional sint32 field_sint32 = 12;
+    optional string field_string = 13;
+    optional bytes field_bytes = 14;
+  }
+
+  // The number of messages the fake producer should send.
+  optional uint32 message_count = 1;
+
+  // The maximum number of messages which should be sent each second.
+  // The actual obserced speed may be lower if the producer is unable to
+  // work fast enough.
+  // If this is zero or unset, the producer will send as fast as possible.
+  optional uint32 max_messages_per_second = 2;
+
+  // The seed value for a simple multiplicative congruential pseudo-random
+  // number sequence.
+  optional uint32 seed = 3;
+
+  // The size of each message in bytes. Should be greater than or equal 5 to
+  // account for the number of bytes needed to encode the random number and a
+  // null byte for the string.
+  optional uint32 message_size = 4;
+
+  // Whether the producer should send a event batch when the data source is
+  // is initially registered.
+  optional bool send_batch_on_register = 5;
+
+  optional DummyFields dummy_fields = 6;
+}
+
+// End of protos/perfetto/config/test_config.proto
+
+// Begin of protos/perfetto/config/track_event/track_event_config.proto
+
+message TrackEventConfig {
+  // The following fields define the set of enabled trace categories. Each list
+  // item is a glob.
+  //
+  // To determine if category is enabled, it is checked against the filters in
+  // the following order:
+  //
+  //   1. Exact matches in enabled categories.
+  //   2. Exact matches in enabled tags.
+  //   3. Exact matches in disabled categories.
+  //   4. Exact matches in disabled tags.
+  //   5. Pattern matches in enabled categories.
+  //   6. Pattern matches in enabled tags.
+  //   7. Pattern matches in disabled categories.
+  //   8. Pattern matches in disabled tags.
+  //
+  // If none of the steps produced a match:
+  //  - In the C++ SDK (`perfetto::Category`), categories are enabled by
+  //  default.
+  //  - In the C SDK (`PerfettoTeCategory`), categories are disabled by default.
+  //
+  // Examples:
+  //
+  //  - To enable all non-slow/debug categories:
+  //
+  //       enabled_categories: "*"
+  //
+  //  - To enable specific categories:
+  //
+  //       disabled_categories: "*"
+  //       enabled_categories: "my_category"
+  //       enabled_categories: "my_category2"
+  //
+  //  - To enable only categories with a specific tag:
+  //
+  //       disabled_tags: "*"
+  //       enabled_tags: "my_tag"
+  //
+
+  // Default: []
+  repeated string disabled_categories = 1;
+
+  // Default: []
+  repeated string enabled_categories = 2;
+
+  // Default: ["slow", "debug"]
+  repeated string disabled_tags = 3;
+
+  // Default: []
+  repeated string enabled_tags = 4;
+
+  // Default: false (i.e. enabled by default)
+  optional bool disable_incremental_timestamps = 5;
+
+  // Allows to specify a custom unit different than the default (ns).
+  // Also affects thread timestamps if enable_thread_time_sampling = true.
+  // A multiplier of 1000 means that a timestamp = 3 should be interpreted as
+  // 3000 ns = 3 us.
+  // Default: 1 (if unset, it should be read as 1).
+  optional uint64 timestamp_unit_multiplier = 6;
+
+  // Default: false (i.e. debug_annotations is NOT filtered out by default)
+  // When true, any debug annotations provided as arguments to the
+  // TRACE_EVENT macros are not written into the trace. Typed arguments will
+  // still be emitted even if set to true.
+  optional bool filter_debug_annotations = 7;
+
+  // Default : false (i.e. disabled)
+  // When true, the SDK samples and emits the current thread time counter value
+  // for each event on the current thread's track. This value represents the
+  // total CPU time consumed by that thread since its creation. Note that if a
+  // thread is not scheduled by OS for some duration, that time won't be
+  // included in thread_time.
+  // Learn more : "CLOCK_THREAD_CPUTIME_ID" flag at
+  // https://linux.die.net/man/3/clock_gettime
+  optional bool enable_thread_time_sampling = 8;
+
+  // Default: false (i.e. dynamic event names are NOT filtered out by default)
+  // When true, event_names wrapped in perfetto::DynamicString will be filtered
+  // out.
+  optional bool filter_dynamic_event_names = 9;
+}
+
+// End of protos/perfetto/config/track_event/track_event_config.proto
+
+// Begin of protos/perfetto/config/data_source_config.proto
+
+// The configuration that is passed to each data source when starting tracing.
+// Next id: 129
+message DataSourceConfig {
+  enum SessionInitiator {
+    SESSION_INITIATOR_UNSPECIFIED = 0;
+    // This trace was initiated from a trusted system app has DUMP and
+    // USAGE_STATS permission. This system app is expected to not expose the
+    // trace to the user of the device.
+    // This is determined by checking the UID initiating the trace.
+    SESSION_INITIATOR_TRUSTED_SYSTEM = 1;
+  };
+  // Data source unique name, e.g., "linux.ftrace". This must match
+  // the name passed by the data source when it registers (see
+  // RegisterDataSource()).
+  optional string name = 1;
+
+  // The index of the logging buffer where TracePacket(s) will be stored.
+  // This field doesn't make a major difference for the Producer(s). The final
+  // logging buffers, in fact, are completely owned by the Service. We just ask
+  // the Producer to copy this number into the chunk headers it emits, so that
+  // the Service can quickly identify the buffer where to move the chunks into
+  // without expensive lookups on its fastpath.
+  optional uint32 target_buffer = 2;
+
+  // Set by the service to indicate the duration of the trace.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint32 trace_duration_ms = 3;
+
+  // If true, |trace_duration_ms| should count also time in suspend. This
+  // is propagated from TraceConfig.prefer_suspend_clock_for_duration.
+  optional bool prefer_suspend_clock_for_duration = 122;
+
+  // Set by the service to indicate how long it waits after StopDataSource.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint32 stop_timeout_ms = 7;
+
+  // Set by the service to indicate whether this tracing session has extra
+  // guardrails.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional bool enable_extra_guardrails = 6;
+
+  // Set by the service to indicate which user initiated this trace.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional SessionInitiator session_initiator = 8;
+
+  // Set by the service to indicate which tracing session the data source
+  // belongs to. The intended use case for this is checking if two data sources,
+  // one of which produces metadata for the other one, belong to the same trace
+  // session and hence should be linked together.
+  // This field was introduced in Aug 2018 after Android P.
+  // DO NOT SET in consumer as this will be overridden by the service.
+  optional uint64 tracing_session_id = 4;
+
+  // Keeep the lower IDs (up to 99) for fields that are *not* specific to
+  // data-sources and needs to be processed by the traced daemon.
+
+  // All data source config fields must be marked as [lazy=true]. This prevents
+  // the proto-to-cpp generator from recursing into those when generating the
+  // cpp classes and polluting tracing/core with data-source-specific classes.
+  // Instead they are treated as opaque strings containing raw proto bytes.
+
+  // Data source name: linux.ftrace
+  optional FtraceConfig ftrace_config = 100 [lazy = true];
+  // Data source name: linux.inode_file_map
+  optional InodeFileConfig inode_file_config = 102 [lazy = true];
+  // Data source name: linux.process_stats
+  optional ProcessStatsConfig process_stats_config = 103 [lazy = true];
+  // Data source name: linux.sys_stats
+  optional SysStatsConfig sys_stats_config = 104 [lazy = true];
+  // Data source name: android.heapprofd
+  // Introduced in Android 10.
+  optional HeapprofdConfig heapprofd_config = 105 [lazy = true];
+  // Data source name: android.java_hprof
+  // Introduced in Android 11.
+  optional JavaHprofConfig java_hprof_config = 110 [lazy = true];
+  // Data source name: android.power
+  optional AndroidPowerConfig android_power_config = 106 [lazy = true];
+  // Data source name: android.log
+  optional AndroidLogConfig android_log_config = 107 [lazy = true];
+  // TODO(fmayer): Add data source name for this.
+  optional GpuCounterConfig gpu_counter_config = 108 [lazy = true];
+  // Data source name: android.game_interventions
+  optional AndroidGameInterventionListConfig
+      android_game_intervention_list_config = 116 [lazy = true];
+  // Data source name: android.packages_list
+  optional PackagesListConfig packages_list_config = 109 [lazy = true];
+  // Data source name: linux.perf
+  optional PerfEventConfig perf_event_config = 111 [lazy = true];
+  // Data source name: vulkan.memory_tracker
+  optional VulkanMemoryConfig vulkan_memory_config = 112 [lazy = true];
+  // Data source name: track_event
+  optional TrackEventConfig track_event_config = 113 [lazy = true];
+  // Data source name: android.polled_state
+  optional AndroidPolledStateConfig android_polled_state_config = 114
+      [lazy = true];
+  // Data source name: android.system_property
+  optional AndroidSystemPropertyConfig android_system_property_config = 118
+      [lazy = true];
+  // Data source name: android.statsd
+  optional StatsdTracingConfig statsd_tracing_config = 117 [lazy = true];
+  // Data source name: linux.system_info
+  optional SystemInfoConfig system_info_config = 119;
+
+  // Chrome is special as it doesn't use the perfetto IPC layer. We want to
+  // avoid proto serialization and de-serialization there because that would
+  // just add extra hops on top of the Mojo ser/des. Instead we auto-generate a
+  // C++ class for it so it can pass around plain C++ objets.
+  optional ChromeConfig chrome_config = 101;
+
+  // Data source name: code.v8.dev
+  optional V8Config v8_config = 127 [lazy = true];
+
+  // If an interceptor is specified here, packets for this data source will be
+  // rerouted to the interceptor instead of the main trace buffer. This can be
+  // used, for example, to write trace data into ETW or for logging trace points
+  // to the console.
+  //
+  // Note that interceptors are only supported by data sources registered
+  // through the Perfetto SDK API. Data sources that don't use that API (e.g.,
+  // traced_probes) may not support interception.
+  optional InterceptorConfig interceptor_config = 115;
+
+  // Data source name: android.network_packets.
+  // Introduced in Android 14 (U).
+  optional NetworkPacketTraceConfig network_packet_trace_config = 120
+      [lazy = true];
+
+  // Data source name: android.surfaceflinger.layers
+  optional SurfaceFlingerLayersConfig surfaceflinger_layers_config = 121
+      [lazy = true];
+
+  // Data source name: android.surfaceflinger.transactions
+  optional SurfaceFlingerTransactionsConfig surfaceflinger_transactions_config =
+      123 [lazy = true];
+
+  // Data source name: android.sdk_sysprop_guard
+  // Introduced in Android 14 (U) QPR1.
+  optional AndroidSdkSyspropGuardConfig android_sdk_sysprop_guard_config = 124
+      [lazy = true];
+
+  // Data source name: windows.etw
+  optional EtwConfig etw_config = 125 [lazy = true];
+
+  // Data source name: android.protolog
+  optional ProtoLogConfig protolog_config = 126 [lazy = true];
+
+  // Data source name: android.input.inputevent
+  optional AndroidInputEventConfig android_input_event_config = 128 [lazy = true];
+
+  // This is a fallback mechanism to send a free-form text config to the
+  // producer. In theory this should never be needed. All the code that
+  // is part of the platform (i.e. traced service) is supposed to *not* truncate
+  // the trace config proto and propagate unknown fields. However, if anything
+  // in the pipeline (client or backend) ends up breaking this forward compat
+  // plan, this field will become the escape hatch to allow future data sources
+  // to get some meaningful configuration.
+  optional string legacy_config = 1000;
+
+  // This field is only used for testing.
+  optional TestConfig for_testing = 1001;
+
+  // Was |for_testing|. Caused more problems then found.
+  reserved 268435455;
+}
+
+// End of protos/perfetto/config/data_source_config.proto
+
+// Begin of protos/perfetto/config/trace_config.proto
+
+// The overall config that is used when starting a new tracing session through
+// ProducerPort::StartTracing().
+// It contains the general config for the logging buffer(s) and the configs for
+// all the data source being enabled.
+//
+// Next id: 39.
+message TraceConfig {
+  message BufferConfig {
+    optional uint32 size_kb = 1;
+
+    // |page_size|, now deprecated.
+    reserved 2;
+
+    // |optimize_for|, now deprecated.
+    reserved 3;
+
+    enum FillPolicy {
+      UNSPECIFIED = 0;
+
+      // Default behavior. The buffer operates as a conventional ring buffer.
+      // If the writer is faster than the reader (or if the reader reads only
+      // after tracing is stopped) newly written packets will overwrite old
+      // packets.
+      RING_BUFFER = 1;
+
+      // Behaves like RING_BUFFER as long as there is space in the buffer or
+      // the reader catches up with the writer. As soon as the writer hits
+      // an unread chunk, it stops accepting new data in the buffer.
+      DISCARD = 2;
+    }
+    optional FillPolicy fill_policy = 4;
+
+    // When true the buffer is moved (rather than copied) onto the cloned
+    // session, and an empty buffer of the same size is allocated in the source
+    // tracing session. This feature will likely get deprecated in the future.
+    // It been introduced mainly to support the surfaceflinger snapshot dump
+    // for bugreports, where SF can dumps O(400MB) into the bugreport trace. In
+    // that case we don't want to retain another in-memory copy of the buffer.
+    optional bool transfer_on_clone = 5;
+
+    // Used in conjuction with transfer_on_clone. When true the buffer is
+    // cleared before issuing the Flush(reason=kTraceClone). This is to ensure
+    // that if the data source took too long to write the data in a previous
+    // clone-related flush, we don't end up with a mixture of leftovers from
+    // the previous write and new data.
+    optional bool clear_before_clone = 6;
+  }
+  repeated BufferConfig buffers = 1;
+
+  message DataSource {
+    // Filters and data-source specific config. It contains also the unique name
+    // of the data source, the one passed in the  DataSourceDescriptor when they
+    // register on the service.
+    optional protos.DataSourceConfig config = 1;
+
+    // Optional. If multiple producers (~processes) expose the same data source
+    // and either |producer_name_filter| or |producer_name_regex_filter| is set,
+    // the data source is enabled only for producers whose names match any of
+    // the filters.
+    // |producer_name_filter| has to be an exact match, while
+    // |producer_name_regex_filter| is a regular expression.
+    // This allows to enable a data source only for specific processes.
+    // The "repeated" fields have OR semantics: specifying a filter ["foo",
+    // "bar"] will enable data sources on both "foo" and "bar" (if they exist).
+    repeated string producer_name_filter = 2;
+    repeated string producer_name_regex_filter = 3;
+  }
+  repeated DataSource data_sources = 2;
+
+  // Config for disabling builtin data sources in the tracing service.
+  message BuiltinDataSource {
+    // Disable emitting clock timestamps into the trace.
+    optional bool disable_clock_snapshotting = 1;
+
+    // Disable echoing the original trace config in the trace.
+    optional bool disable_trace_config = 2;
+
+    // Disable emitting system info (build fingerprint, cpuinfo, etc).
+    optional bool disable_system_info = 3;
+
+    // Disable emitting events for data-source state changes (e.g. the marker
+    // for all data sources having ACKed the start of the trace).
+    optional bool disable_service_events = 4;
+
+    // The authoritative clock domain for the trace. Defaults to BOOTTIME. See
+    // also ClockSnapshot's primary_trace_clock. The configured value is written
+    // into the trace as part of the ClockSnapshots emitted by the service.
+    // Trace processor will attempt to translate packet/event timestamps from
+    // various data sources (and their chosen clock domains) to this domain
+    // during import. Added in Android R.
+    optional BuiltinClock primary_trace_clock = 5;
+
+    // Time interval in between snapshotting of sync markers, clock snapshots,
+    // stats, and other periodic service-emitted events. Note that the service
+    // only keeps track of the first and the most recent snapshot until
+    // ReadBuffers() is called.
+    optional uint32 snapshot_interval_ms = 6;
+
+    // Hints to the service that a suspend-aware (i.e. counting time in suspend)
+    // clock should be used for periodic snapshots of service-emitted events.
+    // This means, if a snapshot *should* have happened during suspend, it will
+    // happen immediately after the device resumes.
+    //
+    // Choosing a clock like this is done on best-effort basis; not all
+    // platforms (e.g. Windows) expose a clock which can be used for periodic
+    // tasks counting suspend. If such a clock is not available, the service
+    // falls back to the best-available alternative.
+    //
+    // Introduced in Android S.
+    // TODO(lalitm): deprecate this in T and make this the default if nothing
+    // crashes in S.
+    optional bool prefer_suspend_clock_for_snapshot = 7;
+
+    // Disables the reporting of per-trace-writer histograms in TraceStats.
+    optional bool disable_chunk_usage_histograms = 8;
+  }
+  optional BuiltinDataSource builtin_data_sources = 20;
+
+  // If specified, the trace will be stopped |duration_ms| after starting.
+  // This does *not* count the time the system is suspended, so we will run
+  // for duration_ms of system activity, not wall time.
+  //
+  // However in case of traces with triggers, see
+  // TriggerConfig.trigger_timeout_ms instead.
+  optional uint32 duration_ms = 3;
+
+  // If true, tries to use CLOCK_BOOTTIME for duration_ms rather than
+  // CLOCK_MONOTONIC (which doesn't count time in suspend). Supported only on
+  // Linux/Android, no-op on other platforms. This is used when dealing with
+  // long (e.g. 24h) traces, where suspend can inflate them to weeks of
+  // wall-time, making them more likely to hit device reboots (and hence loss).
+  // This option also changes consistently the semantic of
+  // TriggerConfig.stop_delay_ms.
+  optional bool prefer_suspend_clock_for_duration = 36;
+
+  // This is set when --dropbox is passed to the Perfetto command line client
+  // and enables guardrails that limit resource usage for traces requested
+  // by statsd.
+  optional bool enable_extra_guardrails = 4;
+
+  enum LockdownModeOperation {
+    LOCKDOWN_UNCHANGED = 0;
+    LOCKDOWN_CLEAR = 1;
+    LOCKDOWN_SET = 2;
+  }
+  // Reject producers that are not running under the same UID as the tracing
+  // service.
+  optional LockdownModeOperation lockdown_mode = 5;
+
+  message ProducerConfig {
+    // Identifies the producer for which this config is for.
+    optional string producer_name = 1;
+
+    // Specifies the preferred size of the shared memory buffer. If the size is
+    // larger than the max size, the max will be used. If it is smaller than
+    // the page size or doesn't fit pages evenly into it, it will fall back to
+    // the size specified by the producer or finally the default shared memory
+    // size.
+    optional uint32 shm_size_kb = 2;
+
+    // Specifies the preferred size of each page in the shared memory buffer.
+    // Must be an integer multiple of 4K.
+    optional uint32 page_size_kb = 3;
+  }
+
+  repeated ProducerConfig producers = 6;
+
+  // Contains statsd-specific metadata about an alert associated with the trace.
+  message StatsdMetadata {
+    // The identifier of the alert which triggered this trace.
+    optional int64 triggering_alert_id = 1;
+    // The uid which registered the triggering configuration with statsd.
+    optional int32 triggering_config_uid = 2;
+    // The identifier of the config which triggered the alert.
+    optional int64 triggering_config_id = 3;
+    // The identifier of the subscription which triggered this trace.
+    optional int64 triggering_subscription_id = 4;
+  }
+
+  // Statsd-specific metadata.
+  optional StatsdMetadata statsd_metadata = 7;
+
+  // When true && |output_path| is empty, the EnableTracing() request must
+  // provide a file descriptor. The service will then periodically read packets
+  // out of the trace buffer and store it into the passed file.
+  // If |output_path| is not empty no fd should be passed, the service
+  // will create a new file and write into that (see comment below).
+  optional bool write_into_file = 8;
+
+  // This must point to a non-existing file. If the file exists the service
+  // will NOT overwrite and will fail instead as a security precaution.
+  // On Android, when this is used with the system traced, the path must be
+  // within /data/misc/perfetto-traces/ or the trace will fail.
+  // This option has been introduced in Android R. Before R write_into_file
+  // can be used only with the "pass a file descriptor over IPC" mode.
+  optional string output_path = 29;
+
+  // Optional. If non-zero tunes the write period. A min value of 100ms is
+  // enforced (i.e. smaller values are ignored).
+  optional uint32 file_write_period_ms = 9;
+
+  // Optional. When non zero the periodic write stops once at most X bytes
+  // have been written into the file. Tracing is disabled when this limit is
+  // reached, even if |duration_ms| has not been reached yet.
+  optional uint64 max_file_size_bytes = 10;
+
+  // Contains flags which override the default values of the guardrails inside
+  // Perfetto.
+  message GuardrailOverrides {
+    // Override the default limit (in bytes) for uploading data to server within
+    // a 24 hour period.
+    // On R-, this override only affected userdebug builds. Since S, it also
+    // affects user builds.
+    // In 24Q3+ (V+), this override is a noop because upload guardrail logic
+    // was removed from Perfetto.
+    optional uint64 max_upload_per_day_bytes = 1 [deprecated = true];
+
+    // Overrides the guardrail for maximum trace buffer size.
+    // Available on U+
+    optional uint32 max_tracing_buffer_size_kb = 2;
+  }
+  optional GuardrailOverrides guardrail_overrides = 11;
+
+  // When true, data sources are not started until an explicit call to
+  // StartTracing() on the consumer port. This is to support early
+  // initialization and fast trace triggering. This can be used only when the
+  // Consumer explicitly triggers the StartTracing() method.
+  // This should not be used in a remote trace config via statsd, doing so will
+  // result in a hung trace session.
+  optional bool deferred_start = 12;
+
+  // When set, it periodically issues a Flush() to all data source, forcing them
+  // to commit their data into the tracing service. This can be used for
+  // quasi-real-time streaming mode and to guarantee some partial ordering of
+  // events in the trace in windows of X ms.
+  optional uint32 flush_period_ms = 13;
+
+  // Wait for this long for producers to acknowledge flush requests.
+  // Default 5s.
+  optional uint32 flush_timeout_ms = 14;
+
+  // Wait for this long for producers to acknowledge stop requests.
+  // Default 5s.
+  optional uint32 data_source_stop_timeout_ms = 23;
+
+  // |disable_clock_snapshotting| moved.
+  reserved 15;
+
+  // Android-only. If set, sends an intent to the Traceur system app when the
+  // trace ends to notify it about the trace readiness.
+  optional bool notify_traceur = 16;
+
+  // This field was introduced in Android S.
+  // Android-only. If set to a value > 0, marks the trace session as a candidate
+  // for being attached to a bugreport. This field effectively acts as a z-index
+  // for bugreports. When Android's dumpstate runs perfetto
+  // --save-for-bugreport, traced will pick the tracing session with the highest
+  // score (score <= 0 is ignored) and:
+  // On Android S, T:  will steal its contents, save the trace into
+  //     a known path and stop prematurely.
+  // On Android U+: will create a read-only snapshot and save that into a known
+  //     path, without stoppin the original tracing session.
+  // When this field is set the tracing session becomes eligible to be cloned
+  // by other UIDs.
+  optional int32 bugreport_score = 30;
+
+  // When set, defines name of the file that will be saved under
+  // /data/misc/perfetto-traces/bugreport/ when using --save-all-for-bugreport.
+  // If omitted, traces will be named systrace.pftrace, systrace_1.pftrace, etc,
+  // starting from the highest `bugreport_score`.
+  // Introduced in v42 / Android V.
+  optional string bugreport_filename = 38;
+
+  // Triggers allow producers to start or stop the tracing session when an event
+  // occurs.
+  //
+  // For example if we are tracing probabilistically, most traces will be
+  // uninteresting. Triggers allow us to keep only the interesting ones such as
+  // those traces during which the device temperature reached a certain
+  // threshold. In this case the producer can activate a trigger to keep
+  // (STOP_TRACING) the trace, otherwise it can also begin a trace
+  // (START_TRACING) because it knows something is about to happen.
+  message TriggerConfig {
+    enum TriggerMode {
+      UNSPECIFIED = 0;
+
+      // When this mode is chosen, data sources are not started until one of the
+      // |triggers| are received. This supports early initialization and fast
+      // starting of the tracing system. On triggering, the session will then
+      // record for |stop_delay_ms|. However if no trigger is seen
+      // after |trigger_timeout_ms| the session will be stopped and no data will
+      // be returned.
+      START_TRACING = 1;
+
+      // When this mode is chosen, the session will be started via the normal
+      // EnableTracing() & StartTracing(). If no trigger is ever seen
+      // the session will be stopped after |trigger_timeout_ms| and no data will
+      // be returned. However if triggered the trace will stop after
+      // |stop_delay_ms| and any data in the buffer will be returned to the
+      // consumer.
+      STOP_TRACING = 2;
+
+      // 3 was taken by CLONE_SNAPSHOT but that has been moved to 4.
+      // The early implementation of CLONE_SNAPSHOT had various bugs
+      // (b/290798988, b/290799105) and made it into Android U. The number
+      // change is to make sure nobody rolls out a config that hits the broken
+      // behaviour.
+      reserved 3;
+
+      // When this mode is chosen, this causes a snapshot of the current tracing
+      // session to be created after |stop_delay_ms| while the current tracing
+      // session continues undisturbed (% an extra flush). This mode can be
+      // used only when the tracing session is handled by the "perfetto" cmdline
+      // client (which is true in 90% of cases). Part of the business logic
+      // necessary for this behavior, and ensuing file handling, lives in
+      // perfetto_cmd.cc . On other consumers, this causes only a notification
+      // of the trigger through a CloneTriggerHit ObservableEvent. The custom
+      // consumer is supposed to call CloneSession() itself after the event.
+      // Use use_clone_snapshot_if_available=true when targeting older versions
+      // of perfetto.
+      CLONE_SNAPSHOT = 4;
+
+      // NOTE: CLONE_SNAPSHOT should be used only when we targeting Android V+
+      // (15+) / Perfetto v38+. A bug in older versions of the tracing service
+      // might cause indefinitely long tracing sessions (see b/274931668).
+    }
+    optional TriggerMode trigger_mode = 1;
+
+    // This flag is really a workaround for b/274931668. This is needed only
+    // when deploying configs to different versions of the tracing service.
+    // When this is set to true this has the same effect of setting trigger_mode
+    // to CLONE_SNAPSHOT on newer versions of the service. This boolean has been
+    // introduced to allow to have configs that use CLONE_SNAPSHOT on newer
+    // versions of Android and fall back to STOP_TRACING on older versions where
+    // CLONE_SNAPSHOT did not exist.
+    // When using this flag, trigger_mode must be set to STOP_TRACING.
+    optional bool use_clone_snapshot_if_available = 5;
+
+    // DEPRECATED, was use_clone_snapshot_if_available in U. See the comment
+    // around CLONE_SNAPSHOT.
+    reserved 4;
+
+    message Trigger {
+      // The producer must specify this name to activate the trigger.
+      optional string name = 1;
+
+      // An std::regex that will match the producer that can activate this
+      // trigger. This is optional. If unset any producers can activate this
+      // trigger.
+      optional string producer_name_regex = 2;
+
+      // After a trigger is received either in START_TRACING or STOP_TRACING
+      // mode then the trace will end |stop_delay_ms| after triggering.
+      // In CLONE_SNAPSHOT mode, this is the delay between the trigger and the
+      // snapshot.
+      // If |prefer_suspend_clock_for_duration| is set, the duration will be
+      // based on wall-clock, counting also time in suspend.
+      optional uint32 stop_delay_ms = 3;
+
+      // Limits the number of traces this trigger can start/stop in a rolling
+      // 24 hour window. If this field is unset or zero, no limit is applied and
+      // activiation of this trigger *always* starts/stops the trace.
+      optional uint32 max_per_24_h = 4;
+
+      // A value between 0 and 1 which encodes the probability of skipping a
+      // trigger with this name. This is useful for reducing the probability
+      // of high-frequency triggers from dominating trace finaization. If this
+      // field is unset or zero, the trigger will *never* be skipped. If this
+      // field is greater than or equal to 1, this trigger will *always* be
+      // skipped i.e. it will be as if this trigger was never included in the
+      // first place.
+      // This probability check is applied *before* any other limits. For
+      // example, if |max_per_24_h| is also set, first we will check if the
+      // probability bar is met and only then will we check the |max_per_24_h|
+      // limit.
+      optional double skip_probability = 5;
+    }
+    // A list of triggers which are related to this configuration. If ANY
+    // trigger is seen then an action will be performed based on |trigger_mode|.
+    repeated Trigger triggers = 2;
+
+    // Required and must be positive if a TriggerConfig is specified. This is
+    // how long this TraceConfig should wait for a trigger to arrive. After this
+    // period of time if no trigger is seen the TracingSession will be cleaned
+    // up.
+    optional uint32 trigger_timeout_ms = 3;
+  }
+  optional TriggerConfig trigger_config = 17;
+
+  // When this is non-empty the perfetto command line tool will ignore the rest
+  // of this TraceConfig and instead connect to the perfetto service as a
+  // producer and send these triggers, potentially stopping or starting traces
+  // that were previous configured to use a TriggerConfig.
+  repeated string activate_triggers = 18;
+
+  // Configuration for trace contents that reference earlier trace data. For
+  // example, a data source might intern strings, and emit packets containing
+  // {interned id : string} pairs. Future packets from that data source can then
+  // use the interned ids instead of duplicating the raw string contents. The
+  // trace parser will then need to use that interning table to fully interpret
+  // the rest of the trace.
+  message IncrementalStateConfig {
+    // If nonzero, notify eligible data sources to clear their incremental state
+    // periodically, with the given period. The notification is sent only to
+    // data sources that have |handles_incremental_state_clear| set in their
+    // DataSourceDescriptor. The notification requests that the data source
+    // stops referring to past trace contents. This is particularly useful when
+    // tracing in ring buffer mode, where it is not exceptional to overwrite old
+    // trace data.
+    //
+    // Warning: this time-based global clearing is likely to be removed in the
+    // future, to be replaced with a smarter way of sending the notifications
+    // only when necessary.
+    optional uint32 clear_period_ms = 1;
+  }
+  optional IncrementalStateConfig incremental_state_config = 21;
+
+  // Additional guardrail used by the Perfetto command line client.
+  // On user builds when --dropbox is set perfetto will refuse to trace unless
+  // this is also set.
+  // Added in Q.
+  optional bool allow_user_build_tracing = 19;
+
+  // If set the tracing service will ensure there is at most one tracing session
+  // with this key.
+  optional string unique_session_name = 22;
+
+  // Compress trace with the given method. Best effort.
+  enum CompressionType {
+    COMPRESSION_TYPE_UNSPECIFIED = 0;
+    COMPRESSION_TYPE_DEFLATE = 1;
+  }
+  optional CompressionType compression_type = 24;
+
+  // DEPRECATED, was compress_from_cli.
+  reserved 37;
+
+  // Android-only. Not for general use. If set, saves the trace into an
+  // incident. This field is read by perfetto_cmd, rather than the tracing
+  // service. This field must be set when passing the --upload flag to
+  // perfetto_cmd.
+  message IncidentReportConfig {
+    // In this message, either:
+    //  * all of |destination_package|, |destination_class| and |privacy_level|
+    //    must be set.
+    //  * |skip_incidentd| must be explicitly set to true.
+
+    optional string destination_package = 1;
+    optional string destination_class = 2;
+    // Level of filtering in the requested incident. See |Destination| in
+    // frameworks/base/core/proto/android/privacy.proto.
+    optional int32 privacy_level = 3;
+
+    // If true, then skips saving the trace to incidentd.
+    //
+    // This flag is useful in testing (e.g. Perfetto-statsd integration tests)
+    // or when we explicitly don't want traces to go to incidentd even when they
+    // usually would (e.g. configs deployed using statsd but only used for
+    // inclusion in bugreports using |bugreport_score|).
+    //
+    // The motivation for having this flag, instead of just not setting
+    // |incident_report_config|, is prevent accidents where
+    // |incident_report_config| is omitted by mistake.
+    optional bool skip_incidentd = 5;
+
+    // If true, do not write the trace into dropbox (i.e. incident only).
+    // Otherwise, write to both dropbox and incident.
+    // TODO(lalitm): remove this field as we no longer use Dropbox.
+    optional bool skip_dropbox = 4 [deprecated = true];
+  }
+  optional IncidentReportConfig incident_report_config = 25;
+
+  enum StatsdLogging {
+    STATSD_LOGGING_UNSPECIFIED = 0;
+    STATSD_LOGGING_ENABLED = 1;
+    STATSD_LOGGING_DISABLED = 2;
+  }
+
+  // Android-only. Not for general use. If specified, sets the logging to statsd
+  // of guardrails and checkpoints in the tracing service. perfetto_cmd sets
+  // this to enabled (if not explicitly set in the config) when specifying
+  // --upload.
+  optional StatsdLogging statsd_logging = 31;
+
+  // DEPRECATED. Was trace_uuid, use trace_uuid_msb and trace_uuid_lsb instead.
+  reserved 26;
+
+  // An identifier clients can use to tie this trace to other logging.
+  // DEPRECATED as per v32. See TracePacket.trace_uuid for the authoritative
+  // Trace UUID. If this field is set, the tracing service will respect the
+  // requested UUID (i.e. TracePacket.trace_uuid == this field) but only if
+  // gap-less snapshotting is not used.
+  optional int64 trace_uuid_msb = 27 [deprecated = true];
+  optional int64 trace_uuid_lsb = 28 [deprecated = true];
+
+  // When set applies a post-filter to the trace contents using the filter
+  // provided. The filter is applied at ReadBuffers() time and works both in the
+  // case of IPC readback and write_into_file. This filter can be generated
+  // using `tools/proto_filter -s schema.proto -F filter_out.bytes` or
+  // `-T filter_out.escaped_string` (for .pbtx). See go/trace-filtering for
+  // design.
+  //
+  // Introduced in Android S, but it was broken (b/195065199). Reintroduced in
+  // Android T with a different field number. Updated in Android U with a new
+  // bytecode version which supports string filtering.
+  message TraceFilter {
+    // =========================
+    // Filter bytecode.
+    // =========================
+
+    // The bytecode as implemented in Android T.
+    optional bytes bytecode = 1;
+
+    // The bytecode as implemented in Android U. Adds support for string
+    // filtering.
+    optional bytes bytecode_v2 = 2;
+
+    // =========================
+    // String filtering
+    // =========================
+
+    // The principles and terminology of string filtering is heavily inspired by
+    // iptables. A "rule" decide how strings should be filtered. Each rule
+    // contains a "policy" which indicates the algorithm to use for filtering.
+    // A "chain" is a list of rules which will be sequentially checked against
+    // each string.
+    //
+    // The first rule which applies to the string terminates filtering for that
+    // string. If no rules apply, the string is left unchanged.
+
+    // A policy specifies which algorithm should be used for filtering the
+    // string.
+    enum StringFilterPolicy {
+      SFP_UNSPECIFIED = 0;
+
+      // Tries to match the string field against |regex_pattern|. If it
+      // matches, all matching groups are "redacted" (i.e. replaced with a
+      // constant string) and filtering is terminated (i.e. no further rules are
+      // checked). If it doesn't match, the string is left unchanged and the
+      // next rule in chain is considered.
+      SFP_MATCH_REDACT_GROUPS = 1;
+
+      // Like |SFP_MATCH_REDACT_GROUPS| but tries to do some pre-work before
+      // checking the regex. Specifically, it tries to parse the string field as
+      // an atrace tracepoint and checks if the post-tgid field starts with
+      // |atrace_post_tgid_starts_with|. The regex matching is only performed if
+      // this check succeeds.
+      SFP_ATRACE_MATCH_REDACT_GROUPS = 2;
+
+      // Tries to match the string field against |regex_pattern|. If it
+      // matches, filtering is terminated (i.e. no further rules are checked).
+      // If it doesn't match, the string is left unchanged and the next rule in
+      // chain is considered.
+      SFP_MATCH_BREAK = 3;
+
+      // Like |SFP_MATCH_BREAK| but tries to do some pre-work before checking
+      // the regex. Specifically, it tries to parse the string field as an
+      // atrace tracepoint and checks if the post-tgid field starts with
+      // |atrace_post_tgid_starts_with|. The regex matching is only performed if
+      // this check succeeds.
+      SFP_ATRACE_MATCH_BREAK = 4;
+
+      // Tries to repeatedly search (i.e. find substrings of) the string field
+      // with |regex_pattern|. For each match, redacts any matching groups (i.e.
+      // replaced with a constant string). Once there are no further matches,
+      // filtering is terminated (i.e. no further rules are checked).
+      //
+      // Note that this is policy is a "search" policy not a "match" policy
+      // unlike the above policies:
+      //  * Match policies require matching the full string i.e. there is an
+      //    implicit leading `^` and trailing `$`.
+      //  * Search policies perform repeated partial matching of the string
+      //    e.g.
+      //      - String: `foo=aaa,bar=123,foo=bbb,baz=456`
+      //      - Pattern: `foo=(\d+)`
+      //      - Output: `foo=P6O,bar=123,foo=P6O,baz=456`
+      //    where P6O is the redaction string
+      //
+      // All of this is only performed after some pre-work where we try to parse
+      // the string field as an atrace tracepoint and check if the post-tgid
+      // field starts with |atrace_post_tgid_starts_with|.
+      //
+      // If there are no partial matches, the string is left unchanged and the
+      // next rule in chain is considered.
+      SFP_ATRACE_REPEATED_SEARCH_REDACT_GROUPS = 5;
+    }
+
+    // A rule specifies how strings should be filtered.
+    message StringFilterRule {
+      // The policy (i.e. algorithm) dictating how strings matching this rule
+      // should be handled.
+      optional StringFilterPolicy policy = 1;
+
+      // The regex pattern used to match against each string.
+      optional string regex_pattern = 2;
+
+      // The string which should appear after the tgid in atrace tracepoint
+      // strings.
+      optional string atrace_payload_starts_with = 3;
+    }
+
+    // A chain is a list of rules which string will be sequentially checked
+    // against.
+    message StringFilterChain {
+      repeated StringFilterRule rules = 1;
+    }
+    optional StringFilterChain string_filter_chain = 3;
+  }
+  // old field number for trace_filter
+  reserved 32;
+  optional TraceFilter trace_filter = 33;
+
+  // Android-only. Not for general use. If set, reports the trace to the
+  // Android framework. This field is read by perfetto_cmd, rather than the
+  // tracing service. This field must be set when passing the --upload flag to
+  // perfetto_cmd.
+  message AndroidReportConfig {
+    // In this message, either:
+    //  * |reporter_service_package| and |reporter_service_class| must be set.
+    //  * |skip_reporting| must be explicitly set to true.
+
+    optional string reporter_service_package = 1;
+    optional string reporter_service_class = 2;
+
+    // If true, then skips reporting the trace to Android framework.
+    //
+    // This flag is useful in testing (e.g. Perfetto-statsd integration tests)
+    // or when we explicitly don't want to report traces to the framework even
+    // when they usually would (e.g. configs deployed using statsd but only
+    // used for inclusion in bugreports using |bugreport_score|).
+    //
+    // The motivation for having this flag, instead of just not setting
+    // |framework_report_config|, is prevent accidents where
+    // |framework_report_config| is omitted by mistake.
+    optional bool skip_report = 3;
+
+    // If true, will direct the Android framework to read the data in trace
+    // file and pass it to the reporter class over a pipe instead of passing
+    // the file descriptor directly.
+    //
+    // This flag is needed because the Android test framework does not
+    // currently support priv-app helper apps (in terms of SELinux) and we
+    // really don't want to add an allow rule for untrusted_app to receive
+    // trace fds.
+    //
+    // Because of this, we instead will direct the framework to create a new
+    // pipe and pass this to the reporter process instead. As the pipe is
+    // created by the framework, we won't have any problems with SELinux
+    // (system_server is already allowed to pass pipe fds, even
+    // to untrusted apps).
+    //
+    // As the name suggests this option *MUST* only be used for testing.
+    // Note that the framework will reject (and drop) files which are too
+    // large both for simplicity and to be minimize the amount of data we
+    // pass to a non-priv app (note that the framework will still check
+    // manifest permissions even though SELinux permissions are worked around).
+    optional bool use_pipe_in_framework_for_testing = 4;
+  }
+  optional AndroidReportConfig android_report_config = 34;
+
+  // If set, delays the start of tracing by a random duration. The duration is
+  // chosen from a uniform distribution between the specified minimum and
+  // maximum.
+  // Note: this delay is implemented by perfetto_cmd *not* by traced so will
+  // not work if you communicate with traced directly over the consumer API.
+  // Introduced in Android T.
+  message CmdTraceStartDelay {
+    optional uint32 min_delay_ms = 1;
+    optional uint32 max_delay_ms = 2;
+  }
+  optional CmdTraceStartDelay cmd_trace_start_delay = 35;
+}
+
+// End of protos/perfetto/config/trace_config.proto
+
+// Begin of protos/perfetto/common/trace_stats.proto
+
+// Statistics for the internals of the tracing service.
+//
+// Next id: 19.
+message TraceStats {
+  // From TraceBuffer::Stats.
+  //
+  // Next id: 21.
+  message BufferStats {
+    // Size of the circular buffer in bytes.
+    optional uint64 buffer_size = 12;
+
+    // Num. bytes written into the circular buffer, including chunk headers.
+    optional uint64 bytes_written = 1;
+
+    // Num. bytes overwritten before they have been read (i.e. loss of data).
+    optional uint64 bytes_overwritten = 13;
+
+    // Total size of chunks that were fully read from the circular buffer by the
+    // consumer. This may not be equal to |bytes_written| either in the middle
+    // of tracing, or if |chunks_overwritten| is non-zero. Note that this is the
+    // size of the chunks read from the buffer, including chunk headers, which
+    // will be different from the total size of packets returned to the
+    // consumer.
+    //
+    // The current utilization of the trace buffer (mid-tracing) can be obtained
+    // by subtracting |bytes_read| and |bytes_overwritten| from |bytes_written|,
+    // adding the difference of |padding_bytes_written| and
+    // |padding_bytes_cleared|, and comparing this sum to the |buffer_size|.
+    // Note that this represents the total size of buffered data in the buffer,
+    // yet this data may be spread non-contiguously through the buffer and may
+    // be overridden before the utilization reaches 100%.
+    optional uint64 bytes_read = 14;
+
+    // Num. bytes that were allocated as padding between chunks in the circular
+    // buffer.
+    optional uint64 padding_bytes_written = 15;
+
+    // Num. of padding bytes that were removed from the circular buffer when
+    // they were overwritten.
+    //
+    // The difference between |padding_bytes_written| and
+    // |padding_bytes_cleared| denotes the total size of padding currently
+    // present in the buffer.
+    optional uint64 padding_bytes_cleared = 16;
+
+    // Num. chunks (!= packets) written into the buffer.
+    optional uint64 chunks_written = 2;
+
+    // Num. chunks (!= packets) rewritten into the buffer. This means we rewrote
+    // the same chunk with additional packets appended to the end.
+    optional uint64 chunks_rewritten = 10;
+
+    // Num. chunks overwritten before they have been read (i.e. loss of data).
+    optional uint64 chunks_overwritten = 3;
+
+    // Num. chunks discarded (i.e. loss of data). Can be > 0 only when a buffer
+    // is configured with FillPolicy == DISCARD.
+    optional uint64 chunks_discarded = 18;
+
+    // Num. chunks (!= packets) that were fully read from the circular buffer by
+    // the consumer. This may not be equal to |chunks_written| either in the
+    // middle of tracing, or if |chunks_overwritten| is non-zero.
+    optional uint64 chunks_read = 17;
+
+    // Num. chunks that were committed out of order.
+    optional uint64 chunks_committed_out_of_order = 11;
+
+    // Num. times the ring buffer wrapped around.
+    optional uint64 write_wrap_count = 4;
+
+    // Num. out-of-band (OOB) patches that succeeded.
+    optional uint64 patches_succeeded = 5;
+
+    // Num. OOB patches that failed (e.g., the chunk to patch was gone).
+    optional uint64 patches_failed = 6;
+
+    // Num. readaheads (for large multi-chunk packet reads) that ended up in a
+    // successful packet read.
+    optional uint64 readaheads_succeeded = 7;
+
+    // Num. readaheads aborted because of missing chunks in the sequence stream.
+    // Note that a small number > 0 is totally expected: occasionally, when
+    // issuing a read, the very last packet in a sequence might be incomplete
+    // (because the producer is still writing it while we read). The read will
+    // stop at that point, for that sequence, increasing this counter.
+    optional uint64 readaheads_failed = 8;
+
+    // Num. of violations of the SharedMemoryABI found while writing or reading
+    // the buffer. This is an indication of either a bug in the producer(s) or
+    // malicious producer(s).
+    optional uint64 abi_violations = 9;
+
+    // The fields below have been introduced in Android R.
+
+    // Num. of times the service detected packet loss on a trace writer
+    // sequence. This is usually caused by exhaustion of available chunks in the
+    // writer process's SMB. Note that this relies on the client's TraceWriter
+    // indicating this loss to the service -- packets lost for other reasons are
+    // not reflected in this stat.
+    optional uint64 trace_writer_packet_loss = 19;
+  }
+
+  // Stats for the TraceBuffer(s) of the current trace session.
+  repeated BufferStats buffer_stats = 1;
+
+  // Per TraceWriter stat. Each {producer, trace writer} tuple is publicly
+  // visible as a unique sequence ID in the trace.
+  message WriterStats {
+    // This matches the TracePacket.trusted_packet_sequence_id and is used to
+    // correlate the stats with the actual packet types.
+    optional uint64 sequence_id = 1;
+
+    // The buffer index (0..N, as defined in the TraceConfig).
+    optional uint32 buffer = 4;
+
+    // These two arrays have the same cardinality and match the cardinality of
+    // chunk_payload_histogram_def + 1 (for the overflow bucket, see below).
+    // `sum` contains the SUM(entries) and `counts` contains the COUNT(entries)
+    // for each bucket.
+    repeated uint64 chunk_payload_histogram_counts = 2 [packed = true];
+    repeated int64 chunk_payload_histogram_sum = 3 [packed = true];
+  }
+
+  // The thresholds of each the `writer_stats` histogram buckets. This is
+  // emitted only once as all WriterStats share the same bucket layout.
+  // This field has the same cardinality of the
+  // `writer_stats.chunk_payload_histogram_{counts,sum}` - 1.
+  // (The -1 is because the last overflow bucket is not reported in the _def).
+  // An array of values [10, 100, 1000] in the _def array means that there are
+  // four buckets (3 + the implicit overflow bucket):
+  // [0]: x <= 10; [1]: 100 < x <= 1000; [2]: 1000 < x <= 1000; [3]: x > 1000.
+  repeated int64 chunk_payload_histogram_def = 17;
+  repeated WriterStats writer_stats = 18;
+
+  // Num. producers connected (whether they are involved in the current tracing
+  // session or not).
+  optional uint32 producers_connected = 2;
+
+  // Num. producers ever seen for all trace sessions since startup (it's a good
+  // proxy for inferring num. producers crashed / killed).
+  optional uint64 producers_seen = 3;
+
+  // Num. data sources registered for all trace sessions.
+  optional uint32 data_sources_registered = 4;
+
+  // Num. data sources ever seen for all trace sessions since startup.
+  optional uint64 data_sources_seen = 5;
+
+  // Num. concurrently active tracing sessions.
+  optional uint32 tracing_sessions = 6;
+
+  // Num. buffers for all tracing session (not just the current one). This will
+  // be >= buffer_stats.size(), because the latter is only about the current
+  // session.
+  optional uint32 total_buffers = 7;
+
+  // The fields below have been introduced in Android Q.
+
+  // Num. chunks that were discarded by the service before attempting to commit
+  // them to a buffer, e.g. because the producer specified an invalid buffer ID.
+  optional uint64 chunks_discarded = 8;
+
+  // Num. patches that were discarded by the service before attempting to apply
+  // them to a buffer, e.g. because the producer specified an invalid buffer ID.
+  optional uint64 patches_discarded = 9;
+
+  // Packets that failed validation of the TrustedPacket. If this is > 0, there
+  // is a bug in the producer.
+  optional uint64 invalid_packets = 10;
+
+  // This is set only when the TraceConfig specifies a TraceFilter.
+  message FilterStats {
+    optional uint64 input_packets = 1;
+    optional uint64 input_bytes = 2;
+    optional uint64 output_bytes = 3;
+    optional uint64 errors = 4;
+    optional uint64 time_taken_ns = 5;
+
+    // The number of bytes discarded by the filter (i.e. output - input).
+    // The array has one entry for each buffer defined in the config (unless no
+    // packets for that buffer were seen and hence filtered).
+    // Note: the SUM(bytes_discarded_per_buffer) will be <= but not == the total
+    // (output_bytes - input_bytes) because the filter might also discard
+    // server-generated synthetic packets, that have no buffer index.
+    repeated uint64 bytes_discarded_per_buffer = 20;
+  }
+  optional FilterStats filter_stats = 11;
+
+  // Count of Flush() requests (either from the Consumer, or self-induced
+  // periodic flushes). The final Flush() is also included in the count.
+  optional uint64 flushes_requested = 12;
+
+  // The count of the Flush() requests that were completed successfully.
+  // In a well behaving trace this should always be == `flush_requests`.
+  optional uint64 flushes_succeeded = 13;
+
+  // The count of the Flush() requests that failed (in most timed out).
+  // In a well behaving trace this should always be == 0.
+  optional uint64 flushes_failed = 14;
+
+  enum FinalFlushOutcome {
+    FINAL_FLUSH_UNSPECIFIED = 0;
+    FINAL_FLUSH_SUCCEEDED = 1;
+    FINAL_FLUSH_FAILED = 2;
+  }
+  optional FinalFlushOutcome final_flush_outcome = 15;
+}
+
+// End of protos/perfetto/common/trace_stats.proto
+
+// Begin of protos/perfetto/trace/android/android_game_intervention_list.proto
+
+message AndroidGameInterventionList {
+  message GameModeInfo {
+    optional uint32 mode = 1;
+    optional bool use_angle = 2;
+    optional float resolution_downscale = 3;
+    optional float fps = 4;
+  }
+  message GamePackageInfo {
+    optional string name = 1;
+    optional uint64 uid = 2;
+    optional uint32 current_mode = 3;
+    repeated GameModeInfo game_mode_info = 4;
+  }
+
+  repeated GamePackageInfo game_packages = 1;
+
+  // True when at least one error occurred when parsing
+  // game_mode_intervention.list
+  optional bool parse_error = 2;
+
+  // Failed to open / read game_mode_intervention.list
+  optional bool read_error = 3;
+}
+
+// End of protos/perfetto/trace/android/android_game_intervention_list.proto
+
+// Begin of protos/perfetto/trace/android/android_input_event.proto
+
+// A representation of an Android MotionEvent.
+// See: https://developer.android.com/reference/android/view/MotionEvent
+message AndroidMotionEvent {
+  // A representation of one pointer inside a MotionEvent.
+  // Each Pointer contains the values present in its corresponding
+  // MotionEvent.PointerCoords and MotionEvent.PointerProperties.
+  message Pointer {
+     message AxisValue {
+      optional int32 axis = 1;
+      optional float value = 2;
+    }
+    repeated AxisValue axis_value = 1;
+    optional int32 pointer_id = 2;
+    optional int32 tool_type = 3;
+  }
+
+  // The randomly-generated ID used to track the event through the pipeline.
+  optional fixed32 event_id = 1;
+  // The event's timestamp - generated by the kernel.
+  optional int64 event_time_nanos = 2;
+  optional uint32 source = 3;
+  optional int32 action = 4;
+  optional int32 device_id = 5;
+  // Use a signed int for display_id, because -1 (DISPLAY_IS_NONE) is a common value.
+  optional sint32 display_id = 6;
+  optional int32 classification = 7;
+  optional uint32 flags = 8;
+  repeated Pointer pointer = 9;
+
+  // Field numbers 10-15 are reserved for commonly used fields.
+
+  // If this event was synthesized as a result of one or more different
+  // event, original_event_ids are the event_ids associated with the original events.
+  // For example, if this is an ACTION_HOVER_ENTER event that is synthesized
+  // due to an ACTION_HOVER_MOVE event entering the bounds of a window, the
+  // id of the original hover move event will be listed here.
+  repeated fixed32 original_event_id = 16 [packed = true];
+  // The timestamp of the ACTION_DOWN event associated with this gesture.
+  optional int64 down_time_nanos = 17;
+  optional float cursor_position_x = 18;
+  optional float cursor_position_y = 19;
+  optional int32 action_button = 20;
+  optional uint32 button_state = 21;
+  optional uint32 meta_state = 22;
+  optional uint32 policy_flags = 23;
+  optional float precision_x = 24;
+  optional float precision_y = 25;
+}
+
+// A representation of an Android KeyEvent.
+// See: https://developer.android.com/reference/android/view/KeyEvent
+message AndroidKeyEvent {
+  // The randomly-generated ID used to track the event through the pipeline.
+  optional fixed32 event_id = 1;
+  // The event's timestamp - generated by the kernel.
+  optional int64 event_time_nanos = 2;
+  // The timestamp of the ACTION_DOWN event associated with this gesture.
+  optional int64 down_time_nanos = 3;
+  optional uint32 source = 4;
+  optional int32 action = 5;
+  optional int32 device_id = 6;
+  // Use a signed int for display_id, because -1 (DISPLAY_IS_NONE) is a common value.
+  optional sint32 display_id = 7;
+  optional int32 key_code = 8;
+  optional uint32 scan_code = 9;
+  optional uint32 meta_state = 10;
+  optional int32 repeat_count = 11;
+  optional uint32 flags = 12;
+  optional uint32 policy_flags = 13;
+}
+
+// An event that traces an input event being dispatched by the system to one window.
+message AndroidWindowInputDispatchEvent {
+  // Stores x/y values for each pointer sent to the window for events
+  // that are dispatched to a certain location on the screen. This is not relevant
+  // for KeyEvents and MotionEvents that are dispatched to focused windows.
+  message DispatchedPointer {
+    optional int32 pointer_id = 1;
+    // The coordinates of the pointer in the logical display space, AKA "raw coordinates".
+    optional float x_in_display = 2;
+    optional float y_in_display = 3;
+    // The axis values for this pointer that were modified by the window transform.
+    repeated AndroidMotionEvent.Pointer.AxisValue axis_value_in_window = 4;
+  }
+
+  // The event_id of the event that was dispatched to the window.
+  optional fixed32 event_id = 1;
+  // The vsync_id of the frame in which the decision was made to dispatch the event to
+  // the window.
+  optional int64 vsync_id = 2;
+  // The id of the window to which the event was dispatched.
+  optional int32 window_id = 3;
+  // Only relevant for MotionEvents that are dispatched to a screen location.
+  // Each DispatchedPointer has a 1:1 correspondence with the Pointers in the AndroidMotionEvent.
+  repeated DispatchedPointer dispatched_pointer = 4;
+  // The event flags that were used when dispatching the event to this window.
+  // If the same event is dispatched to more than one window, it is possible that they
+  // were dispatched using different flag values for each window.
+  optional uint32 resolved_flags = 5;
+}
+
+message AndroidInputEvent {
+  oneof event {
+    // Traces input events received by or generated by InputDispatcher
+    AndroidMotionEvent dispatcher_motion_event = 1;
+    AndroidMotionEvent dispatcher_motion_event_redacted = 2;
+    AndroidKeyEvent dispatcher_key_event = 3;
+    AndroidKeyEvent dispatcher_key_event_redacted = 4;
+
+    // Traces an event being dispatched to a window.
+    AndroidWindowInputDispatchEvent dispatcher_window_dispatch_event = 5;
+    AndroidWindowInputDispatchEvent dispatcher_window_dispatch_event_redacted = 6;
+  }
+}
+
+// End of protos/perfetto/trace/android/android_input_event.proto
+
+// Begin of protos/perfetto/trace/android/android_log.proto
+
+message AndroidLogPacket {
+  message LogEvent {
+    // The log buffer (e.g. MAIN, SYSTEM, RADIO) the event comes from.
+    optional AndroidLogId log_id = 1;
+
+    // PID (TGID), TID and UID of the task that emitted the event.
+    optional int32 pid = 2;
+    optional int32 tid = 3;
+    optional int32 uid = 4;
+
+    // Timestamp [ns]. The clock source is CLOCK_REALTIME, unlike many other
+    // Perfetto trace events that instead use CLOCK_BOOTTIME. The trace
+    // processor will take care of realigning clocks using the ClockSnapshot(s).
+    optional uint64 timestamp = 5;
+
+    // When log_id == LID_EVENTS, |tag| corresponds to the event name defined in
+    // the second column of /system/etc/event-log-tags. For all other events,
+    // |tag| is the app-specified argument passed to __android_log_write().
+    optional string tag = 6;
+
+    // Empty when log_id == LID_EVENTS.
+    optional AndroidLogPriority prio = 7;
+
+    // Empty when log_id == LID_EVENTS.
+    optional string message = 8;
+
+    message Arg {
+      optional string name = 1;
+      oneof value {
+        int64 int_value = 2;
+        float float_value = 3;
+        string string_value = 4;
+      }
+    }
+    // Only populated when log_id == LID_EVENTS.
+    repeated Arg args = 9;
+  }
+
+  repeated LogEvent events = 1;
+
+  // Stats are emitted only upon Flush() and are monotonic (i.e. they are
+  // absolute counters since the beginning of the lifetime of the tracing
+  // session and NOT relative to the previous Stats snapshot).
+  message Stats {
+    // Total number of log events seen, including errors and skipped entries
+    // (num of events stored in the trace = total - failed - skipped).
+    optional uint64 num_total = 1;
+
+    // Parser failures.
+    optional uint64 num_failed = 2;
+
+    // Messages skipped due to filters.
+    optional uint64 num_skipped = 3;
+  }
+  optional Stats stats = 2;
+}
+
+// End of protos/perfetto/trace/android/android_log.proto
+
+// Begin of protos/perfetto/trace/android/android_system_property.proto
+
+message AndroidSystemProperty {
+  message PropertyValue {
+    optional string name = 1;
+    optional string value = 2;
+  }
+
+  repeated PropertyValue values = 1;
+}
+
+// End of protos/perfetto/trace/android/android_system_property.proto
+
+// Begin of protos/perfetto/trace/android/camera_event.proto
+
+// A profiling event corresponding to a single camera frame. This message
+// collects important details and timestamps involved in producing a single
+// camera frame.
+// Next ID: 17
+message AndroidCameraFrameEvent {
+  // Identifier for the CameraCaptureSession this frame originates from. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession
+  optional uint64 session_id = 1;
+  // Identifier for the camera sensor that is the source of this frame. This may
+  // be either a physical or logical camera (up to vendor interpretation).
+  optional uint32 camera_id = 2;
+  // The frame number identifying this frame on this camera.
+  optional int64 frame_number = 3;
+  // Identifier for the CaptureRequest. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CaptureRequest
+  //
+  // If multiple cameras are streaming simultaneously, the request_id may be
+  // used to identify which frames were captured in service of the same request.
+  optional int64 request_id = 4;
+
+  // The CLOCK_BOOTTIME timestamp at which the camera framework request is
+  // received by the camera HAL pipeline. Note that this request may wait for
+  // some time before processing actually begins. See also
+  // request_processing_started_ns.
+  optional int64 request_received_ns = 5;
+  // The CLOCK_BOOTTIME timestamp at which the framework request is accepted for
+  // processing by the camera HAL pipeline. This is the time at which the
+  // pipeline actually begins to work on the request.
+  optional int64 request_processing_started_ns = 6;
+
+  // The CLOCK_BOOTTIME timestamp at which the sensor begins its exposure.
+  optional int64 start_of_exposure_ns = 7;
+  // The CLOCK_BOOTTIME timestamp corresponding to the sensor start of frame
+  // event.
+  optional int64 start_of_frame_ns = 8;
+  // The CLOCK_BOOTTIME timestamp at which the camera HAL has sent all responses
+  // for the frame.
+  optional int64 responses_all_sent_ns = 9;
+
+  // The error status, if any, reported to the camera framework. Any status
+  // other than STATUS_OK indicates a dropped frame.
+  // Next Enum: 6
+  enum CaptureResultStatus {
+    STATUS_UNSPECIFIED = 0;
+    STATUS_OK = 1;
+    // Early metadata was returned to the camera framework with an error.
+    STATUS_EARLY_METADATA_ERROR = 2;
+    // Final metadata was returned to the camera framework with an error.
+    STATUS_FINAL_METADATA_ERROR = 3;
+    // One or more buffers were returned to the camera framework with an error.
+    STATUS_BUFFER_ERROR = 4;
+    // The frame was dropped as a result of a flush operation.
+    STATUS_FLUSH_ERROR = 5;
+  }
+  optional CaptureResultStatus capture_result_status = 10;
+
+  // The number of sensor frames that were skipped between this frame and the
+  // previous frame. Under normal operation, this should be zero. Any number
+  // greater than zero indicates dropped sensor frames.
+  optional int32 skipped_sensor_frames = 11;
+
+  // The value of CONTROL_CAPTURE_INTENT. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CaptureRequest#CONTROL_CAPTURE_INTENT
+  optional int32 capture_intent = 12;
+  // The number of streams in the capture request.
+  optional int32 num_streams = 13;
+
+  // A profiling event corresponding to a single node processing within the camera
+  // pipeline. Intuitively this corresponds to a single stage of processing to
+  // produce a camera frame.
+  // Next ID: 6
+  message CameraNodeProcessingDetails {
+    optional int64 node_id = 1;
+    // The timestamp at which node processing begins to run.
+    optional int64 start_processing_ns = 2;
+    // The timestamp at which node processing finishes running.
+    optional int64 end_processing_ns = 3;
+    // The delay between inputs becoming ready and the node actually beginning to
+    // run.
+    optional int64 scheduling_latency_ns = 4;
+  }
+  repeated CameraNodeProcessingDetails node_processing_details = 14;
+
+  // These fields capture vendor-specific additions to this proto message. In
+  // practice `vendor_data` typically contains a serialized message of the
+  // vendor's design, and `vendor_data_version` is incremented each time there
+  // is a backwards incompatible change made to the message.
+  optional int32 vendor_data_version = 15;
+  optional bytes vendor_data = 16;
+}
+
+// A profiling event that may be emitted periodically (i.e., at a slower rate
+// than `AndroidCameraFrameEvent`s) to record fixed and aggregated camera
+// session-specific values.
+message AndroidCameraSessionStats {
+  // Identifier for the CameraCaptureSession this frame originates from. See:
+  // https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession
+  optional uint64 session_id = 1;
+
+  // Although vendor implementations may vary, camera pipeline processing is
+  // typically arranged into a directed graph-like structure. This message is
+  // used to record that graph.
+  message CameraGraph {
+    message CameraNode {
+      optional int64 node_id = 1;
+      // A list of inputs consumed by this node.
+      repeated int64 input_ids = 2;
+      // A list of outputs produced by this node.
+      repeated int64 output_ids = 3;
+
+      // These fields capture vendor-specific additions to this proto message. In
+      // practice `vendor_data` typically contains a serialized message of the
+      // vendor's design, and `vendor_data_version` is incremented each time there
+      // is a backwards incompatible change made to the message.
+      optional int32 vendor_data_version = 4;
+      optional bytes vendor_data = 5;
+    }
+    repeated CameraNode nodes = 1;
+
+    // An adjacency list describing connections between CameraNodes, mapping
+    // nodes and their outputs to other nodes that consume them as inputs.
+    message CameraEdge {
+      // The pair of IDs identifying the node and output connected by this edge.
+      optional int64 output_node_id = 1;
+      optional int64 output_id = 2;
+
+      // The pair of IDs identifying the node and input connected by this edge.
+      optional int64 input_node_id = 3;
+      optional int64 input_id = 4;
+
+      // These fields capture vendor-specific additions to this proto message. In
+      // practice `vendor_data` typically contains a serialized message of the
+      // vendor's design, and `vendor_data_version` is incremented each time there
+      // is a backwards incompatible change made to the message.
+      optional int32 vendor_data_version = 5;
+      optional bytes vendor_data = 6;
+    }
+    repeated CameraEdge edges = 2;
+  }
+  optional CameraGraph graph = 2;
+}
+
+// End of protos/perfetto/trace/android/camera_event.proto
+
+// Begin of protos/perfetto/trace/android/frame_timeline_event.proto
+
+// Generated by SurfaceFlinger's FrameTimeline (go/adaptive-scheduling-fr).
+// Used in comparing the expected timeline of a frame to the actual timeline.
+// Key terms:
+//    1) DisplayFrame - represents SurfaceFlinger's work on a frame(composited)
+//    2) SurfaceFrame - represents App's work on its frame
+//    3) Timeline = start to end of a component's(app/SF) work on a frame.
+// SurfaceFlinger composites frames from many apps together, so
+//    One DisplayFrame can map to N SurfaceFrame(s)
+// This relationship can be reconstructed by using
+//    DisplayFrame.token = SurfaceFrame.display_frame_token
+message FrameTimelineEvent {
+  // Specifies the reason(s) most likely to have caused the jank.
+  // Used as a bitmask.
+  enum JankType {
+    JANK_UNSPECIFIED = 0;
+    JANK_NONE = 1;
+    JANK_SF_SCHEDULING = 2;
+    JANK_PREDICTION_ERROR = 4;
+    JANK_DISPLAY_HAL = 8;
+    JANK_SF_CPU_DEADLINE_MISSED = 16;
+    JANK_SF_GPU_DEADLINE_MISSED = 32;
+    JANK_APP_DEADLINE_MISSED = 64;
+    JANK_BUFFER_STUFFING = 128;
+    JANK_UNKNOWN = 256;
+    JANK_SF_STUFFING = 512;
+    JANK_DROPPED = 1024;
+  };
+
+  // Specifies the severity of a jank.
+  enum JankSeverityType {
+    SEVERITY_UNKNOWN = 0;
+    SEVERITY_NONE = 1;
+    SEVERITY_PARTIAL = 2;
+    SEVERITY_FULL = 3;
+  }
+
+  // Specifies how a frame was presented on screen w.r.t. timing.
+  // Can be different for SurfaceFrame and DisplayFrame.
+  enum PresentType {
+    PRESENT_UNSPECIFIED = 0;
+    PRESENT_ON_TIME = 1;
+    PRESENT_LATE = 2;
+    PRESENT_EARLY = 3;
+    PRESENT_DROPPED = 4;
+    PRESENT_UNKNOWN = 5;
+  };
+
+  // Specifies if the predictions for the frame are still valid, expired or
+  // unknown.
+  enum PredictionType {
+    PREDICTION_UNSPECIFIED = 0;
+    PREDICTION_VALID = 1;
+    PREDICTION_EXPIRED = 2;
+    PREDICTION_UNKNOWN = 3;
+  };
+
+  // Indicates the start of expected timeline slice for SurfaceFrames.
+  message ExpectedSurfaceFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by the app for its work. Can be shared between multiple
+    // layers of the same app (example: pip mode).
+    optional int64 token = 2;
+    // The corresponding DisplayFrame token is required to link the App's work
+    // with SurfaceFlinger's work. Many SurfaceFrames can be mapped to a single
+    // DisplayFrame.
+    // this.display_frame_token = DisplayFrame.token
+    optional int64 display_frame_token = 3;
+
+    // Pid of the app. Used in creating the timeline tracks (and slices) inside
+    // the respective process track group.
+    optional int32 pid = 4;
+    optional string layer_name = 5;
+  };
+
+  // Indicates the start of actual timeline slice for SurfaceFrames. Also
+  // includes the jank information.
+  message ActualSurfaceFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by the app for its work. Can be shared between multiple
+    // layers of the same app (example: pip mode).
+    optional int64 token = 2;
+    // The corresponding DisplayFrame token is required to link the App's work
+    // with SurfaceFlinger's work. Many SurfaceFrames can be mapped to a single
+    // DisplayFrame.
+    // this.display_frame_token = DisplayFrame.token
+    optional int64 display_frame_token = 3;
+
+    // Pid of the app. Used in creating the timeline tracks (and slices) inside
+    // the respective process track group.
+    optional int32 pid = 4;
+    optional string layer_name = 5;
+
+    optional PresentType present_type = 6;
+    optional bool on_time_finish = 7;
+    optional bool gpu_composition = 8;
+    // A bitmask of JankType. More than one reason can be attributed to a janky
+    // frame.
+    optional int32 jank_type = 9;
+    optional PredictionType prediction_type = 10;
+    optional bool is_buffer = 11;
+    optional JankSeverityType jank_severity_type = 12;
+  };
+
+  // Indicates the start of expected timeline slice for DisplayFrames.
+  message ExpectedDisplayFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by SurfaceFlinger for its work
+    // this.token = SurfaceFrame.display_frame_token
+    optional int64 token = 2;
+
+    // Pid of SurfaceFlinger. Used in creating the timeline tracks (and slices)
+    // inside the SurfaceFlinger process group.
+    optional int32 pid = 3;
+  };
+
+  // Indicates the start of actual timeline slice for DisplayFrames. Also
+  // includes the jank information.
+  message ActualDisplayFrameStart {
+    // Cookie used to correlate between the start and end messages of the same
+    // frame. Since all values except the ts are same for start and end, cookie
+    // helps in preventing redundant data transmission.
+    // The same cookie is used only by start and end messages of a single frame
+    // and is otherwise unique.
+    optional int64 cookie = 1;
+
+    // Token received by SurfaceFlinger for its work
+    // this.token = SurfaceFrame.display_frame_token
+    optional int64 token = 2;
+
+    // Pid of SurfaceFlinger. Used in creating the timeline tracks (and slices)
+    // inside the SurfaceFlinger process group.
+    optional int32 pid = 3;
+
+    optional PresentType present_type = 4;
+    optional bool on_time_finish = 5;
+    optional bool gpu_composition = 6;
+    // A bitmask of JankType. More than one reason can be attributed to a janky
+    // frame.
+    optional int32 jank_type = 7;
+    optional PredictionType prediction_type = 8;
+    optional JankSeverityType jank_severity_type = 9;
+  };
+
+  // FrameEnd just sends the cookie to indicate that the corresponding
+  // <display/surface>frame slice's end.
+  message FrameEnd { optional int64 cookie = 1; };
+
+  oneof event {
+    ExpectedDisplayFrameStart expected_display_frame_start = 1;
+    ActualDisplayFrameStart actual_display_frame_start = 2;
+
+    ExpectedSurfaceFrameStart expected_surface_frame_start = 3;
+    ActualSurfaceFrameStart actual_surface_frame_start = 4;
+
+    FrameEnd frame_end = 5;
+  }
+}
+
+// End of protos/perfetto/trace/android/frame_timeline_event.proto
+
+// Begin of protos/perfetto/trace/android/gpu_mem_event.proto
+
+// Generated by Android's GpuService.
+message GpuMemTotalEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 pid = 2;
+  optional uint64 size = 3;
+}
+
+// End of protos/perfetto/trace/android/gpu_mem_event.proto
+
+// Begin of protos/perfetto/trace/android/graphics_frame_event.proto
+
+// Generated by Android's SurfaceFlinger.
+message GraphicsFrameEvent {
+  enum BufferEventType {
+    UNSPECIFIED = 0;
+    DEQUEUE = 1;
+    QUEUE = 2;
+    POST = 3;
+    ACQUIRE_FENCE = 4;
+    LATCH = 5;
+    // HWC will compose this buffer
+    HWC_COMPOSITION_QUEUED = 6;
+    // renderEngine composition
+    FALLBACK_COMPOSITION = 7;
+    PRESENT_FENCE = 8;
+    RELEASE_FENCE = 9;
+    MODIFY = 10;
+    DETACH = 11;
+    ATTACH = 12;
+    CANCEL = 13;
+  }
+
+  message BufferEvent {
+    optional uint32 frame_number = 1;
+    optional BufferEventType type = 2;
+    optional string layer_name = 3;
+    // If no duration is set, the event is an instant event.
+    optional uint64 duration_ns = 4;
+    // Unique buffer identifier.
+    optional uint32 buffer_id = 5;
+  }
+
+  optional BufferEvent buffer_event = 1;
+}
+
+// End of protos/perfetto/trace/android/graphics_frame_event.proto
+
+// Begin of protos/perfetto/trace/android/initial_display_state.proto
+
+message InitialDisplayState {
+  // Same values as android.view.Display.STATE_*
+  optional int32 display_state = 1;
+  optional double brightness = 2;
+}
+
+// End of protos/perfetto/trace/android/initial_display_state.proto
+
+// Begin of protos/perfetto/trace/android/network_trace.proto
+
+enum TrafficDirection {
+  DIR_UNSPECIFIED = 0;
+  DIR_INGRESS = 1;
+  DIR_EGRESS = 2;
+}
+
+// NetworkPacketEvent records the details of a single packet sent or received
+// on the network (in Linux kernel terminology, one sk_buff struct).
+message NetworkPacketEvent {
+  // The direction traffic is flowing for this event.
+  optional TrafficDirection direction = 1;
+
+  // The name of the interface if available (e.g. 'rmnet0').
+  optional string interface = 2;
+
+  // The length of the packet in bytes (wire_size - L2_header_size). Ignored
+  // when using NetworkPacketEvent as the ctx in either NetworkPacketBundle or
+  // NetworkPacketContext.
+  optional uint32 length = 3;
+
+  // The Linux user id associated with the packet's socket.
+  optional uint32 uid = 4;
+
+  // The Android network tag associated with the packet's socket.
+  optional uint32 tag = 5;
+
+  // The packet's IP protocol (TCP=6, UDP=17, etc).
+  optional uint32 ip_proto = 6;
+
+  // The packet's TCP flags as a bitmask (FIN=0x1, SYN=0x2, RST=0x4, etc).
+  optional uint32 tcp_flags = 7;
+
+  // The local udp/tcp port of the packet.
+  optional uint32 local_port = 8;
+
+  // The remote udp/tcp port of the packet.
+  optional uint32 remote_port = 9;
+
+  // The 1-byte ICMP type identifier.
+  optional uint32 icmp_type = 10;
+
+  // The 1-byte ICMP code identifier.
+  optional uint32 icmp_code = 11;
+}
+
+// NetworkPacketBundle bundles one or more packets sharing the same attributes.
+message NetworkPacketBundle {
+  oneof packet_context {
+    // The intern id for looking up the associated packet context.
+    uint64 iid = 1;
+
+    // The inlined context for events in this bundle.
+    NetworkPacketEvent ctx = 2;
+  }
+
+  // The timestamp of the i-th packet encoded as the nanoseconds since the
+  // enclosing TracePacket's timestamp.
+  repeated uint64 packet_timestamps = 3 [packed = true];
+
+  // The length of the i-th packet in bytes (wire_size - L2_header_size).
+  repeated uint32 packet_lengths = 4 [packed = true];
+
+  // Total number of packets in the bundle (when above aggregation_threshold).
+  optional uint32 total_packets = 5;
+
+  // Duration between first and last packet (when above aggregation_threshold).
+  optional uint64 total_duration = 6;
+
+  // Total packet length in bytes (when above aggregation_threshold).
+  optional uint64 total_length = 7;
+}
+
+// An internable packet context.
+message NetworkPacketContext {
+  optional uint64 iid = 1;
+  optional NetworkPacketEvent ctx = 2;
+}
+
+// End of protos/perfetto/trace/android/network_trace.proto
+
+// Begin of protos/perfetto/trace/android/packages_list.proto
+
+message PackagesList {
+  message PackageInfo {
+    optional string name = 1;
+    optional uint64 uid = 2;
+    optional bool debuggable = 3;
+    optional bool profileable_from_shell = 4;
+    optional int64 version_code = 5;
+  }
+
+  repeated PackageInfo packages = 1;
+
+  // At least one error occurred parsing the packages.list.
+  optional bool parse_error = 2;
+
+  // Failed to open / read packages.list.
+  optional bool read_error = 3;
+}
+
+// End of protos/perfetto/trace/android/packages_list.proto
+
+// Begin of protos/perfetto/trace/android/protolog.proto
+
+/* represents a single log entry */
+message ProtoLogMessage {
+  /* log statement identifier, created from message string and log level. */
+  optional fixed64 message_id = 1;
+  /* string parameters passed to the log call that have been interned. */
+  repeated uint32 str_param_iids = 2;
+  /* integer parameters passed to the log call. */
+  repeated sint64 sint64_params = 3;
+  /* floating point parameters passed to the log call. */
+  repeated double double_params = 4;
+  /* boolean parameters passed to the log call. */
+  repeated int32 boolean_params = 5;
+  // id of the interned stacktrace string
+  // (only dumped if explicitly confuigured to do so)
+  optional uint32 stacktrace_iid = 6;
+}
+
+/* contains all the data required to fully decode the protolog messages */
+message ProtoLogViewerConfig {
+  message MessageData {
+    // the id of the message that is logged in a ProtoLogMessage
+    optional fixed64 message_id = 1;
+    // the string representation of the message
+    optional string message = 2;
+    // the level of the message
+    optional ProtoLogLevel level = 3;
+    // the id of the log group this message belongs to
+    optional uint32 group_id = 4;
+  }
+
+  /* information about a ProtoLog log group */
+  message Group {
+    optional uint32 id = 1;
+    optional string name = 2;
+    optional string tag = 3;
+  }
+
+  repeated MessageData messages = 1;
+  repeated Group groups = 2;
+}
+
+// End of protos/perfetto/trace/android/protolog.proto
+
+// Begin of protos/perfetto/trace/android/shell_transition.proto
+
+// ShellTransition messages record information about the shell transitions in
+// the system. This is used to track the animations that are created and execute
+// through the shell transition system.
+message ShellTransition {
+  // The unique identifier of the transition.
+  optional int32 id = 1;
+
+  // The time the transition was created on the WM side
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 create_time_ns = 2;
+  // The time the transition was sent from the WM side to shell
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 send_time_ns = 3;
+  // The time the transition was dispatched by shell to execute
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 dispatch_time_ns = 4;
+  // If the transition merge was accepted by the transition handler, this
+  // contains the time the transition was merged into transition with id
+  // `merge_target`.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 merge_time_ns = 5;
+  // The time shell proposed the transition should be merged to the transition
+  // handler into transition with id `merge_target`.
+  // (using SystemClock.elapsedRealtimeNanos()).
+  optional int64 merge_request_time_ns = 6;
+  // If the transition was aborted on the shell side, this is the time that
+  // occurred.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 shell_abort_time_ns = 7;
+  // If the transition was aborted on the wm side, this is the time that
+  // occurred.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 wm_abort_time_ns = 8;
+  // The time WM considers the transition to be complete.
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 finish_time_ns = 9;
+
+  // The id of the transaction that WM proposed to use as the starting
+  // transaction. It contains all the layer changes required to setup the
+  // transition and should be executed right at the start of the transition
+  // by the transition handler.
+  optional uint64 start_transaction_id = 10;
+  // The if of the transaction that WM proposed to use as the finish
+  // transaction. It contains all the layer changes required to set the final
+  // state of the transition.
+  optional uint64 finish_transaction_id = 11;
+
+  // The id of the handler that executed the transition. A HandlerMappings
+  // message in the trace will contain the mapping of id to a string
+  // representation of the handler.
+  optional int32 handler = 12;
+  // The transition type of this transition (e.g. TO_FRONT, OPEN, CLOSE).
+  optional int32 type = 13;
+
+  // The list of targets that are part of this transition.
+  repeated Target targets = 14;
+  // The id of the transition we have requested to merge or have merged this
+  // transition into.
+  optional int32 merge_target = 15;
+
+  // The flags set on this transition.
+  optional int32 flags = 16;
+  // The time the starting window was removed. Tracked because this can
+  // happen after the transition finishes, but the app may not yet be visible
+  // until the starting window is removed. So in a sense the transition is not
+  // finished until the starting window is removed. (b/284302118)
+  // (using SystemClock.elapsedRealtimeNanos())
+  optional int64 starting_window_remove_time_ns = 17;
+
+  // Contains the information about the windows targeted in a transition.
+  message Target {
+    // The transition mode of this target (e.g. TO_FRONT, CLOSE...)
+    optional int32 mode = 1;
+    // The layer id of this target.
+    optional int32 layer_id = 2;
+    // The window id of this target.
+    optional int32 window_id = 3;
+    // The flags set on this target.
+    optional int32 flags = 4;
+  }
+}
+
+// Contains mappings from handler ids to string representation of the handlers.
+message ShellHandlerMappings {
+  repeated ShellHandlerMapping mapping = 1;
+}
+
+message ShellHandlerMapping {
+  // The id of the handler used in the ShellTransition message.
+  optional int32 id = 1;
+  // A human readable and meaningful string representation of the handler.
+  optional string name = 2;
+}
+
+// End of protos/perfetto/trace/android/shell_transition.proto
+
+// Begin of protos/perfetto/trace/android/surfaceflinger_common.proto
+
+message RegionProto {
+  // Previously: uint64 id
+  reserved 1;
+  repeated RectProto rect = 2;
+}
+
+message RectProto {
+  optional int32 left = 1;
+  optional int32 top = 2;
+  optional int32 right = 3;
+  optional int32 bottom = 4;
+}
+
+message SizeProto {
+  optional int32 w = 1;
+  optional int32 h = 2;
+}
+
+message TransformProto {
+  optional float dsdx = 1;
+  optional float dtdx = 2;
+  optional float dsdy = 3;
+  optional float dtdy = 4;
+  optional int32 type = 5;
+}
+
+message ColorProto {
+  optional float r = 1;
+  optional float g = 2;
+  optional float b = 3;
+  optional float a = 4;
+}
+
+message InputWindowInfoProto {
+  optional uint32 layout_params_flags = 1;
+  optional int32 layout_params_type = 2;
+  optional RectProto frame = 3;
+  optional RegionProto touchable_region = 4;
+
+  optional int32 surface_inset = 5;
+  optional bool visible = 6;
+  optional bool can_receive_keys = 7 [deprecated = true];
+  optional bool focusable = 8;
+  optional bool has_wallpaper = 9;
+
+  optional float global_scale_factor = 10;
+  optional float window_x_scale = 11 [deprecated = true];
+  optional float window_y_scale = 12 [deprecated = true];
+
+  optional int32 crop_layer_id = 13;
+  optional bool replace_touchable_region_with_crop = 14;
+  optional RectProto touchable_region_crop = 15;
+  optional TransformProto transform = 16;
+  optional uint32 input_config = 17;
+}
+
+message BlurRegion {
+  optional uint32 blur_radius = 1;
+  optional uint32 corner_radius_tl = 2;
+  optional uint32 corner_radius_tr = 3;
+  optional uint32 corner_radius_bl = 4;
+  optional float corner_radius_br = 5;
+  optional float alpha = 6;
+  optional int32 left = 7;
+  optional int32 top = 8;
+  optional int32 right = 9;
+  optional int32 bottom = 10;
+}
+
+message ColorTransformProto {
+  // This will be a 4x4 matrix of float values
+  repeated float val = 1 [packed = true];
+}
+
+// End of protos/perfetto/trace/android/surfaceflinger_common.proto
+
+// Begin of protos/perfetto/trace/android/surfaceflinger_layers.proto
+
+// Message used by Winscope to process legacy trace files.
+// Represents a file full of surface flinger trace entries.
+// Encoded, it should start with 0x4c 0x59 0x52 0x54 0x52 0x41 0x43 0x45
+// (.LYRTRACE), such that they can be easily identified.
+message LayersTraceFileProto {
+  // constant; MAGIC_NUMBER = (long) MAGIC_NUMBER_H << 32 |
+  // MagicNumber.MAGIC_NUMBER_L (this is needed because enums have to be 32 bits
+  // and there's no nice way to put 64bit constants into .proto files.
+  enum MagicNumber {
+    INVALID = 0;
+    // LYRT (little-endian ASCII)
+    MAGIC_NUMBER_L = 0x5452594c;
+    // RACE (little-endian ASCII)
+    MAGIC_NUMBER_H = 0x45434152;
+  }
+
+  // Must be the first field, set to value in MagicNumber
+  optional fixed64 magic_number = 1;
+
+  repeated LayersSnapshotProto entry = 2;
+
+  // Offset between real-time clock and elapsed time clock in nanoseconds.
+  // Calculated as: systemTime(SYSTEM_TIME_REALTIME) -
+  // systemTime(SYSTEM_TIME_MONOTONIC)
+  optional fixed64 real_to_elapsed_time_offset_nanos = 3;
+}
+
+message LayersSnapshotProto {
+  // elapsed realtime in nanos since boot of when this entry was logged
+  optional sfixed64 elapsed_realtime_nanos = 1;
+
+  // SurfaceFlinger's stage where the snapshot was triggered.
+  // Currently either "visibleRegionsDirty" or "bufferLatched".
+  optional string where = 2;
+
+  optional LayersProto layers = 3;
+
+  // Blob for the current HWC information for all layers, reported by dumpsys.
+  // Example:
+  //   "maxDownScale: 4, maxFullWidth: 8192, HWState: 1, AssignedState: 3, ..."
+  optional string hwc_blob = 4;
+
+  // Excludes state sent during composition like visible region and composition
+  // type.
+  optional bool excludes_composition_state = 5;
+
+  // Number of missed entries since the last entry was recorded.
+  optional uint32 missed_entries = 6;
+
+  repeated DisplayProto displays = 7;
+
+  optional int64 vsync_id = 8;
+}
+
+// Contains a list of all layers.
+message LayersProto {
+  repeated LayerProto layers = 1;
+}
+
+message DisplayProto {
+  optional uint64 id = 1;
+  // Display descriptor, e.g. "Built-In Screen"
+  optional string name = 2;
+  optional uint32 layer_stack = 3;
+  optional SizeProto size = 4;
+  optional RectProto layer_stack_space_rect = 5;
+  optional TransformProto transform = 6;
+  optional bool is_virtual = 7;
+  optional double dpi_x = 8;
+  optional double dpi_y = 9;
+}
+
+// Must match definition in the IComposerClient HAL
+enum HwcCompositionType {
+  // Invalid composition type
+  HWC_TYPE_UNSPECIFIED = 0;
+  // Layer was composited by the client into the client target buffer
+  HWC_TYPE_CLIENT = 1;
+  // Layer was composited by the device through hardware overlays
+  HWC_TYPE_DEVICE = 2;
+  // Layer was composited by the device using a color
+  HWC_TYPE_SOLID_COLOR = 3;
+  // Similar to DEVICE, but the layer position may have been asynchronously set
+  // through setCursorPosition
+  HWC_TYPE_CURSOR = 4;
+  // Layer was composited by the device via a sideband stream
+  HWC_TYPE_SIDEBAND = 5;
+   // Layer was composited by hardware optimized for display decoration
+  HWC_TYPE_DISPLAY_DECORATION = 6;
+}
+
+// Information about each layer.
+message LayerProto {
+  // unique id per layer.
+  optional int32 id = 1;
+  // unique name per layer.
+  // Example: "Wallpaper".
+  optional string name = 2;
+  // list of children this layer may have. May be empty.
+  repeated int32 children = 3 [packed = true];
+  // list of layers that are z order relative to this layer.
+  repeated int32 relatives = 4 [packed = true];
+  // The type of layer.
+  // Examples: "ContainerLayer", "BufferStateLayer".
+  optional string type = 5;
+  optional RegionProto transparent_region = 6;
+  optional RegionProto visible_region = 7;
+  optional RegionProto damage_region = 8;
+  optional uint32 layer_stack = 9;
+  // The layer's z order. Can be z order in layer stack, relative to parent,
+  // or relative to another layer specified in zOrderRelative.
+  optional int32 z = 10;
+  // The layer's position on the display.
+  optional PositionProto position = 11;
+  // The layer's requested position.
+  optional PositionProto requested_position = 12;
+  // The layer's size.
+  optional SizeProto size = 13;
+  // The layer's crop in its own bounds.
+  optional RectProto crop = 14;
+  // The layer's crop in its parent's bounds.
+  optional RectProto final_crop = 15 [deprecated = true];
+  optional bool is_opaque = 16;
+  optional bool invalidate = 17;
+  // Composition states's dataspace.
+  // Examples: "STANDARD_BT709", "STANDARD_BT601_625".
+  // See full enum in
+  // frameworks/native/libs/nativewindow/include/android/data_space.h
+  optional string dataspace = 18;
+  // Buffer's pixel format
+  // Examples: "PIXEL_FORMAT_TRANSLUCENT", "PIXEL_FORMAT_RGBA_8888".
+  // See full enum in frameworks/native/libs/ui/include/ui/PixelFormat.h
+  optional string pixel_format = 19;
+  // The layer's actual color.
+  optional ColorProto color = 20;
+  // The layer's requested color.
+  optional ColorProto requested_color = 21;
+  // Can be any combination of
+  //    hidden = 0x01
+  //    opaque = 0x02,
+  //    secure = 0x80,
+  optional uint32 flags = 22;
+  // The layer's actual transform
+  optional TransformProto transform = 23;
+  // The layer's requested transform.
+  optional TransformProto requested_transform = 24;
+  // The parent layer. This value can be null if there is no parent.
+  optional int32 parent = 25;
+  // The layer that this layer has a z order relative to. This value can be
+  // null.
+  optional int32 z_order_relative_of = 26;
+  // This value can be null if there's nothing to draw.
+  optional ActiveBufferProto active_buffer = 27;
+  // The number of frames available.
+  optional int32 queued_frames = 28;
+  optional bool refresh_pending = 29;
+  // The layer's composer backend destination frame
+  optional RectProto hwc_frame = 30;
+  // The layer's composer backend source crop
+  optional FloatRectProto hwc_crop = 31;
+  // The layer's composer backend transform
+  optional int32 hwc_transform = 32;
+  optional int32 window_type = 33 [deprecated = true];
+  optional int32 app_id = 34 [deprecated = true];
+  // The layer's composition type
+  optional HwcCompositionType hwc_composition_type = 35;
+  // If it's a buffer layer, indicate if the content is protected
+  optional bool is_protected = 36;
+  // Current frame number being rendered.
+  optional uint64 curr_frame = 37;
+  // A list of barriers that the layer is waiting to update state.
+  repeated BarrierLayerProto barrier_layer = 38;
+  // If active_buffer is not null, record its transform.
+  optional TransformProto buffer_transform = 39;
+  optional int32 effective_scaling_mode = 40;
+  // Layer's corner radius.
+  optional float corner_radius = 41;
+  // Metadata map. May be empty.
+  map<int32, string> metadata = 42;
+
+  optional TransformProto effective_transform = 43;
+  optional FloatRectProto source_bounds = 44;
+  optional FloatRectProto bounds = 45;
+  optional FloatRectProto screen_bounds = 46;
+
+  optional InputWindowInfoProto input_window_info = 47;
+
+  // Crop used to draw the rounded corner.
+  optional FloatRectProto corner_radius_crop = 48;
+
+  // length of the shadow to draw around the layer, it may be set on the
+  // layer or set by a parent layer.
+  optional float shadow_radius = 49;
+  optional ColorTransformProto color_transform = 50;
+
+  optional bool is_relative_of = 51;
+  // Layer's background blur radius in pixels.
+  optional int32 background_blur_radius = 52;
+
+  optional uint32 owner_uid = 53;
+
+  // Regions of a layer, where blur should be applied.
+  repeated BlurRegion blur_regions = 54;
+
+  optional bool is_trusted_overlay = 55;
+
+  // Corner radius explicitly set on layer rather than inherited
+  optional float requested_corner_radius = 56;
+
+  optional RectProto destination_frame = 57;
+
+  optional uint32 original_id = 58;
+}
+
+message PositionProto {
+  optional float x = 1;
+  optional float y = 2;
+}
+
+message FloatRectProto {
+  optional float left = 1;
+  optional float top = 2;
+  optional float right = 3;
+  optional float bottom = 4;
+}
+
+message ActiveBufferProto {
+  optional uint32 width = 1;
+  optional uint32 height = 2;
+  optional uint32 stride = 3;
+  optional int32 format = 4;
+  optional uint64 usage = 5;
+}
+
+message BarrierLayerProto {
+  // layer id the barrier is waiting on.
+  optional int32 id = 1;
+  // frame number the barrier is waiting on.
+  optional uint64 frame_number = 2;
+}
+
+// End of protos/perfetto/trace/android/surfaceflinger_layers.proto
+
+// Begin of protos/perfetto/trace/android/surfaceflinger_transactions.proto
+
+// Message used by Winscope to process legacy trace files.
+// Represents a file full of surface flinger transactions.
+// Encoded, it should start with 0x54 0x4E 0x58 0x54 0x52 0x41 0x43 0x45
+// (.TNXTRACE), such that they can be easily identified.
+message TransactionTraceFile {
+  // constant; MAGIC_NUMBER = (long) MAGIC_NUMBER_H << 32 |
+  // MagicNumber.MAGIC_NUMBER_L (this is needed because enums have to be 32 bits
+  // and there's no nice way to put 64bit constants into .proto files.
+  enum MagicNumber {
+    INVALID = 0;
+    // TNXT (little-endian ASCII)
+    MAGIC_NUMBER_L = 0x54584E54;
+    // RACE (little-endian ASCII)
+    MAGIC_NUMBER_H = 0x45434152;
+  }
+
+  // Must be the first field, set to value in MagicNumber
+  optional fixed64 magic_number = 1;
+  repeated TransactionTraceEntry entry = 2;
+
+  // offset between real-time clock and elapsed time clock in nanoseconds.
+  // Calculated as: systemTime(SYSTEM_TIME_REALTIME) -
+  // systemTime(SYSTEM_TIME_MONOTONIC)
+  optional fixed64 real_to_elapsed_time_offset_nanos = 3;
+  optional uint32 version = 4;
+}
+
+message TransactionTraceEntry {
+  optional int64 elapsed_realtime_nanos = 1;
+  optional int64 vsync_id = 2;
+  repeated TransactionState transactions = 3;
+  repeated LayerCreationArgs added_layers = 4;
+  repeated uint32 destroyed_layers = 5;
+  repeated DisplayState added_displays = 6;
+  repeated int32 removed_displays = 7;
+  repeated uint32 destroyed_layer_handles = 8;
+  optional bool displays_changed = 9;
+  repeated DisplayInfo displays = 10;
+}
+
+message DisplayInfo {
+  optional uint32 layer_stack = 1;
+  optional int32 display_id = 2;
+  optional int32 logical_width = 3;
+  optional int32 logical_height = 4;
+  optional Transform transform_inverse = 5;
+  optional Transform transform = 6;
+  optional bool receives_input = 7;
+  optional bool is_secure = 8;
+  optional bool is_primary = 9;
+  optional bool is_virtual = 10;
+  optional int32 rotation_flags = 11;
+  optional int32 transform_hint = 12;
+}
+
+message LayerCreationArgs {
+  optional uint32 layer_id = 1;
+  optional string name = 2;
+  optional uint32 flags = 3;
+  optional uint32 parent_id = 4;
+  optional uint32 mirror_from_id = 5;
+  optional bool add_to_root = 6;
+  optional uint32 layer_stack_to_mirror = 7;
+}
+
+message Transform {
+  optional float dsdx = 1;
+  optional float dtdx = 2;
+  optional float dtdy = 3;
+  optional float dsdy = 4;
+  optional float tx = 5;
+  optional float ty = 6;
+}
+
+message TransactionState {
+  optional int32 pid = 1;
+  optional int32 uid = 2;
+  optional int64 vsync_id = 3;
+  optional int32 input_event_id = 4;
+  optional int64 post_time = 5;
+  optional uint64 transaction_id = 6;
+  repeated LayerState layer_changes = 7;
+  repeated DisplayState display_changes = 8;
+  repeated uint64 merged_transaction_ids = 9;
+}
+
+// Keep insync with layer_state_t
+message LayerState {
+  optional uint32 layer_id = 1;
+  // Changes are split into ChangesLsb and ChangesMsb. First 32 bits are in
+  // ChangesLsb and the next 32 bits are in ChangesMsb. This is needed because
+  // enums have to be 32 bits and there's no nice way to put 64bit constants
+  // into .proto files.
+  enum ChangesLsb {
+    eChangesLsbNone = 0;
+    ePositionChanged = 0x00000001;
+    eLayerChanged = 0x00000002;
+    // unused = 0x00000004;
+    eAlphaChanged = 0x00000008;
+
+    eMatrixChanged = 0x00000010;
+    eTransparentRegionChanged = 0x00000020;
+    eFlagsChanged = 0x00000040;
+    eLayerStackChanged = 0x00000080;
+
+    eReleaseBufferListenerChanged = 0x00000400;
+    eShadowRadiusChanged = 0x00000800;
+
+    eBufferCropChanged = 0x00002000;
+    eRelativeLayerChanged = 0x00004000;
+    eReparent = 0x00008000;
+
+    eColorChanged = 0x00010000;
+    eBufferTransformChanged = 0x00040000;
+    eTransformToDisplayInverseChanged = 0x00080000;
+
+    eCropChanged = 0x00100000;
+    eBufferChanged = 0x00200000;
+    eAcquireFenceChanged = 0x00400000;
+    eDataspaceChanged = 0x00800000;
+
+    eHdrMetadataChanged = 0x01000000;
+    eSurfaceDamageRegionChanged = 0x02000000;
+    eApiChanged = 0x04000000;
+    eSidebandStreamChanged = 0x08000000;
+
+    eColorTransformChanged = 0x10000000;
+    eHasListenerCallbacksChanged = 0x20000000;
+    eInputInfoChanged = 0x40000000;
+    // 0x80000000; (proto stores enums as signed int)
+    eCornerRadiusChanged = -2147483648;
+  };
+  enum ChangesMsb {
+    eChangesMsbNone = 0;
+    eDestinationFrameChanged = 0x1;
+    eCachedBufferChanged = 0x2;
+    eBackgroundColorChanged = 0x4;
+    eMetadataChanged = 0x8;
+    eColorSpaceAgnosticChanged = 0x10;
+    eFrameRateSelectionPriority = 0x20;
+    eFrameRateChanged = 0x40;
+    eBackgroundBlurRadiusChanged = 0x80;
+    eProducerDisconnect = 0x100;
+    eFixedTransformHintChanged = 0x200;
+    eFrameNumberChanged = 0x400;
+    eBlurRegionsChanged = 0x800;
+    eAutoRefreshChanged = 0x1000;
+    eStretchChanged = 0x2000;
+    eTrustedOverlayChanged = 0x4000;
+    eDropInputModeChanged = 0x8000;
+  };
+  optional uint64 what = 2;
+  optional float x = 3;
+  optional float y = 4;
+  optional int32 z = 5;
+  optional uint32 w = 6;
+  optional uint32 h = 7;
+  optional uint32 layer_stack = 8;
+
+  enum Flags {
+    eFlagsNone = 0;
+    eLayerHidden = 0x01;
+    eLayerOpaque = 0x02;
+    eLayerSkipScreenshot = 0x40;
+    eLayerSecure = 0x80;
+    eEnableBackpressure = 0x100;
+    eLayerIsDisplayDecoration = 0x200;
+  };
+  optional uint32 flags = 9;
+  optional uint32 mask = 10;
+
+  message Matrix22 {
+    optional float dsdx = 1;
+    optional float dtdx = 2;
+    optional float dtdy = 3;
+    optional float dsdy = 4;
+  };
+  optional Matrix22 matrix = 11;
+  optional float corner_radius = 12;
+  optional uint32 background_blur_radius = 13;
+  optional uint32 parent_id = 14;
+  optional uint32 relative_parent_id = 15;
+
+  optional float alpha = 16;
+  message Color3 {
+    optional float r = 1;
+    optional float g = 2;
+    optional float b = 3;
+  }
+  optional Color3 color = 17;
+  optional RegionProto transparent_region = 18;
+  optional uint32 transform = 19;
+  optional bool transform_to_display_inverse = 20;
+  optional RectProto crop = 21;
+
+  message BufferData {
+    optional uint64 buffer_id = 1;
+    optional uint32 width = 2;
+    optional uint32 height = 3;
+    optional uint64 frame_number = 4;
+
+    enum BufferDataChange {
+      BufferDataChangeNone = 0;
+      fenceChanged = 0x01;
+      frameNumberChanged = 0x02;
+      cachedBufferChanged = 0x04;
+    }
+    optional uint32 flags = 5;
+    optional uint64 cached_buffer_id = 6;
+
+    enum PixelFormat {
+      PIXEL_FORMAT_UNKNOWN = 0;
+      PIXEL_FORMAT_CUSTOM = -4;
+      PIXEL_FORMAT_TRANSLUCENT = -3;
+      PIXEL_FORMAT_TRANSPARENT = -2;
+      PIXEL_FORMAT_OPAQUE = -1;
+      PIXEL_FORMAT_RGBA_8888 = 1;
+      PIXEL_FORMAT_RGBX_8888 = 2;
+      PIXEL_FORMAT_RGB_888 = 3;
+      PIXEL_FORMAT_RGB_565 = 4;
+      PIXEL_FORMAT_BGRA_8888 = 5;
+      PIXEL_FORMAT_RGBA_5551 = 6;
+      PIXEL_FORMAT_RGBA_4444 = 7;
+      PIXEL_FORMAT_RGBA_FP16 = 22;
+      PIXEL_FORMAT_RGBA_1010102 = 43;
+      PIXEL_FORMAT_R_8 = 0x38;
+    }
+    optional PixelFormat pixel_format = 7;
+    optional uint64 usage = 8;
+  }
+  optional BufferData buffer_data = 22;
+  optional int32 api = 23;
+  optional bool has_sideband_stream = 24;
+  optional ColorTransformProto color_transform = 25;
+  repeated BlurRegion blur_regions = 26;
+
+  message WindowInfo {
+    optional uint32 layout_params_flags = 1;
+    optional int32 layout_params_type = 2;
+    optional RegionProto touchable_region = 3;
+    optional int32 surface_inset = 4;
+    // unused
+    optional bool focusable = 5;
+    // unused
+    optional bool has_wallpaper = 6;
+    optional float global_scale_factor = 7;
+    optional uint32 crop_layer_id = 8;
+    optional bool replace_touchable_region_with_crop = 9;
+    optional RectProto touchable_region_crop = 10;
+    optional Transform transform = 11;
+    optional uint32 input_config = 12;
+  }
+  optional WindowInfo window_info_handle = 27;
+  optional float bg_color_alpha = 28;
+  optional int32 bg_color_dataspace = 29;
+  optional bool color_space_agnostic = 30;
+  optional float shadow_radius = 31;
+  optional int32 frame_rate_selection_priority = 32;
+  optional float frame_rate = 33;
+  optional int32 frame_rate_compatibility = 34;
+  optional int32 change_frame_rate_strategy = 35;
+  optional uint32 fixed_transform_hint = 36;
+  optional uint64 frame_number = 37;
+  optional bool auto_refresh = 38;
+  optional bool is_trusted_overlay = 39;
+  optional RectProto buffer_crop = 40;
+  optional RectProto destination_frame = 41;
+
+  enum DropInputMode {
+    NONE = 0;
+    ALL = 1;
+    OBSCURED = 2;
+  };
+  optional DropInputMode drop_input_mode = 42;
+}
+
+message DisplayState {
+  enum Changes {
+    eChangesNone = 0;
+    eSurfaceChanged = 0x01;
+    eLayerStackChanged = 0x02;
+    eDisplayProjectionChanged = 0x04;
+    eDisplaySizeChanged = 0x08;
+    eFlagsChanged = 0x10;
+  };
+  optional int32 id = 1;
+  optional uint32 what = 2;
+  optional uint32 flags = 3;
+  optional uint32 layer_stack = 4;
+  optional uint32 orientation = 5;
+  optional RectProto layer_stack_space_rect = 6;
+  optional RectProto oriented_display_space_rect = 7;
+  optional uint32 width = 8;
+  optional uint32 height = 9;
+}
+
+// End of protos/perfetto/trace/android/surfaceflinger_transactions.proto
+
+// Begin of protos/perfetto/trace/chrome/chrome_benchmark_metadata.proto
+
+// This message is not intended to be written by the chrome on the device.
+// It's emitted on the host by the telemetry benchmark infrastructure (it's a
+// part of the trace that's written by the telemetry tracing agent).
+message ChromeBenchmarkMetadata {
+  // Time when the benchmark execution started (host unixtime in microseconds).
+  optional int64 benchmark_start_time_us = 1;
+
+  // Time when this particular story was run (host unixtime in microseconds).
+  optional int64 story_run_time_us = 2;
+
+  // Name of benchmark.
+  optional string benchmark_name = 3;
+
+  // Description of benchmark.
+  optional string benchmark_description = 4;
+
+  // Optional label.
+  optional string label = 5;
+
+  // Name of story.
+  optional string story_name = 6;
+
+  // List of story tags.
+  repeated string story_tags = 7;
+
+  // Index of the story run (>0 if the same story was run several times).
+  optional int32 story_run_index = 8;
+
+  // Whether this run failed.
+  optional bool had_failures = 9;
+}
+
+// End of protos/perfetto/trace/chrome/chrome_benchmark_metadata.proto
+
+// Begin of protos/perfetto/trace/chrome/chrome_metadata.proto
+
+// Metadata for chrome traces.
+message ChromeMetadataPacket {
+  optional BackgroundTracingMetadata background_tracing_metadata = 1;
+
+  // Version code of Chrome used by Android's Play Store. This field is only set
+  // on Android.
+  optional int32 chrome_version_code = 2;
+
+  // Comma separated list of enabled categories for tracing. The list of
+  // possible category strings are listed in code
+  // base/trace_event/builtin_categories.h.
+  optional string enabled_categories = 3;
+
+  // Finch name and group based on the ActiveGroupId.
+  message FinchHash {
+    optional uint32 name = 1;
+    optional uint32 group = 2;
+  }
+
+  // List of Finch study/groups that apply to this trace.
+  repeated FinchHash field_trial_hashes = 4;
+}
+
+// Metadata related to background tracing scenarios, states and triggers.
+message BackgroundTracingMetadata {
+  // Information about a trigger rule defined in the experiment config.
+  message TriggerRule {
+    enum TriggerType {
+      TRIGGER_UNSPECIFIED = 0;
+
+      // Traces are triggered by specific range of values of an UMA histogram.
+      MONITOR_AND_DUMP_WHEN_SPECIFIC_HISTOGRAM_AND_VALUE = 1;
+
+      // Traces are triggered by specific named events in chromium codebase,
+      // like "second-update-failure".
+      MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED = 2;
+    }
+    optional TriggerType trigger_type = 1;
+
+    // Configuration of histogram trigger.
+    message HistogramRule {
+      // UMA histogram name hash, same as HistogramEventProto.name_hash.
+      optional fixed64 histogram_name_hash = 1;
+
+      // Range of values of the histogram that activates trigger.
+      optional int64 histogram_min_trigger = 2;
+      optional int64 histogram_max_trigger = 3;
+    }
+    optional HistogramRule histogram_rule = 2;
+
+    // Configuration of named trigger.
+    message NamedRule {
+      enum EventType {
+        UNSPECIFIED = 0;
+        SESSION_RESTORE = 1;
+        NAVIGATION = 2;
+        STARTUP = 3;
+        REACHED_CODE = 4;
+        CONTENT_TRIGGER = 5;
+
+        TEST_RULE = 1000;
+      }
+      optional EventType event_type = 1;
+
+      // If |event_type| is CONTENT_TRIGGER, then this stores the hash of the
+      // content-trigger that actually fired.
+      optional fixed64 content_trigger_name_hash = 2;
+    }
+    optional NamedRule named_rule = 3;
+
+    // Hash of the rule name.
+    optional fixed32 name_hash = 4;
+  }
+
+  // Specifies the rule that caused the trace to be uploaded.
+  optional TriggerRule triggered_rule = 1;
+
+  // List of all active triggers in current session, when trace was triggered.
+  repeated TriggerRule active_rules = 2;
+
+  // Hash of the scenario name.
+  optional fixed32 scenario_name_hash = 3;
+}
+
+// End of protos/perfetto/trace/chrome/chrome_metadata.proto
+
+// Begin of protos/perfetto/trace/chrome/chrome_trace_event.proto
+
+message ChromeTracedValue {
+  enum NestedType {
+    DICT = 0;
+    ARRAY = 1;
+  }
+  optional NestedType nested_type = 1;
+
+  repeated string dict_keys = 2;
+  repeated ChromeTracedValue dict_values = 3;
+  repeated ChromeTracedValue array_values = 4;
+  optional int32 int_value = 5;
+  optional double double_value = 6;
+  optional bool bool_value = 7;
+  optional string string_value = 8;
+}
+
+message ChromeStringTableEntry {
+  optional string value = 1;
+  optional int32 index = 2;
+}
+
+// Deprecated, use TrackEvent protos instead.
+message ChromeTraceEvent {
+  message Arg {
+    optional string name = 1;
+
+    oneof value {
+      bool bool_value = 2;
+      uint64 uint_value = 3;
+      int64 int_value = 4;
+      double double_value = 5;
+      string string_value = 6;
+      // Pointers are stored in a separate type as the JSON output treats them
+      // differently from other uint64 values.
+      uint64 pointer_value = 7;
+      string json_value = 8;
+      ChromeTracedValue traced_value = 10;
+    }
+
+    // Takes precedence over |name| if set,
+    // and is an index into |string_table|.
+    optional uint32 name_index = 9;
+  }
+
+  optional string name = 1;
+  optional int64 timestamp = 2;
+  optional int32 phase = 3;
+  optional int32 thread_id = 4;
+  optional int64 duration = 5;
+  optional int64 thread_duration = 6;
+  optional string scope = 7;
+  optional uint64 id = 8;
+  optional uint32 flags = 9;
+  optional string category_group_name = 10;
+  optional int32 process_id = 11;
+  optional int64 thread_timestamp = 12;
+  optional uint64 bind_id = 13;
+
+  repeated Arg args = 14;
+
+  // Takes precedence over respectively |name| and
+  // |category_group_name_index| if set,
+  // and are indices into |string_table|.
+  optional uint32 name_index = 15;
+  optional uint32 category_group_name_index = 16;
+}
+
+message ChromeMetadata {
+  optional string name = 1;
+
+  oneof value {
+    string string_value = 2;
+    bool bool_value = 3;
+    int64 int_value = 4;
+    string json_value = 5;
+  }
+}
+
+// Subtraces produced in legacy json format by Chrome tracing agents not yet
+// updated to support the new binary format, e.g. ETW and CrOS ARC.
+// TODO(eseckler): Update these agents to become perfetto producers.
+message ChromeLegacyJsonTrace {
+  enum TraceType {
+    USER_TRACE = 0;
+
+    // Deprecated.
+    SYSTEM_TRACE = 1;
+  }
+  optional TraceType type = 1;
+  optional string data = 2;
+}
+
+message ChromeEventBundle {
+  // Deprecated, use TrackEvent protos instead.
+  repeated ChromeTraceEvent trace_events = 1 [deprecated = true];
+  // TODO(ssid): This should be deprecated in favor of ChromeMetadataPacket
+  // which contains typed fields.
+  repeated ChromeMetadata metadata = 2;
+  // ftrace output from CrOS and Cast system tracing agents.
+  // TODO(eseckler): Replace system traces with native perfetto service.
+  repeated string legacy_ftrace_output = 4;
+  repeated ChromeLegacyJsonTrace legacy_json_trace = 5;
+
+  // Contents of a string table that's valid for
+  // the whole ChromeEventBundle entry.
+  repeated ChromeStringTableEntry string_table = 3 [deprecated = true];
+}
+
+// End of protos/perfetto/trace/chrome/chrome_trace_event.proto
+
+// Begin of protos/perfetto/trace/chrome/chrome_trigger.proto
+
+// When a TracingSession receives a trigger it records the boot time
+// nanoseconds in the TracePacket's timestamp field. We emit this data so
+// filtering can be done on triggers received in the trace.
+message ChromeTrigger {
+  // Name of the trigger which was received.
+  optional string trigger_name = 1;
+  // MD5 hash of the trigger name.
+  optional string trigger_hash = 2;
+}
+
+// End of protos/perfetto/trace/chrome/chrome_trigger.proto
+
+// Begin of protos/perfetto/trace/chrome/v8.proto
+
+// These are the protos for the V8 data source.
+//
+// All events are associated to a V8 isolate instance. There can be multiple
+// instances associated to a given thread, although this is rare.
+//
+// Generated code in V8 is allocated in the V8 heap (in a special executeable
+// section), this means that code can be garbage collected (when no longer used)
+// or can be moved around (e.g. during heap compactation). This means that a
+// given callsite might correspond to function `A` at one point in time and to
+// function `B` later on.
+// In addition V8 code has various levels of optimization, so a function might
+// have multiple associated code snippets.
+//
+// V8 does not track code deletion, so we have to indirectly infer it by
+// detecting code overlaps, if a newer code creation event overlaps with older
+// code we need to asume that the old code was deleted. Code moves are logged,
+// and there is an event to track those.
+
+// Strings used by V8 can have different encodings, instead of coverting to a
+// common encoding (e.g. UTF-8) on device is expensive. Instead we send the
+// "raw" string and do the convestion at trace ingestion time.
+//
+// ATTENTION: There is some overhead in using a message (as opossed to having
+// the `oneof encoded_string`` direcly embedded in the message), so use this
+// message in places were these extra bytes don't matter that much.
+// Next id: 5
+message V8String {
+  oneof encoded_string {
+    // ISO/IEC 8859-1:1998 encoding aka latin1
+    // https://en.wikipedia.org/wiki/ISO/IEC_8859-1
+    bytes latin1 = 1;
+    // UTF-16 Little Endian Encoding
+    bytes utf16_le = 2;
+    // UTF-16 Big Endian Encoding
+    bytes utf16_be = 3;
+  }
+}
+
+// Interned version of V8String
+message InternedV8String {
+  optional uint64 iid = 1;
+  // We inline the fields in V8String here to save some bytes in the serialized
+  // proto format. Interning is about saving bytes so this makes sense here.
+  oneof encoded_string {
+    // ISO/IEC 8859-1:1998 encoding aka latin1
+    // https://en.wikipedia.org/wiki/ISO/IEC_8859-1
+    bytes latin1 = 2;
+    // UTF-16 Little Endian Encoding
+    bytes utf16_le = 3;
+    // UTF-16 Big Endian Encoding
+    bytes utf16_be = 4;
+  }
+}
+
+// Represents a script that was compiled to generate code. Some V8 code is
+// generated out of scripts and will reference a V8Script other types of code
+// will not (e.g. builtins).
+message InternedV8JsScript {
+  optional uint64 iid = 1;
+  // Unique in a given isolate
+  optional int32 script_id = 2;
+
+  enum Type {
+    TYPE_UNKNOWN = 0;
+    TYPE_NORMAL = 1;
+    TYPE_EVAL = 2;
+    TYPE_MODULE = 3;
+    TYPE_NATIVE = 4;
+    TYPE_EXTENSION = 5;
+    TYPE_INSPECTOR = 6;
+  }
+
+  optional Type type = 3;
+  optional V8String name = 4;
+  // Actual source of the script
+  optional V8String source = 5;
+}
+
+message InternedV8WasmScript {
+  optional uint64 iid = 1;
+  // Unique in a given isolate
+  optional int32 script_id = 2;
+
+  optional string url = 3;
+}
+
+message InternedV8JsFunction {
+  enum Kind {
+    KIND_UNKNOWN = 0;
+    KIND_NORMAL_FUNCTION = 1;
+    KIND_MODULE = 2;
+    KIND_ASYNC_MODULE = 3;
+    KIND_BASE_CONSTRUCTOR = 4;
+    KIND_DEFAULT_BASE_CONSTRUCTOR = 5;
+    KIND_DEFAULT_DERIVED_CONSTRUCTOR = 6;
+    KIND_DERIVED_CONSTRUCTOR = 7;
+    KIND_GETTER_FUNCTION = 8;
+    KIND_STATIC_GETTER_FUNCTION = 9;
+    KIND_SETTER_FUNCTION = 10;
+    KIND_STATIC_SETTER_FUNCTION = 11;
+    KIND_ARROW_FUNCTION = 12;
+    KIND_ASYNC_ARROW_FUNCTION = 13;
+    KIND_ASYNC_FUNCTION = 14;
+    KIND_ASYNC_CONCISE_METHOD = 15;
+    KIND_STATIC_ASYNC_CONCISE_METHOD = 16;
+    KIND_ASYNC_CONCISE_GENERATOR_METHOD = 17;
+    KIND_STATIC_ASYNC_CONCISE_GENERATOR_METHOD = 18;
+    KIND_ASYNC_GENERATOR_FUNCTION = 19;
+    KIND_GENERATOR_FUNCTION = 20;
+    KIND_CONCISE_GENERATOR_METHOD = 21;
+    KIND_STATIC_CONCISE_GENERATOR_METHOD = 22;
+    KIND_CONCISE_METHOD = 23;
+    KIND_STATIC_CONCISE_METHOD = 24;
+    KIND_CLASS_MEMBERS_INITIALIZER_FUNCTION = 25;
+    KIND_CLASS_STATIC_INITIALIZER_FUNCTION = 26;
+    KIND_INVALID = 27;
+  }
+  optional uint64 iid = 1;
+  optional uint64 v8_js_function_name_iid = 2;
+  optional uint64 v8_js_script_iid = 3;
+
+  optional bool is_toplevel = 4;
+  optional Kind kind = 5;
+
+  // Where in the script source this function is defined. This is counted in
+  // bytes not characters.
+  optional uint32 byte_offset = 6;
+}
+
+// A V8 Isolate instance. A V8 Isolate represents an isolated instance of the V8
+// engine.
+message InternedV8Isolate {
+  optional uint64 iid = 1;
+
+  optional uint32 pid = 2;
+
+  // Process unique isolate id.
+  optional int32 isolate_id = 3;
+
+  // A code range is a virtual memory cage that may contain executable code.
+  // Depending on the Isolate settings the Isolate might have one or not.
+  // See:
+  // https://source.chromium.org/chromium/chromium/src/+/main:v8/src/heap/code-range.h
+  // If the isolate defines code range this will be tracked here.
+  message CodeRange {
+    optional uint64 base_address = 1;
+    optional uint64 size = 2;
+    // Used when short builtin calls are enabled, where embedded builtins are
+    // copied into the CodeRange so calls can be nearer.
+    optional uint64 embedded_blob_code_copy_start_address = 3;
+    // Whether this code range is shared with other Isolates in the same process
+    optional bool is_process_wide = 4;
+  }
+  optional CodeRange code_range = 4;
+  // The embedded blob holds code for built in functions that are precompiled in
+  // the V8 library.
+  optional uint64 embedded_blob_code_start_address = 5;
+  optional uint64 embedded_blob_code_size = 6;
+}
+
+message V8JsCode {
+  enum Tier {
+    TIER_UNKNOWN = 0;
+    TIER_IGNITION = 1;
+    TIER_SPARKPLUG = 2;
+    TIER_MAGLEV = 3;
+    TIER_TURBOSHAFT = 4;
+    TIER_TURBOFAN = 5;
+  }
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional uint64 v8_js_function_iid = 3;
+  optional Tier tier = 4;
+
+  optional uint64 instruction_start = 5;
+  optional uint64 instruction_size_bytes = 6;
+  oneof instructions {
+    bytes machine_code = 7;
+    bytes bytecode = 8;
+  }
+}
+
+message V8InternalCode {
+  enum Type {
+    TYPE_UNKNOWN = 0;
+    TYPE_BYTECODE_HANDLER = 1;
+    TYPE_FOR_TESTING = 2;
+    TYPE_BUILTIN = 3;
+    TYPE_WASM_FUNCTION = 4;
+    TYPE_WASM_TO_CAPI_FUNCTION = 5;
+    TYPE_WASM_TO_JS_FUNCTION = 6;
+    TYPE_JS_TO_WASM_FUNCTION = 7;
+    TYPE_JS_TO_JS_FUNCTION = 8;
+    TYPE_C_WASM_ENTRY = 9;
+  }
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional string name = 3;
+  optional Type type = 4;
+  optional int32 builtin_id = 5;
+
+  optional uint64 instruction_start = 6;
+  optional uint64 instruction_size_bytes = 7;
+  optional bytes machine_code = 8;
+}
+
+message V8WasmCode {
+  enum Tier {
+    TIER_UNKNOWN = 0;
+    TIER_LIFTOFF = 1;
+    TIER_TURBOFAN = 2;
+  }
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional uint64 v8_wasm_script_iid = 3;
+  optional string function_name = 4;
+
+  optional Tier tier = 5;
+  optional int32 code_offset_in_module = 6;
+
+  optional uint64 instruction_start = 7;
+  optional uint64 instruction_size_bytes = 8;
+  optional bytes machine_code = 9;
+}
+
+message V8RegExpCode {
+  optional uint64 v8_isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional V8String pattern = 3;
+
+  optional uint64 instruction_start = 4;
+  optional uint64 instruction_size_bytes = 5;
+  optional bytes machine_code = 6;
+}
+
+// Move event for V8 code (JS / Wasm / Internal / Regexp) that was relocated in
+// memory by V8's GC.
+message V8CodeMove {
+  optional uint64 isolate_iid = 1;
+  optional uint32 tid = 2;
+  optional uint64 from_instruction_start_address = 3;
+  optional uint64 to_instruction_start_address = 4;
+  optional uint64 instruction_size_bytes = 5;
+  oneof to_instructions {
+    bytes to_machine_code = 6;
+    bytes to_bytecode = 7;
+  }
+}
+
+message V8CodeDefaults {
+  optional uint32 tid = 1;
+}
+// End of protos/perfetto/trace/chrome/v8.proto
+
+// Begin of protos/perfetto/trace/clock_snapshot.proto
+
+// A snapshot of clock readings to allow for trace alignment.
+message ClockSnapshot {
+  message Clock {
+    // DEPRECATED. This enum has moved to ../common/builtin_clock.proto.
+    enum BuiltinClocks {
+      UNKNOWN = 0;
+      REALTIME = 1;
+      REALTIME_COARSE = 2;
+      MONOTONIC = 3;
+      MONOTONIC_COARSE = 4;
+      MONOTONIC_RAW = 5;
+      BOOTTIME = 6;
+      BUILTIN_CLOCK_MAX_ID = 63;
+
+      reserved 7, 8;
+    }
+
+    // Clock IDs have the following semantic:
+    // [1, 63]:    Builtin types, see BuiltinClock from
+    //             ../common/builtin_clock.proto.
+    // [64, 127]:  User-defined clocks. These clocks are sequence-scoped. They
+    //             are only valid within the same |trusted_packet_sequence_id|
+    //             (i.e. only for TracePacket(s) emitted by the same TraceWriter
+    //             that emitted the clock snapshot).
+    // [128, MAX]: Reserved for future use. The idea is to allow global clock
+    //             IDs and setting this ID to hash(full_clock_name) & ~127.
+    optional uint32 clock_id = 1;
+
+    // Absolute timestamp. Unit is ns unless specified otherwise by the
+    // unit_multiplier_ns field below.
+    optional uint64 timestamp = 2;
+
+    // When true each TracePacket's timestamp should be interpreted as a delta
+    // from the last TracePacket's timestamp (referencing this clock) emitted by
+    // the same packet_sequence_id. Should only be used for user-defined
+    // sequence-local clocks. The first packet timestamp after each
+    // ClockSnapshot that contains this clock is relative to the |timestamp| in
+    // the ClockSnapshot.
+    optional bool is_incremental = 3;
+
+    // Allows to specify a custom unit different than the default (ns) for this
+    // clock domain. A multiplier of 1000 means that a timestamp = 3 should be
+    // interpreted as 3000 ns = 3 us. All snapshots for the same clock within a
+    // trace need to use the same unit.
+    optional uint64 unit_multiplier_ns = 4;
+  }
+  repeated Clock clocks = 1;
+
+  // The authoritative clock domain for the trace. Defaults to BOOTTIME, but can
+  // be overridden in TraceConfig's builtin_data_sources. Trace processor will
+  // attempt to translate packet/event timestamps from various data sources (and
+  // their chosen clock domains) to this domain during import.
+  optional BuiltinClock primary_trace_clock = 2;
+}
+
+// End of protos/perfetto/trace/clock_snapshot.proto
+
+// Begin of protos/perfetto/trace/etw/etw.proto
+
+// Proto definition based on the Thread_v2 CSwitch class definition
+// See: https://learn.microsoft.com/en-us/windows/win32/etw/cswitch
+message CSwitchEtwEvent {
+  // New thread ID after the switch.
+  optional uint32 new_thread_id = 1;
+
+  // Previous thread ID.
+  optional uint32 old_thread_id = 2;
+
+  // Thread priority of the new thread.
+  optional sint32 new_thread_priority = 3;
+
+  // Thread priority of the previous thread.
+  optional sint32 old_thread_priority = 4;
+
+  // The index of the C-state that was last used by the processor. A value of 0
+  // represents the lightest idle state with higher values representing deeper
+  // C-states.
+  optional uint32 previous_c_state = 5;
+
+  // Wait reason for the previous thread. The ordering is important as based on
+  // the OldThreadWaitReason definition from the link above. The following are
+  // the possible values:
+  enum OldThreadWaitReason {
+    EXECUTIVE = 0;
+    FREE_PAGE = 1;
+    PAGE_IN = 2;
+    POOL_ALLOCATION = 3;
+    DELAY_EXECUTION = 4;
+    SUSPEND = 5;
+    USER_REQUEST = 6;
+    WR_EXECUTIVE = 7;
+    WR_FREE_PAGE = 8;
+    WR_PAGE_IN = 9;
+    WR_POOL_ALLOCATION = 10;
+    WR_DELAY_EXECUTION = 11;
+    WR_SUSPENDED = 12;
+    WR_USER_REQUEST = 13;
+    WR_EVENT_PAIR = 14;
+    WR_QUEUE = 15;
+    WR_LPC_RECEIVER = 16;
+    WR_LPC_REPLY = 17;
+    WR_VIRTUAL_MEMORY = 18;
+    WR_PAGE_OUT = 19;
+    WR_RENDEZ_VOUS = 20;
+    WR_KEYED_EVENT = 21;
+    WR_TERMINATED = 22;
+    WR_PROCESS_IN_SWAP = 23;
+    WR_CPU_RATE_CONTROL = 24;
+    WR_CALLOUT_STACK = 25;
+    WR_KERNEL = 26;
+    WR_RESOURCE = 27;
+    WR_PUSH_LOCK = 28;
+    WR_MUTEX = 29;
+    WR_QUANTUM_END = 30;
+    WR_DISPATCH_INT = 31;
+    WR_PREEMPTED = 32;
+    WR_YIELD_EXECUTION = 33;
+    WR_FAST_MUTEX = 34;
+    WR_GUARD_MUTEX = 35;
+    WR_RUNDOWN = 36;
+    MAXIMUM_WAIT_REASON = 37;
+  }
+
+  optional OldThreadWaitReason old_thread_wait_reason = 6;
+
+  // Wait mode for the previous thread. The ordering is important as based on
+  // the OldThreadWaitMode definition from the link above. The following are the
+  // possible values:
+  enum OldThreadWaitMode {
+    KERNEL_MODE = 0;
+    USER_MODE = 1;
+  }
+
+  optional OldThreadWaitMode old_thread_wait_mode = 7;
+
+  // State of the previous thread. The ordering is important as based on the
+  // OldThreadState definition from the link above. The following are the
+  // possible state values:
+  enum OldThreadState {
+    INITIALIZED = 0;
+    READY = 1;
+    RUNNING = 2;
+    STANDBY = 3;
+    TERMINATED = 4;
+    WAITING = 5;
+    TRANSITION = 6;
+    DEFERRED_READY = 7;
+  }
+
+  optional OldThreadState old_thread_state = 8;
+
+  // Ideal wait time of the previous thread.
+  optional sint32 old_thread_wait_ideal_processor = 9;
+
+  // Wait time for the new thread.
+  optional uint32 new_thread_wait_time = 10;
+}
+
+// Proto definition based on the Thread_v2 CSwitch class definition
+// See: https://learn.microsoft.com/en-us/windows/win32/etw/readythread
+message ReadyThreadEtwEvent {
+  // The thread identifier of the thread being readied for execution.
+  optional uint32 t_thread_id = 1;
+
+  // The reason for the priority boost. The ordering is important as based on
+  // the AdjustReason definition from the link above.
+  enum AdjustReason {
+    IGNORE_THE_INCREMENT = 0;
+    // Apply the increment, which will decay incrementally at the end of each
+    // quantum.
+    APPLY_INCREMENT = 1;
+    // Apply the increment as a boost that will decay in its entirety at quantum
+    // (typically for priority donation).
+    APPLY_INCREMENT_BOOST = 2;
+  }
+
+  optional AdjustReason adjust_reason = 2;
+
+  //  The value by which the priority is being adjusted.
+  optional sint32 adjust_increment = 3;
+
+  enum TraceFlag {
+    TRACE_FLAG_UNSPECIFIED = 0;
+    // The thread has been readied from DPC (deferred procedure call).
+    THREAD_READIED = 0x1;
+    // The kernel stack is currently swapped out.
+    KERNEL_STACK_SWAPPED_OUT = 0x2;
+    // The process address space is swapped out.
+    PROCESS_ADDRESS_SWAPPED_OUT = 0x4;
+  }
+
+  optional TraceFlag flag = 4;
+}
+// End of protos/perfetto/trace/etw/etw.proto
+
+// Begin of protos/perfetto/trace/etw/etw_event.proto
+
+message EtwTraceEvent {
+  optional uint64 timestamp = 1;
+  optional uint32 cpu = 4;
+
+  oneof event {
+    CSwitchEtwEvent c_switch = 2;
+    ReadyThreadEtwEvent ready_thread = 3;
+  }
+}
+// End of protos/perfetto/trace/etw/etw_event.proto
+
+// Begin of protos/perfetto/trace/etw/etw_event_bundle.proto
+
+// The result of tracing one or more etw event uses per-processor buffers where
+// an in-use buffer is assigned to each processor at all times. Therefore,
+// collecting multiple events they should already be synchronized.
+message EtwTraceEventBundle {
+  optional uint32 cpu = 1;
+  repeated EtwTraceEvent event = 2;
+}
+// End of protos/perfetto/trace/etw/etw_event_bundle.proto
+
+// Begin of protos/perfetto/common/descriptor.proto
+
+// The protocol compiler can output a FileDescriptorSet containing the .proto
+// files it parses.
+message FileDescriptorSet {
+  repeated FileDescriptorProto file = 1;
+}
+
+// Describes a complete .proto file.
+message FileDescriptorProto {
+  // file name, relative to root of source tree
+  optional string name = 1;
+  // e.g. "foo", "foo.bar", etc.
+  optional string package = 2;
+
+  // Names of files imported by this file.
+  repeated string dependency = 3;
+  // Indexes of the public imported files in the dependency list above.
+  repeated int32 public_dependency = 10;
+  // Indexes of the weak imported files in the dependency list.
+  // For Google-internal migration only. Do not use.
+  repeated int32 weak_dependency = 11;
+
+  // All top-level definitions in this file.
+  repeated DescriptorProto message_type = 4;
+  repeated EnumDescriptorProto enum_type = 5;
+  repeated FieldDescriptorProto extension = 7;
+
+  reserved 6;
+  reserved 8;
+  reserved 9;
+  reserved 12;
+}
+
+// Describes a message type.
+message DescriptorProto {
+  optional string name = 1;
+
+  repeated FieldDescriptorProto field = 2;
+  repeated FieldDescriptorProto extension = 6;
+
+  repeated DescriptorProto nested_type = 3;
+  repeated EnumDescriptorProto enum_type = 4;
+
+  reserved 5;
+
+  repeated OneofDescriptorProto oneof_decl = 8;
+
+  reserved 7;
+
+  // Range of reserved tag numbers. Reserved tag numbers may not be used by
+  // fields or extension ranges in the same message. Reserved ranges may
+  // not overlap.
+  message ReservedRange {
+    // Inclusive.
+    optional int32 start = 1;
+    // Exclusive.
+    optional int32 end = 2;
+  }
+  repeated ReservedRange reserved_range = 9;
+  // Reserved field names, which may not be used by fields in the same message.
+  // A given name may only be reserved once.
+  repeated string reserved_name = 10;
+}
+
+// A message representing a option the parser does not recognize. This only
+// appears in options protos created by the compiler::Parser class.
+// DescriptorPool resolves these when building Descriptor objects. Therefore,
+// options protos in descriptor objects (e.g. returned by Descriptor::options(),
+// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
+// in them.
+message UninterpretedOption {
+  // The name of the uninterpreted option.  Each string represents a segment in
+  // a dot-separated name.  is_extension is true iff a segment represents an
+  // extension (denoted with parentheses in options specs in .proto files).
+  // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+  // "foo.(bar.baz).moo".
+  message NamePart {
+    optional string name_part = 1;
+    optional bool is_extension = 2;
+  }
+  repeated NamePart name = 2;
+
+  // The value of the uninterpreted option, in whatever type the tokenizer
+  // identified it as during parsing. Exactly one of these should be set.
+  optional string identifier_value = 3;
+  optional uint64 positive_int_value = 4;
+  optional int64 negative_int_value = 5;
+  optional double double_value = 6;
+  optional bytes string_value = 7;
+  optional string aggregate_value = 8;
+}
+
+message FieldOptions {
+  // The packed option can be enabled for repeated primitive fields to enable
+  // a more efficient representation on the wire. Rather than repeatedly
+  // writing the tag and type for each element, the entire array is encoded as
+  // a single length-delimited blob. In proto3, only explicit setting it to
+  // false will avoid using packed encoding.
+  optional bool packed = 2;
+
+  // The parser stores options it doesn't recognize here. See above.
+  repeated UninterpretedOption uninterpreted_option = 999;
+}
+
+// Describes a field within a message.
+message FieldDescriptorProto {
+  enum Type {
+    // 0 is reserved for errors.
+    // Order is weird for historical reasons.
+    TYPE_DOUBLE = 1;
+    TYPE_FLOAT = 2;
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
+    // negative values are likely.
+    TYPE_INT64 = 3;
+    TYPE_UINT64 = 4;
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
+    // negative values are likely.
+    TYPE_INT32 = 5;
+    TYPE_FIXED64 = 6;
+    TYPE_FIXED32 = 7;
+    TYPE_BOOL = 8;
+    TYPE_STRING = 9;
+    // Tag-delimited aggregate.
+    // Group type is deprecated and not supported in proto3. However, Proto3
+    // implementations should still be able to parse the group wire format and
+    // treat group fields as unknown fields.
+    TYPE_GROUP = 10;
+    // Length-delimited aggregate.
+    TYPE_MESSAGE = 11;
+
+    // New in version 2.
+    TYPE_BYTES = 12;
+    TYPE_UINT32 = 13;
+    TYPE_ENUM = 14;
+    TYPE_SFIXED32 = 15;
+    TYPE_SFIXED64 = 16;
+    // Uses ZigZag encoding.
+    TYPE_SINT32 = 17;
+    // Uses ZigZag encoding.
+    TYPE_SINT64 = 18;
+  };
+
+  enum Label {
+    // 0 is reserved for errors
+    LABEL_OPTIONAL = 1;
+    LABEL_REQUIRED = 2;
+    LABEL_REPEATED = 3;
+  };
+
+  optional string name = 1;
+  optional int32 number = 3;
+  optional Label label = 4;
+
+  // If type_name is set, this need not be set.  If both this and type_name
+  // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
+  optional Type type = 5;
+
+  // For message and enum types, this is the name of the type.  If the name
+  // starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
+  // rules are used to find the type (i.e. first the nested types within this
+  // message are searched, then within the parent, on up to the root
+  // namespace).
+  optional string type_name = 6;
+
+  // For extensions, this is the name of the type being extended.  It is
+  // resolved in the same manner as type_name.
+  optional string extendee = 2;
+
+  // For numeric types, contains the original text representation of the value.
+  // For booleans, "true" or "false".
+  // For strings, contains the default text contents (not escaped in any way).
+  // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
+  // TODO(kenton):  Base-64 encode?
+  optional string default_value = 7;
+
+  optional FieldOptions options = 8;
+
+  // If set, gives the index of a oneof in the containing type's oneof_decl
+  // list.  This field is a member of that oneof.
+  optional int32 oneof_index = 9;
+
+  reserved 10;
+}
+
+// Describes a oneof.
+message OneofDescriptorProto {
+  optional string name = 1;
+  optional OneofOptions options = 2;
+}
+
+// Describes an enum type.
+message EnumDescriptorProto {
+  optional string name = 1;
+
+  repeated EnumValueDescriptorProto value = 2;
+
+  reserved 3;
+  reserved 4;
+
+  // Reserved enum value names, which may not be reused. A given name may only
+  // be reserved once.
+  repeated string reserved_name = 5;
+}
+
+// Describes a value within an enum.
+message EnumValueDescriptorProto {
+  optional string name = 1;
+  optional int32 number = 2;
+
+  reserved 3;
+}
+
+message OneofOptions {
+  reserved 999;
+
+  // Clients can define custom options in extensions of this message. See above.
+  extensions 1000 to max;
+}
+
+// End of protos/perfetto/common/descriptor.proto
+
+// Begin of protos/perfetto/trace/extension_descriptor.proto
+
+// This message contains descriptors used to parse extension fields of
+// TrackEvent.
+//
+// See docs/design-docs/extensions.md for more details.
+message ExtensionDescriptor {
+  optional FileDescriptorSet extension_set = 1;
+}
+
+// End of protos/perfetto/trace/extension_descriptor.proto
+
+// Begin of protos/perfetto/trace/filesystem/inode_file_map.proto
+
+// Represents the mapping between inode numbers in a block device and their path
+// on the filesystem
+message InodeFileMap {
+  // Representation of Entry
+  message Entry {
+    optional uint64 inode_number = 1;
+
+    // The path to the file, e.g. "etc/file.xml"
+    // List of strings for multiple hardlinks
+    repeated string paths = 2;
+
+    // The file type
+    enum Type {
+      UNKNOWN = 0;
+      FILE = 1;
+      DIRECTORY = 2;
+    }
+    optional Type type = 3;
+  }
+
+  optional uint64 block_device_id = 1;
+
+  // The mount points of the block device, e.g. ["system"].
+  repeated string mount_points = 2;
+
+  // The list of all the entries from the block device
+  repeated Entry entries = 3;
+}
+
+// End of protos/perfetto/trace/filesystem/inode_file_map.proto
+
+// Begin of protos/perfetto/trace/ftrace/android_fs.proto
+
+message AndroidFsDatareadEndFtraceEvent {
+  optional int32 bytes = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+}
+message AndroidFsDatareadStartFtraceEvent {
+  optional int32 bytes = 1;
+  optional string cmdline = 2;
+  optional int64 i_size = 3;
+  optional uint64 ino = 4;
+  optional int64 offset = 5;
+  optional string pathbuf = 6;
+  optional int32 pid = 7;
+}
+message AndroidFsDatawriteEndFtraceEvent {
+  optional int32 bytes = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+}
+message AndroidFsDatawriteStartFtraceEvent {
+  optional int32 bytes = 1;
+  optional string cmdline = 2;
+  optional int64 i_size = 3;
+  optional uint64 ino = 4;
+  optional int64 offset = 5;
+  optional string pathbuf = 6;
+  optional int32 pid = 7;
+}
+message AndroidFsFsyncEndFtraceEvent {
+  optional int32 bytes = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+}
+message AndroidFsFsyncStartFtraceEvent {
+  optional string cmdline = 1;
+  optional int64 i_size = 2;
+  optional uint64 ino = 3;
+  optional string pathbuf = 4;
+  optional int32 pid = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/android_fs.proto
+
+// Begin of protos/perfetto/trace/ftrace/binder.proto
+
+message BinderTransactionFtraceEvent {
+  optional int32 debug_id = 1;
+  optional int32 target_node = 2;
+  optional int32 to_proc = 3;
+  optional int32 to_thread = 4;
+  optional int32 reply = 5;
+  optional uint32 code = 6;
+  optional uint32 flags = 7;
+}
+message BinderTransactionReceivedFtraceEvent {
+  optional int32 debug_id = 1;
+}
+message BinderSetPriorityFtraceEvent {
+  optional int32 proc = 1;
+  optional int32 thread = 2;
+  optional uint32 old_prio = 3;
+  optional uint32 new_prio = 4;
+  optional uint32 desired_prio = 5;
+}
+message BinderLockFtraceEvent {
+  optional string tag = 1;
+}
+message BinderLockedFtraceEvent {
+  optional string tag = 1;
+}
+message BinderUnlockFtraceEvent {
+  optional string tag = 1;
+}
+message BinderTransactionAllocBufFtraceEvent {
+  optional uint64 data_size = 1;
+  optional int32 debug_id = 2;
+  optional uint64 offsets_size = 3;
+  optional uint64 extra_buffers_size = 4;
+}
+message BinderCommandFtraceEvent {
+  optional uint32 cmd = 1;
+}
+message BinderReturnFtraceEvent {
+  optional uint32 cmd = 1;
+}
+
+// End of protos/perfetto/trace/ftrace/binder.proto
+
+// Begin of protos/perfetto/trace/ftrace/block.proto
+
+message BlockRqIssueFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint32 bytes = 4;
+  optional string rwbs = 5;
+  optional string comm = 6;
+  optional string cmd = 7;
+}
+message BlockBioBackmergeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioBounceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioCompleteFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 error = 4;
+  optional string rwbs = 5;
+}
+message BlockBioFrontmergeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioQueueFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockBioRemapFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint64 old_dev = 4;
+  optional uint64 old_sector = 5;
+  optional string rwbs = 6;
+}
+message BlockDirtyBufferFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint64 size = 3;
+}
+message BlockGetrqFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockPlugFtraceEvent {
+  optional string comm = 1;
+}
+message BlockRqAbortFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 errors = 4;
+  optional string rwbs = 5;
+  optional string cmd = 6;
+}
+message BlockRqCompleteFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 errors = 4;
+  optional string rwbs = 5;
+  optional string cmd = 6;
+  optional int32 error = 7;
+}
+message BlockRqInsertFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint32 bytes = 4;
+  optional string rwbs = 5;
+  optional string comm = 6;
+  optional string cmd = 7;
+}
+message BlockRqRemapFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional uint64 old_dev = 4;
+  optional uint64 old_sector = 5;
+  optional uint32 nr_bios = 6;
+  optional string rwbs = 7;
+}
+message BlockRqRequeueFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional int32 errors = 4;
+  optional string rwbs = 5;
+  optional string cmd = 6;
+}
+message BlockSleeprqFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint32 nr_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockSplitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint64 new_sector = 3;
+  optional string rwbs = 4;
+  optional string comm = 5;
+}
+message BlockTouchBufferFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 sector = 2;
+  optional uint64 size = 3;
+}
+message BlockUnplugFtraceEvent {
+  optional int32 nr_rq = 1;
+  optional string comm = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/block.proto
+
+// Begin of protos/perfetto/trace/ftrace/cgroup.proto
+
+message CgroupAttachTaskFtraceEvent {
+  optional int32 dst_root = 1;
+  optional int32 dst_id = 2;
+  optional int32 pid = 3;
+  optional string comm = 4;
+  optional string cname = 5;
+  optional int32 dst_level = 6;
+  optional string dst_path = 7;
+}
+message CgroupMkdirFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupRemountFtraceEvent {
+  optional int32 root = 1;
+  optional uint32 ss_mask = 2;
+  optional string name = 3;
+}
+message CgroupRmdirFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupTransferTasksFtraceEvent {
+  optional int32 dst_root = 1;
+  optional int32 dst_id = 2;
+  optional int32 pid = 3;
+  optional string comm = 4;
+  optional string cname = 5;
+  optional int32 dst_level = 6;
+  optional string dst_path = 7;
+}
+message CgroupDestroyRootFtraceEvent {
+  optional int32 root = 1;
+  optional uint32 ss_mask = 2;
+  optional string name = 3;
+}
+message CgroupReleaseFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupRenameFtraceEvent {
+  optional int32 root = 1;
+  optional int32 id = 2;
+  optional string cname = 3;
+  optional int32 level = 4;
+  optional string path = 5;
+}
+message CgroupSetupRootFtraceEvent {
+  optional int32 root = 1;
+  optional uint32 ss_mask = 2;
+  optional string name = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/cgroup.proto
+
+// Begin of protos/perfetto/trace/ftrace/clk.proto
+
+message ClkEnableFtraceEvent {
+  optional string name = 1;
+}
+message ClkDisableFtraceEvent {
+  optional string name = 1;
+}
+message ClkSetRateFtraceEvent {
+  optional string name = 1;
+  optional uint64 rate = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/clk.proto
+
+// Begin of protos/perfetto/trace/ftrace/cma.proto
+
+message CmaAllocStartFtraceEvent {
+  optional uint32 align = 1;
+  optional uint32 count = 2;
+  optional string name = 3;
+}
+message CmaAllocInfoFtraceEvent {
+  optional uint32 align = 1;
+  optional uint32 count = 2;
+  optional uint32 err_iso = 3;
+  optional uint32 err_mig = 4;
+  optional uint32 err_test = 5;
+  optional string name = 6;
+  optional uint64 nr_mapped = 7;
+  optional uint64 nr_migrated = 8;
+  optional uint64 nr_reclaimed = 9;
+  optional uint64 pfn = 10;
+}
+
+// End of protos/perfetto/trace/ftrace/cma.proto
+
+// Begin of protos/perfetto/trace/ftrace/compaction.proto
+
+message MmCompactionBeginFtraceEvent {
+  optional uint64 zone_start = 1;
+  optional uint64 migrate_pfn = 2;
+  optional uint64 free_pfn = 3;
+  optional uint64 zone_end = 4;
+  optional uint32 sync = 5;
+}
+message MmCompactionDeferCompactionFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional uint32 considered = 4;
+  optional uint32 defer_shift = 5;
+  optional int32 order_failed = 6;
+}
+message MmCompactionDeferredFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional uint32 considered = 4;
+  optional uint32 defer_shift = 5;
+  optional int32 order_failed = 6;
+}
+message MmCompactionDeferResetFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional uint32 considered = 4;
+  optional uint32 defer_shift = 5;
+  optional int32 order_failed = 6;
+}
+message MmCompactionEndFtraceEvent {
+  optional uint64 zone_start = 1;
+  optional uint64 migrate_pfn = 2;
+  optional uint64 free_pfn = 3;
+  optional uint64 zone_end = 4;
+  optional uint32 sync = 5;
+  optional int32 status = 6;
+}
+message MmCompactionFinishedFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional int32 ret = 4;
+}
+message MmCompactionIsolateFreepagesFtraceEvent {
+  optional uint64 start_pfn = 1;
+  optional uint64 end_pfn = 2;
+  optional uint64 nr_scanned = 3;
+  optional uint64 nr_taken = 4;
+}
+message MmCompactionIsolateMigratepagesFtraceEvent {
+  optional uint64 start_pfn = 1;
+  optional uint64 end_pfn = 2;
+  optional uint64 nr_scanned = 3;
+  optional uint64 nr_taken = 4;
+}
+message MmCompactionKcompactdSleepFtraceEvent {
+  optional int32 nid = 1;
+}
+message MmCompactionKcompactdWakeFtraceEvent {
+  optional int32 nid = 1;
+  optional int32 order = 2;
+  optional uint32 classzone_idx = 3;
+  optional uint32 highest_zoneidx = 4;
+}
+message MmCompactionMigratepagesFtraceEvent {
+  optional uint64 nr_migrated = 1;
+  optional uint64 nr_failed = 2;
+}
+message MmCompactionSuitableFtraceEvent {
+  optional int32 nid = 1;
+  optional uint32 idx = 2;
+  optional int32 order = 3;
+  optional int32 ret = 4;
+}
+message MmCompactionTryToCompactPagesFtraceEvent {
+  optional int32 order = 1;
+  optional uint32 gfp_mask = 2;
+  optional uint32 mode = 3;
+  optional int32 prio = 4;
+}
+message MmCompactionWakeupKcompactdFtraceEvent {
+  optional int32 nid = 1;
+  optional int32 order = 2;
+  optional uint32 classzone_idx = 3;
+  optional uint32 highest_zoneidx = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/compaction.proto
+
+// Begin of protos/perfetto/trace/ftrace/cpuhp.proto
+
+message CpuhpExitFtraceEvent {
+  optional uint32 cpu = 1;
+  optional int32 idx = 2;
+  optional int32 ret = 3;
+  optional int32 state = 4;
+}
+message CpuhpMultiEnterFtraceEvent {
+  optional uint32 cpu = 1;
+  optional uint64 fun = 2;
+  optional int32 idx = 3;
+  optional int32 target = 4;
+}
+message CpuhpEnterFtraceEvent {
+  optional uint32 cpu = 1;
+  optional uint64 fun = 2;
+  optional int32 idx = 3;
+  optional int32 target = 4;
+}
+message CpuhpLatencyFtraceEvent {
+  optional uint32 cpu = 1;
+  optional int32 ret = 2;
+  optional uint32 state = 3;
+  optional uint64 time = 4;
+}
+message CpuhpPauseFtraceEvent {
+  optional uint32 active_cpus = 1;
+  optional uint32 cpus = 2;
+  optional uint32 pause = 3;
+  optional uint32 time = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/cpuhp.proto
+
+// Begin of protos/perfetto/trace/ftrace/cros_ec.proto
+
+message CrosEcSensorhubDataFtraceEvent {
+  optional int64 current_time = 1;
+  optional int64 current_timestamp = 2;
+  optional int64 delta = 3;
+  optional uint32 ec_fifo_timestamp = 4;
+  optional uint32 ec_sensor_num = 5;
+  optional int64 fifo_timestamp = 6;
+}
+
+// End of protos/perfetto/trace/ftrace/cros_ec.proto
+
+// Begin of protos/perfetto/trace/ftrace/dma_fence.proto
+
+message DmaFenceInitFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceEmitFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceSignaledFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceWaitStartFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message DmaFenceWaitEndFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/dma_fence.proto
+
+// Begin of protos/perfetto/trace/ftrace/dmabuf_heap.proto
+
+message DmaHeapStatFtraceEvent {
+  optional uint64 inode = 1;
+  optional int64 len = 2;
+  optional uint64 total_allocated = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/dmabuf_heap.proto
+
+// Begin of protos/perfetto/trace/ftrace/dpu.proto
+
+message DpuTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+  optional string name = 4;
+  optional uint32 type = 5;
+  optional int32 value = 6;
+}
+message DpuDsiCmdFifoStatusFtraceEvent {
+  optional uint32 header = 1;
+  optional uint32 payload = 2;
+}
+message DpuDsiRxFtraceEvent {
+  optional uint32 cmd = 1;
+  optional uint32 rx_buf = 2;
+}
+message DpuDsiTxFtraceEvent {
+  optional uint32 type = 1;
+  optional uint32 tx_buf = 2;
+  optional uint32 last = 3;
+  optional uint32 delay_ms = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/dpu.proto
+
+// Begin of protos/perfetto/trace/ftrace/drm.proto
+
+message DrmVblankEventFtraceEvent {
+  optional int32 crtc = 1;
+  optional uint32 high_prec = 2;
+  optional uint32 seq = 3;
+  optional int64 time = 4;
+}
+message DrmVblankEventDeliveredFtraceEvent {
+  optional int32 crtc = 1;
+  optional uint64 file = 2;
+  optional uint32 seq = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/drm.proto
+
+// Begin of protos/perfetto/trace/ftrace/ext4.proto
+
+message Ext4DaWriteBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4DaWriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message Ext4SyncFileEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 parent = 3;
+  optional int32 datasync = 4;
+}
+message Ext4SyncFileExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message Ext4AllocDaBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 data_blocks = 3;
+  optional uint32 meta_blocks = 4;
+}
+message Ext4AllocateBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional uint32 len = 4;
+  optional uint32 logical = 5;
+  optional uint32 lleft = 6;
+  optional uint32 lright = 7;
+  optional uint64 goal = 8;
+  optional uint64 pleft = 9;
+  optional uint64 pright = 10;
+  optional uint32 flags = 11;
+}
+message Ext4AllocateInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 dir = 3;
+  optional uint32 mode = 4;
+}
+message Ext4BeginOrderedTruncateFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 new_size = 3;
+}
+message Ext4CollapseRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+}
+message Ext4DaReleaseSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 i_blocks = 3;
+  optional int32 freed_blocks = 4;
+  optional int32 reserved_data_blocks = 5;
+  optional int32 reserved_meta_blocks = 6;
+  optional int32 allocated_meta_blocks = 7;
+  optional uint32 mode = 8;
+}
+message Ext4DaReserveSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 i_blocks = 3;
+  optional int32 reserved_data_blocks = 4;
+  optional int32 reserved_meta_blocks = 5;
+  optional uint32 mode = 6;
+  optional int32 md_needed = 7;
+}
+message Ext4DaUpdateReserveSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 i_blocks = 3;
+  optional int32 used_blocks = 4;
+  optional int32 reserved_data_blocks = 5;
+  optional int32 reserved_meta_blocks = 6;
+  optional int32 allocated_meta_blocks = 7;
+  optional int32 quota_claim = 8;
+  optional uint32 mode = 9;
+}
+message Ext4DaWritePagesFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 first_page = 3;
+  optional int64 nr_to_write = 4;
+  optional int32 sync_mode = 5;
+  optional uint64 b_blocknr = 6;
+  optional uint32 b_size = 7;
+  optional uint32 b_state = 8;
+  optional int32 io_done = 9;
+  optional int32 pages_written = 10;
+}
+message Ext4DaWritePagesExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 lblk = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4DirectIOEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint64 len = 4;
+  optional int32 rw = 5;
+}
+message Ext4DirectIOExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint64 len = 4;
+  optional int32 rw = 5;
+  optional int32 ret = 6;
+}
+message Ext4DiscardBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 blk = 2;
+  optional uint64 count = 3;
+}
+message Ext4DiscardPreallocationsFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 len = 3;
+  optional uint32 needed = 4;
+}
+message Ext4DropInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 drop = 3;
+}
+message Ext4EsCacheExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint32 status = 6;
+}
+message Ext4EsFindDelayedExtentRangeEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+}
+message Ext4EsFindDelayedExtentRangeExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint64 status = 6;
+}
+message Ext4EsInsertExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint64 status = 6;
+}
+message Ext4EsLookupExtentEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+}
+message Ext4EsLookupExtentExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 pblk = 5;
+  optional uint64 status = 6;
+  optional int32 found = 7;
+}
+message Ext4EsRemoveExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 lblk = 3;
+  optional int64 len = 4;
+}
+message Ext4EsShrinkFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_shrunk = 2;
+  optional uint64 scan_time = 3;
+  optional int32 nr_skipped = 4;
+  optional int32 retried = 5;
+}
+message Ext4EsShrinkCountFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_to_scan = 2;
+  optional int32 cache_cnt = 3;
+}
+message Ext4EsShrinkScanEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_to_scan = 2;
+  optional int32 cache_cnt = 3;
+}
+message Ext4EsShrinkScanExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 nr_shrunk = 2;
+  optional int32 cache_cnt = 3;
+}
+message Ext4EvictInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 nlink = 3;
+}
+message Ext4ExtConvertToInitializedEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 m_lblk = 3;
+  optional uint32 m_len = 4;
+  optional uint32 u_lblk = 5;
+  optional uint32 u_len = 6;
+  optional uint64 u_pblk = 7;
+}
+message Ext4ExtConvertToInitializedFastpathFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 m_lblk = 3;
+  optional uint32 m_len = 4;
+  optional uint32 u_lblk = 5;
+  optional uint32 u_len = 6;
+  optional uint64 u_pblk = 7;
+  optional uint32 i_lblk = 8;
+  optional uint32 i_len = 9;
+  optional uint64 i_pblk = 10;
+}
+message Ext4ExtHandleUnwrittenExtentsFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 flags = 3;
+  optional uint32 lblk = 4;
+  optional uint64 pblk = 5;
+  optional uint32 len = 6;
+  optional uint32 allocated = 7;
+  optional uint64 newblk = 8;
+}
+message Ext4ExtInCacheFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional int32 ret = 4;
+}
+message Ext4ExtLoadExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pblk = 3;
+  optional uint32 lblk = 4;
+}
+message Ext4ExtMapBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4ExtMapBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 flags = 3;
+  optional uint64 pblk = 4;
+  optional uint32 lblk = 5;
+  optional uint32 len = 6;
+  optional uint32 mflags = 7;
+  optional int32 ret = 8;
+}
+message Ext4ExtPutInCacheFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint64 start = 5;
+}
+message Ext4ExtRemoveSpaceFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 start = 3;
+  optional uint32 end = 4;
+  optional int32 depth = 5;
+}
+message Ext4ExtRemoveSpaceDoneFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 start = 3;
+  optional uint32 end = 4;
+  optional int32 depth = 5;
+  optional int64 partial = 6;
+  optional uint32 eh_entries = 7;
+  optional uint32 pc_lblk = 8;
+  optional uint64 pc_pclu = 9;
+  optional int32 pc_state = 10;
+}
+message Ext4ExtRmIdxFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pblk = 3;
+}
+message Ext4ExtRmLeafFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 partial = 3;
+  optional uint32 start = 4;
+  optional uint32 ee_lblk = 5;
+  optional uint64 ee_pblk = 6;
+  optional int32 ee_len = 7;
+  optional uint32 pc_lblk = 8;
+  optional uint64 pc_pclu = 9;
+  optional int32 pc_state = 10;
+}
+message Ext4ExtShowExtentFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pblk = 3;
+  optional uint32 lblk = 4;
+  optional uint32 len = 5;
+}
+message Ext4FallocateEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+  optional int32 mode = 5;
+  optional int64 pos = 6;
+}
+message Ext4FallocateExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 blocks = 4;
+  optional int32 ret = 5;
+}
+message Ext4FindDelallocRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 from = 3;
+  optional uint32 to = 4;
+  optional int32 reverse = 5;
+  optional int32 found = 6;
+  optional uint32 found_blk = 7;
+}
+message Ext4ForgetFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional int32 is_metadata = 4;
+  optional uint32 mode = 5;
+}
+message Ext4FreeBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional uint64 count = 4;
+  optional int32 flags = 5;
+  optional uint32 mode = 6;
+}
+message Ext4FreeInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 uid = 3;
+  optional uint32 gid = 4;
+  optional uint64 blocks = 5;
+  optional uint32 mode = 6;
+}
+message Ext4GetImpliedClusterAllocExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 flags = 2;
+  optional uint32 lblk = 3;
+  optional uint64 pblk = 4;
+  optional uint32 len = 5;
+  optional int32 ret = 6;
+}
+message Ext4GetReservedClusterAllocFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+}
+message Ext4IndMapBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 lblk = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4IndMapBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 flags = 3;
+  optional uint64 pblk = 4;
+  optional uint32 lblk = 5;
+  optional uint32 len = 6;
+  optional uint32 mflags = 7;
+  optional int32 ret = 8;
+}
+message Ext4InsertRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+}
+message Ext4InvalidatepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+  optional uint64 offset = 4;
+  optional uint32 length = 5;
+}
+message Ext4JournalStartFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ip = 2;
+  optional int32 blocks = 3;
+  optional int32 rsv_blocks = 4;
+  optional int32 nblocks = 5;
+  optional int32 revoke_creds = 6;
+}
+message Ext4JournalStartReservedFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ip = 2;
+  optional int32 blocks = 3;
+}
+message Ext4JournalledInvalidatepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+  optional uint64 offset = 4;
+  optional uint32 length = 5;
+}
+message Ext4JournalledWriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message Ext4LoadInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+}
+message Ext4LoadInodeBitmapFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+}
+message Ext4MarkInodeDirtyFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 ip = 3;
+}
+message Ext4MbBitmapLoadFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+}
+message Ext4MbBuddyBitmapLoadFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+}
+message Ext4MbDiscardPreallocationsFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 needed = 2;
+}
+message Ext4MbNewGroupPaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pa_pstart = 3;
+  optional uint64 pa_lstart = 4;
+  optional uint32 pa_len = 5;
+}
+message Ext4MbNewInodePaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pa_pstart = 3;
+  optional uint64 pa_lstart = 4;
+  optional uint32 pa_len = 5;
+}
+message Ext4MbReleaseGroupPaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 pa_pstart = 2;
+  optional uint32 pa_len = 3;
+}
+message Ext4MbReleaseInodePaFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 block = 3;
+  optional uint32 count = 4;
+}
+message Ext4MballocAllocFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 orig_logical = 3;
+  optional int32 orig_start = 4;
+  optional uint32 orig_group = 5;
+  optional int32 orig_len = 6;
+  optional uint32 goal_logical = 7;
+  optional int32 goal_start = 8;
+  optional uint32 goal_group = 9;
+  optional int32 goal_len = 10;
+  optional uint32 result_logical = 11;
+  optional int32 result_start = 12;
+  optional uint32 result_group = 13;
+  optional int32 result_len = 14;
+  optional uint32 found = 15;
+  optional uint32 groups = 16;
+  optional uint32 buddy = 17;
+  optional uint32 flags = 18;
+  optional uint32 tail = 19;
+  optional uint32 cr = 20;
+}
+message Ext4MballocDiscardFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 result_start = 3;
+  optional uint32 result_group = 4;
+  optional int32 result_len = 5;
+}
+message Ext4MballocFreeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 result_start = 3;
+  optional uint32 result_group = 4;
+  optional int32 result_len = 5;
+}
+message Ext4MballocPreallocFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 orig_logical = 3;
+  optional int32 orig_start = 4;
+  optional uint32 orig_group = 5;
+  optional int32 orig_len = 6;
+  optional uint32 result_logical = 7;
+  optional int32 result_start = 8;
+  optional uint32 result_group = 9;
+  optional int32 result_len = 10;
+}
+message Ext4OtherInodeUpdateTimeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 orig_ino = 3;
+  optional uint32 uid = 4;
+  optional uint32 gid = 5;
+  optional uint32 mode = 6;
+}
+message Ext4PunchHoleFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+  optional int32 mode = 5;
+}
+message Ext4ReadBlockBitmapLoadFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 group = 2;
+  optional uint32 prefetch = 3;
+}
+message Ext4ReadpageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+}
+message Ext4ReleasepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+}
+message Ext4RemoveBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 from = 3;
+  optional uint32 to = 4;
+  optional int64 partial = 5;
+  optional uint64 ee_pblk = 6;
+  optional uint32 ee_lblk = 7;
+  optional uint32 ee_len = 8;
+  optional uint32 pc_lblk = 9;
+  optional uint64 pc_pclu = 10;
+  optional int32 pc_state = 11;
+}
+message Ext4RequestBlocksFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 len = 3;
+  optional uint32 logical = 4;
+  optional uint32 lleft = 5;
+  optional uint32 lright = 6;
+  optional uint64 goal = 7;
+  optional uint64 pleft = 8;
+  optional uint64 pright = 9;
+  optional uint32 flags = 10;
+}
+message Ext4RequestInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 dir = 2;
+  optional uint32 mode = 3;
+}
+message Ext4SyncFsFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 wait = 2;
+}
+message Ext4TrimAllFreeFtraceEvent {
+  optional int32 dev_major = 1;
+  optional int32 dev_minor = 2;
+  optional uint32 group = 3;
+  optional int32 start = 4;
+  optional int32 len = 5;
+}
+message Ext4TrimExtentFtraceEvent {
+  optional int32 dev_major = 1;
+  optional int32 dev_minor = 2;
+  optional uint32 group = 3;
+  optional int32 start = 4;
+  optional int32 len = 5;
+}
+message Ext4TruncateEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 blocks = 3;
+}
+message Ext4TruncateExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 blocks = 3;
+}
+message Ext4UnlinkEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 parent = 3;
+  optional int64 size = 4;
+}
+message Ext4UnlinkExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message Ext4WriteBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message Ext4WriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message Ext4WritepageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+}
+message Ext4WritepagesFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 nr_to_write = 3;
+  optional int64 pages_skipped = 4;
+  optional int64 range_start = 5;
+  optional int64 range_end = 6;
+  optional uint64 writeback_index = 7;
+  optional int32 sync_mode = 8;
+  optional uint32 for_kupdate = 9;
+  optional uint32 range_cyclic = 10;
+}
+message Ext4WritepagesResultFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+  optional int32 pages_written = 4;
+  optional int64 pages_skipped = 5;
+  optional uint64 writeback_index = 6;
+  optional int32 sync_mode = 7;
+}
+message Ext4ZeroRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 offset = 3;
+  optional int64 len = 4;
+  optional int32 mode = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/ext4.proto
+
+// Begin of protos/perfetto/trace/ftrace/f2fs.proto
+
+message F2fsDoSubmitBioFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 btype = 2;
+  optional uint32 sync = 3;
+  optional uint64 sector = 4;
+  optional uint32 size = 5;
+}
+message F2fsEvictInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsFallocateFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 mode = 3;
+  optional int64 offset = 4;
+  optional int64 len = 5;
+  optional int64 size = 6;
+  optional uint64 blocks = 7;
+  optional int32 ret = 8;
+}
+message F2fsGetDataBlockFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 iblock = 3;
+  optional uint64 bh_start = 4;
+  optional uint64 bh_size = 5;
+  optional int32 ret = 6;
+}
+message F2fsGetVictimFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 type = 2;
+  optional int32 gc_type = 3;
+  optional int32 alloc_mode = 4;
+  optional int32 gc_mode = 5;
+  optional uint32 victim = 6;
+  optional uint32 ofs_unit = 7;
+  optional uint32 pre_victim = 8;
+  optional uint32 prefree = 9;
+  optional uint32 free = 10;
+  optional uint32 cost = 11;
+}
+message F2fsIgetFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsIgetExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsNewInodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsReadpageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 index = 3;
+  optional uint64 blkaddr = 4;
+  optional int32 type = 5;
+  optional int32 dir = 6;
+  optional int32 dirty = 7;
+  optional int32 uptodate = 8;
+}
+message F2fsReserveNewBlockFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 nid = 2;
+  optional uint32 ofs_in_node = 3;
+}
+message F2fsSetPageDirtyFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 type = 3;
+  optional int32 dir = 4;
+  optional uint64 index = 5;
+  optional int32 dirty = 6;
+  optional int32 uptodate = 7;
+}
+message F2fsSubmitWritePageFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 type = 3;
+  optional uint64 index = 4;
+  optional uint32 block = 5;
+}
+message F2fsSyncFileEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsSyncFileExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 need_cp = 3;
+  optional int32 datasync = 4;
+  optional int32 ret = 5;
+  optional int32 cp_reason = 6;
+}
+message F2fsSyncFsFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 dirty = 2;
+  optional int32 wait = 3;
+}
+message F2fsTruncateFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint64 pino = 3;
+  optional uint32 mode = 4;
+  optional int64 size = 5;
+  optional uint32 nlink = 6;
+  optional uint64 blocks = 7;
+  optional uint32 advise = 8;
+}
+message F2fsTruncateBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 size = 3;
+  optional uint64 blocks = 4;
+  optional uint64 from = 5;
+}
+message F2fsTruncateBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsTruncateDataBlocksRangeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional uint32 ofs = 4;
+  optional int32 free = 5;
+}
+message F2fsTruncateInodeBlocksEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 size = 3;
+  optional uint64 blocks = 4;
+  optional uint64 from = 5;
+}
+message F2fsTruncateInodeBlocksExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsTruncateNodeFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional uint32 blk_addr = 4;
+}
+message F2fsTruncateNodesEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional uint32 blk_addr = 4;
+}
+message F2fsTruncateNodesExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsTruncatePartialNodesFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional uint32 nid = 3;
+  optional int32 depth = 4;
+  optional int32 err = 5;
+}
+message F2fsUnlinkEnterFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 size = 3;
+  optional uint64 blocks = 4;
+  optional string name = 5;
+}
+message F2fsUnlinkExitFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 ret = 3;
+}
+message F2fsVmPageMkwriteFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int32 type = 3;
+  optional int32 dir = 4;
+  optional uint64 index = 5;
+  optional int32 dirty = 6;
+  optional int32 uptodate = 7;
+}
+message F2fsWriteBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 flags = 5;
+}
+message F2fsWriteCheckpointFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 is_umount = 2;
+  optional string msg = 3;
+  optional int32 reason = 4;
+}
+message F2fsWriteEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint64 ino = 2;
+  optional int64 pos = 3;
+  optional uint32 len = 4;
+  optional uint32 copied = 5;
+}
+message F2fsIostatFtraceEvent {
+  optional uint64 app_bio = 1;
+  optional uint64 app_brio = 2;
+  optional uint64 app_dio = 3;
+  optional uint64 app_drio = 4;
+  optional uint64 app_mio = 5;
+  optional uint64 app_mrio = 6;
+  optional uint64 app_rio = 7;
+  optional uint64 app_wio = 8;
+  optional uint64 dev = 9;
+  optional uint64 fs_cdrio = 10;
+  optional uint64 fs_cp_dio = 11;
+  optional uint64 fs_cp_mio = 12;
+  optional uint64 fs_cp_nio = 13;
+  optional uint64 fs_dio = 14;
+  optional uint64 fs_discard = 15;
+  optional uint64 fs_drio = 16;
+  optional uint64 fs_gc_dio = 17;
+  optional uint64 fs_gc_nio = 18;
+  optional uint64 fs_gdrio = 19;
+  optional uint64 fs_mio = 20;
+  optional uint64 fs_mrio = 21;
+  optional uint64 fs_nio = 22;
+  optional uint64 fs_nrio = 23;
+}
+message F2fsIostatLatencyFtraceEvent {
+  optional uint32 d_rd_avg = 1;
+  optional uint32 d_rd_cnt = 2;
+  optional uint32 d_rd_peak = 3;
+  optional uint32 d_wr_as_avg = 4;
+  optional uint32 d_wr_as_cnt = 5;
+  optional uint32 d_wr_as_peak = 6;
+  optional uint32 d_wr_s_avg = 7;
+  optional uint32 d_wr_s_cnt = 8;
+  optional uint32 d_wr_s_peak = 9;
+  optional uint64 dev = 10;
+  optional uint32 m_rd_avg = 11;
+  optional uint32 m_rd_cnt = 12;
+  optional uint32 m_rd_peak = 13;
+  optional uint32 m_wr_as_avg = 14;
+  optional uint32 m_wr_as_cnt = 15;
+  optional uint32 m_wr_as_peak = 16;
+  optional uint32 m_wr_s_avg = 17;
+  optional uint32 m_wr_s_cnt = 18;
+  optional uint32 m_wr_s_peak = 19;
+  optional uint32 n_rd_avg = 20;
+  optional uint32 n_rd_cnt = 21;
+  optional uint32 n_rd_peak = 22;
+  optional uint32 n_wr_as_avg = 23;
+  optional uint32 n_wr_as_cnt = 24;
+  optional uint32 n_wr_as_peak = 25;
+  optional uint32 n_wr_s_avg = 26;
+  optional uint32 n_wr_s_cnt = 27;
+  optional uint32 n_wr_s_peak = 28;
+}
+message F2fsBackgroundGcFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 wait_ms = 2;
+  optional uint32 prefree = 3;
+  optional uint32 free = 4;
+}
+message F2fsGcBeginFtraceEvent {
+  optional uint64 dev = 1;
+  optional uint32 sync = 2;
+  optional uint32 background = 3;
+  optional int64 dirty_nodes = 4;
+  optional int64 dirty_dents = 5;
+  optional int64 dirty_imeta = 6;
+  optional uint32 free_sec = 7;
+  optional uint32 free_seg = 8;
+  optional int32 reserved_seg = 9;
+  optional uint32 prefree_seg = 10;
+  optional int32 gc_type = 11;
+  optional uint32 no_bg_gc = 12;
+  optional uint32 nr_free_secs = 13;
+}
+message F2fsGcEndFtraceEvent {
+  optional uint64 dev = 1;
+  optional int32 ret = 2;
+  optional int32 seg_freed = 3;
+  optional int32 sec_freed = 4;
+  optional int64 dirty_nodes = 5;
+  optional int64 dirty_dents = 6;
+  optional int64 dirty_imeta = 7;
+  optional uint32 free_sec = 8;
+  optional uint32 free_seg = 9;
+  optional int32 reserved_seg = 10;
+  optional uint32 prefree_seg = 11;
+}
+
+// End of protos/perfetto/trace/ftrace/f2fs.proto
+
+// Begin of protos/perfetto/trace/ftrace/fastrpc.proto
+
+message FastrpcDmaStatFtraceEvent {
+  optional int32 cid = 1;
+  optional int64 len = 2;
+  optional uint64 total_allocated = 3;
+}
+message FastrpcDmaFreeFtraceEvent {
+  optional int32 cid = 1;
+  optional uint64 phys = 2;
+  optional uint64 size = 3;
+}
+message FastrpcDmaAllocFtraceEvent {
+  optional int32 cid = 1;
+  optional uint64 phys = 2;
+  optional uint64 size = 3;
+  optional uint64 attr = 4;
+  optional int32 mflags = 5;
+}
+message FastrpcDmaUnmapFtraceEvent {
+  optional int32 cid = 1;
+  optional uint64 phys = 2;
+  optional uint64 size = 3;
+}
+message FastrpcDmaMapFtraceEvent {
+  optional int32 cid = 1;
+  optional int32 fd = 2;
+  optional uint64 phys = 3;
+  optional uint64 size = 4;
+  optional uint64 len = 5;
+  optional uint32 attr = 6;
+  optional int32 mflags = 7;
+}
+
+// End of protos/perfetto/trace/ftrace/fastrpc.proto
+
+// Begin of protos/perfetto/trace/ftrace/fence.proto
+
+message FenceInitFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message FenceDestroyFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message FenceEnableSignalFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+message FenceSignaledFtraceEvent {
+  optional uint32 context = 1;
+  optional string driver = 2;
+  optional uint32 seqno = 3;
+  optional string timeline = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/fence.proto
+
+// Begin of protos/perfetto/trace/ftrace/filemap.proto
+
+message MmFilemapAddToPageCacheFtraceEvent {
+  optional uint64 pfn = 1;
+  optional uint64 i_ino = 2;
+  optional uint64 index = 3;
+  optional uint64 s_dev = 4;
+  optional uint64 page = 5;
+}
+message MmFilemapDeleteFromPageCacheFtraceEvent {
+  optional uint64 pfn = 1;
+  optional uint64 i_ino = 2;
+  optional uint64 index = 3;
+  optional uint64 s_dev = 4;
+  optional uint64 page = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/filemap.proto
+
+// Begin of protos/perfetto/trace/ftrace/ftrace.proto
+
+message PrintFtraceEvent {
+  optional uint64 ip = 1;
+  optional string buf = 2;
+}
+message FuncgraphEntryFtraceEvent {
+  optional int32 depth = 1;
+  optional uint64 func = 2;
+}
+message FuncgraphExitFtraceEvent {
+  optional uint64 calltime = 1;
+  optional int32 depth = 2;
+  optional uint64 func = 3;
+  optional uint64 overrun = 4;
+  optional uint64 rettime = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/ftrace.proto
+
+// Begin of protos/perfetto/trace/ftrace/g2d.proto
+
+message G2dTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string name = 4;
+  optional uint32 type = 5;
+  optional int32 value = 6;
+}
+
+// End of protos/perfetto/trace/ftrace/g2d.proto
+
+// Begin of protos/perfetto/trace/ftrace/generic.proto
+
+// This generic proto is used to output events in the trace
+// when a specific proto for that event does not exist.
+message GenericFtraceEvent {
+  message Field {
+    optional string name = 1;
+    oneof value {
+      string str_value = 3;
+      int64 int_value = 4;
+      uint64 uint_value = 5;
+    }
+  }
+
+  optional string event_name = 1;
+  repeated Field field = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/generic.proto
+
+// Begin of protos/perfetto/trace/ftrace/gpu_mem.proto
+
+message GpuMemTotalFtraceEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 pid = 2;
+  optional uint64 size = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/gpu_mem.proto
+
+// Begin of protos/perfetto/trace/ftrace/gpu_scheduler.proto
+
+message DrmSchedJobFtraceEvent {
+  optional uint64 entity = 1;
+  optional uint64 fence = 2;
+  optional int32 hw_job_count = 3;
+  optional uint64 id = 4;
+  optional uint32 job_count = 5;
+  optional string name = 6;
+}
+message DrmRunJobFtraceEvent {
+  optional uint64 entity = 1;
+  optional uint64 fence = 2;
+  optional int32 hw_job_count = 3;
+  optional uint64 id = 4;
+  optional uint32 job_count = 5;
+  optional string name = 6;
+}
+message DrmSchedProcessJobFtraceEvent {
+  optional uint64 fence = 1;
+}
+
+// End of protos/perfetto/trace/ftrace/gpu_scheduler.proto
+
+// Begin of protos/perfetto/trace/ftrace/hyp.proto
+
+message HypEnterFtraceEvent {}
+message HypExitFtraceEvent {}
+message HostHcallFtraceEvent {
+  optional uint32 id = 1;
+  optional uint32 invalid = 2;
+}
+message HostSmcFtraceEvent {
+  optional uint64 id = 1;
+  optional uint32 forwarded = 2;
+}
+message HostMemAbortFtraceEvent {
+  optional uint64 esr = 1;
+  optional uint64 addr = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/hyp.proto
+
+// Begin of protos/perfetto/trace/ftrace/i2c.proto
+
+message I2cReadFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 msg_nr = 2;
+  optional uint32 addr = 3;
+  optional uint32 flags = 4;
+  optional uint32 len = 5;
+}
+message I2cWriteFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 msg_nr = 2;
+  optional uint32 addr = 3;
+  optional uint32 flags = 4;
+  optional uint32 len = 5;
+  optional uint32 buf = 6;
+}
+message I2cResultFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 nr_msgs = 2;
+  optional int32 ret = 3;
+}
+message I2cReplyFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 msg_nr = 2;
+  optional uint32 addr = 3;
+  optional uint32 flags = 4;
+  optional uint32 len = 5;
+  optional uint32 buf = 6;
+}
+message SmbusReadFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 flags = 2;
+  optional uint32 addr = 3;
+  optional uint32 command = 4;
+  optional uint32 protocol = 5;
+}
+message SmbusWriteFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 addr = 2;
+  optional uint32 flags = 3;
+  optional uint32 command = 4;
+  optional uint32 len = 5;
+  optional uint32 protocol = 6;
+}
+message SmbusResultFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 addr = 2;
+  optional uint32 flags = 3;
+  optional uint32 read_write = 4;
+  optional uint32 command = 5;
+  optional int32 res = 6;
+  optional uint32 protocol = 7;
+}
+message SmbusReplyFtraceEvent {
+  optional int32 adapter_nr = 1;
+  optional uint32 addr = 2;
+  optional uint32 flags = 3;
+  optional uint32 command = 4;
+  optional uint32 len = 5;
+  optional uint32 protocol = 6;
+}
+
+// End of protos/perfetto/trace/ftrace/i2c.proto
+
+// Begin of protos/perfetto/trace/ftrace/ion.proto
+
+message IonStatFtraceEvent {
+  optional uint32 buffer_id = 1;
+  optional int64 len = 2;
+  optional uint64 total_allocated = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/ion.proto
+
+// Begin of protos/perfetto/trace/ftrace/ipi.proto
+
+message IpiEntryFtraceEvent {
+  optional string reason = 1;
+}
+message IpiExitFtraceEvent {
+  optional string reason = 1;
+}
+message IpiRaiseFtraceEvent {
+  optional uint32 target_cpus = 1;
+  optional string reason = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/ipi.proto
+
+// Begin of protos/perfetto/trace/ftrace/irq.proto
+
+message SoftirqEntryFtraceEvent {
+  optional uint32 vec = 1;
+}
+message SoftirqExitFtraceEvent {
+  optional uint32 vec = 1;
+}
+message SoftirqRaiseFtraceEvent {
+  optional uint32 vec = 1;
+}
+message IrqHandlerEntryFtraceEvent {
+  optional int32 irq = 1;
+  optional string name = 2;
+  optional uint32 handler = 3;
+}
+message IrqHandlerExitFtraceEvent {
+  optional int32 irq = 1;
+  optional int32 ret = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/irq.proto
+
+// Begin of protos/perfetto/trace/ftrace/kmem.proto
+
+message AllocPagesIommuEndFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesIommuFailFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesIommuStartFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesSysEndFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesSysFailFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message AllocPagesSysStartFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional uint32 order = 2;
+}
+message DmaAllocContiguousRetryFtraceEvent {
+  optional int32 tries = 1;
+}
+message IommuMapRangeFtraceEvent {
+  optional uint64 chunk_size = 1;
+  optional uint64 len = 2;
+  optional uint64 pa = 3;
+  optional uint64 va = 4;
+}
+message IommuSecPtblMapRangeEndFtraceEvent {
+  optional uint64 len = 1;
+  optional int32 num = 2;
+  optional uint32 pa = 3;
+  optional int32 sec_id = 4;
+  optional uint64 va = 5;
+}
+message IommuSecPtblMapRangeStartFtraceEvent {
+  optional uint64 len = 1;
+  optional int32 num = 2;
+  optional uint32 pa = 3;
+  optional int32 sec_id = 4;
+  optional uint64 va = 5;
+}
+message IonAllocBufferEndFtraceEvent {
+  optional string client_name = 1;
+  optional uint32 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+  optional uint32 mask = 5;
+}
+message IonAllocBufferFailFtraceEvent {
+  optional string client_name = 1;
+  optional int64 error = 2;
+  optional uint32 flags = 3;
+  optional string heap_name = 4;
+  optional uint64 len = 5;
+  optional uint32 mask = 6;
+}
+message IonAllocBufferFallbackFtraceEvent {
+  optional string client_name = 1;
+  optional int64 error = 2;
+  optional uint32 flags = 3;
+  optional string heap_name = 4;
+  optional uint64 len = 5;
+  optional uint32 mask = 6;
+}
+message IonAllocBufferStartFtraceEvent {
+  optional string client_name = 1;
+  optional uint32 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+  optional uint32 mask = 5;
+}
+message IonCpAllocRetryFtraceEvent {
+  optional int32 tries = 1;
+}
+message IonCpSecureBufferEndFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonCpSecureBufferStartFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonPrefetchingFtraceEvent {
+  optional uint64 len = 1;
+}
+message IonSecureCmaAddToPoolEndFtraceEvent {
+  optional uint32 is_prefetch = 1;
+  optional uint64 len = 2;
+  optional int32 pool_total = 3;
+}
+message IonSecureCmaAddToPoolStartFtraceEvent {
+  optional uint32 is_prefetch = 1;
+  optional uint64 len = 2;
+  optional int32 pool_total = 3;
+}
+message IonSecureCmaAllocateEndFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonSecureCmaAllocateStartFtraceEvent {
+  optional uint64 align = 1;
+  optional uint64 flags = 2;
+  optional string heap_name = 3;
+  optional uint64 len = 4;
+}
+message IonSecureCmaShrinkPoolEndFtraceEvent {
+  optional uint64 drained_size = 1;
+  optional uint64 skipped_size = 2;
+}
+message IonSecureCmaShrinkPoolStartFtraceEvent {
+  optional uint64 drained_size = 1;
+  optional uint64 skipped_size = 2;
+}
+message KfreeFtraceEvent {
+  optional uint64 call_site = 1;
+  optional uint64 ptr = 2;
+}
+message KmallocFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional uint64 ptr = 5;
+}
+message KmallocNodeFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional int32 node = 5;
+  optional uint64 ptr = 6;
+}
+message KmemCacheAllocFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional uint64 ptr = 5;
+}
+message KmemCacheAllocNodeFtraceEvent {
+  optional uint64 bytes_alloc = 1;
+  optional uint64 bytes_req = 2;
+  optional uint64 call_site = 3;
+  optional uint32 gfp_flags = 4;
+  optional int32 node = 5;
+  optional uint64 ptr = 6;
+}
+message KmemCacheFreeFtraceEvent {
+  optional uint64 call_site = 1;
+  optional uint64 ptr = 2;
+}
+message MigratePagesEndFtraceEvent {
+  optional int32 mode = 1;
+}
+message MigratePagesStartFtraceEvent {
+  optional int32 mode = 1;
+}
+message MigrateRetryFtraceEvent {
+  optional int32 tries = 1;
+}
+message MmPageAllocFtraceEvent {
+  optional uint32 gfp_flags = 1;
+  optional int32 migratetype = 2;
+  optional uint32 order = 3;
+  optional uint64 page = 4;
+  optional uint64 pfn = 5;
+}
+message MmPageAllocExtfragFtraceEvent {
+  optional int32 alloc_migratetype = 1;
+  optional int32 alloc_order = 2;
+  optional int32 fallback_migratetype = 3;
+  optional int32 fallback_order = 4;
+  optional uint64 page = 5;
+  optional int32 change_ownership = 6;
+  optional uint64 pfn = 7;
+}
+message MmPageAllocZoneLockedFtraceEvent {
+  optional int32 migratetype = 1;
+  optional uint32 order = 2;
+  optional uint64 page = 3;
+  optional uint64 pfn = 4;
+}
+message MmPageFreeFtraceEvent {
+  optional uint32 order = 1;
+  optional uint64 page = 2;
+  optional uint64 pfn = 3;
+}
+message MmPageFreeBatchedFtraceEvent {
+  optional int32 cold = 1;
+  optional uint64 page = 2;
+  optional uint64 pfn = 3;
+}
+message MmPagePcpuDrainFtraceEvent {
+  optional int32 migratetype = 1;
+  optional uint32 order = 2;
+  optional uint64 page = 3;
+  optional uint64 pfn = 4;
+}
+message RssStatFtraceEvent {
+  optional int32 member = 1;
+  optional int64 size = 2;
+  optional uint32 curr = 3;
+  optional uint32 mm_id = 4;
+}
+message IonHeapShrinkFtraceEvent {
+  optional string heap_name = 1;
+  optional uint64 len = 2;
+  optional int64 total_allocated = 3;
+}
+message IonHeapGrowFtraceEvent {
+  optional string heap_name = 1;
+  optional uint64 len = 2;
+  optional int64 total_allocated = 3;
+}
+message IonBufferCreateFtraceEvent {
+  optional uint64 addr = 1;
+  optional uint64 len = 2;
+}
+message IonBufferDestroyFtraceEvent {
+  optional uint64 addr = 1;
+  optional uint64 len = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/kmem.proto
+
+// Begin of protos/perfetto/trace/ftrace/kvm.proto
+
+message KvmAccessFaultFtraceEvent {
+  optional uint64 ipa = 1;
+}
+message KvmAckIrqFtraceEvent {
+  optional uint32 irqchip = 1;
+  optional uint32 pin = 2;
+}
+message KvmAgeHvaFtraceEvent {
+  optional uint64 end = 1;
+  optional uint64 start = 2;
+}
+message KvmAgePageFtraceEvent {
+  optional uint64 gfn = 1;
+  optional uint64 hva = 2;
+  optional uint32 level = 3;
+  optional uint32 referenced = 4;
+}
+message KvmArmClearDebugFtraceEvent {
+  optional uint32 guest_debug = 1;
+}
+message KvmArmSetDreg32FtraceEvent {
+  optional string name = 1;
+  optional uint32 value = 2;
+}
+message KvmArmSetRegsetFtraceEvent {
+  optional int32 len = 1;
+  optional string name = 2;
+}
+message KvmArmSetupDebugFtraceEvent {
+  optional uint32 guest_debug = 1;
+  optional uint64 vcpu = 2;
+}
+message KvmEntryFtraceEvent {
+  optional uint64 vcpu_pc = 1;
+}
+message KvmExitFtraceEvent {
+  optional uint32 esr_ec = 1;
+  optional int32 ret = 2;
+  optional uint64 vcpu_pc = 3;
+}
+message KvmFpuFtraceEvent {
+  optional uint32 load = 1;
+}
+message KvmGetTimerMapFtraceEvent {
+  optional int32 direct_ptimer = 1;
+  optional int32 direct_vtimer = 2;
+  optional int32 emul_ptimer = 3;
+  optional uint64 vcpu_id = 4;
+}
+message KvmGuestFaultFtraceEvent {
+  optional uint64 hsr = 1;
+  optional uint64 hxfar = 2;
+  optional uint64 ipa = 3;
+  optional uint64 vcpu_pc = 4;
+}
+message KvmHandleSysRegFtraceEvent {
+  optional uint64 hsr = 1;
+}
+message KvmHvcArm64FtraceEvent {
+  optional uint64 imm = 1;
+  optional uint64 r0 = 2;
+  optional uint64 vcpu_pc = 3;
+}
+message KvmIrqLineFtraceEvent {
+  optional int32 irq_num = 1;
+  optional int32 level = 2;
+  optional uint32 type = 3;
+  optional int32 vcpu_idx = 4;
+}
+message KvmMmioFtraceEvent {
+  optional uint64 gpa = 1;
+  optional uint32 len = 2;
+  optional uint32 type = 3;
+  optional uint64 val = 4;
+}
+message KvmMmioEmulateFtraceEvent {
+  optional uint64 cpsr = 1;
+  optional uint64 instr = 2;
+  optional uint64 vcpu_pc = 3;
+}
+message KvmSetGuestDebugFtraceEvent {
+  optional uint32 guest_debug = 1;
+  optional uint64 vcpu = 2;
+}
+message KvmSetIrqFtraceEvent {
+  optional uint32 gsi = 1;
+  optional int32 irq_source_id = 2;
+  optional int32 level = 3;
+}
+message KvmSetSpteHvaFtraceEvent {
+  optional uint64 hva = 1;
+}
+message KvmSetWayFlushFtraceEvent {
+  optional uint32 cache = 1;
+  optional uint64 vcpu_pc = 2;
+}
+message KvmSysAccessFtraceEvent {
+  optional uint32 CRm = 1;
+  optional uint32 CRn = 2;
+  optional uint32 Op0 = 3;
+  optional uint32 Op1 = 4;
+  optional uint32 Op2 = 5;
+  optional uint32 is_write = 6;
+  optional string name = 7;
+  optional uint64 vcpu_pc = 8;
+}
+message KvmTestAgeHvaFtraceEvent {
+  optional uint64 hva = 1;
+}
+message KvmTimerEmulateFtraceEvent {
+  optional uint32 should_fire = 1;
+  optional int32 timer_idx = 2;
+}
+message KvmTimerHrtimerExpireFtraceEvent {
+  optional int32 timer_idx = 1;
+}
+message KvmTimerRestoreStateFtraceEvent {
+  optional uint64 ctl = 1;
+  optional uint64 cval = 2;
+  optional int32 timer_idx = 3;
+}
+message KvmTimerSaveStateFtraceEvent {
+  optional uint64 ctl = 1;
+  optional uint64 cval = 2;
+  optional int32 timer_idx = 3;
+}
+message KvmTimerUpdateIrqFtraceEvent {
+  optional uint32 irq = 1;
+  optional int32 level = 2;
+  optional uint64 vcpu_id = 3;
+}
+message KvmToggleCacheFtraceEvent {
+  optional uint32 now = 1;
+  optional uint64 vcpu_pc = 2;
+  optional uint32 was = 3;
+}
+message KvmUnmapHvaRangeFtraceEvent {
+  optional uint64 end = 1;
+  optional uint64 start = 2;
+}
+message KvmUserspaceExitFtraceEvent {
+  optional uint32 reason = 1;
+}
+message KvmVcpuWakeupFtraceEvent {
+  optional uint64 ns = 1;
+  optional uint32 valid = 2;
+  optional uint32 waited = 3;
+}
+message KvmWfxArm64FtraceEvent {
+  optional uint32 is_wfe = 1;
+  optional uint64 vcpu_pc = 2;
+}
+message TrapRegFtraceEvent {
+  optional string fn = 1;
+  optional uint32 is_write = 2;
+  optional int32 reg = 3;
+  optional uint64 write_value = 4;
+}
+message VgicUpdateIrqPendingFtraceEvent {
+  optional uint32 irq = 1;
+  optional uint32 level = 2;
+  optional uint64 vcpu_id = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/kvm.proto
+
+// Begin of protos/perfetto/trace/ftrace/lowmemorykiller.proto
+
+message LowmemoryKillFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int64 pagecache_size = 3;
+  optional int64 pagecache_limit = 4;
+  optional int64 free = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/lowmemorykiller.proto
+
+// Begin of protos/perfetto/trace/ftrace/lwis.proto
+
+message LwisTracingMarkWriteFtraceEvent {
+  optional string lwis_name = 1;
+  optional uint32 type = 2;
+  optional int32 pid = 3;
+  optional string func_name = 4;
+  optional int64 value = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/lwis.proto
+
+// Begin of protos/perfetto/trace/ftrace/mali.proto
+
+message MaliTracingMarkWriteFtraceEvent {
+  optional string name = 1;
+  optional int32 pid = 2;
+  optional uint32 type = 3;
+  optional int32 value = 4;
+}
+message MaliMaliKCPUCQSSETFtraceEvent {
+  optional uint32 id = 1;
+  optional uint64 info_val1 = 2;
+  optional uint64 info_val2 = 3;
+  optional uint32 kctx_id = 4;
+  optional int32 kctx_tgid = 5;
+}
+message MaliMaliKCPUCQSWAITSTARTFtraceEvent {
+  optional uint32 id = 1;
+  optional uint64 info_val1 = 2;
+  optional uint64 info_val2 = 3;
+  optional uint32 kctx_id = 4;
+  optional int32 kctx_tgid = 5;
+}
+message MaliMaliKCPUCQSWAITENDFtraceEvent {
+  optional uint32 id = 1;
+  optional uint64 info_val1 = 2;
+  optional uint64 info_val2 = 3;
+  optional uint32 kctx_id = 4;
+  optional int32 kctx_tgid = 5;
+}
+message MaliMaliKCPUFENCESIGNALFtraceEvent {
+  optional uint64 info_val1 = 1;
+  optional uint64 info_val2 = 2;
+  optional int32 kctx_tgid = 3;
+  optional uint32 kctx_id = 4;
+  optional uint32 id = 5;
+}
+message MaliMaliKCPUFENCEWAITSTARTFtraceEvent {
+  optional uint64 info_val1 = 1;
+  optional uint64 info_val2 = 2;
+  optional int32 kctx_tgid = 3;
+  optional uint32 kctx_id = 4;
+  optional uint32 id = 5;
+}
+message MaliMaliKCPUFENCEWAITENDFtraceEvent {
+  optional uint64 info_val1 = 1;
+  optional uint64 info_val2 = 2;
+  optional int32 kctx_tgid = 3;
+  optional uint32 kctx_id = 4;
+  optional uint32 id = 5;
+}
+message MaliMaliCSFINTERRUPTSTARTFtraceEvent {
+  optional int32 kctx_tgid = 1;
+  optional uint32 kctx_id = 2;
+  optional uint64 info_val = 3;
+}
+message MaliMaliCSFINTERRUPTENDFtraceEvent {
+  optional int32 kctx_tgid = 1;
+  optional uint32 kctx_id = 2;
+  optional uint64 info_val = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/mali.proto
+
+// Begin of protos/perfetto/trace/ftrace/mdss.proto
+
+message MdpCmdKickoffFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional int32 kickoff_cnt = 2;
+}
+message MdpCommitFtraceEvent {
+  optional uint32 num = 1;
+  optional uint32 play_cnt = 2;
+  optional uint32 clk_rate = 3;
+  optional uint64 bandwidth = 4;
+}
+message MdpPerfSetOtFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 xin_id = 2;
+  optional uint32 rd_lim = 3;
+  optional uint32 is_vbif_rt = 4;
+}
+message MdpSsppChangeFtraceEvent {
+  optional uint32 num = 1;
+  optional uint32 play_cnt = 2;
+  optional uint32 mixer = 3;
+  optional uint32 stage = 4;
+  optional uint32 flags = 5;
+  optional uint32 format = 6;
+  optional uint32 img_w = 7;
+  optional uint32 img_h = 8;
+  optional uint32 src_x = 9;
+  optional uint32 src_y = 10;
+  optional uint32 src_w = 11;
+  optional uint32 src_h = 12;
+  optional uint32 dst_x = 13;
+  optional uint32 dst_y = 14;
+  optional uint32 dst_w = 15;
+  optional uint32 dst_h = 16;
+}
+message TracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+}
+message MdpCmdPingpongDoneFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional uint32 intf_num = 2;
+  optional uint32 pp_num = 3;
+  optional int32 koff_cnt = 4;
+}
+message MdpCompareBwFtraceEvent {
+  optional uint64 new_ab = 1;
+  optional uint64 new_ib = 2;
+  optional uint64 new_wb = 3;
+  optional uint64 old_ab = 4;
+  optional uint64 old_ib = 5;
+  optional uint64 old_wb = 6;
+  optional uint32 params_changed = 7;
+  optional uint32 update_bw = 8;
+}
+message MdpPerfSetPanicLutsFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 fmt = 2;
+  optional uint32 mode = 3;
+  optional uint32 panic_lut = 4;
+  optional uint32 robust_lut = 5;
+}
+message MdpSsppSetFtraceEvent {
+  optional uint32 num = 1;
+  optional uint32 play_cnt = 2;
+  optional uint32 mixer = 3;
+  optional uint32 stage = 4;
+  optional uint32 flags = 5;
+  optional uint32 format = 6;
+  optional uint32 img_w = 7;
+  optional uint32 img_h = 8;
+  optional uint32 src_x = 9;
+  optional uint32 src_y = 10;
+  optional uint32 src_w = 11;
+  optional uint32 src_h = 12;
+  optional uint32 dst_x = 13;
+  optional uint32 dst_y = 14;
+  optional uint32 dst_w = 15;
+  optional uint32 dst_h = 16;
+}
+message MdpCmdReadptrDoneFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional int32 koff_cnt = 2;
+}
+message MdpMisrCrcFtraceEvent {
+  optional uint32 block_id = 1;
+  optional uint32 vsync_cnt = 2;
+  optional uint32 crc = 3;
+}
+message MdpPerfSetQosLutsFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 fmt = 2;
+  optional uint32 intf = 3;
+  optional uint32 rot = 4;
+  optional uint32 fl = 5;
+  optional uint32 lut = 6;
+  optional uint32 linear = 7;
+}
+message MdpTraceCounterFtraceEvent {
+  optional int32 pid = 1;
+  optional string counter_name = 2;
+  optional int32 value = 3;
+}
+message MdpCmdReleaseBwFtraceEvent {
+  optional uint32 ctl_num = 1;
+}
+message MdpMixerUpdateFtraceEvent {
+  optional uint32 mixer_num = 1;
+}
+message MdpPerfSetWmLevelsFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 use_space = 2;
+  optional uint32 priority_bytes = 3;
+  optional uint32 wm0 = 4;
+  optional uint32 wm1 = 5;
+  optional uint32 wm2 = 6;
+  optional uint32 mb_cnt = 7;
+  optional uint32 mb_size = 8;
+}
+message MdpVideoUnderrunDoneFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional uint32 underrun_cnt = 2;
+}
+message MdpCmdWaitPingpongFtraceEvent {
+  optional uint32 ctl_num = 1;
+  optional int32 kickoff_cnt = 2;
+}
+message MdpPerfPrefillCalcFtraceEvent {
+  optional uint32 pnum = 1;
+  optional uint32 latency_buf = 2;
+  optional uint32 ot = 3;
+  optional uint32 y_buf = 4;
+  optional uint32 y_scaler = 5;
+  optional uint32 pp_lines = 6;
+  optional uint32 pp_bytes = 7;
+  optional uint32 post_sc = 8;
+  optional uint32 fbc_bytes = 9;
+  optional uint32 prefill_bytes = 10;
+}
+message MdpPerfUpdateBusFtraceEvent {
+  optional int32 client = 1;
+  optional uint64 ab_quota = 2;
+  optional uint64 ib_quota = 3;
+}
+message RotatorBwAoAsContextFtraceEvent {
+  optional uint32 state = 1;
+}
+
+// End of protos/perfetto/trace/ftrace/mdss.proto
+
+// Begin of protos/perfetto/trace/ftrace/mm_event.proto
+
+message MmEventRecordFtraceEvent {
+  optional uint32 avg_lat = 1;
+  optional uint32 count = 2;
+  optional uint32 max_lat = 3;
+  optional uint32 type = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/mm_event.proto
+
+// Begin of protos/perfetto/trace/ftrace/net.proto
+
+message NetifReceiveSkbFtraceEvent {
+  optional uint32 len = 1;
+  optional string name = 2;
+  optional uint64 skbaddr = 3;
+}
+message NetDevXmitFtraceEvent {
+  optional uint32 len = 1;
+  optional string name = 2;
+  optional int32 rc = 3;
+  optional uint64 skbaddr = 4;
+}
+message NapiGroReceiveEntryFtraceEvent {
+  optional uint32 data_len = 1;
+  optional uint32 gso_size = 2;
+  optional uint32 gso_type = 3;
+  optional uint32 hash = 4;
+  optional uint32 ip_summed = 5;
+  optional uint32 l4_hash = 6;
+  optional uint32 len = 7;
+  optional int32 mac_header = 8;
+  optional uint32 mac_header_valid = 9;
+  optional string name = 10;
+  optional uint32 napi_id = 11;
+  optional uint32 nr_frags = 12;
+  optional uint32 protocol = 13;
+  optional uint32 queue_mapping = 14;
+  optional uint64 skbaddr = 15;
+  optional uint32 truesize = 16;
+  optional uint32 vlan_proto = 17;
+  optional uint32 vlan_tagged = 18;
+  optional uint32 vlan_tci = 19;
+}
+message NapiGroReceiveExitFtraceEvent {
+  optional int32 ret = 1;
+}
+
+// End of protos/perfetto/trace/ftrace/net.proto
+
+// Begin of protos/perfetto/trace/ftrace/oom.proto
+
+message OomScoreAdjUpdateFtraceEvent {
+  optional string comm = 1;
+  optional int32 oom_score_adj = 2;
+  optional int32 pid = 3;
+}
+message MarkVictimFtraceEvent {
+  optional int32 pid = 1;
+}
+
+// End of protos/perfetto/trace/ftrace/oom.proto
+
+// Begin of protos/perfetto/trace/ftrace/panel.proto
+
+message DsiCmdFifoStatusFtraceEvent {
+  optional uint32 header = 1;
+  optional uint32 payload = 2;
+}
+message DsiRxFtraceEvent {
+  optional uint32 cmd = 1;
+  optional uint32 rx_buf = 2;
+}
+message DsiTxFtraceEvent {
+  optional uint32 last = 1;
+  optional uint32 tx_buf = 2;
+  optional uint32 type = 3;
+}
+message PanelWriteGenericFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+  optional string name = 4;
+  optional uint32 type = 5;
+  optional int32 value = 6;
+}
+
+// End of protos/perfetto/trace/ftrace/panel.proto
+
+// Begin of protos/perfetto/trace/ftrace/perf_trace_counters.proto
+
+message SchedSwitchWithCtrsFtraceEvent {
+  optional int32 old_pid = 1;
+  optional int32 new_pid = 2;
+  optional uint32 cctr = 3;
+  optional uint32 ctr0 = 4;
+  optional uint32 ctr1 = 5;
+  optional uint32 ctr2 = 6;
+  optional uint32 ctr3 = 7;
+  optional uint32 lctr0 = 8;
+  optional uint32 lctr1 = 9;
+  optional uint32 ctr4 = 10;
+  optional uint32 ctr5 = 11;
+  optional string prev_comm = 12;
+  optional int32 prev_pid = 13;
+  optional uint32 cyc = 14;
+  optional uint32 inst = 15;
+  optional uint32 stallbm = 16;
+  optional uint32 l3dm = 17;
+}
+
+// End of protos/perfetto/trace/ftrace/perf_trace_counters.proto
+
+// Begin of protos/perfetto/trace/ftrace/power.proto
+
+message CpuFrequencyFtraceEvent {
+  optional uint32 state = 1;
+  optional uint32 cpu_id = 2;
+}
+message CpuFrequencyLimitsFtraceEvent {
+  optional uint32 min_freq = 1;
+  optional uint32 max_freq = 2;
+  optional uint32 cpu_id = 3;
+}
+message CpuIdleFtraceEvent {
+  optional uint32 state = 1;
+  optional uint32 cpu_id = 2;
+}
+message ClockEnableFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+  optional uint64 cpu_id = 3;
+}
+message ClockDisableFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+  optional uint64 cpu_id = 3;
+}
+message ClockSetRateFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+  optional uint64 cpu_id = 3;
+}
+message SuspendResumeFtraceEvent {
+  optional string action = 1;
+  optional int32 val = 2;
+  optional uint32 start = 3;
+}
+message GpuFrequencyFtraceEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 state = 2;
+}
+message WakeupSourceActivateFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+}
+message WakeupSourceDeactivateFtraceEvent {
+  optional string name = 1;
+  optional uint64 state = 2;
+}
+message GpuWorkPeriodFtraceEvent {
+  optional uint32 gpu_id = 1;
+  optional uint32 uid = 2;
+  optional uint64 start_time_ns = 3;
+  optional uint64 end_time_ns = 4;
+  optional uint64 total_active_duration_ns = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/power.proto
+
+// Begin of protos/perfetto/trace/ftrace/printk.proto
+
+message ConsoleFtraceEvent {
+  optional string msg = 1;
+}
+
+// End of protos/perfetto/trace/ftrace/printk.proto
+
+// Begin of protos/perfetto/trace/ftrace/raw_syscalls.proto
+
+message SysEnterFtraceEvent {
+  optional int64 id = 1;
+  repeated uint64 args = 2;
+}
+message SysExitFtraceEvent {
+  optional int64 id = 1;
+  optional int64 ret = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/raw_syscalls.proto
+
+// Begin of protos/perfetto/trace/ftrace/regulator.proto
+
+message RegulatorDisableFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorDisableCompleteFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorEnableFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorEnableCompleteFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorEnableDelayFtraceEvent {
+  optional string name = 1;
+}
+message RegulatorSetVoltageFtraceEvent {
+  optional string name = 1;
+  optional int32 min = 2;
+  optional int32 max = 3;
+}
+message RegulatorSetVoltageCompleteFtraceEvent {
+  optional string name = 1;
+  optional uint32 val = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/regulator.proto
+
+// Begin of protos/perfetto/trace/ftrace/rpm.proto
+
+message RpmStatusFtraceEvent {
+  optional string name = 1;
+  optional int32 status = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/rpm.proto
+
+// Begin of protos/perfetto/trace/ftrace/samsung.proto
+
+message SamsungTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_begin = 3;
+  optional uint32 trace_type = 4;
+  optional int32 value = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/samsung.proto
+
+// Begin of protos/perfetto/trace/ftrace/sched.proto
+
+message SchedSwitchFtraceEvent {
+  optional string prev_comm = 1;
+  optional int32 prev_pid = 2;
+  optional int32 prev_prio = 3;
+  optional int64 prev_state = 4;
+  optional string next_comm = 5;
+  optional int32 next_pid = 6;
+  optional int32 next_prio = 7;
+}
+message SchedWakeupFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 success = 4;
+  optional int32 target_cpu = 5;
+}
+message SchedBlockedReasonFtraceEvent {
+  optional int32 pid = 1;
+  optional uint64 caller = 2;
+  optional uint32 io_wait = 3;
+}
+message SchedCpuHotplugFtraceEvent {
+  optional int32 affected_cpu = 1;
+  optional int32 error = 2;
+  optional int32 status = 3;
+}
+message SchedWakingFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 success = 4;
+  optional int32 target_cpu = 5;
+}
+message SchedWakeupNewFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 success = 4;
+  optional int32 target_cpu = 5;
+}
+message SchedProcessExecFtraceEvent {
+  optional string filename = 1;
+  optional int32 pid = 2;
+  optional int32 old_pid = 3;
+}
+message SchedProcessExitFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 tgid = 3;
+  optional int32 prio = 4;
+}
+message SchedProcessForkFtraceEvent {
+  optional string parent_comm = 1;
+  optional int32 parent_pid = 2;
+  optional string child_comm = 3;
+  optional int32 child_pid = 4;
+}
+message SchedProcessFreeFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+}
+message SchedProcessHangFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+}
+message SchedProcessWaitFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+}
+message SchedPiSetprioFtraceEvent {
+  optional string comm = 1;
+  optional int32 newprio = 2;
+  optional int32 oldprio = 3;
+  optional int32 pid = 4;
+}
+message SchedCpuUtilCfsFtraceEvent {
+  optional int32 active = 1;
+  optional uint64 capacity = 2;
+  optional uint64 capacity_orig = 3;
+  optional uint32 cpu = 4;
+  optional uint64 cpu_importance = 5;
+  optional uint64 cpu_util = 6;
+  optional uint32 exit_lat = 7;
+  optional uint64 group_capacity = 8;
+  optional uint32 grp_overutilized = 9;
+  optional uint32 idle_cpu = 10;
+  optional uint32 nr_running = 11;
+  optional int64 spare_cap = 12;
+  optional uint32 task_fits = 13;
+  optional uint64 wake_group_util = 14;
+  optional uint64 wake_util = 15;
+}
+message SchedMigrateTaskFtraceEvent {
+  optional string comm = 1;
+  optional int32 pid = 2;
+  optional int32 prio = 3;
+  optional int32 orig_cpu = 4;
+  optional int32 dest_cpu = 5;
+  optional int32 running = 6;
+  optional uint32 load = 7;
+}
+
+// End of protos/perfetto/trace/ftrace/sched.proto
+
+// Begin of protos/perfetto/trace/ftrace/scm.proto
+
+message ScmCallStartFtraceEvent {
+  optional uint32 arginfo = 1;
+  optional uint64 x0 = 2;
+  optional uint64 x5 = 3;
+}
+message ScmCallEndFtraceEvent {}
+
+// End of protos/perfetto/trace/ftrace/scm.proto
+
+// Begin of protos/perfetto/trace/ftrace/sde.proto
+
+message SdeTracingMarkWriteFtraceEvent {
+  optional int32 pid = 1;
+  optional string trace_name = 2;
+  optional uint32 trace_type = 3;
+  optional int32 value = 4;
+  optional uint32 trace_begin = 5;
+}
+message SdeSdeEvtlogFtraceEvent {
+  optional string evtlog_tag = 1;
+  optional int32 pid = 2;
+  optional uint32 tag_id = 3;
+}
+message SdeSdePerfCalcCrtcFtraceEvent {
+  optional uint64 bw_ctl_ebi = 1;
+  optional uint64 bw_ctl_llcc = 2;
+  optional uint64 bw_ctl_mnoc = 3;
+  optional uint32 core_clk_rate = 4;
+  optional uint32 crtc = 5;
+  optional uint64 ib_ebi = 6;
+  optional uint64 ib_llcc = 7;
+  optional uint64 ib_mnoc = 8;
+}
+message SdeSdePerfCrtcUpdateFtraceEvent {
+  optional uint64 bw_ctl_ebi = 1;
+  optional uint64 bw_ctl_llcc = 2;
+  optional uint64 bw_ctl_mnoc = 3;
+  optional uint32 core_clk_rate = 4;
+  optional uint32 crtc = 5;
+  optional int32 params = 6;
+  optional uint64 per_pipe_ib_ebi = 7;
+  optional uint64 per_pipe_ib_llcc = 8;
+  optional uint64 per_pipe_ib_mnoc = 9;
+  optional uint32 stop_req = 10;
+  optional uint32 update_bus = 11;
+  optional uint32 update_clk = 12;
+}
+message SdeSdePerfSetQosLutsFtraceEvent {
+  optional uint32 fl = 1;
+  optional uint32 fmt = 2;
+  optional uint64 lut = 3;
+  optional uint32 lut_usage = 4;
+  optional uint32 pnum = 5;
+  optional uint32 rt = 6;
+}
+message SdeSdePerfUpdateBusFtraceEvent {
+  optional uint64 ab_quota = 1;
+  optional uint32 bus_id = 2;
+  optional int32 client = 3;
+  optional uint64 ib_quota = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/sde.proto
+
+// Begin of protos/perfetto/trace/ftrace/signal.proto
+
+message SignalDeliverFtraceEvent {
+  optional int32 code = 1;
+  optional uint64 sa_flags = 2;
+  optional int32 sig = 3;
+}
+message SignalGenerateFtraceEvent {
+  optional int32 code = 1;
+  optional string comm = 2;
+  optional int32 group = 3;
+  optional int32 pid = 4;
+  optional int32 result = 5;
+  optional int32 sig = 6;
+}
+
+// End of protos/perfetto/trace/ftrace/signal.proto
+
+// Begin of protos/perfetto/trace/ftrace/skb.proto
+
+message KfreeSkbFtraceEvent {
+  optional uint64 location = 1;
+  optional uint32 protocol = 2;
+  optional uint64 skbaddr = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/skb.proto
+
+// Begin of protos/perfetto/trace/ftrace/sock.proto
+
+message InetSockSetStateFtraceEvent {
+  optional uint32 daddr = 1;
+  optional uint32 dport = 2;
+  optional uint32 family = 3;
+  optional int32 newstate = 4;
+  optional int32 oldstate = 5;
+  optional uint32 protocol = 6;
+  optional uint32 saddr = 7;
+  optional uint64 skaddr = 8;
+  optional uint32 sport = 9;
+}
+
+// End of protos/perfetto/trace/ftrace/sock.proto
+
+// Begin of protos/perfetto/trace/ftrace/sync.proto
+
+message SyncPtFtraceEvent {
+  optional string timeline = 1;
+  optional string value = 2;
+}
+message SyncTimelineFtraceEvent {
+  optional string name = 1;
+  optional string value = 2;
+}
+message SyncWaitFtraceEvent {
+  optional string name = 1;
+  optional int32 status = 2;
+  optional uint32 begin = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/sync.proto
+
+// Begin of protos/perfetto/trace/ftrace/synthetic.proto
+
+message RssStatThrottledFtraceEvent {
+  optional uint32 curr = 1;
+  optional int32 member = 2;
+  optional uint32 mm_id = 3;
+  optional int64 size = 4;
+}
+message SuspendResumeMinimalFtraceEvent {
+  optional uint32 start = 1;
+}
+
+// End of protos/perfetto/trace/ftrace/synthetic.proto
+
+// Begin of protos/perfetto/trace/ftrace/systrace.proto
+
+message ZeroFtraceEvent {
+  optional int32 flag = 1;
+  optional string name = 2;
+  optional int32 pid = 3;
+  optional int64 value = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/systrace.proto
+
+// Begin of protos/perfetto/trace/ftrace/task.proto
+
+message TaskNewtaskFtraceEvent {
+  optional int32 pid = 1;
+  optional string comm = 2;
+  optional uint64 clone_flags = 3;
+  optional int32 oom_score_adj = 4;
+}
+message TaskRenameFtraceEvent {
+  optional int32 pid = 1;
+  optional string oldcomm = 2;
+  optional string newcomm = 3;
+  optional int32 oom_score_adj = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/task.proto
+
+// Begin of protos/perfetto/trace/ftrace/tcp.proto
+
+message TcpRetransmitSkbFtraceEvent {
+  optional uint32 daddr = 1;
+  optional uint32 dport = 2;
+  optional uint32 saddr = 3;
+  optional uint64 skaddr = 4;
+  optional uint64 skbaddr = 5;
+  optional uint32 sport = 6;
+  optional int32 state = 7;
+}
+
+// End of protos/perfetto/trace/ftrace/tcp.proto
+
+// Begin of protos/perfetto/trace/ftrace/thermal.proto
+
+message ThermalTemperatureFtraceEvent {
+  optional int32 id = 1;
+  optional int32 temp = 2;
+  optional int32 temp_prev = 3;
+  optional string thermal_zone = 4;
+}
+message CdevUpdateFtraceEvent {
+  optional uint64 target = 1;
+  optional string type = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/thermal.proto
+
+// Begin of protos/perfetto/trace/ftrace/trusty.proto
+
+message TrustySmcFtraceEvent {
+  optional uint64 r0 = 1;
+  optional uint64 r1 = 2;
+  optional uint64 r2 = 3;
+  optional uint64 r3 = 4;
+}
+message TrustySmcDoneFtraceEvent {
+  optional uint64 ret = 1;
+}
+message TrustyStdCall32FtraceEvent {
+  optional uint64 r0 = 1;
+  optional uint64 r1 = 2;
+  optional uint64 r2 = 3;
+  optional uint64 r3 = 4;
+}
+message TrustyStdCall32DoneFtraceEvent {
+  optional int64 ret = 1;
+}
+message TrustyShareMemoryFtraceEvent {
+  optional uint64 len = 1;
+  optional uint32 lend = 2;
+  optional uint32 nents = 3;
+}
+message TrustyShareMemoryDoneFtraceEvent {
+  optional uint64 handle = 1;
+  optional uint64 len = 2;
+  optional uint32 lend = 3;
+  optional uint32 nents = 4;
+  optional int32 ret = 5;
+}
+message TrustyReclaimMemoryFtraceEvent {
+  optional uint64 id = 1;
+}
+message TrustyReclaimMemoryDoneFtraceEvent {
+  optional uint64 id = 1;
+  optional int32 ret = 2;
+}
+message TrustyIrqFtraceEvent {
+  optional int32 irq = 1;
+}
+message TrustyIpcHandleEventFtraceEvent {
+  optional uint32 chan = 1;
+  optional uint32 event_id = 2;
+  optional string srv_name = 3;
+}
+message TrustyIpcConnectFtraceEvent {
+  optional uint32 chan = 1;
+  optional string port = 2;
+  optional int32 state = 3;
+}
+message TrustyIpcConnectEndFtraceEvent {
+  optional uint32 chan = 1;
+  optional int32 err = 2;
+  optional int32 state = 3;
+}
+message TrustyIpcWriteFtraceEvent {
+  optional uint64 buf_id = 1;
+  optional uint32 chan = 2;
+  optional int32 kind_shm = 3;
+  optional int32 len_or_err = 4;
+  optional uint64 shm_cnt = 5;
+  optional string srv_name = 6;
+}
+message TrustyIpcPollFtraceEvent {
+  optional uint32 chan = 1;
+  optional uint32 poll_mask = 2;
+  optional string srv_name = 3;
+}
+message TrustyIpcReadFtraceEvent {
+  optional uint32 chan = 1;
+  optional string srv_name = 2;
+}
+message TrustyIpcReadEndFtraceEvent {
+  optional uint64 buf_id = 1;
+  optional uint32 chan = 2;
+  optional int32 len_or_err = 3;
+  optional uint64 shm_cnt = 4;
+  optional string srv_name = 5;
+}
+message TrustyIpcRxFtraceEvent {
+  optional uint64 buf_id = 1;
+  optional uint32 chan = 2;
+  optional string srv_name = 3;
+}
+message TrustyEnqueueNopFtraceEvent {
+  optional uint32 arg1 = 1;
+  optional uint32 arg2 = 2;
+  optional uint32 arg3 = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/trusty.proto
+
+// Begin of protos/perfetto/trace/ftrace/ufs.proto
+
+message UfshcdCommandFtraceEvent {
+  optional string dev_name = 1;
+  optional uint32 doorbell = 2;
+  optional uint32 intr = 3;
+  optional uint64 lba = 4;
+  optional uint32 opcode = 5;
+  optional string str = 6;
+  optional uint32 tag = 7;
+  optional int32 transfer_len = 8;
+  optional uint32 group_id = 9;
+  optional uint32 str_t = 10;
+}
+message UfshcdClkGatingFtraceEvent {
+  optional string dev_name = 1;
+  optional int32 state = 2;
+}
+
+// End of protos/perfetto/trace/ftrace/ufs.proto
+
+// Begin of protos/perfetto/trace/ftrace/v4l2.proto
+
+message V4l2QbufFtraceEvent {
+  optional uint32 bytesused = 1;
+  optional uint32 field = 2;
+  optional uint32 flags = 3;
+  optional uint32 index = 4;
+  optional int32 minor = 5;
+  optional uint32 sequence = 6;
+  optional uint32 timecode_flags = 7;
+  optional uint32 timecode_frames = 8;
+  optional uint32 timecode_hours = 9;
+  optional uint32 timecode_minutes = 10;
+  optional uint32 timecode_seconds = 11;
+  optional uint32 timecode_type = 12;
+  optional uint32 timecode_userbits0 = 13;
+  optional uint32 timecode_userbits1 = 14;
+  optional uint32 timecode_userbits2 = 15;
+  optional uint32 timecode_userbits3 = 16;
+  optional int64 timestamp = 17;
+  optional uint32 type = 18;
+}
+message V4l2DqbufFtraceEvent {
+  optional uint32 bytesused = 1;
+  optional uint32 field = 2;
+  optional uint32 flags = 3;
+  optional uint32 index = 4;
+  optional int32 minor = 5;
+  optional uint32 sequence = 6;
+  optional uint32 timecode_flags = 7;
+  optional uint32 timecode_frames = 8;
+  optional uint32 timecode_hours = 9;
+  optional uint32 timecode_minutes = 10;
+  optional uint32 timecode_seconds = 11;
+  optional uint32 timecode_type = 12;
+  optional uint32 timecode_userbits0 = 13;
+  optional uint32 timecode_userbits1 = 14;
+  optional uint32 timecode_userbits2 = 15;
+  optional uint32 timecode_userbits3 = 16;
+  optional int64 timestamp = 17;
+  optional uint32 type = 18;
+}
+message Vb2V4l2BufQueueFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
+message Vb2V4l2BufDoneFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
+message Vb2V4l2QbufFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
+message Vb2V4l2DqbufFtraceEvent {
+  optional uint32 field = 1;
+  optional uint32 flags = 2;
+  optional int32 minor = 3;
+  optional uint32 sequence = 4;
+  optional uint32 timecode_flags = 5;
+  optional uint32 timecode_frames = 6;
+  optional uint32 timecode_hours = 7;
+  optional uint32 timecode_minutes = 8;
+  optional uint32 timecode_seconds = 9;
+  optional uint32 timecode_type = 10;
+  optional uint32 timecode_userbits0 = 11;
+  optional uint32 timecode_userbits1 = 12;
+  optional uint32 timecode_userbits2 = 13;
+  optional uint32 timecode_userbits3 = 14;
+  optional int64 timestamp = 15;
+}
+
+// End of protos/perfetto/trace/ftrace/v4l2.proto
+
+// Begin of protos/perfetto/trace/ftrace/virtio_gpu.proto
+
+message VirtioGpuCmdQueueFtraceEvent {
+  optional uint32 ctx_id = 1;
+  optional int32 dev = 2;
+  optional uint64 fence_id = 3;
+  optional uint32 flags = 4;
+  optional string name = 5;
+  optional uint32 num_free = 6;
+  optional uint32 seqno = 7;
+  optional uint32 type = 8;
+  optional uint32 vq = 9;
+}
+message VirtioGpuCmdResponseFtraceEvent {
+  optional uint32 ctx_id = 1;
+  optional int32 dev = 2;
+  optional uint64 fence_id = 3;
+  optional uint32 flags = 4;
+  optional string name = 5;
+  optional uint32 num_free = 6;
+  optional uint32 seqno = 7;
+  optional uint32 type = 8;
+  optional uint32 vq = 9;
+}
+
+// End of protos/perfetto/trace/ftrace/virtio_gpu.proto
+
+// Begin of protos/perfetto/trace/ftrace/virtio_video.proto
+
+message VirtioVideoCmdFtraceEvent {
+  optional uint32 stream_id = 1;
+  optional uint32 type = 2;
+}
+message VirtioVideoCmdDoneFtraceEvent {
+  optional uint32 stream_id = 1;
+  optional uint32 type = 2;
+}
+message VirtioVideoResourceQueueFtraceEvent {
+  optional uint32 data_size0 = 1;
+  optional uint32 data_size1 = 2;
+  optional uint32 data_size2 = 3;
+  optional uint32 data_size3 = 4;
+  optional uint32 queue_type = 5;
+  optional int32 resource_id = 6;
+  optional int32 stream_id = 7;
+  optional uint64 timestamp = 8;
+}
+message VirtioVideoResourceQueueDoneFtraceEvent {
+  optional uint32 data_size0 = 1;
+  optional uint32 data_size1 = 2;
+  optional uint32 data_size2 = 3;
+  optional uint32 data_size3 = 4;
+  optional uint32 queue_type = 5;
+  optional int32 resource_id = 6;
+  optional int32 stream_id = 7;
+  optional uint64 timestamp = 8;
+}
+
+// End of protos/perfetto/trace/ftrace/virtio_video.proto
+
+// Begin of protos/perfetto/trace/ftrace/vmscan.proto
+
+message MmVmscanDirectReclaimBeginFtraceEvent {
+  optional int32 order = 1;
+  optional int32 may_writepage = 2;
+  optional uint32 gfp_flags = 3;
+}
+message MmVmscanDirectReclaimEndFtraceEvent {
+  optional uint64 nr_reclaimed = 1;
+}
+message MmVmscanKswapdWakeFtraceEvent {
+  optional int32 nid = 1;
+  optional int32 order = 2;
+  optional int32 zid = 3;
+}
+message MmVmscanKswapdSleepFtraceEvent {
+  optional int32 nid = 1;
+}
+message MmShrinkSlabStartFtraceEvent {
+  optional uint64 cache_items = 1;
+  optional uint64 delta = 2;
+  optional uint32 gfp_flags = 3;
+  optional uint64 lru_pgs = 4;
+  optional int64 nr_objects_to_shrink = 5;
+  optional uint64 pgs_scanned = 6;
+  optional uint64 shr = 7;
+  optional uint64 shrink = 8;
+  optional uint64 total_scan = 9;
+  optional int32 nid = 10;
+  optional int32 priority = 11;
+}
+message MmShrinkSlabEndFtraceEvent {
+  optional int64 new_scan = 1;
+  optional int32 retval = 2;
+  optional uint64 shr = 3;
+  optional uint64 shrink = 4;
+  optional int64 total_scan = 5;
+  optional int64 unused_scan = 6;
+  optional int32 nid = 7;
+}
+
+// End of protos/perfetto/trace/ftrace/vmscan.proto
+
+// Begin of protos/perfetto/trace/ftrace/workqueue.proto
+
+message WorkqueueActivateWorkFtraceEvent {
+  optional uint64 work = 1;
+}
+message WorkqueueExecuteEndFtraceEvent {
+  optional uint64 work = 1;
+  optional uint64 function = 2;
+}
+message WorkqueueExecuteStartFtraceEvent {
+  optional uint64 work = 1;
+  optional uint64 function = 2;
+}
+message WorkqueueQueueWorkFtraceEvent {
+  optional uint64 work = 1;
+  optional uint64 function = 2;
+  optional uint64 workqueue = 3;
+  optional uint32 req_cpu = 4;
+  optional uint32 cpu = 5;
+}
+
+// End of protos/perfetto/trace/ftrace/workqueue.proto
+
+// Begin of protos/perfetto/trace/ftrace/ftrace_event.proto
+
+message FtraceEvent {
+  // Timestamp in nanoseconds using .../tracing/trace_clock.
+  optional uint64 timestamp = 1;
+
+  // Kernel pid (do not confuse with userspace pid aka tgid).
+  optional uint32 pid = 2;
+
+  // Not populated in actual traces. Wire format might change.
+  // Placeholder declaration so that the ftrace parsing code accepts the
+  // existence of this common field. If this becomes needed for all events:
+  // consider merging with common_preempt_count to avoid extra proto tags.
+  optional uint32 common_flags = 5;
+
+  oneof event {
+    PrintFtraceEvent print = 3;
+    SchedSwitchFtraceEvent sched_switch = 4;
+    // removed field with id 5;
+    // removed field with id 6;
+    // removed field with id 7;
+    // removed field with id 8;
+    // removed field with id 9;
+    // removed field with id 10;
+    CpuFrequencyFtraceEvent cpu_frequency = 11;
+    CpuFrequencyLimitsFtraceEvent cpu_frequency_limits = 12;
+    CpuIdleFtraceEvent cpu_idle = 13;
+    ClockEnableFtraceEvent clock_enable = 14;
+    ClockDisableFtraceEvent clock_disable = 15;
+    ClockSetRateFtraceEvent clock_set_rate = 16;
+    SchedWakeupFtraceEvent sched_wakeup = 17;
+    SchedBlockedReasonFtraceEvent sched_blocked_reason = 18;
+    SchedCpuHotplugFtraceEvent sched_cpu_hotplug = 19;
+    SchedWakingFtraceEvent sched_waking = 20;
+    IpiEntryFtraceEvent ipi_entry = 21;
+    IpiExitFtraceEvent ipi_exit = 22;
+    IpiRaiseFtraceEvent ipi_raise = 23;
+    SoftirqEntryFtraceEvent softirq_entry = 24;
+    SoftirqExitFtraceEvent softirq_exit = 25;
+    SoftirqRaiseFtraceEvent softirq_raise = 26;
+    I2cReadFtraceEvent i2c_read = 27;
+    I2cWriteFtraceEvent i2c_write = 28;
+    I2cResultFtraceEvent i2c_result = 29;
+    I2cReplyFtraceEvent i2c_reply = 30;
+    SmbusReadFtraceEvent smbus_read = 31;
+    SmbusWriteFtraceEvent smbus_write = 32;
+    SmbusResultFtraceEvent smbus_result = 33;
+    SmbusReplyFtraceEvent smbus_reply = 34;
+    LowmemoryKillFtraceEvent lowmemory_kill = 35;
+    IrqHandlerEntryFtraceEvent irq_handler_entry = 36;
+    IrqHandlerExitFtraceEvent irq_handler_exit = 37;
+    SyncPtFtraceEvent sync_pt = 38;
+    SyncTimelineFtraceEvent sync_timeline = 39;
+    SyncWaitFtraceEvent sync_wait = 40;
+    Ext4DaWriteBeginFtraceEvent ext4_da_write_begin = 41;
+    Ext4DaWriteEndFtraceEvent ext4_da_write_end = 42;
+    Ext4SyncFileEnterFtraceEvent ext4_sync_file_enter = 43;
+    Ext4SyncFileExitFtraceEvent ext4_sync_file_exit = 44;
+    BlockRqIssueFtraceEvent block_rq_issue = 45;
+    MmVmscanDirectReclaimBeginFtraceEvent mm_vmscan_direct_reclaim_begin = 46;
+    MmVmscanDirectReclaimEndFtraceEvent mm_vmscan_direct_reclaim_end = 47;
+    MmVmscanKswapdWakeFtraceEvent mm_vmscan_kswapd_wake = 48;
+    MmVmscanKswapdSleepFtraceEvent mm_vmscan_kswapd_sleep = 49;
+    BinderTransactionFtraceEvent binder_transaction = 50;
+    BinderTransactionReceivedFtraceEvent binder_transaction_received = 51;
+    BinderSetPriorityFtraceEvent binder_set_priority = 52;
+    BinderLockFtraceEvent binder_lock = 53;
+    BinderLockedFtraceEvent binder_locked = 54;
+    BinderUnlockFtraceEvent binder_unlock = 55;
+    WorkqueueActivateWorkFtraceEvent workqueue_activate_work = 56;
+    WorkqueueExecuteEndFtraceEvent workqueue_execute_end = 57;
+    WorkqueueExecuteStartFtraceEvent workqueue_execute_start = 58;
+    WorkqueueQueueWorkFtraceEvent workqueue_queue_work = 59;
+    RegulatorDisableFtraceEvent regulator_disable = 60;
+    RegulatorDisableCompleteFtraceEvent regulator_disable_complete = 61;
+    RegulatorEnableFtraceEvent regulator_enable = 62;
+    RegulatorEnableCompleteFtraceEvent regulator_enable_complete = 63;
+    RegulatorEnableDelayFtraceEvent regulator_enable_delay = 64;
+    RegulatorSetVoltageFtraceEvent regulator_set_voltage = 65;
+    RegulatorSetVoltageCompleteFtraceEvent regulator_set_voltage_complete = 66;
+    CgroupAttachTaskFtraceEvent cgroup_attach_task = 67;
+    CgroupMkdirFtraceEvent cgroup_mkdir = 68;
+    CgroupRemountFtraceEvent cgroup_remount = 69;
+    CgroupRmdirFtraceEvent cgroup_rmdir = 70;
+    CgroupTransferTasksFtraceEvent cgroup_transfer_tasks = 71;
+    CgroupDestroyRootFtraceEvent cgroup_destroy_root = 72;
+    CgroupReleaseFtraceEvent cgroup_release = 73;
+    CgroupRenameFtraceEvent cgroup_rename = 74;
+    CgroupSetupRootFtraceEvent cgroup_setup_root = 75;
+    MdpCmdKickoffFtraceEvent mdp_cmd_kickoff = 76;
+    MdpCommitFtraceEvent mdp_commit = 77;
+    MdpPerfSetOtFtraceEvent mdp_perf_set_ot = 78;
+    MdpSsppChangeFtraceEvent mdp_sspp_change = 79;
+    TracingMarkWriteFtraceEvent tracing_mark_write = 80;
+    MdpCmdPingpongDoneFtraceEvent mdp_cmd_pingpong_done = 81;
+    MdpCompareBwFtraceEvent mdp_compare_bw = 82;
+    MdpPerfSetPanicLutsFtraceEvent mdp_perf_set_panic_luts = 83;
+    MdpSsppSetFtraceEvent mdp_sspp_set = 84;
+    MdpCmdReadptrDoneFtraceEvent mdp_cmd_readptr_done = 85;
+    MdpMisrCrcFtraceEvent mdp_misr_crc = 86;
+    MdpPerfSetQosLutsFtraceEvent mdp_perf_set_qos_luts = 87;
+    MdpTraceCounterFtraceEvent mdp_trace_counter = 88;
+    MdpCmdReleaseBwFtraceEvent mdp_cmd_release_bw = 89;
+    MdpMixerUpdateFtraceEvent mdp_mixer_update = 90;
+    MdpPerfSetWmLevelsFtraceEvent mdp_perf_set_wm_levels = 91;
+    MdpVideoUnderrunDoneFtraceEvent mdp_video_underrun_done = 92;
+    MdpCmdWaitPingpongFtraceEvent mdp_cmd_wait_pingpong = 93;
+    MdpPerfPrefillCalcFtraceEvent mdp_perf_prefill_calc = 94;
+    MdpPerfUpdateBusFtraceEvent mdp_perf_update_bus = 95;
+    RotatorBwAoAsContextFtraceEvent rotator_bw_ao_as_context = 96;
+    MmFilemapAddToPageCacheFtraceEvent mm_filemap_add_to_page_cache = 97;
+    MmFilemapDeleteFromPageCacheFtraceEvent mm_filemap_delete_from_page_cache =
+        98;
+    MmCompactionBeginFtraceEvent mm_compaction_begin = 99;
+    MmCompactionDeferCompactionFtraceEvent mm_compaction_defer_compaction = 100;
+    MmCompactionDeferredFtraceEvent mm_compaction_deferred = 101;
+    MmCompactionDeferResetFtraceEvent mm_compaction_defer_reset = 102;
+    MmCompactionEndFtraceEvent mm_compaction_end = 103;
+    MmCompactionFinishedFtraceEvent mm_compaction_finished = 104;
+    MmCompactionIsolateFreepagesFtraceEvent mm_compaction_isolate_freepages =
+        105;
+    MmCompactionIsolateMigratepagesFtraceEvent
+        mm_compaction_isolate_migratepages = 106;
+    MmCompactionKcompactdSleepFtraceEvent mm_compaction_kcompactd_sleep = 107;
+    MmCompactionKcompactdWakeFtraceEvent mm_compaction_kcompactd_wake = 108;
+    MmCompactionMigratepagesFtraceEvent mm_compaction_migratepages = 109;
+    MmCompactionSuitableFtraceEvent mm_compaction_suitable = 110;
+    MmCompactionTryToCompactPagesFtraceEvent
+        mm_compaction_try_to_compact_pages = 111;
+    MmCompactionWakeupKcompactdFtraceEvent mm_compaction_wakeup_kcompactd = 112;
+    SuspendResumeFtraceEvent suspend_resume = 113;
+    SchedWakeupNewFtraceEvent sched_wakeup_new = 114;
+    BlockBioBackmergeFtraceEvent block_bio_backmerge = 115;
+    BlockBioBounceFtraceEvent block_bio_bounce = 116;
+    BlockBioCompleteFtraceEvent block_bio_complete = 117;
+    BlockBioFrontmergeFtraceEvent block_bio_frontmerge = 118;
+    BlockBioQueueFtraceEvent block_bio_queue = 119;
+    BlockBioRemapFtraceEvent block_bio_remap = 120;
+    BlockDirtyBufferFtraceEvent block_dirty_buffer = 121;
+    BlockGetrqFtraceEvent block_getrq = 122;
+    BlockPlugFtraceEvent block_plug = 123;
+    BlockRqAbortFtraceEvent block_rq_abort = 124;
+    BlockRqCompleteFtraceEvent block_rq_complete = 125;
+    BlockRqInsertFtraceEvent block_rq_insert = 126;
+    // removed field with id 127;
+    BlockRqRemapFtraceEvent block_rq_remap = 128;
+    BlockRqRequeueFtraceEvent block_rq_requeue = 129;
+    BlockSleeprqFtraceEvent block_sleeprq = 130;
+    BlockSplitFtraceEvent block_split = 131;
+    BlockTouchBufferFtraceEvent block_touch_buffer = 132;
+    BlockUnplugFtraceEvent block_unplug = 133;
+    Ext4AllocDaBlocksFtraceEvent ext4_alloc_da_blocks = 134;
+    Ext4AllocateBlocksFtraceEvent ext4_allocate_blocks = 135;
+    Ext4AllocateInodeFtraceEvent ext4_allocate_inode = 136;
+    Ext4BeginOrderedTruncateFtraceEvent ext4_begin_ordered_truncate = 137;
+    Ext4CollapseRangeFtraceEvent ext4_collapse_range = 138;
+    Ext4DaReleaseSpaceFtraceEvent ext4_da_release_space = 139;
+    Ext4DaReserveSpaceFtraceEvent ext4_da_reserve_space = 140;
+    Ext4DaUpdateReserveSpaceFtraceEvent ext4_da_update_reserve_space = 141;
+    Ext4DaWritePagesFtraceEvent ext4_da_write_pages = 142;
+    Ext4DaWritePagesExtentFtraceEvent ext4_da_write_pages_extent = 143;
+    Ext4DirectIOEnterFtraceEvent ext4_direct_IO_enter = 144;
+    Ext4DirectIOExitFtraceEvent ext4_direct_IO_exit = 145;
+    Ext4DiscardBlocksFtraceEvent ext4_discard_blocks = 146;
+    Ext4DiscardPreallocationsFtraceEvent ext4_discard_preallocations = 147;
+    Ext4DropInodeFtraceEvent ext4_drop_inode = 148;
+    Ext4EsCacheExtentFtraceEvent ext4_es_cache_extent = 149;
+    Ext4EsFindDelayedExtentRangeEnterFtraceEvent
+        ext4_es_find_delayed_extent_range_enter = 150;
+    Ext4EsFindDelayedExtentRangeExitFtraceEvent
+        ext4_es_find_delayed_extent_range_exit = 151;
+    Ext4EsInsertExtentFtraceEvent ext4_es_insert_extent = 152;
+    Ext4EsLookupExtentEnterFtraceEvent ext4_es_lookup_extent_enter = 153;
+    Ext4EsLookupExtentExitFtraceEvent ext4_es_lookup_extent_exit = 154;
+    Ext4EsRemoveExtentFtraceEvent ext4_es_remove_extent = 155;
+    Ext4EsShrinkFtraceEvent ext4_es_shrink = 156;
+    Ext4EsShrinkCountFtraceEvent ext4_es_shrink_count = 157;
+    Ext4EsShrinkScanEnterFtraceEvent ext4_es_shrink_scan_enter = 158;
+    Ext4EsShrinkScanExitFtraceEvent ext4_es_shrink_scan_exit = 159;
+    Ext4EvictInodeFtraceEvent ext4_evict_inode = 160;
+    Ext4ExtConvertToInitializedEnterFtraceEvent
+        ext4_ext_convert_to_initialized_enter = 161;
+    Ext4ExtConvertToInitializedFastpathFtraceEvent
+        ext4_ext_convert_to_initialized_fastpath = 162;
+    Ext4ExtHandleUnwrittenExtentsFtraceEvent ext4_ext_handle_unwritten_extents =
+        163;
+    Ext4ExtInCacheFtraceEvent ext4_ext_in_cache = 164;
+    Ext4ExtLoadExtentFtraceEvent ext4_ext_load_extent = 165;
+    Ext4ExtMapBlocksEnterFtraceEvent ext4_ext_map_blocks_enter = 166;
+    Ext4ExtMapBlocksExitFtraceEvent ext4_ext_map_blocks_exit = 167;
+    Ext4ExtPutInCacheFtraceEvent ext4_ext_put_in_cache = 168;
+    Ext4ExtRemoveSpaceFtraceEvent ext4_ext_remove_space = 169;
+    Ext4ExtRemoveSpaceDoneFtraceEvent ext4_ext_remove_space_done = 170;
+    Ext4ExtRmIdxFtraceEvent ext4_ext_rm_idx = 171;
+    Ext4ExtRmLeafFtraceEvent ext4_ext_rm_leaf = 172;
+    Ext4ExtShowExtentFtraceEvent ext4_ext_show_extent = 173;
+    Ext4FallocateEnterFtraceEvent ext4_fallocate_enter = 174;
+    Ext4FallocateExitFtraceEvent ext4_fallocate_exit = 175;
+    Ext4FindDelallocRangeFtraceEvent ext4_find_delalloc_range = 176;
+    Ext4ForgetFtraceEvent ext4_forget = 177;
+    Ext4FreeBlocksFtraceEvent ext4_free_blocks = 178;
+    Ext4FreeInodeFtraceEvent ext4_free_inode = 179;
+    Ext4GetImpliedClusterAllocExitFtraceEvent
+        ext4_get_implied_cluster_alloc_exit = 180;
+    Ext4GetReservedClusterAllocFtraceEvent ext4_get_reserved_cluster_alloc =
+        181;
+    Ext4IndMapBlocksEnterFtraceEvent ext4_ind_map_blocks_enter = 182;
+    Ext4IndMapBlocksExitFtraceEvent ext4_ind_map_blocks_exit = 183;
+    Ext4InsertRangeFtraceEvent ext4_insert_range = 184;
+    Ext4InvalidatepageFtraceEvent ext4_invalidatepage = 185;
+    Ext4JournalStartFtraceEvent ext4_journal_start = 186;
+    Ext4JournalStartReservedFtraceEvent ext4_journal_start_reserved = 187;
+    Ext4JournalledInvalidatepageFtraceEvent ext4_journalled_invalidatepage =
+        188;
+    Ext4JournalledWriteEndFtraceEvent ext4_journalled_write_end = 189;
+    Ext4LoadInodeFtraceEvent ext4_load_inode = 190;
+    Ext4LoadInodeBitmapFtraceEvent ext4_load_inode_bitmap = 191;
+    Ext4MarkInodeDirtyFtraceEvent ext4_mark_inode_dirty = 192;
+    Ext4MbBitmapLoadFtraceEvent ext4_mb_bitmap_load = 193;
+    Ext4MbBuddyBitmapLoadFtraceEvent ext4_mb_buddy_bitmap_load = 194;
+    Ext4MbDiscardPreallocationsFtraceEvent ext4_mb_discard_preallocations = 195;
+    Ext4MbNewGroupPaFtraceEvent ext4_mb_new_group_pa = 196;
+    Ext4MbNewInodePaFtraceEvent ext4_mb_new_inode_pa = 197;
+    Ext4MbReleaseGroupPaFtraceEvent ext4_mb_release_group_pa = 198;
+    Ext4MbReleaseInodePaFtraceEvent ext4_mb_release_inode_pa = 199;
+    Ext4MballocAllocFtraceEvent ext4_mballoc_alloc = 200;
+    Ext4MballocDiscardFtraceEvent ext4_mballoc_discard = 201;
+    Ext4MballocFreeFtraceEvent ext4_mballoc_free = 202;
+    Ext4MballocPreallocFtraceEvent ext4_mballoc_prealloc = 203;
+    Ext4OtherInodeUpdateTimeFtraceEvent ext4_other_inode_update_time = 204;
+    Ext4PunchHoleFtraceEvent ext4_punch_hole = 205;
+    Ext4ReadBlockBitmapLoadFtraceEvent ext4_read_block_bitmap_load = 206;
+    Ext4ReadpageFtraceEvent ext4_readpage = 207;
+    Ext4ReleasepageFtraceEvent ext4_releasepage = 208;
+    Ext4RemoveBlocksFtraceEvent ext4_remove_blocks = 209;
+    Ext4RequestBlocksFtraceEvent ext4_request_blocks = 210;
+    Ext4RequestInodeFtraceEvent ext4_request_inode = 211;
+    Ext4SyncFsFtraceEvent ext4_sync_fs = 212;
+    Ext4TrimAllFreeFtraceEvent ext4_trim_all_free = 213;
+    Ext4TrimExtentFtraceEvent ext4_trim_extent = 214;
+    Ext4TruncateEnterFtraceEvent ext4_truncate_enter = 215;
+    Ext4TruncateExitFtraceEvent ext4_truncate_exit = 216;
+    Ext4UnlinkEnterFtraceEvent ext4_unlink_enter = 217;
+    Ext4UnlinkExitFtraceEvent ext4_unlink_exit = 218;
+    Ext4WriteBeginFtraceEvent ext4_write_begin = 219;
+    // removed field with id 220;
+    // removed field with id 221;
+    // removed field with id 222;
+    // removed field with id 223;
+    // removed field with id 224;
+    // removed field with id 225;
+    // removed field with id 226;
+    // removed field with id 227;
+    // removed field with id 228;
+    // removed field with id 229;
+    Ext4WriteEndFtraceEvent ext4_write_end = 230;
+    Ext4WritepageFtraceEvent ext4_writepage = 231;
+    Ext4WritepagesFtraceEvent ext4_writepages = 232;
+    Ext4WritepagesResultFtraceEvent ext4_writepages_result = 233;
+    Ext4ZeroRangeFtraceEvent ext4_zero_range = 234;
+    TaskNewtaskFtraceEvent task_newtask = 235;
+    TaskRenameFtraceEvent task_rename = 236;
+    SchedProcessExecFtraceEvent sched_process_exec = 237;
+    SchedProcessExitFtraceEvent sched_process_exit = 238;
+    SchedProcessForkFtraceEvent sched_process_fork = 239;
+    SchedProcessFreeFtraceEvent sched_process_free = 240;
+    SchedProcessHangFtraceEvent sched_process_hang = 241;
+    SchedProcessWaitFtraceEvent sched_process_wait = 242;
+    F2fsDoSubmitBioFtraceEvent f2fs_do_submit_bio = 243;
+    F2fsEvictInodeFtraceEvent f2fs_evict_inode = 244;
+    F2fsFallocateFtraceEvent f2fs_fallocate = 245;
+    F2fsGetDataBlockFtraceEvent f2fs_get_data_block = 246;
+    F2fsGetVictimFtraceEvent f2fs_get_victim = 247;
+    F2fsIgetFtraceEvent f2fs_iget = 248;
+    F2fsIgetExitFtraceEvent f2fs_iget_exit = 249;
+    F2fsNewInodeFtraceEvent f2fs_new_inode = 250;
+    F2fsReadpageFtraceEvent f2fs_readpage = 251;
+    F2fsReserveNewBlockFtraceEvent f2fs_reserve_new_block = 252;
+    F2fsSetPageDirtyFtraceEvent f2fs_set_page_dirty = 253;
+    F2fsSubmitWritePageFtraceEvent f2fs_submit_write_page = 254;
+    F2fsSyncFileEnterFtraceEvent f2fs_sync_file_enter = 255;
+    F2fsSyncFileExitFtraceEvent f2fs_sync_file_exit = 256;
+    F2fsSyncFsFtraceEvent f2fs_sync_fs = 257;
+    F2fsTruncateFtraceEvent f2fs_truncate = 258;
+    F2fsTruncateBlocksEnterFtraceEvent f2fs_truncate_blocks_enter = 259;
+    F2fsTruncateBlocksExitFtraceEvent f2fs_truncate_blocks_exit = 260;
+    F2fsTruncateDataBlocksRangeFtraceEvent f2fs_truncate_data_blocks_range =
+        261;
+    F2fsTruncateInodeBlocksEnterFtraceEvent f2fs_truncate_inode_blocks_enter =
+        262;
+    F2fsTruncateInodeBlocksExitFtraceEvent f2fs_truncate_inode_blocks_exit =
+        263;
+    F2fsTruncateNodeFtraceEvent f2fs_truncate_node = 264;
+    F2fsTruncateNodesEnterFtraceEvent f2fs_truncate_nodes_enter = 265;
+    F2fsTruncateNodesExitFtraceEvent f2fs_truncate_nodes_exit = 266;
+    F2fsTruncatePartialNodesFtraceEvent f2fs_truncate_partial_nodes = 267;
+    F2fsUnlinkEnterFtraceEvent f2fs_unlink_enter = 268;
+    F2fsUnlinkExitFtraceEvent f2fs_unlink_exit = 269;
+    F2fsVmPageMkwriteFtraceEvent f2fs_vm_page_mkwrite = 270;
+    F2fsWriteBeginFtraceEvent f2fs_write_begin = 271;
+    F2fsWriteCheckpointFtraceEvent f2fs_write_checkpoint = 272;
+    F2fsWriteEndFtraceEvent f2fs_write_end = 273;
+    AllocPagesIommuEndFtraceEvent alloc_pages_iommu_end = 274;
+    AllocPagesIommuFailFtraceEvent alloc_pages_iommu_fail = 275;
+    AllocPagesIommuStartFtraceEvent alloc_pages_iommu_start = 276;
+    AllocPagesSysEndFtraceEvent alloc_pages_sys_end = 277;
+    AllocPagesSysFailFtraceEvent alloc_pages_sys_fail = 278;
+    AllocPagesSysStartFtraceEvent alloc_pages_sys_start = 279;
+    DmaAllocContiguousRetryFtraceEvent dma_alloc_contiguous_retry = 280;
+    IommuMapRangeFtraceEvent iommu_map_range = 281;
+    IommuSecPtblMapRangeEndFtraceEvent iommu_sec_ptbl_map_range_end = 282;
+    IommuSecPtblMapRangeStartFtraceEvent iommu_sec_ptbl_map_range_start = 283;
+    IonAllocBufferEndFtraceEvent ion_alloc_buffer_end = 284;
+    IonAllocBufferFailFtraceEvent ion_alloc_buffer_fail = 285;
+    IonAllocBufferFallbackFtraceEvent ion_alloc_buffer_fallback = 286;
+    IonAllocBufferStartFtraceEvent ion_alloc_buffer_start = 287;
+    IonCpAllocRetryFtraceEvent ion_cp_alloc_retry = 288;
+    IonCpSecureBufferEndFtraceEvent ion_cp_secure_buffer_end = 289;
+    IonCpSecureBufferStartFtraceEvent ion_cp_secure_buffer_start = 290;
+    IonPrefetchingFtraceEvent ion_prefetching = 291;
+    IonSecureCmaAddToPoolEndFtraceEvent ion_secure_cma_add_to_pool_end = 292;
+    IonSecureCmaAddToPoolStartFtraceEvent ion_secure_cma_add_to_pool_start =
+        293;
+    IonSecureCmaAllocateEndFtraceEvent ion_secure_cma_allocate_end = 294;
+    IonSecureCmaAllocateStartFtraceEvent ion_secure_cma_allocate_start = 295;
+    IonSecureCmaShrinkPoolEndFtraceEvent ion_secure_cma_shrink_pool_end = 296;
+    IonSecureCmaShrinkPoolStartFtraceEvent ion_secure_cma_shrink_pool_start =
+        297;
+    KfreeFtraceEvent kfree = 298;
+    KmallocFtraceEvent kmalloc = 299;
+    KmallocNodeFtraceEvent kmalloc_node = 300;
+    KmemCacheAllocFtraceEvent kmem_cache_alloc = 301;
+    KmemCacheAllocNodeFtraceEvent kmem_cache_alloc_node = 302;
+    KmemCacheFreeFtraceEvent kmem_cache_free = 303;
+    MigratePagesEndFtraceEvent migrate_pages_end = 304;
+    MigratePagesStartFtraceEvent migrate_pages_start = 305;
+    MigrateRetryFtraceEvent migrate_retry = 306;
+    MmPageAllocFtraceEvent mm_page_alloc = 307;
+    MmPageAllocExtfragFtraceEvent mm_page_alloc_extfrag = 308;
+    MmPageAllocZoneLockedFtraceEvent mm_page_alloc_zone_locked = 309;
+    MmPageFreeFtraceEvent mm_page_free = 310;
+    MmPageFreeBatchedFtraceEvent mm_page_free_batched = 311;
+    MmPagePcpuDrainFtraceEvent mm_page_pcpu_drain = 312;
+    RssStatFtraceEvent rss_stat = 313;
+    IonHeapShrinkFtraceEvent ion_heap_shrink = 314;
+    IonHeapGrowFtraceEvent ion_heap_grow = 315;
+    FenceInitFtraceEvent fence_init = 316;
+    FenceDestroyFtraceEvent fence_destroy = 317;
+    FenceEnableSignalFtraceEvent fence_enable_signal = 318;
+    FenceSignaledFtraceEvent fence_signaled = 319;
+    ClkEnableFtraceEvent clk_enable = 320;
+    ClkDisableFtraceEvent clk_disable = 321;
+    ClkSetRateFtraceEvent clk_set_rate = 322;
+    BinderTransactionAllocBufFtraceEvent binder_transaction_alloc_buf = 323;
+    SignalDeliverFtraceEvent signal_deliver = 324;
+    SignalGenerateFtraceEvent signal_generate = 325;
+    OomScoreAdjUpdateFtraceEvent oom_score_adj_update = 326;
+    GenericFtraceEvent generic = 327;
+    MmEventRecordFtraceEvent mm_event_record = 328;
+    SysEnterFtraceEvent sys_enter = 329;
+    SysExitFtraceEvent sys_exit = 330;
+    ZeroFtraceEvent zero = 331;
+    GpuFrequencyFtraceEvent gpu_frequency = 332;
+    SdeTracingMarkWriteFtraceEvent sde_tracing_mark_write = 333;
+    MarkVictimFtraceEvent mark_victim = 334;
+    IonStatFtraceEvent ion_stat = 335;
+    IonBufferCreateFtraceEvent ion_buffer_create = 336;
+    IonBufferDestroyFtraceEvent ion_buffer_destroy = 337;
+    ScmCallStartFtraceEvent scm_call_start = 338;
+    ScmCallEndFtraceEvent scm_call_end = 339;
+    GpuMemTotalFtraceEvent gpu_mem_total = 340;
+    ThermalTemperatureFtraceEvent thermal_temperature = 341;
+    CdevUpdateFtraceEvent cdev_update = 342;
+    CpuhpExitFtraceEvent cpuhp_exit = 343;
+    CpuhpMultiEnterFtraceEvent cpuhp_multi_enter = 344;
+    CpuhpEnterFtraceEvent cpuhp_enter = 345;
+    CpuhpLatencyFtraceEvent cpuhp_latency = 346;
+    FastrpcDmaStatFtraceEvent fastrpc_dma_stat = 347;
+    DpuTracingMarkWriteFtraceEvent dpu_tracing_mark_write = 348;
+    G2dTracingMarkWriteFtraceEvent g2d_tracing_mark_write = 349;
+    MaliTracingMarkWriteFtraceEvent mali_tracing_mark_write = 350;
+    DmaHeapStatFtraceEvent dma_heap_stat = 351;
+    CpuhpPauseFtraceEvent cpuhp_pause = 352;
+    SchedPiSetprioFtraceEvent sched_pi_setprio = 353;
+    SdeSdeEvtlogFtraceEvent sde_sde_evtlog = 354;
+    SdeSdePerfCalcCrtcFtraceEvent sde_sde_perf_calc_crtc = 355;
+    SdeSdePerfCrtcUpdateFtraceEvent sde_sde_perf_crtc_update = 356;
+    SdeSdePerfSetQosLutsFtraceEvent sde_sde_perf_set_qos_luts = 357;
+    SdeSdePerfUpdateBusFtraceEvent sde_sde_perf_update_bus = 358;
+    RssStatThrottledFtraceEvent rss_stat_throttled = 359;
+    NetifReceiveSkbFtraceEvent netif_receive_skb = 360;
+    NetDevXmitFtraceEvent net_dev_xmit = 361;
+    InetSockSetStateFtraceEvent inet_sock_set_state = 362;
+    TcpRetransmitSkbFtraceEvent tcp_retransmit_skb = 363;
+    CrosEcSensorhubDataFtraceEvent cros_ec_sensorhub_data = 364;
+    NapiGroReceiveEntryFtraceEvent napi_gro_receive_entry = 365;
+    NapiGroReceiveExitFtraceEvent napi_gro_receive_exit = 366;
+    KfreeSkbFtraceEvent kfree_skb = 367;
+    KvmAccessFaultFtraceEvent kvm_access_fault = 368;
+    KvmAckIrqFtraceEvent kvm_ack_irq = 369;
+    KvmAgeHvaFtraceEvent kvm_age_hva = 370;
+    KvmAgePageFtraceEvent kvm_age_page = 371;
+    KvmArmClearDebugFtraceEvent kvm_arm_clear_debug = 372;
+    KvmArmSetDreg32FtraceEvent kvm_arm_set_dreg32 = 373;
+    KvmArmSetRegsetFtraceEvent kvm_arm_set_regset = 374;
+    KvmArmSetupDebugFtraceEvent kvm_arm_setup_debug = 375;
+    KvmEntryFtraceEvent kvm_entry = 376;
+    KvmExitFtraceEvent kvm_exit = 377;
+    KvmFpuFtraceEvent kvm_fpu = 378;
+    KvmGetTimerMapFtraceEvent kvm_get_timer_map = 379;
+    KvmGuestFaultFtraceEvent kvm_guest_fault = 380;
+    KvmHandleSysRegFtraceEvent kvm_handle_sys_reg = 381;
+    KvmHvcArm64FtraceEvent kvm_hvc_arm64 = 382;
+    KvmIrqLineFtraceEvent kvm_irq_line = 383;
+    KvmMmioFtraceEvent kvm_mmio = 384;
+    KvmMmioEmulateFtraceEvent kvm_mmio_emulate = 385;
+    KvmSetGuestDebugFtraceEvent kvm_set_guest_debug = 386;
+    KvmSetIrqFtraceEvent kvm_set_irq = 387;
+    KvmSetSpteHvaFtraceEvent kvm_set_spte_hva = 388;
+    KvmSetWayFlushFtraceEvent kvm_set_way_flush = 389;
+    KvmSysAccessFtraceEvent kvm_sys_access = 390;
+    KvmTestAgeHvaFtraceEvent kvm_test_age_hva = 391;
+    KvmTimerEmulateFtraceEvent kvm_timer_emulate = 392;
+    KvmTimerHrtimerExpireFtraceEvent kvm_timer_hrtimer_expire = 393;
+    KvmTimerRestoreStateFtraceEvent kvm_timer_restore_state = 394;
+    KvmTimerSaveStateFtraceEvent kvm_timer_save_state = 395;
+    KvmTimerUpdateIrqFtraceEvent kvm_timer_update_irq = 396;
+    KvmToggleCacheFtraceEvent kvm_toggle_cache = 397;
+    KvmUnmapHvaRangeFtraceEvent kvm_unmap_hva_range = 398;
+    KvmUserspaceExitFtraceEvent kvm_userspace_exit = 399;
+    KvmVcpuWakeupFtraceEvent kvm_vcpu_wakeup = 400;
+    KvmWfxArm64FtraceEvent kvm_wfx_arm64 = 401;
+    TrapRegFtraceEvent trap_reg = 402;
+    VgicUpdateIrqPendingFtraceEvent vgic_update_irq_pending = 403;
+    WakeupSourceActivateFtraceEvent wakeup_source_activate = 404;
+    WakeupSourceDeactivateFtraceEvent wakeup_source_deactivate = 405;
+    UfshcdCommandFtraceEvent ufshcd_command = 406;
+    UfshcdClkGatingFtraceEvent ufshcd_clk_gating = 407;
+    ConsoleFtraceEvent console = 408;
+    DrmVblankEventFtraceEvent drm_vblank_event = 409;
+    DrmVblankEventDeliveredFtraceEvent drm_vblank_event_delivered = 410;
+    DrmSchedJobFtraceEvent drm_sched_job = 411;
+    DrmRunJobFtraceEvent drm_run_job = 412;
+    DrmSchedProcessJobFtraceEvent drm_sched_process_job = 413;
+    DmaFenceInitFtraceEvent dma_fence_init = 414;
+    DmaFenceEmitFtraceEvent dma_fence_emit = 415;
+    DmaFenceSignaledFtraceEvent dma_fence_signaled = 416;
+    DmaFenceWaitStartFtraceEvent dma_fence_wait_start = 417;
+    DmaFenceWaitEndFtraceEvent dma_fence_wait_end = 418;
+    F2fsIostatFtraceEvent f2fs_iostat = 419;
+    F2fsIostatLatencyFtraceEvent f2fs_iostat_latency = 420;
+    SchedCpuUtilCfsFtraceEvent sched_cpu_util_cfs = 421;
+    V4l2QbufFtraceEvent v4l2_qbuf = 422;
+    V4l2DqbufFtraceEvent v4l2_dqbuf = 423;
+    Vb2V4l2BufQueueFtraceEvent vb2_v4l2_buf_queue = 424;
+    Vb2V4l2BufDoneFtraceEvent vb2_v4l2_buf_done = 425;
+    Vb2V4l2QbufFtraceEvent vb2_v4l2_qbuf = 426;
+    Vb2V4l2DqbufFtraceEvent vb2_v4l2_dqbuf = 427;
+    DsiCmdFifoStatusFtraceEvent dsi_cmd_fifo_status = 428;
+    DsiRxFtraceEvent dsi_rx = 429;
+    DsiTxFtraceEvent dsi_tx = 430;
+    AndroidFsDatareadEndFtraceEvent android_fs_dataread_end = 431;
+    AndroidFsDatareadStartFtraceEvent android_fs_dataread_start = 432;
+    AndroidFsDatawriteEndFtraceEvent android_fs_datawrite_end = 433;
+    AndroidFsDatawriteStartFtraceEvent android_fs_datawrite_start = 434;
+    AndroidFsFsyncEndFtraceEvent android_fs_fsync_end = 435;
+    AndroidFsFsyncStartFtraceEvent android_fs_fsync_start = 436;
+    FuncgraphEntryFtraceEvent funcgraph_entry = 437;
+    FuncgraphExitFtraceEvent funcgraph_exit = 438;
+    VirtioVideoCmdFtraceEvent virtio_video_cmd = 439;
+    VirtioVideoCmdDoneFtraceEvent virtio_video_cmd_done = 440;
+    VirtioVideoResourceQueueFtraceEvent virtio_video_resource_queue = 441;
+    VirtioVideoResourceQueueDoneFtraceEvent virtio_video_resource_queue_done =
+        442;
+    MmShrinkSlabStartFtraceEvent mm_shrink_slab_start = 443;
+    MmShrinkSlabEndFtraceEvent mm_shrink_slab_end = 444;
+    TrustySmcFtraceEvent trusty_smc = 445;
+    TrustySmcDoneFtraceEvent trusty_smc_done = 446;
+    TrustyStdCall32FtraceEvent trusty_std_call32 = 447;
+    TrustyStdCall32DoneFtraceEvent trusty_std_call32_done = 448;
+    TrustyShareMemoryFtraceEvent trusty_share_memory = 449;
+    TrustyShareMemoryDoneFtraceEvent trusty_share_memory_done = 450;
+    TrustyReclaimMemoryFtraceEvent trusty_reclaim_memory = 451;
+    TrustyReclaimMemoryDoneFtraceEvent trusty_reclaim_memory_done = 452;
+    TrustyIrqFtraceEvent trusty_irq = 453;
+    TrustyIpcHandleEventFtraceEvent trusty_ipc_handle_event = 454;
+    TrustyIpcConnectFtraceEvent trusty_ipc_connect = 455;
+    TrustyIpcConnectEndFtraceEvent trusty_ipc_connect_end = 456;
+    TrustyIpcWriteFtraceEvent trusty_ipc_write = 457;
+    TrustyIpcPollFtraceEvent trusty_ipc_poll = 458;
+    // removed field with id 459;
+    TrustyIpcReadFtraceEvent trusty_ipc_read = 460;
+    TrustyIpcReadEndFtraceEvent trusty_ipc_read_end = 461;
+    TrustyIpcRxFtraceEvent trusty_ipc_rx = 462;
+    // removed field with id 463;
+    TrustyEnqueueNopFtraceEvent trusty_enqueue_nop = 464;
+    CmaAllocStartFtraceEvent cma_alloc_start = 465;
+    CmaAllocInfoFtraceEvent cma_alloc_info = 466;
+    LwisTracingMarkWriteFtraceEvent lwis_tracing_mark_write = 467;
+    VirtioGpuCmdQueueFtraceEvent virtio_gpu_cmd_queue = 468;
+    VirtioGpuCmdResponseFtraceEvent virtio_gpu_cmd_response = 469;
+    MaliMaliKCPUCQSSETFtraceEvent mali_mali_KCPU_CQS_SET = 470;
+    MaliMaliKCPUCQSWAITSTARTFtraceEvent mali_mali_KCPU_CQS_WAIT_START = 471;
+    MaliMaliKCPUCQSWAITENDFtraceEvent mali_mali_KCPU_CQS_WAIT_END = 472;
+    MaliMaliKCPUFENCESIGNALFtraceEvent mali_mali_KCPU_FENCE_SIGNAL = 473;
+    MaliMaliKCPUFENCEWAITSTARTFtraceEvent mali_mali_KCPU_FENCE_WAIT_START = 474;
+    MaliMaliKCPUFENCEWAITENDFtraceEvent mali_mali_KCPU_FENCE_WAIT_END = 475;
+    HypEnterFtraceEvent hyp_enter = 476;
+    HypExitFtraceEvent hyp_exit = 477;
+    HostHcallFtraceEvent host_hcall = 478;
+    HostSmcFtraceEvent host_smc = 479;
+    HostMemAbortFtraceEvent host_mem_abort = 480;
+    SuspendResumeMinimalFtraceEvent suspend_resume_minimal = 481;
+    MaliMaliCSFINTERRUPTSTARTFtraceEvent mali_mali_CSF_INTERRUPT_START = 482;
+    MaliMaliCSFINTERRUPTENDFtraceEvent mali_mali_CSF_INTERRUPT_END = 483;
+    SamsungTracingMarkWriteFtraceEvent samsung_tracing_mark_write = 484;
+    BinderCommandFtraceEvent binder_command = 485;
+    BinderReturnFtraceEvent binder_return = 486;
+    SchedSwitchWithCtrsFtraceEvent sched_switch_with_ctrs = 487;
+    GpuWorkPeriodFtraceEvent gpu_work_period = 488;
+    RpmStatusFtraceEvent rpm_status = 489;
+    PanelWriteGenericFtraceEvent panel_write_generic = 490;
+    SchedMigrateTaskFtraceEvent sched_migrate_task = 491;
+    DpuDsiCmdFifoStatusFtraceEvent dpu_dsi_cmd_fifo_status = 492;
+    DpuDsiRxFtraceEvent dpu_dsi_rx = 493;
+    DpuDsiTxFtraceEvent dpu_dsi_tx = 494;
+    F2fsBackgroundGcFtraceEvent f2fs_background_gc = 495;
+    F2fsGcBeginFtraceEvent f2fs_gc_begin = 496;
+    F2fsGcEndFtraceEvent f2fs_gc_end = 497;
+    FastrpcDmaFreeFtraceEvent fastrpc_dma_free = 498;
+    FastrpcDmaAllocFtraceEvent fastrpc_dma_alloc = 499;
+    FastrpcDmaUnmapFtraceEvent fastrpc_dma_unmap = 500;
+    FastrpcDmaMapFtraceEvent fastrpc_dma_map = 501;
+  }
+}
+
+// End of protos/perfetto/trace/ftrace/ftrace_event.proto
+
+// Begin of protos/perfetto/trace/ftrace/ftrace_stats.proto
+
+// Per-CPU kernel buffer stats for the ftrace data source gathered from
+// /sys/kernel/tracing/per_cpu/cpuX/stats.
+message FtraceCpuStats {
+  // CPU index.
+  optional uint64 cpu = 1;
+
+  // Number of entries currently in the kernel buffer.
+  optional uint64 entries = 2;
+
+  // Number of events lost in kernel buffers due to overwriting of old events
+  // before userspace had a chance to drain them. Valid if the buffer is in
+  // "overwrite" mode, otherwise see |dropped_events|.
+  optional uint64 overrun = 3;
+
+  // This should always be zero. If not the buffer size is way too small or
+  // something went wrong with the tracer. Quoting the kernel: "number of
+  // commits failing due to the buffer wrapping around while there are
+  // uncommitted events, such as during an interrupt storm".
+  optional uint64 commit_overrun = 4;
+
+  // Size of entries currently in the kernel buffer (see |entries|) in bytes.
+  // The field should be named "bytes", but is misnamed for historical reasons.
+  // This value has known inaccuracies before Linux v6.6:
+  // https://github.com/torvalds/linux/commit/45d99ea
+  optional uint64 bytes_read = 5;
+
+  // The timestamp for the oldest event still in the ring buffer.
+  // Unit: seconds for typical trace clocks (i.e. not tsc/counter).
+  optional double oldest_event_ts = 6;
+
+  // The current timestamp.
+  // Unit: seconds for typical trace clocks (i.e. not tsc/counter).
+  optional double now_ts = 7;
+
+  // If the kernel buffer has overwrite mode disabled, this will show the number
+  // of new events that were lost because the buffer was full. This is similar
+  // to |overrun| but only for the overwrite=false case.
+  optional uint64 dropped_events = 8;
+
+  // The number of events read (consumed) from the buffer by userspace.
+  optional uint64 read_events = 9;
+}
+
+// Errors and kernel buffer stats for the ftrace data source.
+message FtraceStats {
+  enum Phase {
+    UNSPECIFIED = 0;
+    START_OF_TRACE = 1;
+    END_OF_TRACE = 2;
+  }
+
+  // A pair of FtraceStats is written on every trace flush:
+  // * START_OF_TRACE - stats recorded at the beginning of the trace.
+  // * END_OF_TRACE - stats recorded during the flush. In other words shortly
+  //                  before this packet was written. For simple traces this
+  //                  will be once at the end of the trace.
+  optional Phase phase = 1;
+
+  // Per-CPU stats (one entry for each CPU).
+  repeated FtraceCpuStats cpu_stats = 2;
+
+  // When FtraceConfig.symbolize_ksyms = true, this records the number of
+  // symbols parsed from /proc/kallsyms, whether they have been seen in the
+  // trace or not. It can be used to debug kptr_restrict or security-related
+  // errors.
+  // Note: this will be valid only when phase = END_OF_TRACE. The symbolizer is
+  // initialized. When START_OF_TRACE is emitted it is not ready yet.
+  optional uint32 kernel_symbols_parsed = 3;
+
+  // The memory used by the kernel symbolizer (KernelSymbolMap.size_bytes()).
+  optional uint32 kernel_symbols_mem_kb = 4;
+
+  // Atrace errors (even non-fatal ones) are reported here. A typical example is
+  // one or more atrace categories not available on the device.
+  optional string atrace_errors = 5;
+
+  // Ftrace events requested by the config but not present on device.
+  repeated string unknown_ftrace_events = 6;
+
+  // Ftrace events requested by the config and present on device, but which we
+  // failed to enable due to permissions, or due to a conflicting option
+  // (currently FtraceConfig.disable_generic_events).
+  repeated string failed_ftrace_events = 7;
+
+  // The data source was configured to preserve existing events in the ftrace
+  // buffer before the start of the trace.
+  optional bool preserve_ftrace_buffer = 8;
+
+  // Unique errors encountered during reading and parsing of the raw ftrace
+  // data. Ring buffer ABI related errors will also be recorded in the
+  // affected FtraceEventBundles with a timestamp.
+  // Any traces with entries in this field should be investigated, as they
+  // indicate a bug in perfetto or the kernel.
+  repeated FtraceParseStatus ftrace_parse_errors = 9;
+}
+
+enum FtraceParseStatus {
+  FTRACE_STATUS_UNSPECIFIED = 0;
+  // Not written, used for convenience of implementation:
+  FTRACE_STATUS_OK = 1;
+  // Issues with reading data out of the ftrace ring buffer:
+  FTRACE_STATUS_UNEXPECTED_READ_ERROR = 2;
+  FTRACE_STATUS_PARTIAL_PAGE_READ = 3;
+  // Ring buffer binary data not matching our understanding of the layout:
+  FTRACE_STATUS_ABI_INVALID_PAGE_HEADER = 4;
+  FTRACE_STATUS_ABI_SHORT_EVENT_HEADER = 5;
+  FTRACE_STATUS_ABI_NULL_PADDING = 6;
+  FTRACE_STATUS_ABI_SHORT_PADDING_LENGTH = 7;
+  FTRACE_STATUS_ABI_INVALID_PADDING_LENGTH = 8;
+  FTRACE_STATUS_ABI_SHORT_TIME_EXTEND = 9;
+  FTRACE_STATUS_ABI_SHORT_TIME_STAMP = 10;
+  FTRACE_STATUS_ABI_SHORT_DATA_LENGTH = 11;
+  FTRACE_STATUS_ABI_ZERO_DATA_LENGTH = 12;
+  FTRACE_STATUS_ABI_INVALID_DATA_LENGTH = 13;
+  FTRACE_STATUS_ABI_SHORT_EVENT_ID = 14;
+  FTRACE_STATUS_ABI_END_OVERFLOW = 15;
+  // Issues with parsing the event payload:
+  FTRACE_STATUS_SHORT_COMPACT_EVENT = 16;
+  FTRACE_STATUS_INVALID_EVENT = 17;
+}
+
+// End of protos/perfetto/trace/ftrace/ftrace_stats.proto
+
+// Begin of protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
+
+// The result of tracing one or more ftrace data pages from a single per-cpu
+// kernel ring buffer. If collating multiple pages' worth of events, all of
+// them come from contiguous pages, with no kernel data loss in between.
+message FtraceEventBundle {
+  optional uint32 cpu = 1;
+  repeated FtraceEvent event = 2;
+
+  // Set to true if there was data loss between the last time we've read from
+  // the corresponding per-cpu kernel buffer, and the earliest event recorded
+  // in this bundle.
+  optional bool lost_events = 3;
+
+  // Optionally-enabled compact encoding of a batch of scheduling events. Only
+  // a subset of events & their fields is recorded.
+  // All fields (except comms) are stored in a structure-of-arrays form, one
+  // entry in each repeated field per event.
+  message CompactSched {
+    // Interned table of unique strings for this bundle.
+    repeated string intern_table = 5;
+
+    // Delta-encoded timestamps across all sched_switch events within this
+    // bundle. The first is absolute, each next one is relative to its
+    // predecessor.
+    repeated uint64 switch_timestamp = 1 [packed = true];
+    repeated int64 switch_prev_state = 2 [packed = true];
+    repeated int32 switch_next_pid = 3 [packed = true];
+    repeated int32 switch_next_prio = 4 [packed = true];
+    // One per event, index into |intern_table| corresponding to the
+    // next_comm field of the event.
+    repeated uint32 switch_next_comm_index = 6 [packed = true];
+
+    // Delta-encoded timestamps across all sched_waking events within this
+    // bundle. The first is absolute, each next one is relative to its
+    // predecessor.
+    repeated uint64 waking_timestamp = 7 [packed = true];
+    repeated int32 waking_pid = 8 [packed = true];
+    repeated int32 waking_target_cpu = 9 [packed = true];
+    repeated int32 waking_prio = 10 [packed = true];
+    // One per event, index into |intern_table| corresponding to the
+    // comm field of the event.
+    repeated uint32 waking_comm_index = 11 [packed = true];
+    repeated uint32 waking_common_flags = 12 [packed = true];
+  }
+  optional CompactSched compact_sched = 4;
+
+  // traced_probes always sets the ftrace_clock to "boot". That is not available
+  // in older kernels (v3.x). In that case we fallback on "global" or "local".
+  // When we do that, we report the fallback clock in each bundle so we can do
+  // proper clock syncing at parsing time in TraceProcessor. We cannot use the
+  // TracePacket timestamp_clock_id because: (1) there is no per-packet
+  // timestamp for ftrace bundles; (2) "global" does not match CLOCK_MONOTONIC.
+  // Having a dedicated and explicit flag allows us to correct further misakes
+  // in future by looking at the kernel version.
+  // This field has been introduced in perfetto v19 / Android T (13).
+  // This field is omitted when the ftrace clock is just "boot", as that is the
+  // default assumption (and for consistency with the past).
+  optional FtraceClock ftrace_clock = 5;
+
+  // The timestamp according to the ftrace clock, taken at the same instant
+  // as |boot_timestamp|. This is used to sync ftrace events when a non-boot
+  // clock is used as the ftrace clock. We don't use the ClockSnapshot packet
+  // because the ftrace global/local clocks don't match any of the clock_gettime
+  // domains and can be only read by traced_probes.
+  //
+  // Only set when |ftrace_clock| != FTRACE_CLOCK_UNSPECIFIED.
+  //
+  // Implementation note: Populated by reading the 'now ts:' field in
+  // tracefs/per_cpu/cpuX/stat.
+  optional int64 ftrace_timestamp = 6;
+
+  // The timestamp according to CLOCK_BOOTTIME, taken at the same instant as
+  // |ftrace_timestamp|. See documentation of |ftrace_timestamp| for
+  // more info.
+  //
+  // Only set when |ftrace_clock| != FTRACE_CLOCK_UNSPECIFIED.
+  optional int64 boot_timestamp = 7;
+
+  // Errors encountered during parsing of the raw ftrace data. In case of ring
+  // buffer layout errors, the parser skips the rest of the offending kernel
+  // buffer page and continues from the next page.
+  // See also FtraceStats.ftrace_parse_errors, which collates all unique errors
+  // seen within the duration of the trace (even if the affected bundles get
+  // overwritten in ring buffer mode).
+  message FtraceError {
+    // Timestamp of the data that we're unable to parse, in the ftrace clock
+    // domain. Currently, we use the base timestamp of the tracing page
+    // containing the bad record rather than the time of the record itself.
+    optional uint64 timestamp = 1;
+    optional FtraceParseStatus status = 2;
+  }
+  repeated FtraceError error = 8;
+
+  // The timestamp (ftrace clock) of the last event consumed from this per-cpu
+  // kernel buffer prior to starting this bundle. In other words: the last
+  // event in the previous bundle.
+  // Lets the trace processing find an initial timestamp after which ftrace
+  // data is known to be valid across all cpus. Of particular importance when
+  // the perfetto trace buffer is a ring buffer as well, as the overwriting of
+  // oldest bundles can skew the first valid timestamp per cpu significantly.
+  // Added in: perfetto v44.
+  optional uint64 last_read_event_timestamp = 9;
+}
+
+enum FtraceClock {
+  // There is no FTRACE_CLOCK_BOOT entry as that's the default assumption. When
+  // the ftrace clock is "boot", it's just omitted (so UNSPECIFIED == BOOT).
+  FTRACE_CLOCK_UNSPECIFIED = 0;
+  FTRACE_CLOCK_UNKNOWN = 1;
+  FTRACE_CLOCK_GLOBAL = 2;
+  FTRACE_CLOCK_LOCAL = 3;
+  FTRACE_CLOCK_MONO_RAW = 4;
+}
+
+// End of protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
+
+// Begin of protos/perfetto/trace/gpu/gpu_counter_event.proto
+
+message GpuCounterEvent {
+  // The first trace packet of each session should include counter_spec.
+  // optional GpuCounterDescriptor counter_descriptor = 1;
+
+  message GpuCounter {
+    // required. Identifier for counter.
+    optional uint32 counter_id = 1;
+    // required. Value of the counter.
+    oneof value {
+      int64 int_value = 2;
+      double double_value = 3;
+    }
+  }
+  repeated GpuCounter counters = 2;
+
+  // optional. Identifier for GPU in a multi-gpu device.
+  optional int32 gpu_id = 3;
+}
+
+// End of protos/perfetto/trace/gpu/gpu_counter_event.proto
+
+// Begin of protos/perfetto/trace/gpu/gpu_log.proto
+
+// Message for logging events GPU data producer.
+message GpuLog {
+  enum Severity {
+    LOG_SEVERITY_UNSPECIFIED = 0;
+    LOG_SEVERITY_VERBOSE = 1;
+    LOG_SEVERITY_DEBUG = 2;
+    LOG_SEVERITY_INFO = 3;
+    LOG_SEVERITY_WARNING = 4;
+    LOG_SEVERITY_ERROR = 5;
+  };
+  optional Severity severity = 1;
+
+  optional string tag = 2;
+
+  optional string log_message = 3;
+}
+
+// End of protos/perfetto/trace/gpu/gpu_log.proto
+
+// Begin of protos/perfetto/trace/gpu/gpu_render_stage_event.proto
+
+// next id: 15
+message GpuRenderStageEvent {
+  // required. Unique ID for the event.
+  optional uint64 event_id = 1;
+
+  // optional. Duration of the event in nanoseconds. If unset, this is a
+  // single time point event.
+  optional uint64 duration = 2;
+
+  // required. ID to a hardware queue description in the specifications.
+  // InternedGpuRenderStageSpecification
+  optional uint64 hw_queue_iid = 13;
+
+  // required. ID to a render stage description in the specifications.
+  // InternedGpuRenderStageSpecification
+  optional uint64 stage_iid = 14;
+
+  // optional. Identifier for GPU in a multi-gpu device.
+  optional int32 gpu_id = 11;
+
+  // required. Graphics context for the event.
+  // For OpenGL, this is the GL context.
+  // For Vulkan, this is the VkDevice.
+  optional uint64 context = 5;
+
+  // optional. The render target for this event.
+  // For OpenGL, this is the GL frame buffer handle.
+  // For Vulkan, this is the VkFrameBuffer handle.
+  optional uint64 render_target_handle = 8;
+
+  // optional. Submission ID generated by the UMD.
+  // For OpenGL, the ID should map to an API submission (e.g., glFlush,
+  // glFinish, eglSwapBufffers) event.  The set of submissions to the HW due
+  // to a single API submission should share the same ID.
+  // For Vulkan, it should map 1:1 with a vkQueueSubmit.
+  optional uint32 submission_id = 10;
+
+  // optional. Additional data for the user. This may include attributes for
+  // the event like resource ids, shaders, etc.
+  message ExtraData {
+    optional string name = 1;
+    optional string value = 2;
+  }
+  repeated ExtraData extra_data = 6;
+
+  // VULKAN SPECIFICS
+
+  // optional. The Vulkan render pass handle.
+  optional uint64 render_pass_handle = 9;
+
+  // optional. A bit mask representing which render subpasses contributed to
+  // this render stage event.  Subpass index 0 is represented by setting the
+  // LSB of the mask.  Additional mask can be added for subpass index greater
+  // than 63.
+  repeated uint64 render_subpass_index_mask = 15;
+
+  // optional. The Vulkan command buffer handle.
+  optional uint64 command_buffer_handle = 12;
+
+  // DEPRECATED
+
+  // Deprecated.  Use InternedGpuRenderStageSpecification instead.
+  // The first trace packet of each session should include a Specifications
+  // to enumerate *all* IDs that will be used. The timestamp of this packet
+  // must be earlier than all other packets. Only one packet with Specifications
+  // is expected.
+  message Specifications {
+    message ContextSpec {
+      optional uint64 context = 1;
+      optional int32 pid = 2;
+    }
+    optional ContextSpec context_spec = 1;
+
+    message Description {
+      optional string name = 1;
+      optional string description = 2;
+    }
+
+    // Labels to categorize the hw Queue this event goes on.
+    repeated Description hw_queue = 2;
+
+    // Labels to categorize render stage(binning, render, compute etc).
+    repeated Description stage = 3;
+  }
+  // Deprecated.  Use hw_queue_iid and stage_iid to refer to
+  // InternedGpuRenderStageSpecification instead.
+  optional Specifications specifications = 7 [deprecated = true];
+
+  // Deprecated. Use hw_queue_iid instead;
+  optional int32 hw_queue_id = 3 [deprecated = true];
+
+  // Deprecated. Use stage_iid instead;
+  optional int32 stage_id = 4 [deprecated = true];
+
+  // Extension for vendor's custom proto.
+  extensions 100;
+}
+
+// Interned data.
+
+// The iid is the numeric value of either the GL Context or the VkDevice
+// handle.
+message InternedGraphicsContext {
+  optional uint64 iid = 1;
+  optional int32 pid = 2;
+  enum Api {
+    UNDEFINED = 0;
+    OPEN_GL = 1;
+    VULKAN = 2;
+    OPEN_CL = 3;
+  }
+  optional Api api = 3;
+}
+
+message InternedGpuRenderStageSpecification {
+  optional uint64 iid = 1;
+  optional string name = 2;
+  optional string description = 3;
+
+  enum RenderStageCategory {
+    OTHER = 0;
+    GRAPHICS = 1;
+    COMPUTE = 2;
+  }
+  optional RenderStageCategory category = 4;
+}
+
+// End of protos/perfetto/trace/gpu/gpu_render_stage_event.proto
+
+// Begin of protos/perfetto/trace/gpu/vulkan_api_event.proto
+
+// Message for recording the Vulkan call.
+message VulkanApiEvent {
+  oneof event {
+    VkDebugUtilsObjectName vk_debug_utils_object_name = 1;
+    VkQueueSubmit vk_queue_submit = 2;
+  }
+
+  // For recording vkSetDebugUtilsObjectNameEXT and
+  // vkDebugMarkerSetObjectNameEXT
+  message VkDebugUtilsObjectName {
+    optional uint32 pid = 1;
+    optional uint64 vk_device = 2;
+    // VkObjectType.  Value must match
+    // https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkObjectType.html.
+    optional int32 object_type = 3;
+    optional uint64 object = 4;
+    optional string object_name = 5;
+  }
+
+  // For recording vkQueueSubmit call.
+  message VkQueueSubmit {
+    optional uint64 duration_ns = 1;
+    optional uint32 pid = 2;
+    optional uint32 tid = 3;
+    optional uint64 vk_queue = 4;
+    repeated uint64 vk_command_buffers = 5;
+    // Submission ID.  An identifier unique to each vkQueueSubmit call.  This
+    // submission_id must match GpuRenderStageEvent.submission_id if the
+    // GpuRenderStageEvent is created due to this vkQueueSubmit.
+    optional uint32 submission_id = 6;
+  }
+}
+
+// End of protos/perfetto/trace/gpu/vulkan_api_event.proto
+
+// Begin of protos/perfetto/trace/gpu/vulkan_memory_event.proto
+
+// All the information that cannot be sent within a VulkanMemoryEvent message,
+// are sent as annotations to the main memory event. One example is the
+// properties of the object that consumes the allocated memory, for example, a
+// buffer or an image.
+// key_iid and string_iid are both interned strings. Original string value is
+// stored in vulkan_memory_keys from
+// protos/perfetto/trace/interned_data/interned_data.proto.
+message VulkanMemoryEventAnnotation {
+  optional uint64 key_iid = 1;
+  oneof value {
+    int64 int_value = 2;
+    double double_value = 3;
+    uint64 string_iid = 4;
+  }
+}
+
+// Each VulkanMemoryEvent encompasses information regarding one single function
+// call that results in reserving, binding or freeing host or GPU memory. There
+// is a special message type, ANNOTATIONS, which is used to communicate
+// information that are not directly related to a memory event, nonetheless are
+// essential to understand the memory usage. An example is the size and memory
+// types of the memory heaps.
+//
+// Next reserved id: 10 (up to 15).
+// Next id: 21.
+message VulkanMemoryEvent {
+  enum Source {
+    SOURCE_UNSPECIFIED = 0;
+    SOURCE_DRIVER = 1;
+    SOURCE_DEVICE = 2;
+    SOURCE_DEVICE_MEMORY = 3;
+    SOURCE_BUFFER = 4;
+    SOURCE_IMAGE = 5;
+  }
+
+  enum Operation {
+    OP_UNSPECIFIED = 0;
+
+    // alloc, create
+    OP_CREATE = 1;
+
+    // free, destroy(non-bound)
+    OP_DESTROY = 2;
+
+    // bind buffer and image
+    OP_BIND = 3;
+
+    // destroy (bound)
+    OP_DESTROY_BOUND = 4;
+
+    // only annotations
+    OP_ANNOTATIONS = 5;
+  }
+
+  enum AllocationScope {
+    SCOPE_UNSPECIFIED = 0;
+    SCOPE_COMMAND = 1;
+    SCOPE_OBJECT = 2;
+    SCOPE_CACHE = 3;
+    SCOPE_DEVICE = 4;
+    SCOPE_INSTANCE = 5;
+  }
+
+  optional Source source = 1;
+  optional Operation operation = 2;
+  optional int64 timestamp = 3;
+  optional uint32 pid = 4;
+  optional fixed64 memory_address = 5;
+  optional uint64 memory_size = 6;
+  // Interned string. Original string value is stored in function_names from
+  // protos/perfetto/trace/interned_data/interned_data.proto.
+  optional uint64 caller_iid = 7;
+  optional AllocationScope allocation_scope = 8;
+  // Extra related information, e.g., create configs, etc.
+  repeated VulkanMemoryEventAnnotation annotations = 9;
+
+  // Field IDs used for device memory (low sampling rate)
+  optional fixed64 device = 16;
+  optional fixed64 device_memory = 17;
+  optional uint32 memory_type = 18;
+  optional uint32 heap = 19;
+  optional fixed64 object_handle = 20;
+}
+
+// End of protos/perfetto/trace/gpu/vulkan_memory_event.proto
+
+// Begin of protos/perfetto/trace/profiling/profile_common.proto
+
+// TODO(fmayer): Figure out naming thoroughout this file to get a
+// nomenclature that works between Windows and Linux.
+
+// The interning fields in this file can refer to 2 different intern tables,
+// depending on the message they are used in. If the interned fields are present
+// in ProfilePacket proto, then the intern tables included in the ProfilePacket
+// should be used. If the intered fields are present in the
+// StreamingProfilePacket proto, then the intern tables included in all of the
+// previous InternedData message with same sequence ID should be used.
+// TODO(fmayer): Move to the intern tables to a common location.
+message InternedString {
+  optional uint64 iid = 1;
+  optional bytes str = 2;
+}
+
+// A symbol field that is emitted after the trace is written. These tables would
+// be appended as the last packets in the trace that the profiler will use, so
+// that the actual trace need not be rewritten to symbolize the profiles.
+message ProfiledFrameSymbols {
+  // Use the frame id as the interning key for the symbols.
+  optional uint64 frame_iid = 1;
+
+  // These are repeated because when inlining happens, multiple functions'
+  // frames can be at a single address. Imagine function Foo calling the
+  // std::vector<int> constructor, which gets inlined at 0xf00. We then get
+  // both Foo and the std::vector<int> constructor when we symbolize the
+  // address.
+
+  // key to InternedString
+  repeated uint64 function_name_id = 2;
+
+  // key to InternedString
+  repeated uint64 file_name_id = 3;
+
+  repeated uint32 line_number = 4;
+}
+
+message Line {
+  optional string function_name = 1;
+  optional string source_file_name = 2;
+  optional uint32 line_number = 3;
+}
+
+// Symbols for a given address in a module.
+message AddressSymbols {
+  optional uint64 address = 1;
+
+  // Source lines that correspond to this address.
+  //
+  // These are repeated because when inlining happens, multiple functions'
+  // frames can be at a single address. Imagine function Foo calling the
+  // std::vector<int> constructor, which gets inlined at 0xf00. We then get
+  // both Foo and the std::vector<int> constructor when we symbolize the
+  // address.
+  repeated Line lines = 2;
+}
+
+// Symbols for addresses seen in a module.
+message ModuleSymbols {
+  // Fully qualified path to the mapping.
+  // E.g. /system/lib64/libc.so.
+  optional string path = 1;
+
+  // .note.gnu.build-id on Linux (not hex encoded).
+  // uuid on MacOS.
+  // Module GUID on Windows.
+  optional string build_id = 2;
+  repeated AddressSymbols address_symbols = 3;
+}
+
+message Mapping {
+  // Interning key.
+  optional uint64 iid = 1;
+
+  // Interning key.
+  optional uint64 build_id = 2;
+
+  // The linker may create multiple memory mappings for the same shared
+  // library.
+  // This is so that the ELF header is mapped as read only, while the
+  // executable memory is mapped as executable only.
+  // The details of this depend on the linker, a possible mapping of an ELF
+  // file is this:
+  //         +----------------------+
+  // ELF     |xxxxxxxxxyyyyyyyyyyyyy|
+  //         +---------+------------+
+  //         |         |
+  //         | read    | executable
+  //         v mapping v mapping
+  //         +----------------------+
+  // Memory  |xxxxxxxxx|yyyyyyyyyyyy|
+  //         +------------------+---+
+  //         ^         ^        ^
+  //         +         +        +
+  //       start     exact    relpc
+  //       offset   offset    0x1800
+  //       0x0000   0x1000
+  //
+  // exact_offset is the offset into the library file of this mapping.
+  // start_offset is the offset into the library file of the first mapping
+  // for that library. For native libraries (.so files) this should be 0.
+
+  // This is not set on Android 10.
+  optional uint64 exact_offset = 8;
+
+  optional uint64 start_offset = 3;
+  optional uint64 start = 4;
+  optional uint64 end = 5;
+  optional uint64 load_bias = 6;
+
+  // E.g. ["system", "lib64", "libc.so"]
+  // id of string.
+  repeated uint64 path_string_ids = 7;
+}
+
+message Frame {
+  // Interning key
+  optional uint64 iid = 1;
+
+  // E.g. "fopen"
+  // id of string.
+  optional uint64 function_name_id = 2;
+
+  optional uint64 mapping_id = 3;
+  optional uint64 rel_pc = 4;
+}
+
+message Callstack {
+  optional uint64 iid = 1;
+  // Frames of this callstack. Bottom frame first.
+  repeated uint64 frame_ids = 2;
+}
+
+// End of protos/perfetto/trace/profiling/profile_common.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_histogram_sample.proto
+
+message HistogramName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+// An individual histogram sample logged via Chrome's UMA metrics system.
+message ChromeHistogramSample {
+  // MD5 hash of the metric name. Either |name_hash| or |name|/|name_iid| or
+  // both must be present.
+  optional uint64 name_hash = 1;
+  optional string name = 2;
+  optional int64 sample = 3;
+  // Interned HistogramName. Only one of |name|, |name_iid| can be set.
+  optional uint64 name_iid = 4;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_histogram_sample.proto
+
+// Begin of protos/perfetto/trace/track_event/debug_annotation.proto
+
+// Proto representation of untyped key/value annotations provided in TRACE_EVENT
+// macros. Users of the Perfetto SDK should prefer to use the
+// perfetto::TracedValue API to fill these protos, rather than filling them
+// manually.
+//
+// Debug annotations are intended for debug use and are not considered a stable
+// API of the trace contents. Trace-based metrics that use debug annotation
+// values are prone to breakage, so please rely on typed TrackEvent fields for
+// these instead.
+//
+// DebugAnnotations support nested arrays and dictionaries. Each entry is
+// encoded as a single DebugAnnotation message. Only dictionary entries
+// set the "name" field. The TrackEvent message forms an implicit root
+// dictionary.
+//
+// Example TrackEvent with nested annotations:
+//   track_event {
+//     debug_annotations {
+//       name: "foo"
+//       dict_entries {
+//         name: "a"
+//         bool_value: true
+//       }
+//       dict_entries {
+//         name: "b"
+//         int_value: 123
+//       }
+//     }
+//     debug_annotations {
+//       name: "bar"
+//       array_values {
+//         string_value: "hello"
+//       }
+//       array_values {
+//         string_value: "world"
+//       }
+//     }
+//   }
+//
+// Next ID: 18.
+// Reserved ID: 15
+message DebugAnnotation {
+  // Name fields are set only for dictionary entries.
+  oneof name_field {
+    // interned DebugAnnotationName.
+    uint64 name_iid = 1;
+    // non-interned variant.
+    string name = 10;
+  }
+
+  oneof value {
+    bool bool_value = 2;
+    uint64 uint_value = 3;
+    int64 int_value = 4;
+    double double_value = 5;
+    // Pointers are stored in a separate type as the JSON output treats them
+    // differently from other uint64 values.
+    uint64 pointer_value = 7;
+
+    // Deprecated. Use dict_entries / array_values instead.
+    NestedValue nested_value = 8;
+
+    // Legacy instrumentation may not support conversion of nested data to
+    // NestedValue yet.
+    string legacy_json_value = 9;
+
+    // interned and non-interned variants of strings.
+    string string_value = 6;
+    // Corresponds to |debug_annotation_string_values| field in InternedData.
+    uint64 string_value_iid = 17;
+  }
+
+  // Used to embed arbitrary proto messages (which are also typically used to
+  // represent typed TrackEvent arguments). |proto_type_name| or
+  // |proto_type_name_iid| are storing the full name of the proto messages (e.g.
+  // .perfetto.protos.DebugAnnotation) and |proto_value| contains the serialised
+  // proto messages. See |TracedValue::WriteProto| for more details.
+  oneof proto_type_descriptor {
+    string proto_type_name = 16;
+    // interned DebugAnnotationValueTypeName.
+    uint64 proto_type_name_iid = 13;
+  }
+  optional bytes proto_value = 14;
+
+  repeated DebugAnnotation dict_entries = 11;
+  repeated DebugAnnotation array_values = 12;
+
+  // Deprecated legacy way to use nested values. Only kept for
+  // backwards-compatibility in TraceProcessor. May be removed in the future -
+  // code filling protos should use |dict_entries| and |array_values| instead.
+  message NestedValue {
+    enum NestedType {
+      // leaf value.
+      UNSPECIFIED = 0;
+      DICT = 1;
+      ARRAY = 2;
+    }
+    optional NestedType nested_type = 1;
+
+    repeated string dict_keys = 2;
+    repeated NestedValue dict_values = 3;
+    repeated NestedValue array_values = 4;
+    optional int64 int_value = 5;
+    optional double double_value = 6;
+    optional bool bool_value = 7;
+    optional string string_value = 8;
+  }
+}
+
+// --------------------
+// Interned data types:
+// --------------------
+
+message DebugAnnotationName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+// See the |proto_type_descriptor| comment.
+message DebugAnnotationValueTypeName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+// End of protos/perfetto/trace/track_event/debug_annotation.proto
+
+// Begin of protos/perfetto/trace/track_event/log_message.proto
+
+message LogMessage {
+  // interned SourceLocation.
+  optional uint64 source_location_iid = 1;
+  // interned LogMessageBody.
+  optional uint64 body_iid = 2;
+  enum Priority {
+    PRIO_UNSPECIFIED = 0;
+    PRIO_UNUSED = 1;
+    PRIO_VERBOSE = 2;
+    PRIO_DEBUG = 3;
+    PRIO_INFO = 4;
+    PRIO_WARN = 5;
+    PRIO_ERROR = 6;
+    PRIO_FATAL = 7;
+  }
+  optional Priority prio = 3;
+}
+
+// --------------------
+// Interned data types:
+// --------------------
+
+message LogMessageBody {
+  optional uint64 iid = 1;
+  optional string body = 2;
+}
+
+// End of protos/perfetto/trace/track_event/log_message.proto
+
+// Begin of protos/perfetto/trace/track_event/source_location.proto
+
+// --------------------
+// Interned data types:
+// --------------------
+
+// A source location, represented as a native symbol.
+// This is similar to `message Frame` from
+// protos/perfetto/trace/profiling/profile_common.proto, but for abitrary
+// source code locations (for example in track event args), not stack frames.
+message UnsymbolizedSourceLocation {
+  optional uint64 iid = 1;
+  optional uint64 mapping_id = 2;
+  optional uint64 rel_pc = 3;
+}
+
+message SourceLocation {
+  optional uint64 iid = 1;
+  optional string file_name = 2;
+  optional string function_name = 3;
+  optional uint32 line_number = 4;
+}
+
+// End of protos/perfetto/trace/track_event/source_location.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_active_processes.proto
+
+// A list of processes connected to the tracing service.
+message ChromeActiveProcesses {
+  repeated int32 pid = 1;
+}
+// End of protos/perfetto/trace/track_event/chrome_active_processes.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_application_state_info.proto
+
+
+// Trace event arguments for application state changes.
+message ChromeApplicationStateInfo {
+  // Enum definition taken from:
+  // https://source.chromium.org/chromium/chromium/src/+/master:base/android/application_status_listener.h
+  enum ChromeApplicationState {
+    APPLICATION_STATE_UNKNOWN = 0;
+    APPLICATION_STATE_HAS_RUNNING_ACTIVITIES = 1;
+    APPLICATION_STATE_HAS_PAUSED_ACTIVITIES = 2;
+    APPLICATION_STATE_HAS_STOPPED_ACTIVITIES = 3;
+    APPLICATION_STATE_HAS_DESTROYED_ACTIVITIES = 4;
+  };
+  optional ChromeApplicationState application_state = 1;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_application_state_info.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto
+
+// Describes Chrome's Compositor scheduler's current state and associated
+// variables.
+//
+// These protos and enums were adapted from the corresponding original JSON
+// trace event for the scheduler state. In contrast to the JSON, we use strongly
+// typed enum values instead of strings for many fields, and
+// microsecond-granularity timestamps.
+//
+// The original format was generated in JSON by the code at
+// https://cs.chromium.org/chromium/src/cc/scheduler/scheduler.cc?l=870&rcl=5e15eabc9c0eec8daf94fdf78e93f13b6e3b63dd
+//
+// And is now generated as protozero:
+// https://cs.chromium.org/chromium/src/cc/scheduler/scheduler.cc?q=Scheduler::AsPro
+//
+// All non-delta-timestamps are absolute CLOCK_MONOTONIC timestamps.
+
+enum ChromeCompositorSchedulerAction {
+  CC_SCHEDULER_ACTION_UNSPECIFIED = 0;
+  CC_SCHEDULER_ACTION_NONE = 1;
+  CC_SCHEDULER_ACTION_SEND_BEGIN_MAIN_FRAME = 2;
+  CC_SCHEDULER_ACTION_COMMIT = 3;
+  CC_SCHEDULER_ACTION_ACTIVATE_SYNC_TREE = 4;
+  CC_SCHEDULER_ACTION_DRAW_IF_POSSIBLE = 5;
+  CC_SCHEDULER_ACTION_DRAW_FORCED = 6;
+  CC_SCHEDULER_ACTION_DRAW_ABORT = 7;
+  CC_SCHEDULER_ACTION_BEGIN_LAYER_TREE_FRAME_SINK_CREATION = 8;
+  CC_SCHEDULER_ACTION_PREPARE_TILES = 9;
+  CC_SCHEDULER_ACTION_INVALIDATE_LAYER_TREE_FRAME_SINK = 10;
+  CC_SCHEDULER_ACTION_PERFORM_IMPL_SIDE_INVALIDATION = 11;
+  CC_SCHEDULER_ACTION_NOTIFY_BEGIN_MAIN_FRAME_NOT_EXPECTED_UNTIL = 12;
+  CC_SCHEDULER_ACTION_NOTIFY_BEGIN_MAIN_FRAME_NOT_EXPECTED_SOON = 13;
+}
+
+// Next id: 18
+message ChromeCompositorSchedulerState {
+  enum BeginImplFrameDeadlineMode {
+    DEADLINE_MODE_UNSPECIFIED = 0;
+    DEADLINE_MODE_NONE = 1;
+    DEADLINE_MODE_IMMEDIATE = 2;
+    DEADLINE_MODE_REGULAR = 3;
+    DEADLINE_MODE_LATE = 4;
+    DEADLINE_MODE_BLOCKED = 5;
+  }
+  optional ChromeCompositorStateMachine state_machine = 1;
+  optional bool observing_begin_frame_source = 2;
+  optional bool begin_impl_frame_deadline_task = 3;
+  optional bool pending_begin_frame_task = 4;
+  optional bool skipped_last_frame_missed_exceeded_deadline = 5;
+  optional ChromeCompositorSchedulerAction inside_action = 7;
+  optional BeginImplFrameDeadlineMode deadline_mode = 8;
+  optional int64 deadline_us = 9;
+  optional int64 deadline_scheduled_at_us = 10;
+  optional int64 now_us = 11;
+  optional int64 now_to_deadline_delta_us = 12;
+  optional int64 now_to_deadline_scheduled_at_delta_us = 13;
+  optional BeginImplFrameArgs begin_impl_frame_args = 14;
+  optional BeginFrameObserverState begin_frame_observer_state = 15;
+  optional BeginFrameSourceState begin_frame_source_state = 16;
+  optional CompositorTimingHistory compositor_timing_history = 17;
+
+  reserved 6;
+}
+
+// Describes the current values stored in the Chrome Compositor state machine.
+// Next id: 3
+message ChromeCompositorStateMachine {
+  // Next id: 6
+  message MajorState {
+    enum BeginImplFrameState {
+      BEGIN_IMPL_FRAME_UNSPECIFIED = 0;
+      BEGIN_IMPL_FRAME_IDLE = 1;
+      BEGIN_IMPL_FRAME_INSIDE_BEGIN_FRAME = 2;
+      BEGIN_IMPL_FRAME_INSIDE_DEADLINE = 3;
+    }
+    enum BeginMainFrameState {
+      BEGIN_MAIN_FRAME_UNSPECIFIED = 0;
+      BEGIN_MAIN_FRAME_IDLE = 1;
+      BEGIN_MAIN_FRAME_SENT = 2;
+      BEGIN_MAIN_FRAME_READY_TO_COMMIT = 3;
+    }
+    enum LayerTreeFrameSinkState {
+      LAYER_TREE_FRAME_UNSPECIFIED = 0;
+      LAYER_TREE_FRAME_NONE = 1;
+      LAYER_TREE_FRAME_ACTIVE = 2;
+      LAYER_TREE_FRAME_CREATING = 3;
+      LAYER_TREE_FRAME_WAITING_FOR_FIRST_COMMIT = 4;
+      LAYER_TREE_FRAME_WAITING_FOR_FIRST_ACTIVATION = 5;
+    }
+    enum ForcedRedrawOnTimeoutState {
+      FORCED_REDRAW_UNSPECIFIED = 0;
+      FORCED_REDRAW_IDLE = 1;
+      FORCED_REDRAW_WAITING_FOR_COMMIT = 2;
+      FORCED_REDRAW_WAITING_FOR_ACTIVATION = 3;
+      FORCED_REDRAW_WAITING_FOR_DRAW = 4;
+    }
+    optional ChromeCompositorSchedulerAction next_action = 1;
+    optional BeginImplFrameState begin_impl_frame_state = 2;
+    optional BeginMainFrameState begin_main_frame_state = 3;
+    optional LayerTreeFrameSinkState layer_tree_frame_sink_state = 4;
+    optional ForcedRedrawOnTimeoutState forced_redraw_state = 5;
+  }
+  optional MajorState major_state = 1;
+
+  // Next id: 47
+  message MinorState {
+    enum TreePriority {
+      TREE_PRIORITY_UNSPECIFIED = 0;
+      TREE_PRIORITY_SAME_PRIORITY_FOR_BOTH_TREES = 1;
+      TREE_PRIORITY_SMOOTHNESS_TAKES_PRIORITY = 2;
+      TREE_PRIORITY_NEW_CONTENT_TAKES_PRIORITY = 3;
+    }
+    enum ScrollHandlerState {
+      SCROLL_HANDLER_UNSPECIFIED = 0;
+      SCROLL_AFFECTS_SCROLL_HANDLER = 1;
+      SCROLL_DOES_NOT_AFFECT_SCROLL_HANDLER = 2;
+    }
+    optional int32 commit_count = 1;
+    optional int32 current_frame_number = 2;
+    optional int32 last_frame_number_submit_performed = 3;
+    optional int32 last_frame_number_draw_performed = 4;
+    optional int32 last_frame_number_begin_main_frame_sent = 5;
+    optional bool did_draw = 6;
+    optional bool did_send_begin_main_frame_for_current_frame = 7;
+    optional bool did_notify_begin_main_frame_not_expected_until = 8;
+    optional bool did_notify_begin_main_frame_not_expected_soon = 9;
+    optional bool wants_begin_main_frame_not_expected = 10;
+    optional bool did_commit_during_frame = 11;
+    optional bool did_invalidate_layer_tree_frame_sink = 12;
+    optional bool did_perform_impl_side_invalidaion = 13;
+    optional bool did_prepare_tiles = 14;
+    optional int32 consecutive_checkerboard_animations = 15;
+    optional int32 pending_submit_frames = 16;
+    optional int32 submit_frames_with_current_layer_tree_frame_sink = 17;
+    optional bool needs_redraw = 18;
+    optional bool needs_prepare_tiles = 19;
+    optional bool needs_begin_main_frame = 20;
+    optional bool needs_one_begin_impl_frame = 21;
+    optional bool visible = 22;
+    optional bool begin_frame_source_paused = 23;
+    optional bool can_draw = 24;
+    optional bool resourceless_draw = 25;
+    optional bool has_pending_tree = 26;
+    optional bool pending_tree_is_ready_for_activation = 27;
+    optional bool active_tree_needs_first_draw = 28;
+    optional bool active_tree_is_ready_to_draw = 29;
+    optional bool did_create_and_initialize_first_layer_tree_frame_sink = 30;
+    optional TreePriority tree_priority = 31;
+    optional ScrollHandlerState scroll_handler_state = 32;
+    optional bool critical_begin_main_frame_to_activate_is_fast = 33;
+    optional bool main_thread_missed_last_deadline = 34;
+    optional bool video_needs_begin_frames = 36;
+    optional bool defer_begin_main_frame = 37;
+    optional bool last_commit_had_no_updates = 38;
+    optional bool did_draw_in_last_frame = 39;
+    optional bool did_submit_in_last_frame = 40;
+    optional bool needs_impl_side_invalidation = 41;
+    optional bool current_pending_tree_is_impl_side = 42;
+    optional bool previous_pending_tree_was_impl_side = 43;
+    optional bool processing_animation_worklets_for_active_tree = 44;
+    optional bool processing_animation_worklets_for_pending_tree = 45;
+    optional bool processing_paint_worklets_for_pending_tree = 46;
+
+    reserved 35;
+  }
+  optional MinorState minor_state = 2;
+}
+
+// Next id: 13
+message BeginFrameArgs {
+  // JSON format has a "type" field that was always just "BeginFrameArgs" we
+  // drop this in the proto representation, and instead make the JSON format
+  // "subtype" field become the type field.
+  enum BeginFrameArgsType {
+    BEGIN_FRAME_ARGS_TYPE_UNSPECIFIED = 0;
+    BEGIN_FRAME_ARGS_TYPE_INVALID = 1;
+    BEGIN_FRAME_ARGS_TYPE_NORMAL = 2;
+    BEGIN_FRAME_ARGS_TYPE_MISSED = 3;
+  }
+  optional BeginFrameArgsType type = 1;
+  optional uint64 source_id = 2;
+  optional uint64 sequence_number = 3;
+  optional int64 frame_time_us = 4;
+  optional int64 deadline_us = 5;
+  optional int64 interval_delta_us = 6;
+  optional bool on_critical_path = 7;
+  optional bool animate_only = 8;
+  oneof created_from {
+    // The interned SourceLocation.
+    uint64 source_location_iid = 9;
+    // The SourceLocation that this args was created from.
+    // TODO(nuskos): Eventually we will support interning inside of
+    // TypedArgument TraceEvents and then we shouldn't need this SourceLocation
+    // since we can emit it as part of the InternedData message. When we can
+    // remove this |source_location|.
+    SourceLocation source_location = 10;
+  }
+  optional int64 frames_throttled_since_last = 12;
+}
+
+// Next id: 7
+message BeginImplFrameArgs {
+  optional int64 updated_at_us = 1;
+  optional int64 finished_at_us = 2;
+  enum State {
+    BEGIN_FRAME_FINISHED = 0;
+    BEGIN_FRAME_USING = 1;
+  }
+  optional State state = 3;
+  oneof args {
+    // Only set if |state| is BEGIN_FRAME_FINISHED.
+    BeginFrameArgs current_args = 4;
+    // Only set if |state| is BEGIN_FRAME_USING.
+    BeginFrameArgs last_args = 5;
+  }
+  message TimestampsInUs {
+    optional int64 interval_delta = 1;
+    optional int64 now_to_deadline_delta = 2;
+    optional int64 frame_time_to_now_delta = 3;
+    optional int64 frame_time_to_deadline_delta = 4;
+    optional int64 now = 5;
+    optional int64 frame_time = 6;
+    optional int64 deadline = 7;
+  }
+  optional TimestampsInUs timestamps_in_us = 6;
+}
+
+message BeginFrameObserverState {
+  optional int64 dropped_begin_frame_args = 1;
+  optional BeginFrameArgs last_begin_frame_args = 2;
+}
+
+message BeginFrameSourceState {
+  optional uint32 source_id = 1;
+  optional bool paused = 2;
+  optional uint32 num_observers = 3;
+  optional BeginFrameArgs last_begin_frame_args = 4;
+}
+
+message CompositorTimingHistory {
+  optional int64 begin_main_frame_queue_critical_estimate_delta_us = 1;
+  optional int64 begin_main_frame_queue_not_critical_estimate_delta_us = 2;
+  optional int64 begin_main_frame_start_to_ready_to_commit_estimate_delta_us =
+      3;
+  optional int64 commit_to_ready_to_activate_estimate_delta_us = 4;
+  optional int64 prepare_tiles_estimate_delta_us = 5;
+  optional int64 activate_estimate_delta_us = 6;
+  optional int64 draw_estimate_delta_us = 7;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto
+
+// Details about ContentSettings trace events.
+message ChromeContentSettingsEventInfo {
+  // The number of user defined hostname patterns for content settings at
+  // browser start. Similar to UMA histogram
+  // 'ContentSettings.NumberOfExceptions'.
+  optional uint32 number_of_exceptions = 1;
+}
+// End of protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_frame_reporter.proto
+
+message ChromeFrameReporter {
+  enum State {
+    // The frame did not have any updates to present.
+    STATE_NO_UPDATE_DESIRED = 0;
+
+    // The frame presented all the desired updates (i.e. any updates requested
+    // from both the compositor thread and main-threads were handled).
+    STATE_PRESENTED_ALL = 1;
+
+    // The frame was presented with some updates, but also missed some updates
+    // (e.g. missed updates from the main-thread, but included updates from the
+    // compositor thread).
+    STATE_PRESENTED_PARTIAL = 2;
+
+    // The frame was dropped, i.e. some updates were desired for the frame, but
+    // was not presented.
+    STATE_DROPPED = 3;
+  };
+
+  optional State state = 1;
+
+  enum FrameDropReason {
+    REASON_UNSPECIFIED = 0;
+
+    // Frame was dropped by the display-compositor.
+    // The display-compositor may drop a frame some times (e.g. the frame missed
+    // the deadline, or was blocked on surface-sync, etc.)
+    REASON_DISPLAY_COMPOSITOR = 1;
+
+    // Frame was dropped because of the main-thread.
+    // The main-thread may cause a frame to be dropped, e.g. if the main-thread
+    // is running expensive javascript, or doing a lot of layout updates, etc.
+    REASON_MAIN_THREAD = 2;
+
+    // Frame was dropped by the client compositor.
+    // The client compositor can drop some frames too (e.g. attempting to
+    // recover latency, missing the deadline, etc.).
+    REASON_CLIENT_COMPOSITOR = 3;
+  };
+
+  // The reason is set only if |state| is not |STATE_UPDATED_ALL|.
+  optional FrameDropReason reason = 2;
+
+  optional uint64 frame_source = 3;
+  optional uint64 frame_sequence = 4;
+
+  // If this is a droped frame (i.e. if |state| is set to |STATE_DROPPED| or
+  // |STATE_PRESENTED_PARTIAL|), then indicates whether this frame impacts
+  // smoothness.
+  optional bool affects_smoothness = 5;
+
+  enum ScrollState {
+    SCROLL_NONE = 0;
+    SCROLL_MAIN_THREAD = 1;
+    SCROLL_COMPOSITOR_THREAD = 2;
+
+    // Used when it can't be determined whether a scroll is in progress or not.
+    SCROLL_UNKNOWN = 3;
+  }
+
+  // The type of active scroll.
+  optional ScrollState scroll_state = 6;
+
+  // If any main thread animation is active during this frame.
+  optional bool has_main_animation = 7;
+  // If any compositor thread animation is active during this frame.
+  optional bool has_compositor_animation = 8;
+  // If any touch-driven UX (not scroll) is active during this frame.
+  optional bool has_smooth_input_main = 9;
+
+  // Whether the frame contained any missing content (i.e. whether there was
+  // checkerboarding in the frame).
+  optional bool has_missing_content = 10;
+
+  // The id of layer_tree_host that the frame has been produced for.
+  optional uint64 layer_tree_host_id = 11;
+
+  // If total latency of PipelineReporter exceeds a certain limit.
+  optional bool has_high_latency = 12;
+
+  enum FrameType {
+    FORKED = 0;
+    BACKFILL = 1;
+  }
+
+  // Indicate if the frame is "FORKED" (i.e. a PipelineReporter event starts at
+  // the same frame sequence as another PipelineReporter) or "BACKFILL"
+  // (i.e. dropped frames when there are no partial compositor updates).
+  optional FrameType frame_type = 13;
+
+  // The breakdown stage of PipelineReporter that is most likely accountable for
+  // high latency.
+  repeated string high_latency_contribution_stage = 14;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_frame_reporter.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_keyed_service.proto
+
+// Details about one of Chrome's keyed services associated with the event.
+message ChromeKeyedService {
+  // Name of the service, e.g. "MediaRouter", "PreviewsService", etc. (in
+  // Chrome, these are static strings known at compile time).
+  optional string name = 1;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_keyed_service.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_latency_info.proto
+
+message ChromeLatencyInfo {
+  optional int64 trace_id = 1;
+
+  // NEXT ID: 12
+  // All step are optional but the enum is ordered (not by number) below in the
+  // order we expect them to appear if they are emitted in trace in a blocking
+  // fashion.
+  enum Step {
+    STEP_UNSPECIFIED = 0;
+    // Emitted on the browser main thread.
+    STEP_SEND_INPUT_EVENT_UI = 3;
+    // Happens on the renderer's compositor.
+    STEP_HANDLE_INPUT_EVENT_IMPL = 5;
+    STEP_DID_HANDLE_INPUT_AND_OVERSCROLL = 8;
+    // Occurs on the Renderer's main thread.
+    STEP_HANDLE_INPUT_EVENT_MAIN = 4;
+    STEP_MAIN_THREAD_SCROLL_UPDATE = 2;
+    STEP_HANDLE_INPUT_EVENT_MAIN_COMMIT = 1;
+    // Could be emitted on both the renderer's main OR compositor.
+    STEP_HANDLED_INPUT_EVENT_MAIN_OR_IMPL = 9;
+    // Optionally sometimes HANDLED_INPUT_EVENT_MAIN_OR_IMPL will proxy to the
+    // renderer's compositor and this will be emitted.
+    STEP_HANDLED_INPUT_EVENT_IMPL = 10;
+    // Renderer's compositor.
+    STEP_SWAP_BUFFERS = 6;
+    // Happens on the VizCompositor in the GPU process.
+    STEP_DRAW_AND_SWAP = 7;
+    // Happens on the GPU main thread after the swap has completed.
+    STEP_FINISHED_SWAP_BUFFERS = 11;
+    // See above for NEXT ID, enum steps are not ordered by tag number.
+  };
+
+  optional Step step = 2;
+  optional int32 frame_tree_node_id = 3;
+
+  // This enum is a copy of LatencyComponentType enum in Chrome, located in
+  // ui/latency/latency_info.h, modulo added UNKNOWN value per protobuf
+  // practices.
+  enum LatencyComponentType {
+    COMPONENT_UNSPECIFIED = 0;
+    COMPONENT_INPUT_EVENT_LATENCY_BEGIN_RWH = 1;
+    COMPONENT_INPUT_EVENT_LATENCY_SCROLL_UPDATE_ORIGINAL = 2;
+    COMPONENT_INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL = 3;
+    COMPONENT_INPUT_EVENT_LATENCY_ORIGINAL = 4;
+    COMPONENT_INPUT_EVENT_LATENCY_UI = 5;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERER_MAIN = 6;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_MAIN = 7;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_IMPL = 8;
+    COMPONENT_INPUT_EVENT_LATENCY_SCROLL_UPDATE_LAST_EVENT = 9;
+    COMPONENT_INPUT_EVENT_LATENCY_ACK_RWH = 10;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERER_SWAP = 11;
+    COMPONENT_DISPLAY_COMPOSITOR_RECEIVED_FRAME = 12;
+    COMPONENT_INPUT_EVENT_GPU_SWAP_BUFFER = 13;
+    COMPONENT_INPUT_EVENT_LATENCY_FRAME_SWAP = 14;
+  }
+
+  message ComponentInfo {
+    optional LatencyComponentType component_type = 1;
+
+    // Microsecond timestamp in CLOCK_MONOTONIC domain
+    optional uint64 time_us = 2;
+  };
+
+  repeated ComponentInfo component_info = 4;
+  optional bool is_coalesced = 5;
+  optional int64 gesture_scroll_id = 6;
+  optional int64 touch_id = 7;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_latency_info.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_legacy_ipc.proto
+
+// Details about a legacy Chrome IPC message that is either sent by the event.
+// TODO(eseckler): Also use this message on the receiving side?
+message ChromeLegacyIpc {
+  enum MessageClass {
+    CLASS_UNSPECIFIED = 0;
+    CLASS_AUTOMATION = 1;
+    CLASS_FRAME = 2;
+    CLASS_PAGE = 3;
+    CLASS_VIEW = 4;
+    CLASS_WIDGET = 5;
+    CLASS_INPUT = 6;
+    CLASS_TEST = 7;
+    CLASS_WORKER = 8;
+    CLASS_NACL = 9;
+    CLASS_GPU_CHANNEL = 10;
+    CLASS_MEDIA = 11;
+    CLASS_PPAPI = 12;
+    CLASS_CHROME = 13;
+    CLASS_DRAG = 14;
+    CLASS_PRINT = 15;
+    CLASS_EXTENSION = 16;
+    CLASS_TEXT_INPUT_CLIENT = 17;
+    CLASS_BLINK_TEST = 18;
+    CLASS_ACCESSIBILITY = 19;
+    CLASS_PRERENDER = 20;
+    CLASS_CHROMOTING = 21;
+    CLASS_BROWSER_PLUGIN = 22;
+    CLASS_ANDROID_WEB_VIEW = 23;
+    CLASS_NACL_HOST = 24;
+    CLASS_ENCRYPTED_MEDIA = 25;
+    CLASS_CAST = 26;
+    CLASS_GIN_JAVA_BRIDGE = 27;
+    CLASS_CHROME_UTILITY_PRINTING = 28;
+    CLASS_OZONE_GPU = 29;
+    CLASS_WEB_TEST = 30;
+    CLASS_NETWORK_HINTS = 31;
+    CLASS_EXTENSIONS_GUEST_VIEW = 32;
+    CLASS_GUEST_VIEW = 33;
+    CLASS_MEDIA_PLAYER_DELEGATE = 34;
+    CLASS_EXTENSION_WORKER = 35;
+    CLASS_SUBRESOURCE_FILTER = 36;
+    CLASS_UNFREEZABLE_FRAME = 37;
+  }
+
+  // Corresponds to the message class type defined in Chrome's IPCMessageStart
+  // enum, e.g. FrameMsgStart,
+  optional MessageClass message_class = 1;
+
+  // Line number of the message definition. See Chrome's IPC_MESSAGE_ID and
+  // IPC_MESSAGE_START macros.
+  optional uint32 message_line = 2;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_legacy_ipc.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_message_pump.proto
+
+// Details about Chrome message pump events
+message ChromeMessagePump {
+  // True if there are sent messages in the queue.
+  optional bool sent_messages_in_queue = 1;
+  // Interned SourceLocation of IO handler that MessagePumpForIO is about to
+  // invoke.
+  optional uint64 io_handler_location_iid = 2;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_message_pump.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_mojo_event_info.proto
+
+// Contains information to identify mojo handling events. The trace events in
+// mojo are common for all mojo interfaces and this information is used to
+// identify who is the caller or callee.
+message ChromeMojoEventInfo {
+  // Contains the interface name or the file name of the creator of a mojo
+  // handle watcher, recorded when an event if notified to the watcher. The code
+  // that runs within the track event belongs to the interface.
+  optional string watcher_notify_interface_tag = 1;
+
+  // The hash of the IPC message that is being handled.
+  optional uint32 ipc_hash = 2;
+
+  // A static string representing the mojo interface name of the message that is
+  // being handled.
+  optional string mojo_interface_tag = 3;
+
+  // Refers to an interned UnsymbolizedSourceLocation.
+  // The UnsymbolizedSourceLocation contains the interface method that's being
+  // handled, represented as a native symbol.
+  // The native symbol can be symbolized after the trace is recorded.
+  // Not using a symbolized source location for official Chromium builds to
+  // reduce binary size - emitting file/function names as strings into the
+  // trace requires storing them in the binary, which causes a significant
+  // binary size bloat for Chromium.
+  optional uint64 mojo_interface_method_iid = 4;
+
+  // Indicate whether this is a message or reply.
+  optional bool is_reply = 5;
+
+  // The payload size of the message being sent through mojo messages.
+  optional uint64 payload_size = 6;
+
+  // Represents the size of the message. Includes all headers and user payload.
+  optional uint64 data_num_bytes = 7;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_mojo_event_info.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto
+
+// Describes the state of the RendererScheduler for a given Renderer Process.
+
+// RAIL Mode is an indication of the kind of work that a Renderer is currently
+// performing which is in turn used to prioritise work accordingly.
+// A fuller description of these modes can be found https://web.dev/rail/
+enum ChromeRAILMode {
+  RAIL_MODE_NONE = 0;
+  RAIL_MODE_RESPONSE = 1;
+  RAIL_MODE_ANIMATION = 2;
+  RAIL_MODE_IDLE = 3;
+  RAIL_MODE_LOAD = 4;
+}
+
+message ChromeRendererSchedulerState {
+  optional ChromeRAILMode rail_mode = 1;
+
+  optional bool is_backgrounded = 2;
+  optional bool is_hidden = 3;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_user_event.proto
+
+// Details about a UI interaction initiated by the user, such as opening or
+// closing a tab or a context menu.
+message ChromeUserEvent {
+  // Name of the action, e.g. "NewTab", "ShowBookmarkManager", etc. (in
+  // Chrome, these are usually static strings known at compile time, or
+  // concatenations of multiple such static strings).
+  optional string action = 1;
+
+  // MD5 hash of the action string.
+  optional uint64 action_hash = 2;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_user_event.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto
+
+// Details about HWNDMessageHandler trace events.
+message ChromeWindowHandleEventInfo {
+  optional uint32 dpi = 1;
+  optional uint32 message_id = 2;
+  optional fixed64 hwnd_ptr = 3;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto
+
+// Begin of protos/perfetto/trace/track_event/pixel_modem.proto
+
+// Event insights emitted by the Pixel modem.
+message PixelModemEventInsight {
+  // Opaque string containing arguments from the modem.
+  optional string detokenized_message = 1;
+}
+
+// End of protos/perfetto/trace/track_event/pixel_modem.proto
+
+// Begin of protos/perfetto/trace/track_event/screenshot.proto
+
+message Screenshot {
+  optional bytes jpg_image = 1;
+}
+
+// End of protos/perfetto/trace/track_event/screenshot.proto
+
+// Begin of protos/perfetto/trace/track_event/task_execution.proto
+
+// TrackEvent arguments describing the execution of a task.
+message TaskExecution {
+  // Source location that the task was posted from.
+  // interned SourceLocation.
+  optional uint64 posted_from_iid = 1;
+}
+// End of protos/perfetto/trace/track_event/task_execution.proto
+
+// Begin of protos/perfetto/trace/track_event/track_event.proto
+
+// NOTE: Full TrackEvent support in the client lib and chrome is WIP, thus these
+// protos are still subject to change. Don't depend on them staying as they are.
+
+// Trace events emitted by client instrumentation library (TRACE_EVENT macros),
+// which describe activity on a track, such as a thread or asynchronous event
+// track. The track is specified using separate TrackDescriptor messages and
+// referred to via the track's UUID.
+//
+// A simple TrackEvent packet specifies a timestamp, category, name and type:
+// ```protobuf
+//   trace_packet {
+//     timestamp: 1000
+//     track_event {
+//       categories: ["my_cat"]
+//       name: "my_event"
+//       type: TYPE_INSTANT
+//      }
+//    }
+// ```
+//
+// To associate an event with a custom track (e.g. a thread), the track is
+// defined in a separate packet and referred to from the TrackEvent by its UUID:
+// ```protobuf
+//   trace_packet {
+//     track_descriptor {
+//       track_uuid: 1234
+//       name: "my_track"
+//
+//       // Optionally, associate the track with a thread.
+//       thread_descriptor {
+//         pid: 10
+//         tid: 10
+//         ..
+//       }
+//     }
+//   }
+// ```
+//
+// A pair of TYPE_SLICE_BEGIN and _END events form a slice on the track:
+//
+// ```protobuf
+//   trace_packet {
+//     timestamp: 1200
+//     track_event {
+//       track_uuid: 1234
+//       categories: ["my_cat"]
+//       name: "my_slice"
+//       type: TYPE_SLICE_BEGIN
+//     }
+//   }
+//   trace_packet {
+//     timestamp: 1400
+//     track_event {
+//       track_uuid: 1234
+//       type: TYPE_SLICE_END
+//     }
+//   }
+// ```
+// TrackEvents also support optimizations to reduce data repetition and encoded
+// data size, e.g. through data interning (names, categories, ...) and delta
+// encoding of timestamps/counters. For details, see the InternedData message.
+// Further, default values for attributes of events on the same sequence (e.g.
+// their default track association) can be emitted as part of a
+// TrackEventDefaults message.
+//
+// Next reserved id: 13 (up to 15). Next id: 52.
+message TrackEvent {
+  // Names of categories of the event. In the client library, categories are a
+  // way to turn groups of individual events on or off.
+  // interned EventCategoryName.
+  repeated uint64 category_iids = 3;
+  // non-interned variant.
+  repeated string categories = 22;
+
+  // Optional name of the event for its display in trace viewer. May be left
+  // unspecified for events with typed arguments.
+  //
+  // Note that metrics should not rely on event names, as they are prone to
+  // changing. Instead, they should use typed arguments to identify the events
+  // they are interested in.
+  oneof name_field {
+    // interned EventName.
+    uint64 name_iid = 10;
+    // non-interned variant.
+    string name = 23;
+  }
+
+  // TODO(eseckler): Support using binary symbols for category/event names.
+
+  // Type of the TrackEvent (required if |phase| in LegacyEvent is not set).
+  enum Type {
+    TYPE_UNSPECIFIED = 0;
+
+    // Slice events are events that have a begin and end timestamp, i.e. a
+    // duration. They can be nested similar to a callstack: If, on the same
+    // track, event B begins after event A, but before A ends, B is a child
+    // event of A and will be drawn as a nested event underneath A in the UI.
+    // Note that child events should always end before their parents (e.g. B
+    // before A).
+    //
+    // Each slice event is formed by a pair of BEGIN + END events. The END event
+    // does not need to repeat any TrackEvent fields it has in common with its
+    // corresponding BEGIN event. Arguments and debug annotations of the BEGIN +
+    // END pair will be merged during trace import.
+    //
+    // Note that we deliberately chose not to support COMPLETE events (which
+    // would specify a duration directly) since clients would need to delay
+    // writing them until the slice is completed, which can result in reordered
+    // events in the trace and loss of unfinished events at the end of a trace.
+    TYPE_SLICE_BEGIN = 1;
+    TYPE_SLICE_END = 2;
+
+    // Instant events are nestable events without duration. They can be children
+    // of slice events on the same track.
+    TYPE_INSTANT = 3;
+
+    // Event that provides a value for a counter track. |track_uuid| should
+    // refer to a counter track and |counter_value| set to the new value. Note
+    // that most other TrackEvent fields (e.g. categories, name, ..) are not
+    // supported for TYPE_COUNTER events. See also CounterDescriptor.
+    TYPE_COUNTER = 4;
+  }
+  optional Type type = 9;
+
+  // Identifies the track of the event. The default value may be overridden
+  // using TrackEventDefaults, e.g., to specify the track of the TraceWriter's
+  // sequence (in most cases sequence = one thread). If no value is specified
+  // here or in TrackEventDefaults, the TrackEvent will be associated with an
+  // implicit trace-global track (uuid 0). See TrackDescriptor::uuid.
+  optional uint64 track_uuid = 11;
+
+  // A new value for a counter track. |track_uuid| should refer to a track with
+  // a CounterDescriptor, and |type| should be TYPE_COUNTER. For a more
+  // efficient encoding of counter values that are sampled at the beginning/end
+  // of a slice, see |extra_counter_values| and |extra_counter_track_uuids|.
+  // Counter values can optionally be encoded in as delta values (positive or
+  // negative) on each packet sequence (see CounterIncrementalBase).
+  oneof counter_value_field {
+    int64 counter_value = 30;
+    double double_counter_value = 44;
+  }
+
+  // To encode counter values more efficiently, we support attaching additional
+  // counter values to a TrackEvent of any type. All values will share the same
+  // timestamp specified in the TracePacket. The value at
+  // extra_counter_values[N] is for the counter track referenced by
+  // extra_counter_track_uuids[N].
+  //
+  // |extra_counter_track_uuids| may also be set via TrackEventDefaults. There
+  // should always be equal or more uuids than values. It is valid to set more
+  // uuids (e.g. via defaults) than values. If uuids are specified in
+  // TrackEventDefaults and a TrackEvent, the TrackEvent uuids override the
+  // default uuid list.
+  //
+  // For example, this allows snapshotting the thread time clock at each
+  // thread-track BEGIN and END event to capture the cpu time delta of a slice.
+  repeated uint64 extra_counter_track_uuids = 31;
+  repeated int64 extra_counter_values = 12;
+
+  // Counter snapshots using floating point instead of integer values.
+  repeated uint64 extra_double_counter_track_uuids = 45;
+  repeated double extra_double_counter_values = 46;
+
+  // IDs of flows originating, passing through, or ending at this event.
+  // Flow IDs are global within a trace.
+  //
+  // A flow connects a sequence of TrackEvents within or across tracks, e.g.
+  // an input event may be handled on one thread but cause another event on
+  // a different thread - a flow between the two events can associate them.
+  //
+  // The direction of the flows between events is inferred from the events'
+  // timestamps. The earliest event with the same flow ID becomes the source
+  // of the flow. Any events thereafter are intermediate steps of the flow,
+  // until the flow terminates at the last event with the flow ID.
+  //
+  // Flows can also be explicitly terminated (see |terminating_flow_ids|), so
+  // that the same ID can later be reused for another flow.
+  // DEPRECATED. Only kept for backwards compatibility. Use |flow_ids|.
+  repeated uint64 flow_ids_old = 36 [deprecated = true];
+  // TODO(b/204341740): replace "flow_ids_old" with "flow_ids" to reduce memory
+  // consumption.
+  repeated fixed64 flow_ids = 47;
+
+  // List of flow ids which should terminate on this event, otherwise same as
+  // |flow_ids|.
+  // Any one flow ID should be either listed as part of |flow_ids| OR
+  // |terminating_flow_ids|, not both.
+  // DEPRECATED. Only kept for backwards compatibility.  Use
+  // |terminating_flow_ids|.
+  repeated uint64 terminating_flow_ids_old = 42 [deprecated = true];
+  // TODO(b/204341740): replace "terminating_flow_ids_old" with
+  // "terminating_flow_ids" to reduce memory consumption.
+  repeated fixed64 terminating_flow_ids = 48;
+
+  // ---------------------------------------------------------------------------
+  // TrackEvent arguments:
+  // ---------------------------------------------------------------------------
+
+  // Unstable key/value annotations shown in the trace viewer but not intended
+  // for metrics use.
+  repeated DebugAnnotation debug_annotations = 4;
+
+  // Typed event arguments:
+  optional TaskExecution task_execution = 5;
+  optional LogMessage log_message = 21;
+  optional ChromeCompositorSchedulerState cc_scheduler_state = 24;
+  optional ChromeUserEvent chrome_user_event = 25;
+  optional ChromeKeyedService chrome_keyed_service = 26;
+  optional ChromeLegacyIpc chrome_legacy_ipc = 27;
+  optional ChromeHistogramSample chrome_histogram_sample = 28;
+  optional ChromeLatencyInfo chrome_latency_info = 29;
+  optional ChromeFrameReporter chrome_frame_reporter = 32;
+  optional ChromeApplicationStateInfo chrome_application_state_info = 39;
+  optional ChromeRendererSchedulerState chrome_renderer_scheduler_state = 40;
+  optional ChromeWindowHandleEventInfo chrome_window_handle_event_info = 41;
+  optional ChromeContentSettingsEventInfo chrome_content_settings_event_info =
+      43;
+  optional ChromeActiveProcesses chrome_active_processes = 49;
+  optional Screenshot screenshot = 50;
+  optional PixelModemEventInsight pixel_modem_event_insight = 51;
+
+  // This field is used only if the source location represents the function that
+  // executes during this event.
+  oneof source_location_field {
+    // Non-interned field.
+    SourceLocation source_location = 33;
+    // Interned field.
+    uint64 source_location_iid = 34;
+  }
+
+  optional ChromeMessagePump chrome_message_pump = 35;
+  optional ChromeMojoEventInfo chrome_mojo_event_info = 38;
+
+  // New argument types go here :)
+
+  // Extension range for typed events defined externally.
+  // See docs/design-docs/extensions.md for more details.
+  //
+  // Extension support is work-in-progress, in the future the way to reserve a
+  // subrange for a particular project will be described here and in the design
+  // document linked above.
+  //
+  // Contact perfetto-dev@googlegroups.com if you are interested in a subrange
+  // for your project.
+
+  // Extension range reserved for chromium:
+  // https://source.chromium.org/chromium/chromium/src/+/main:base/tracing/protos/chrome_track_event.proto
+  extensions 1000 to 1999;
+  // Extension range reserved for https://b.corp.google.com/issues/301227627.
+  extensions 2000 to 2000;
+  // Extension range for future use.
+  extensions 2001 to 9899;
+  // Reserved for Perfetto unit and integration tests.
+  extensions 9900 to 10000;
+
+  // ---------------------------------------------------------------------------
+  // Deprecated / legacy event fields, which will be removed in the future:
+  // ---------------------------------------------------------------------------
+
+  // Deprecated. Use the |timestamp| and |timestamp_clock_id| fields in
+  // TracePacket instead.
+  //
+  // Timestamp in microseconds (usually CLOCK_MONOTONIC).
+  oneof timestamp {
+    // Delta timestamp value since the last TrackEvent or ThreadDescriptor. To
+    // calculate the absolute timestamp value, sum up all delta values of the
+    // preceding TrackEvents since the last ThreadDescriptor and add the sum to
+    // the |reference_timestamp| in ThreadDescriptor. This value should always
+    // be positive.
+    int64 timestamp_delta_us = 1;
+    // Absolute value (e.g. a manually specified timestamp in the macro).
+    // This is a one-off value that does not affect delta timestamp computation
+    // in subsequent TrackEvents.
+    int64 timestamp_absolute_us = 16;
+  }
+
+  // Deprecated. Use |extra_counter_values| and |extra_counter_track_uuids| to
+  // encode thread time instead.
+  //
+  // CPU time for the current thread (e.g., CLOCK_THREAD_CPUTIME_ID) in
+  // microseconds.
+  oneof thread_time {
+    // Delta timestamp value since the last TrackEvent or ThreadDescriptor. To
+    // calculate the absolute timestamp value, sum up all delta values of the
+    // preceding TrackEvents since the last ThreadDescriptor and add the sum to
+    // the |reference_timestamp| in ThreadDescriptor. This value should always
+    // be positive.
+    int64 thread_time_delta_us = 2;
+    // This is a one-off absolute value that does not affect delta timestamp
+    // computation in subsequent TrackEvents.
+    int64 thread_time_absolute_us = 17;
+  }
+
+  // Deprecated. Use |extra_counter_values| and |extra_counter_track_uuids| to
+  // encode thread instruction count instead.
+  //
+  // Value of the instruction counter for the current thread.
+  oneof thread_instruction_count {
+    // Same encoding as |thread_time| field above.
+    int64 thread_instruction_count_delta = 8;
+    int64 thread_instruction_count_absolute = 20;
+  }
+
+  // Apart from {category, time, thread time, tid, pid}, other legacy trace
+  // event attributes are initially simply proxied for conversion to a JSON
+  // trace. We intend to gradually transition these attributes to similar native
+  // features in TrackEvent (e.g. async + flow events), or deprecate them
+  // without replacement where transition is unsuitable.
+  //
+  // Next reserved id: 16 (up to 16).
+  // Next id: 20.
+  message LegacyEvent {
+    // Deprecated, use TrackEvent::name(_iid) instead.
+    // interned EventName.
+    optional uint64 name_iid = 1;
+    optional int32 phase = 2;
+    optional int64 duration_us = 3;
+    optional int64 thread_duration_us = 4;
+
+    // Elapsed retired instruction count during the event.
+    optional int64 thread_instruction_delta = 15;
+
+    // used to be |flags|.
+    reserved 5;
+
+    oneof id {
+      uint64 unscoped_id = 6;
+      uint64 local_id = 10;
+      uint64 global_id = 11;
+    }
+    // Additional optional scope for |id|.
+    optional string id_scope = 7;
+
+    // Consider the thread timestamps for async BEGIN/END event pairs as valid.
+    optional bool use_async_tts = 9;
+
+    // Idenfifies a flow. Flow events with the same bind_id are connected.
+    optional uint64 bind_id = 8;
+    // Use the enclosing slice as binding point for a flow end event instead of
+    // the next slice. Flow start/step events always bind to the enclosing
+    // slice.
+    optional bool bind_to_enclosing = 12;
+
+    enum FlowDirection {
+      FLOW_UNSPECIFIED = 0;
+      FLOW_IN = 1;
+      FLOW_OUT = 2;
+      FLOW_INOUT = 3;
+    }
+    optional FlowDirection flow_direction = 13;
+
+    enum InstantEventScope {
+      SCOPE_UNSPECIFIED = 0;
+      SCOPE_GLOBAL = 1;
+      SCOPE_PROCESS = 2;
+      SCOPE_THREAD = 3;
+    }
+    optional InstantEventScope instant_event_scope = 14;
+
+    // Override the pid/tid if the writer needs to emit events on behalf of
+    // another process/thread. This should be the exception. Normally, the
+    // pid+tid from ThreadDescriptor is used.
+    optional int32 pid_override = 18;
+    optional int32 tid_override = 19;
+  }
+
+  optional LegacyEvent legacy_event = 6;
+}
+
+// Default values for fields of all TrackEvents on the same packet sequence.
+// Should be emitted as part of TracePacketDefaults whenever incremental state
+// is cleared. It's defined here because field IDs should match those of the
+// corresponding fields in TrackEvent.
+message TrackEventDefaults {
+  optional uint64 track_uuid = 11;
+  repeated uint64 extra_counter_track_uuids = 31;
+  repeated uint64 extra_double_counter_track_uuids = 45;
+
+  // TODO(eseckler): Support default values for more TrackEvent fields.
+}
+
+// --------------------
+// Interned data types:
+// --------------------
+
+message EventCategory {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+message EventName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+// End of protos/perfetto/trace/track_event/track_event.proto
+
+// Begin of protos/perfetto/trace/interned_data/interned_data.proto
+
+// ------------------------------ DATA INTERNING: ------------------------------
+// Interning indexes are built up gradually by adding the entries contained in
+// each TracePacket of the same packet sequence (packets emitted by the same
+// producer and TraceWriter, see |trusted_packet_sequence_id|). Thus, packets
+// can only refer to interned data from other packets in the same sequence.
+//
+// The writer will emit new entries when it encounters new internable values
+// that aren't yet in the index. Data in current and subsequent TracePackets can
+// then refer to the entry by its position (interning ID, abbreviated "iid") in
+// its index. An interning ID with value 0 is considered invalid (not set).
+//
+// Because of the incremental build-up, the interning index will miss data when
+// TracePackets are lost, e.g. because a chunk was overridden in the central
+// ring buffer. To avoid invalidation of the whole trace in such a case, the
+// index is periodically reset (see SEQ_INCREMENTAL_STATE_CLEARED).
+// When packet loss occurs, the reader will only lose interning data up to the
+// next reset.
+// -----------------------------------------------------------------------------
+
+// Message that contains new entries for the interning indices of a packet
+// sequence.
+//
+// The writer will usually emit new entries in the same TracePacket that first
+// refers to them (since the last reset of interning state). They may also be
+// emitted proactively in advance of referring to them in later packets.
+//
+// Next reserved id: 8 (up to 15).
+// Next id: 36.
+message InternedData {
+  // TODO(eseckler): Replace iid fields inside interned messages with
+  // map<iid, message> type fields in InternedData.
+
+  // Each field's message type needs to specify an |iid| field, which is the ID
+  // of the entry in the field's interning index. Each field constructs its own
+  // index, thus interning IDs are scoped to the tracing session and field
+  // (usually as a counter for efficient var-int encoding), and optionally to
+  // the incremental state generation of the packet sequence.
+  repeated EventCategory event_categories = 1;
+  repeated EventName event_names = 2;
+  repeated DebugAnnotationName debug_annotation_names = 3;
+  repeated DebugAnnotationValueTypeName debug_annotation_value_type_names = 27;
+  repeated SourceLocation source_locations = 4;
+  repeated UnsymbolizedSourceLocation unsymbolized_source_locations = 28;
+  repeated LogMessageBody log_message_body = 20;
+  repeated HistogramName histogram_names = 25;
+
+  // Note: field IDs up to 15 should be used for frequent data only.
+
+  // Build IDs of exectuable files.
+  repeated InternedString build_ids = 16;
+  // Paths to executable files.
+  repeated InternedString mapping_paths = 17;
+  // Paths to source files.
+  repeated InternedString source_paths = 18;
+  // Names of functions used in frames below.
+  repeated InternedString function_names = 5;
+  // Symbols that were added to this trace after the fact.
+  repeated ProfiledFrameSymbols profiled_frame_symbols = 21;
+
+  // Executable files mapped into processes.
+  repeated Mapping mappings = 19;
+  // Frames of callstacks of a program.
+  repeated Frame frames = 6;
+  // A callstack of a program.
+  repeated Callstack callstacks = 7;
+
+  // Additional Vulkan information sent in a VulkanMemoryEvent message
+  repeated InternedString vulkan_memory_keys = 22;
+
+  // Graphics context of a render stage event.  This represent the GL
+  // context for an OpenGl app or the VkDevice for a Vulkan app.
+  repeated InternedGraphicsContext graphics_contexts = 23;
+
+  // Description of a GPU hardware queue or render stage.
+  repeated InternedGpuRenderStageSpecification gpu_specifications = 24;
+
+  // This is set when FtraceConfig.symbolize_ksyms = true.
+  // The id of each symbol the number that will be reported in ftrace events
+  // like sched_block_reason.caller and is obtained from a monotonic counter.
+  // The same symbol can have different indexes in different bundles.
+  // This is is NOT the real address. This is to avoid disclosing KASLR through
+  // traces.
+  repeated InternedString kernel_symbols = 26;
+
+  // Interned string values in the DebugAnnotation proto.
+  repeated InternedString debug_annotation_string_values = 29;
+
+  // Interned packet context for android.network_packets.
+  repeated NetworkPacketContext packet_context = 30;
+
+  // Interned name of a js function. We only intern js functions as there is a
+  // lot of duplication for them, but less so for other strings in the V8 data
+  // source.
+  repeated InternedV8String v8_js_function_name = 31;
+  // Js functions can be emitted multiple times for various compilation tiers,
+  // so it makes sense to deduplicate all this.
+  repeated InternedV8JsFunction v8_js_function = 32;
+  // Interned JS script (there is one associated with each JS function)
+  repeated InternedV8JsScript v8_js_script = 33;
+  // Interned Wasm script (there is one associated with each Wasm function)
+  repeated InternedV8WasmScript v8_wasm_script = 34;
+  // Every V8 event is associated with an isolate, intern the isolate to remove
+  // duplication.
+  repeated InternedV8Isolate v8_isolate = 35;
+
+  // Interned protolog strings args.
+  repeated InternedString protolog_string_args = 36;
+  // Interned protolog stacktraces.
+  repeated InternedString protolog_stacktrace = 37;
+}
+
+// End of protos/perfetto/trace/interned_data/interned_data.proto
+
+// Begin of protos/perfetto/trace/memory_graph.proto
+
+// Message definitions for app-reported memory breakdowns. At the moment, this
+// is a Chrome-only tracing feature, historically known as 'memory-infra'. See
+// https://chromium.googlesource.com/chromium/src/+/master/docs/memory-infra/ .
+// This is unrelated to the native or java heap profilers (those protos live
+// in //protos/perfetto/trace/profiling/).
+
+message MemoryTrackerSnapshot {
+  // Memory snapshot of a process. The snapshot contains memory data that is
+  // from 2 different sources, namely system stats and instrumentation stats.
+  // The system memory usage stats come from the OS based on standard API
+  // available in the platform to query memory usage. The instrumentation stats
+  // are added by instrumenting specific piece of code which tracks memory
+  // allocations and deallocations made by a small sub-system within the
+  // application.
+  // The system stats of the global memory snapshot are recorded as part of
+  // ProcessStats and SmapsPacket fields in trace packet with the same
+  // timestamp.
+  message ProcessSnapshot {
+    // Process ID of the process
+    optional int32 pid = 1;
+
+    // Memory dumps are represented as a graph of memory nodes which contain
+    // statistics. To avoid double counting the same memory across different
+    // nodes, edges are used to mark nodes that account for the same memory. See
+    // this doc for examples of the usage:
+    // https://docs.google.com/document/d/1WGQRJ1sjJrfVkNcgPVY6frm64UqPc94tsxUOXImZUZI
+
+    // A single node in the memory graph.
+    message MemoryNode {
+      // Unique ID of the node across all processes involved in the global
+      // memory dump. The ID is only unique within this particular global dump
+      // identified by GlobalMemoryDumpPacket.global_dump_id.
+      optional uint64 id = 1;
+
+      // Absolute name is a unique name for the memory node within the process
+      // with ProcessMemoryDump.pid. The name can contain multiple parts
+      // separated by '/', which traces the edges of the node from the root
+      // node.
+      // Eg: "partition_allocator/array_buffers/buffer1" refers to the child
+      // node "buffer1" in a graph structure of:
+      //   root -> partition_allocator -> array_buffers -> buffer1.
+      optional string absolute_name = 2;
+
+      // A weak node means that the instrumentation that added the current node
+      // is unsure about the existence of the actual memory. Unless a "strong"
+      // (non-weak is default) node that has an edge to the current node exists
+      // in the current global dump, the current node will be discarded.
+      optional bool weak = 3;
+
+      // Size of the node in bytes, used to compute the effective size of the
+      // nodes without double counting.
+      optional uint64 size_bytes = 4;
+
+      // Entries in the memory node that contain statistics and additional
+      // debuggable information about the memory. The size of the node is
+      // tracked separately in the |size_bytes| field.
+      message MemoryNodeEntry {
+        optional string name = 1;
+
+        enum Units {
+          UNSPECIFIED = 0;
+          BYTES = 1;
+          COUNT = 2;
+        }
+        optional Units units = 2;
+
+        // Contains either one of uint64 or string value.
+        optional uint64 value_uint64 = 3;
+        optional string value_string = 4;
+      }
+      repeated MemoryNodeEntry entries = 5;
+    }
+    repeated MemoryNode allocator_dumps = 2;
+
+    // A directed edge that connects any 2 nodes in the graph above. These are
+    // in addition to the inherent edges added due to the tree structure of the
+    // node's absolute names.
+    // Node with id |source_id| owns the node with id |target_id|, and has the
+    // effect of attributing the memory usage of target to source. |importance|
+    // is optional and relevant only for the cases of co-ownership, where it
+    // acts as a z-index: the owner with the highest importance will be
+    // attributed target's memory.
+    message MemoryEdge {
+      optional uint64 source_id = 1;
+      optional uint64 target_id = 2;
+      optional uint32 importance = 3;
+      optional bool overridable = 4;
+    }
+    repeated MemoryEdge memory_edges = 3;
+  }
+
+  // Unique ID that represents the global memory dump.
+  optional uint64 global_dump_id = 1;
+
+  enum LevelOfDetail {
+    DETAIL_FULL = 0;
+    DETAIL_LIGHT = 1;
+    DETAIL_BACKGROUND = 2;
+  }
+  optional LevelOfDetail level_of_detail = 2;
+
+  repeated ProcessSnapshot process_memory_dumps = 3;
+}
+
+// End of protos/perfetto/trace/memory_graph.proto
+
+// Begin of protos/perfetto/trace/perfetto/perfetto_metatrace.proto
+
+// Used to trace the execution of perfetto itself.
+message PerfettoMetatrace {
+  // See base/metatrace_events.h for definitions.
+  oneof record_type {
+    uint32 event_id = 1;
+    uint32 counter_id = 2;
+
+    // For trace processor metatracing.
+    string event_name = 8;
+    uint64 event_name_iid = 11;
+
+    string counter_name = 9;
+  }
+  message Arg {
+    oneof key_or_interned_key {
+      string key = 1;
+      uint64 key_iid = 3;
+    }
+    oneof value_or_interned_value {
+      string value = 2;
+      uint64 value_iid = 4;
+    }
+  }
+
+  // Only when using |event_id|.
+  optional uint64 event_duration_ns = 3;
+
+  // Only when using |counter_id|.
+  optional int32 counter_value = 4;
+
+  // ID of the thread that emitted the event.
+  optional uint32 thread_id = 5;
+
+  // If true the meta-tracing ring buffer had overruns and hence some data is
+  // missing from this point.
+  optional bool has_overruns = 6;
+
+  // Args for the event.
+  repeated Arg args = 7;
+
+  // Interned strings corresponding to the |event_name_iid|, |key_iid| and
+  // |value_iid| above.
+  message InternedString {
+    optional uint64 iid = 1;
+    optional string value = 2;
+  };
+  repeated InternedString interned_strings = 10;
+}
+
+// End of protos/perfetto/trace/perfetto/perfetto_metatrace.proto
+
+// Begin of protos/perfetto/trace/perfetto/tracing_service_event.proto
+
+// Events emitted by the tracing service.
+message TracingServiceEvent {
+  oneof event_type {
+    // When each of the following booleans are set to true, they report the
+    // point in time (through TracePacket's timestamp) where the condition
+    // they describe happened.
+    // The order of the booleans below matches the timestamp ordering
+    // they would generally be expected to have.
+
+    // Emitted when we start tracing and specifically, this will be before any
+    // producer is notified about the existence of this trace. This is always
+    // emitted before the all_data_sources_started event. This event is also
+    // guaranteed to be seen (byte-offset wise) before any data packets from
+    // producers.
+    bool tracing_started = 2;
+
+    // Emitted after all data sources saw the start event and ACKed it.
+    // This identifies the point in time when it's safe to assume that all data
+    // sources have been recording events.
+    bool all_data_sources_started = 1;
+
+    // Emitted when all data sources have been flushed successfully or with an
+    // error (including timeouts). This can generally happen many times over the
+    // course of the trace.
+    bool all_data_sources_flushed = 3;
+
+    // Emitted when reading back the central tracing buffers has been completed.
+    // If |write_into_file| is specified, this can happen many times over the
+    // course of the trace.
+    bool read_tracing_buffers_completed = 4;
+
+    // Emitted after tracing has been disabled and specifically, this will be
+    // after all packets from producers have been included in the central
+    // tracing buffer.
+    bool tracing_disabled = 5;
+
+    // Emitted if perfetto --save-for-bugreport was invoked while the current
+    // tracing session was running and it had the highest bugreport_score. In
+    // this case the original consumer will see a nearly empty trace, because
+    // the contents are routed onto the bugreport file. This event flags the
+    // situation explicitly. Traces that contain this marker should be discarded
+    // by test infrastructures / pipelines.
+    // Deprecated since Android U, where --save-for-bugreport uses
+    // non-destructive cloning.
+    bool seized_for_bugreport = 6;
+  }
+}
+
+// End of protos/perfetto/trace/perfetto/tracing_service_event.proto
+
+// Begin of protos/perfetto/common/android_energy_consumer_descriptor.proto
+
+// Energy consumer based on aidl class:
+// android.hardware.power.stats.EnergyConsumer.
+message AndroidEnergyConsumer {
+  // Unique ID of this energy consumer.  Matches the ID in a
+  // AndroidEnergyEstimationBreakdown.
+  optional int32 energy_consumer_id = 1;
+
+  // For a group of energy consumers of the same logical type, sorting by
+  // ordinal gives their physical order. Ordinals must be consecutive integers
+  // starting from 0.
+  optional int32 ordinal = 2;
+
+  // Type of this energy consumer.
+  optional string type = 3;
+
+  // Unique name of this energy consumer. Vendor/device specific. Opaque to
+  // framework.
+  optional string name = 4;
+}
+
+message AndroidEnergyConsumerDescriptor {
+  repeated AndroidEnergyConsumer energy_consumers = 1;
+}
+
+// End of protos/perfetto/common/android_energy_consumer_descriptor.proto
+
+// Begin of protos/perfetto/trace/power/android_energy_estimation_breakdown.proto
+
+// Energy data retrieve using the ODPM(On Device Power Monitor) API.
+// This proto represents the aidl class:
+// android.hardware.power.stats.EnergyConsumerResult.
+message AndroidEnergyEstimationBreakdown {
+  // The first trace packet of each session should include a energy consumer
+  // descriptor.
+  optional AndroidEnergyConsumerDescriptor energy_consumer_descriptor = 1;
+
+  // ID of the AndroidEnergyConsumer associated with this result.  Matches
+  // the energy_consumer_id in the AndroidEnergyConsumerDescriptor that
+  // should be sent at the beginning of a trace.
+  optional int32 energy_consumer_id = 2;
+
+  // Total accumulated energy since boot in microwatt-seconds (uWs)
+  optional int64 energy_uws = 3;
+
+  message EnergyUidBreakdown {
+    // Android ID/Linux UID, the accumulated energy is attributed to.
+    optional int32 uid = 1;
+
+    // Accumulated energy since boot in microwatt-seconds (uWs).
+    optional int64 energy_uws = 2;
+  }
+  // Optional attributed energy per Android ID / Linux UID for this
+  // EnergyConsumer. Sum total of attributed energy must be less than or equal
+  // to total accumulated energy.
+  repeated EnergyUidBreakdown per_uid_breakdown = 4;
+}
+
+// End of protos/perfetto/trace/power/android_energy_estimation_breakdown.proto
+
+// Begin of protos/perfetto/trace/power/android_entity_state_residency.proto
+
+message EntityStateResidency {
+  message PowerEntityState {
+    // Index corresponding to the entity
+    optional int32 entity_index = 1;
+
+    // Index corresponding to the state
+    optional int32 state_index = 2;
+
+    // Name of the entity. This is device-specific, determined by the PowerStats
+    // HAL, and cannot be configured by the user. An example would be
+    // "Bluetooth".
+    optional string entity_name = 3;
+
+    // Name of the state. This is device-specific, determined by the PowerStats
+    // HAL, and cannot be configured by the user. An example would be
+    // "Active".
+    optional string state_name = 4;
+  }
+
+  // This is only emitted at the beginning of the trace.
+  repeated PowerEntityState power_entity_state = 1;
+
+  message StateResidency {
+    // Index corresponding to PowerEntityState.entity_index
+    optional int32 entity_index = 1;
+
+    // Index corresponding to PowerEntityState.state_index
+    optional int32 state_index = 2;
+
+    // Time since boot that this entity has been in this state
+    optional uint64 total_time_in_state_ms = 3;
+
+    // Total number of times since boot that the entity has entered this state
+    optional uint64 total_state_entry_count = 4;
+
+    // Timestamp of the last time the entity entered this state
+    optional uint64 last_entry_timestamp_ms = 5;
+  }
+
+  repeated StateResidency residency = 2;
+}
+
+// End of protos/perfetto/trace/power/android_entity_state_residency.proto
+
+// Begin of protos/perfetto/trace/power/battery_counters.proto
+
+message BatteryCounters {
+  // Battery capacity in microampere-hours(µAh). Also known as Coulomb counter.
+  optional int64 charge_counter_uah = 1;
+
+  // Remaining battery capacity percentage of total capacity
+  optional float capacity_percent = 2;
+
+  // Instantaneous battery current in microamperes(µA).
+  // Negative values indicate current being drained from the battery and
+  // positive values indicate current feeding the battery from a charge source
+  // (USB).
+  //
+  // See https://perfetto.dev/docs/data-sources/battery-counters for more info.
+  optional int64 current_ua = 3;
+
+  // Instantaneous battery current in microamperes(µA).
+  optional int64 current_avg_ua = 4;
+
+  // Battery name, emitted only on multiple batteries.
+  optional string name = 5;
+
+  // Battery capacity in microwatt-hours(µWh).
+  optional int64 energy_counter_uwh = 6;
+
+  // Battery voltage in microvolts(µV).
+  optional int64 voltage_uv = 7;
+}
+
+// End of protos/perfetto/trace/power/battery_counters.proto
+
+// Begin of protos/perfetto/trace/power/power_rails.proto
+
+message PowerRails {
+
+  message RailDescriptor {
+    // Index corresponding to the rail
+    optional uint32 index = 1;
+
+    // Name of the rail
+    optional string rail_name = 2;
+
+    // Name of the subsystem to which this rail belongs
+    optional string subsys_name = 3;
+
+    // Hardware sampling rate (Hz).
+    optional uint32 sampling_rate = 4;
+  }
+
+  // This is only emitted at the beginning of the trace.
+  repeated RailDescriptor rail_descriptor = 1;
+
+  message EnergyData {
+    // Index corresponding to RailDescriptor.index
+    optional uint32 index = 1;
+
+    // Time since device boot(CLOCK_BOOTTIME) in milli-seconds.
+    optional uint64 timestamp_ms = 2;
+
+    // Accumulated energy since device boot in microwatt-seconds (uWs).
+    optional uint64 energy = 3;
+  }
+
+  repeated EnergyData energy_data = 2;
+}
+
+// End of protos/perfetto/trace/power/power_rails.proto
+
+// Begin of protos/perfetto/trace/profiling/deobfuscation.proto
+
+message ObfuscatedMember {
+  // This is the obfuscated field name relative to the class containing the
+  // ObfuscatedMember.
+  optional string obfuscated_name = 1;
+  // If this is fully qualified (i.e. contains a '.') this is the deobfuscated
+  // field name including its class. Otherwise, this is this the unqualified
+  // deobfuscated field name relative to the class containing this
+  // ObfuscatedMember.
+  optional string deobfuscated_name = 2;
+}
+
+message ObfuscatedClass {
+  optional string obfuscated_name = 1;
+  optional string deobfuscated_name = 2;
+  // fields.
+  repeated ObfuscatedMember obfuscated_members = 3;
+  repeated ObfuscatedMember obfuscated_methods = 4;
+}
+
+message DeobfuscationMapping {
+  optional string package_name = 1;
+  optional int64 version_code = 2;
+  repeated ObfuscatedClass obfuscated_classes = 3;
+}
+// End of protos/perfetto/trace/profiling/deobfuscation.proto
+
+// Begin of protos/perfetto/trace/profiling/heap_graph.proto
+
+message HeapGraphRoot {
+  enum Type {
+    ROOT_UNKNOWN = 0;
+    ROOT_JNI_GLOBAL = 1;
+    ROOT_JNI_LOCAL = 2;
+    ROOT_JAVA_FRAME = 3;
+    ROOT_NATIVE_STACK = 4;
+    ROOT_STICKY_CLASS = 5;
+    ROOT_THREAD_BLOCK = 6;
+    ROOT_MONITOR_USED = 7;
+    ROOT_THREAD_OBJECT = 8;
+    ROOT_INTERNED_STRING = 9;
+    ROOT_FINALIZING = 10;
+    ROOT_DEBUGGER = 11;
+    ROOT_REFERENCE_CLEANUP = 12;
+    ROOT_VM_INTERNAL = 13;
+    ROOT_JNI_MONITOR = 14;
+  };
+  // Objects retained by this root.
+  repeated uint64 object_ids = 1 [packed = true];
+
+  optional Type root_type = 2;
+}
+
+message HeapGraphType {
+  enum Kind {
+    KIND_UNKNOWN = 0;
+    KIND_NORMAL = 1;
+    KIND_NOREFERENCES = 2;
+    KIND_STRING = 3;
+    KIND_ARRAY = 4;
+    KIND_CLASS = 5;
+    KIND_CLASSLOADER = 6;
+    KIND_DEXCACHE = 7;
+    KIND_SOFT_REFERENCE = 8;
+    KIND_WEAK_REFERENCE = 9;
+    KIND_FINALIZER_REFERENCE = 10;
+    KIND_PHANTOM_REFERENCE = 11;
+  };
+  // TODO(fmayer): Consider removing this and using the index in the repeaed
+  // field to save space.
+  optional uint64 id = 1;
+  optional uint64 location_id = 2;
+  optional string class_name = 3;
+  // Size of objects of this type.
+  optional uint64 object_size = 4;
+  optional uint64 superclass_id = 5;
+  // Indices for InternedData.field_names for the names of the fields of
+  // instances of this class. This does NOT include the fields from
+  // superclasses. The consumer of this data needs to walk all super
+  // classes to get a full lists of fields. Objects always write the
+  // fields in order of most specific class to the furthest up superclass.
+  repeated uint64 reference_field_id = 6 [packed = true];
+  optional Kind kind = 7;
+  optional uint64 classloader_id = 8;
+}
+
+message HeapGraphObject {
+  oneof identifier {
+    uint64 id = 1;
+    uint64 id_delta = 7;
+  }
+
+  // Index for InternedData.types for the name of the type of this object.
+  optional uint64 type_id = 2;
+
+  // Bytes occupied by this objects.
+  optional uint64 self_size = 3;
+
+  // Add this to all non-zero values in reference_object_id. This is used to
+  // get more compact varint encoding.
+  //
+  // The name is confusing, but this has always been used as a base for
+  // reference_object_id. The field should be named reference_object_id_base.
+  optional uint64 reference_field_id_base = 6;
+
+  // Indices for InternedData.field_names for the name of the field referring
+  // to the object. For Android S+ and for instances of normal classes (e.g.
+  // not instances of java.lang.Class or arrays), this is instead set in the
+  // corresponding HeapGraphType, and this is left empty.
+  repeated uint64 reference_field_id = 4 [packed = true];
+
+  // Ids of the Object that is referred to.
+  repeated uint64 reference_object_id = 5 [packed = true];
+
+  // If this object is an instance of `libcore.util.NativeAllocationRegistry`,
+  // the value of the `size` field.
+  //
+  // N.B. This is not the native size of this object.
+  optional int64 native_allocation_registry_size_field = 8;
+}
+
+message HeapGraph {
+  optional int32 pid = 1;
+
+  // This contains all objects at the time this dump was taken. Some of these
+  // will be live, some of those unreachable (garbage). To find the live
+  // objects, the client needs to build the transitive closure of objects
+  // reachable from |roots|.
+  // All objects not contained within that transitive closure are garbage that
+  // has not yet been collected.
+  repeated HeapGraphObject objects = 2;
+
+  // Roots at the time this dump was taken.
+  // All live objects are reachable from the roots. All other objects are
+  // garbage.
+  repeated HeapGraphRoot roots = 7;
+
+  // Types used in HeapGraphObjects.
+  repeated HeapGraphType types = 9;
+
+  reserved 3;
+
+  // Field names for references in managed heap graph.
+  repeated InternedString field_names = 4;
+
+  // Paths of files used in managed heap graph.
+  repeated InternedString location_names = 8;
+
+  optional bool continued = 5;
+  optional uint64 index = 6;
+}
+
+// End of protos/perfetto/trace/profiling/heap_graph.proto
+
+// Begin of protos/perfetto/trace/profiling/profile_packet.proto
+
+// This file contains a mixture of messages emitted by various sampling
+// profilers:
+//
+// Memory allocator profiling
+// ----------------
+// ProfilePacket:
+//   The packet emitted by heapprofd, which started off as a native heap
+//   (malloc/free) profiler, but now supports custom allocators as well. Each
+//   packet contains a preaggregated state of the heap at snapshot time, which
+//   report the total allocated/free bytes per callstack (plus other info such
+//   as the number of samples).
+// StreamingAllocation/StreamingFree:
+//   Emitted by heapprofd when configured in streaming mode (i.e. when
+//   stream_allocations = true). This is only for local testing, and doesn't
+//   report callstacks (only address time and size of each alloc/free). It can
+//   lead to enormous traces, as it contains the stream of each alloc/free call.
+//
+// Callstack sampling
+// ------------------
+// StreamingProfilePacket:
+//   The packet emitted by the chromium in-process sampling profiler, which is
+//   based on periodically sending a signal to itself, and unwinding the stack
+//   in the signal handler. Each packet contains a series of individual stack
+//   samples for a Chromium thread.
+//
+// Callstack and performance counter sampling
+// ---------------------
+// PerfSample:
+//   The packet emitted by traced_perf sampling performance profiler based on
+//   the perf_event_open syscall. Each packet represents an individual sample
+//   of a performance counter (which might be a timer), and optionally a
+//   callstack of the process that was scheduled at the time of the sample.
+//
+
+// The packet emitted by heapprofd for each heap snapshot. A snapshot can
+// involve more than one ProfilePacket if the snapshot is big (when |continued|
+// is true). The cardinality and grouping is as follows:
+// A ProfilePacket contains:
+//  - 1+ per-process heap snapshots (ProcessHeapSamples). Normally there is only
+//    one heap per process (the main malloc/free heap), but there can be more if
+//    the process is using the heapprofd API to profile custom allocators.
+//  - Globally interned strings, mappings and frames (to allow de-duplicating
+//    frames/mapping in common between different processes).
+// A ProcessHeapSamples contains:
+//  - The process and heap identifier.
+//  - A number of HeapSample, one for each callsite that had some alloc/frees.
+//  - Statistics about heapprofd internals (e.g., sampling/unwinding timings).
+// A HeapSample contains statistics about callsites:
+//  - Total number of bytes allocated and freed from that callsite.
+//  - Total number of alloc/free calls sampled.
+//  - Stats at the local maximum when dump_at_max = true.
+// See https://perfetto.dev/docs/data-sources/native-heap-profiler for more.
+message ProfilePacket {
+  // The following interning tables are only used in Android version Q.
+  // In newer versions, these tables are in InternedData
+  // (see protos/perfetto/trace/interned_data) and are shared across
+  // multiple ProfilePackets.
+  // For backwards compatibility, consumers need to first look up interned
+  // data in the tables within the ProfilePacket, and then, if they are empty,
+  // look up in the InternedData instead.
+  repeated InternedString strings = 1;
+  repeated Mapping mappings = 4;
+  repeated Frame frames = 2;
+  repeated Callstack callstacks = 3;
+
+  // Next ID: 9
+  message HeapSample {
+    optional uint64 callstack_id = 1;
+    // bytes allocated at this callstack.
+    optional uint64 self_allocated = 2;
+    // bytes allocated at this callstack that have been freed.
+    optional uint64 self_freed = 3;
+    // deprecated self_idle.
+    reserved 7;
+    // Bytes allocated by this callstack but not freed at the time the malloc
+    // heap usage of this process was maximal. This is only set if dump_at_max
+    // is true in HeapprofdConfig. In that case, self_allocated, self_freed and
+    // self_idle will not be set.
+    optional uint64 self_max = 8;
+    // Number of allocations that were sampled at this callstack but not freed
+    // at the time the malloc heap usage of this process was maximal. This is
+    // only set if dump_at_max is true in HeapprofdConfig. In that case,
+    // self_allocated, self_freed and self_idle will not be set.
+    optional uint64 self_max_count = 9;
+    // timestamp [opt]
+    optional uint64 timestamp = 4;
+    // Number of allocations that were sampled at this callstack.
+    optional uint64 alloc_count = 5;
+    // Number of allocations that were sampled at this callstack that have been
+    // freed.
+    optional uint64 free_count = 6;
+  }
+
+  message Histogram {
+    message Bucket {
+      // This bucket counts values from the previous bucket's (or -infinity if
+      // this is the first bucket) upper_limit (inclusive) to this upper_limit
+      // (exclusive).
+      optional uint64 upper_limit = 1;
+      // This is the highest bucket. This is set instead of the upper_limit. Any
+      // values larger or equal to the previous bucket's upper_limit are counted
+      // in this bucket.
+      optional bool max_bucket = 2;
+      // Number of values that fall into this range.
+      optional uint64 count = 3;
+    }
+    repeated Bucket buckets = 1;
+  }
+
+  message ProcessStats {
+    optional uint64 unwinding_errors = 1;
+    optional uint64 heap_samples = 2;
+    optional uint64 map_reparses = 3;
+    optional Histogram unwinding_time_us = 4;
+    optional uint64 total_unwinding_time_us = 5;
+    optional uint64 client_spinlock_blocked_us = 6;
+  }
+
+  repeated ProcessHeapSamples process_dumps = 5;
+  message ProcessHeapSamples {
+    enum ClientError {
+      CLIENT_ERROR_NONE = 0;
+      CLIENT_ERROR_HIT_TIMEOUT = 1;
+      CLIENT_ERROR_INVALID_STACK_BOUNDS = 2;
+    }
+    optional uint64 pid = 1;
+
+    // This process was profiled from startup.
+    // If false, this process was already running when profiling started.
+    optional bool from_startup = 3;
+
+    // This process was not profiled because a concurrent session was active.
+    // If this is true, samples will be empty.
+    optional bool rejected_concurrent = 4;
+
+    // This process disconnected while it was profiled.
+    // If false, the process outlived the profiling session.
+    optional bool disconnected = 6;
+
+    // If disconnected, this disconnect was caused by the client overrunning
+    // the buffer.
+    // Equivalent to client_error == CLIENT_ERROR_HIT_TIMEOUT
+    // on new S builds.
+    optional bool buffer_overran = 7;
+
+    optional ClientError client_error = 14;
+
+    // If disconnected, this disconnected was caused by the shared memory
+    // buffer being corrupted. THIS IS ALWAYS A BUG IN HEAPPROFD OR CLIENT
+    // MEMORY CORRUPTION.
+    optional bool buffer_corrupted = 8;
+
+    // If disconnected, this disconnect was caused by heapprofd exceeding
+    // guardrails during this profiling session.
+    optional bool hit_guardrail = 10;
+
+    optional string heap_name = 11;
+    optional uint64 sampling_interval_bytes = 12;
+    optional uint64 orig_sampling_interval_bytes = 13;
+
+    // Timestamp of the state of the target process that this dump represents.
+    // This can be different to the timestamp of the TracePackets for various
+    // reasons:
+    // * If disconnected is set above, this is the timestamp of last state
+    //   heapprofd had of the process before it disconnected.
+    // * Otherwise, if the rate of events produced by the process is high,
+    //   heapprofd might be behind.
+    //
+    // TODO(fmayer): This is MONOTONIC_COARSE. Refactor ClockSnapshot::Clock
+    //               to have a type enum that we can reuse here.
+    optional uint64 timestamp = 9;
+
+    // Metadata about heapprofd.
+    optional ProcessStats stats = 5;
+
+    repeated HeapSample samples = 2;
+  }
+
+  // If this is true, the next ProfilePacket in this package_sequence_id is a
+  // continuation of this one.
+  // To get all samples for a process, accummulate its
+  // ProcessHeapSamples.samples until you see continued=false.
+  optional bool continued = 6;
+
+  // Index of this ProfilePacket on its package_sequence_id. Can be used
+  // to detect dropped data.
+  // Verify these are consecutive.
+  optional uint64 index = 7;
+}
+
+// Packet emitted by heapprofd when stream_allocations = true. Only for local
+// testing. Doesn't report the callsite.
+message StreamingAllocation {
+  // TODO(fmayer): Add callstack.
+  repeated uint64 address = 1;
+  repeated uint64 size = 2;
+  repeated uint64 sample_size = 3;
+  repeated uint64 clock_monotonic_coarse_timestamp = 4;
+  repeated uint32 heap_id = 5;
+  repeated uint64 sequence_number = 6;
+};
+
+// Packet emitted by heapprofd when stream_allocations = true. Only for local
+// testing. Doesn't report the callsite.
+message StreamingFree {
+  // TODO(fmayer): Add callstack.
+  repeated uint64 address = 1;
+  repeated uint32 heap_id = 2;
+  repeated uint64 sequence_number = 3;
+};
+
+// Packet emitted by the chromium in-process signal-based callstack sampler.
+// Represents a series of individual stack samples (sampled at discrete points
+// in time), rather than aggregated over an interval.
+message StreamingProfilePacket {
+  // Index into InternedData.callstacks
+  repeated uint64 callstack_iid = 1;
+  // TODO(eseckler): ThreadDescriptor-based timestamps are deprecated. Replace
+  // this with ClockSnapshot-based delta encoding instead.
+  repeated int64 timestamp_delta_us = 2;
+  optional int32 process_priority = 3;
+}
+
+// Namespace for the contained enums.
+message Profiling {
+  enum CpuMode {
+    MODE_UNKNOWN = 0;
+    MODE_KERNEL = 1;
+    MODE_USER = 2;
+    // The following values aren't expected, but included for completeness:
+    MODE_HYPERVISOR = 3;
+    MODE_GUEST_KERNEL = 4;
+    MODE_GUEST_USER = 5;
+  }
+
+  // Enumeration of libunwindstack's error codes.
+  // NB: the integral representations of the two enums are different.
+  enum StackUnwindError {
+    UNWIND_ERROR_UNKNOWN = 0;
+    UNWIND_ERROR_NONE = 1;
+    UNWIND_ERROR_MEMORY_INVALID = 2;
+    UNWIND_ERROR_UNWIND_INFO = 3;
+    UNWIND_ERROR_UNSUPPORTED = 4;
+    UNWIND_ERROR_INVALID_MAP = 5;
+    UNWIND_ERROR_MAX_FRAMES_EXCEEDED = 6;
+    UNWIND_ERROR_REPEATED_FRAME = 7;
+    UNWIND_ERROR_INVALID_ELF = 8;
+    UNWIND_ERROR_SYSTEM_CALL = 9;
+    UNWIND_ERROR_THREAD_TIMEOUT = 10;
+    UNWIND_ERROR_THREAD_DOES_NOT_EXIST = 11;
+    UNWIND_ERROR_BAD_ARCH = 12;
+    UNWIND_ERROR_MAPS_PARSE = 13;
+    UNWIND_ERROR_INVALID_PARAMETER = 14;
+    UNWIND_ERROR_PTRACE_CALL = 15;
+  }
+}
+
+// Packet emitted by the traced_perf sampling performance profiler, which
+// gathers data via the perf_event_open syscall. Each packet contains an
+// individual sample with a counter value, and optionally a
+// callstack.
+//
+// Timestamps are within the root packet. The config can specify the clock, or
+// the implementation will default to CLOCK_MONOTONIC_RAW. Within the Android R
+// timeframe, the default was CLOCK_BOOTTIME.
+//
+// There are several distinct views of this message:
+// * indication of kernel buffer data loss (kernel_records_lost set)
+// * indication of skipped samples (sample_skipped_reason set)
+// * notable event in the sampling implementation (producer_event set)
+// * normal sample (timebase_count set, typically also callstack_iid)
+message PerfSample {
+  optional uint32 cpu = 1;
+  optional uint32 pid = 2;
+  optional uint32 tid = 3;
+
+  // Execution state that the process was sampled at.
+  optional Profiling.CpuMode cpu_mode = 5;
+
+  // Value of the timebase counter (since the event was configured, no deltas).
+  optional uint64 timebase_count = 6;
+
+  // Unwound callstack. Might be partial, in which case a synthetic "error"
+  // frame is appended, and |unwind_error| is set accordingly.
+  optional uint64 callstack_iid = 4;
+
+  // If set, stack unwinding was incomplete due to an error.
+  // Unset values should be treated as UNWIND_ERROR_NONE.
+  oneof optional_unwind_error { Profiling.StackUnwindError unwind_error = 16; };
+
+  // If set, indicates that this message is not a sample, but rather an
+  // indication of data loss in the ring buffer allocated for |cpu|. Such data
+  // loss occurs when the kernel has insufficient ring buffer capacity to write
+  // a record (which gets discarded). A record in this context is an individual
+  // ring buffer entry, and counts more than just sample records.
+  //
+  // The |timestamp| of the packet corresponds to the time that the producer
+  // wrote the packet for trace-sorting purposes alone, and should not be
+  // interpreted relative to the sample timestamps. This field is sufficient to
+  // detect that *some* kernel data loss happened within the trace, but not the
+  // specific time bounds of that loss (which would require tracking precedessor
+  // & successor timestamps, which is not deemed necessary at the moment).
+  optional uint64 kernel_records_lost = 17;
+
+  // If set, indicates that the profiler encountered a sample that was relevant,
+  // but was skipped.
+  enum SampleSkipReason {
+    PROFILER_SKIP_UNKNOWN = 0;
+    PROFILER_SKIP_READ_STAGE = 1;
+    PROFILER_SKIP_UNWIND_STAGE = 2;
+    PROFILER_SKIP_UNWIND_ENQUEUE = 3;
+  }
+  oneof optional_sample_skipped_reason {
+    SampleSkipReason sample_skipped_reason = 18;
+  };
+
+  // A notable event within the sampling implementation.
+  message ProducerEvent {
+    enum DataSourceStopReason {
+      PROFILER_STOP_UNKNOWN = 0;
+      PROFILER_STOP_GUARDRAIL = 1;
+    }
+    oneof optional_source_stop_reason {
+      DataSourceStopReason source_stop_reason = 1;
+    }
+  }
+  optional ProducerEvent producer_event = 19;
+}
+
+// Submessage for TracePacketDefaults.
+message PerfSampleDefaults {
+  // The sampling timebase. Might not be identical to the data source config if
+  // the implementation decided to default/override some parameters.
+  optional PerfEvents.Timebase timebase = 1;
+
+  // If the config requested process sharding, report back the count and which
+  // of those bins was selected. Never changes for the duration of a trace.
+  optional uint32 process_shard_count = 2;
+  optional uint32 chosen_process_shard = 3;
+}
+
+// End of protos/perfetto/trace/profiling/profile_packet.proto
+
+// Begin of protos/perfetto/trace/profiling/smaps.proto
+
+message SmapsEntry {
+  optional string path = 1;
+  optional uint64 size_kb = 2;
+  optional uint64 private_dirty_kb = 3;
+  optional uint64 swap_kb = 4;
+
+  // for field upload (instead of path).
+  optional string file_name = 5;
+
+  // TODO(crbug.com/1098746): Consider encoding this as incremental values.
+  optional uint64 start_address = 6;
+  optional uint64 module_timestamp = 7;
+  optional string module_debugid = 8;
+  optional string module_debug_path = 9;
+  optional uint32 protection_flags = 10;
+
+  optional uint64 private_clean_resident_kb = 11;
+  optional uint64 shared_dirty_resident_kb = 12;
+  optional uint64 shared_clean_resident_kb = 13;
+  optional uint64 locked_kb = 14;
+  optional uint64 proportional_resident_kb = 15;
+};
+
+message SmapsPacket {
+  optional uint32 pid = 1;
+  repeated SmapsEntry entries = 2;
+};
+
+// End of protos/perfetto/trace/profiling/smaps.proto
+
+// Begin of protos/perfetto/trace/ps/process_stats.proto
+
+// Per-process periodically sampled stats. These samples are wrapped in a
+// dedicated message (as opposite to be fields in process_tree.proto) because
+// they are dumped at a different rate than cmdline and thread list.
+// Note: not all of these stats will be present in every ProcessStats message
+// and sometimes processes may be missing. This is because counters are
+// cached to reduce emission of counters which do not change.
+message ProcessStats {
+  // Per-thread periodically sampled stats.
+  // Note: not all of these stats will be present in every message. See the note
+  // for ProcessStats.
+  message Thread {
+    optional int32 tid = 1;
+
+    // DEPRECATED cpu_freq_indices
+    reserved 2;
+
+    // DEPRECATED cpu_freq_ticks
+    reserved 3;
+
+    // DEPRECATED cpu_freq_full
+    reserved 4;
+  }
+
+  message FDInfo {
+    optional uint64 fd = 1;
+    optional string path = 2;
+  }
+
+  message Process {
+    optional int32 pid = 1;
+
+    repeated Thread threads = 11;
+
+    // See /proc/[pid]/status in `man 5 proc` for a description of these fields.
+    optional uint64 vm_size_kb = 2;
+    optional uint64 vm_rss_kb = 3;
+    optional uint64 rss_anon_kb = 4;
+    optional uint64 rss_file_kb = 5;
+    optional uint64 rss_shmem_kb = 6;
+    optional uint64 vm_swap_kb = 7;
+    optional uint64 vm_locked_kb = 8;
+    optional uint64 vm_hwm_kb = 9;
+    // When adding a new field remember to update kProcMemCounterSize in
+    // the trace processor.
+
+    optional int64 oom_score_adj = 10;
+
+    // The peak resident set size is resettable in newer Posix kernels.
+    // This field specifies if reset is supported and if the writer had reset
+    // the peaks after each process stats recording.
+    optional bool is_peak_rss_resettable = 12;
+
+    // Private, shared and swap footprint of the process as measured by
+    // Chrome. To know more about these metrics refer to:
+    // https://docs.google.com/document/d/1_WmgE1F5WUrhwkPqJis3dWyOiUmQKvpXp5cd4w86TvA
+    optional uint32 chrome_private_footprint_kb = 13;
+    optional uint32 chrome_peak_resident_set_kb = 14;
+
+    repeated FDInfo fds = 15;
+
+    // These fields are set only when scan_smaps_rollup=true
+    optional uint64 smr_rss_kb = 16;
+    optional uint64 smr_pss_kb = 17;
+    optional uint64 smr_pss_anon_kb = 18;
+    optional uint64 smr_pss_file_kb = 19;
+    optional uint64 smr_pss_shmem_kb = 20;
+
+    // Time spent scheduled in user mode in nanoseconds. Parsed from utime in
+    // /proc/pid/stat. Recorded if record_process_runtime config option is set.
+    // Resolution of "clock ticks", usually 10ms.
+    optional uint64 runtime_user_mode = 21;
+
+    // Time spent scheduled in kernel mode in nanoseconds. Parsed from stime in
+    // /proc/pid/stat. Recorded if record_process_runtime config option is set.
+    // Resolution of "clock ticks", usually 10ms.
+    optional uint64 runtime_kernel_mode = 22;
+  }
+  repeated Process processes = 1;
+
+  // The time at which we finish collecting this batch of samples;
+  // the top-level packet timestamp is the time at which
+  // we begin collection.
+  optional uint64 collection_end_timestamp = 2;
+}
+
+// End of protos/perfetto/trace/ps/process_stats.proto
+
+// Begin of protos/perfetto/trace/ps/process_tree.proto
+
+// Metadata about the processes and threads in the trace.
+// Note: this proto was designed to be filled in by traced_probes and should
+// only be populated with accurate information coming from the system. Other
+// trace writers should prefer to fill ThreadDescriptor and ProcessDescriptor
+// in TrackDescriptor.
+message ProcessTree {
+  // Representation of a thread.
+  message Thread {
+    // The thread ID (as per gettid()) in the root PID namespace.
+    optional int32 tid = 1;
+
+    // Thread group id (i.e. the PID of the process, == TID of the main thread)
+    optional int32 tgid = 3;
+
+    // The name of the thread.
+    optional string name = 2;
+
+    // The non-root-level thread IDs if the thread runs in a PID namespace. Read
+    // from the NSpid entry of /proc/<tid>/status, with the first element (root-
+    // level thread ID) omitted.
+    repeated int32 nstid = 4;
+  }
+
+  // Representation of a process.
+  message Process {
+    // The UNIX process ID, aka thread group ID (as per getpid()) in the root
+    // PID namespace.
+    optional int32 pid = 1;
+
+    // The parent process ID, as per getppid().
+    optional int32 ppid = 2;
+
+    // The command line for the process, as per /proc/pid/cmdline.
+    // If it is a kernel thread there will only be one cmdline field
+    // and it will contain /proc/pid/comm.
+    repeated string cmdline = 3;
+
+    // The uid for the process, as per /proc/pid/status.
+    optional int32 uid = 5;
+
+    // The non-root-level process IDs if the process runs in a PID namespace.
+    // Read from the NSpid entry of /proc/<pid>/status, with the first element
+    // (root-level process ID) omitted.
+    repeated int32 nspid = 6;
+
+    // Timestamp of when the process was created, in nanoseconds
+    // from boot. Parsed from starttime in /proc/pid/stat.
+    // Recorded if record_process_age config option is set.
+    // Resolution of "clock ticks", usually 10ms.
+    optional uint64 process_start_from_boot = 7;
+
+    // threads_deprecated
+    reserved 4;
+  }
+
+  // List of processes and threads in the client. These lists are incremental
+  // and not exhaustive. A process and its threads might show up separately in
+  // different ProcessTree messages. A thread might event not show up at all, if
+  // no sched_switch activity was detected, for instance:
+  // #0 { processes: [{pid: 10, ...}], threads: [{pid: 11, tgid: 10}] }
+  // #1 { threads: [{pid: 12, tgid: 10}] }
+  // #2 { processes: [{pid: 20, ...}], threads: [{pid: 13, tgid: 10}] }
+  repeated Process processes = 1;
+  repeated Thread threads = 2;
+
+  // The time at which we finish collecting this process tree;
+  // the top-level packet timestamp is the time at which
+  // we begin collection.
+  optional uint64 collection_end_timestamp = 3;
+}
+
+// End of protos/perfetto/trace/ps/process_tree.proto
+
+// Begin of protos/perfetto/trace/remote_clock_sync.proto
+
+// Records the parameters for aligning clock readings between machines.
+message RemoteClockSync {
+  // Synchronized clock snapshots taken on both sides of the relay port (the
+  // tracing service and the relay service). A round of clock synchronization
+  // IPC takes emits 2 SyncedClocks messages, i.e., client snapshot -> host
+  // snapshot -> client snapshot -> host snapshot.
+  message SyncedClocks {
+    optional ClockSnapshot client_clocks = 2;
+    optional ClockSnapshot host_clocks = 3;
+  }
+
+  repeated SyncedClocks synced_clocks = 1;
+}
+
+// End of protos/perfetto/trace/remote_clock_sync.proto
+
+// Begin of protos/perfetto/trace/statsd/statsd_atom.proto
+
+// Deliberate empty message. See comment on StatsdAtom#atom below.
+message Atom {}
+
+// One or more statsd atoms. This must continue to match:
+// perfetto/protos/third_party/statsd/shell_data.proto
+// So that we can efficiently add data from statsd directly to the
+// trace.
+message StatsdAtom {
+  // Atom should be filled with an Atom proto from:
+  // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/proto_logging/stats/atoms.proto?q=f:stats%2Fatoms.proto$%20message%5C%20Atom
+  // We don't reference Atom directly here since we don't want to import
+  // Atom.proto and all its transitive dependencies into Perfetto.
+  // atom and timestamp_nanos have the same cardinality
+  repeated Atom atom = 1;
+  repeated int64 timestamp_nanos = 2;
+}
+
+// End of protos/perfetto/trace/statsd/statsd_atom.proto
+
+// Begin of protos/perfetto/trace/sys_stats/sys_stats.proto
+
+// Various Linux system stat counters from /proc.
+// The fields in this message can be reported at different rates and with
+// different granularity. See sys_stats_config.proto.
+message SysStats {
+  // Counters from /proc/meminfo. Values are in KB.
+  message MeminfoValue {
+    optional MeminfoCounters key = 1;
+    optional uint64 value = 2;
+  };
+  repeated MeminfoValue meminfo = 1;
+
+  // Counter from /proc/vmstat. Units are often pages, not KB.
+  message VmstatValue {
+    optional VmstatCounters key = 1;
+    optional uint64 value = 2;
+  };
+  repeated VmstatValue vmstat = 2;
+
+  // Times in each mode, since boot. Unit: nanoseconds.
+  message CpuTimes {
+    optional uint32 cpu_id = 1;
+
+    // Time spent in user mode.
+    optional uint64 user_ns = 2;
+
+    // Time spent in user mode (low prio).
+    optional uint64 user_nice_ns = 3;
+
+    // Time spent in system mode.
+    optional uint64 system_mode_ns = 4;
+
+    // Time spent in the idle task.
+    optional uint64 idle_ns = 5;
+
+    // Time spent waiting for I/O.
+    optional uint64 io_wait_ns = 6;
+
+    // Time spent servicing interrupts.
+    optional uint64 irq_ns = 7;
+
+    // Time spent servicing softirqs.
+    optional uint64 softirq_ns = 8;
+  }
+  // One entry per cpu.
+  repeated CpuTimes cpu_stat = 3;
+
+  // Num processes forked since boot.
+  // Populated only if FORK_COUNT in config.stat_counters.
+  optional uint64 num_forks = 4;
+
+  message InterruptCount {
+    optional int32 irq = 1;
+    optional uint64 count = 2;
+  }
+
+  // Number of interrupts, broken by IRQ number.
+  // Populated only if IRQ_COUNTS in config.stat_counters.
+
+  // Total num of irqs serviced since boot.
+  optional uint64 num_irq_total = 5;
+  repeated InterruptCount num_irq = 6;
+
+  // Number of softirqs, broken by softirq number.
+  // Populated only if SOFTIRQ_COUNTS in config.stat_counters.
+
+  // Total num of softirqs since boot.
+  optional uint64 num_softirq_total = 7;
+
+  // Per-softirq count.
+  repeated InterruptCount num_softirq = 8;
+
+  // The time at which we finish collecting this set of samples;
+  // the top-level packet timestamp is the time at which
+  // we begin collection.
+  optional uint64 collection_end_timestamp = 9;
+
+  // Frequencies for /sys/class/devfreq/ entries in kHz.
+  message DevfreqValue {
+    optional string key = 1;
+    optional uint64 value = 2;
+  };
+
+  // One entry per device.
+  repeated DevfreqValue devfreq = 10;
+
+  // Cpu current frequency from
+  // /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_cur_freq in kHz.
+  // One entry per cpu. Report 0 for offline cpu
+  repeated uint32 cpufreq_khz = 11;
+
+  message BuddyInfo {
+    optional string node = 1;
+    optional string zone = 2;
+    repeated uint32 order_pages = 3;
+  }
+  // One entry per each node's zones.
+  repeated BuddyInfo buddy_info = 12;
+
+  // Counters from /proc/diskstats.
+  message DiskStat {
+    optional string device_name = 1;
+    optional uint64 read_sectors = 2;
+    optional uint64 read_time_ms = 3;
+    optional uint64 write_sectors = 4;
+    optional uint64 write_time_ms = 5;
+    optional uint64 discard_sectors = 6;
+    optional uint64 discard_time_ms = 7;
+    optional uint64 flush_count = 8;
+    optional uint64 flush_time_ms = 9;
+  }
+  // One entry per disk device.
+  repeated DiskStat disk_stat = 13;
+
+  // Reading from /proc/pressure/*.
+  message PsiSample {
+    // Type of resource that may have exhibited pressure stalls.
+    //    * _SOME indicates some resource tasks stalled.
+    //    * _FULL indicates all non-idle resource tasks stalled simultaneously.
+    enum PsiResource {
+      PSI_RESOURCE_UNSPECIFIED = 0;
+      PSI_RESOURCE_CPU_SOME = 1;
+      PSI_RESOURCE_CPU_FULL = 2;
+      PSI_RESOURCE_IO_SOME = 3;
+      PSI_RESOURCE_IO_FULL = 4;
+      PSI_RESOURCE_MEMORY_SOME = 5;
+      PSI_RESOURCE_MEMORY_FULL = 6;
+    }
+    optional PsiResource resource = 1;
+
+    // Total absolute stall time (in nanos) for a given resource.
+    // While PSI readings are in micros, we store in nanos for consistency with
+    // most other time-based counters.
+    optional uint64 total_ns = 2;
+
+    // Note that /proc/pressure/* exposes historical average utilization values
+    // (as a %), but we don't yet sample those. They could easily be added as
+    // additional fields should the total stall time readings be insufficient.
+  }
+  // One entry per PsiResource type.
+  repeated PsiSample psi = 14;
+}
+
+// End of protos/perfetto/trace/sys_stats/sys_stats.proto
+
+// Begin of protos/perfetto/trace/system_info.proto
+
+message Utsname {
+  optional string sysname = 1;
+  optional string version = 2;
+  optional string release = 3;
+  optional string machine = 4;
+}
+
+message SystemInfo {
+  optional Utsname utsname = 1;
+  optional string android_build_fingerprint = 2;
+
+  // The version of traced (the same returned by `traced --version`).
+  // This is a human readable string with and its format varies depending on
+  // the build system and the repo (standalone vs AOSP).
+  // This is intended for human debugging only.
+  optional string tracing_service_version = 4;
+
+  // The Android SDK vesion (e.g. 21 for L, 31 for S etc).
+  // Introduced in Android T.
+  optional uint64 android_sdk_version = 5;
+
+  // Kernel page size - sysconf(_SC_PAGESIZE).
+  optional uint32 page_size = 6;
+
+  // Number of cpus - sysconf(_SC_NPROCESSORS_CONF).
+  // Might be different to the number of online cpus.
+  // Introduced in perfetto v44.
+  optional uint32 num_cpus = 8;
+
+  // The timezone offset from UTC, as per strftime("%z"), in minutes.
+  // Introduced in v38 / Android V.
+  optional int32 timezone_off_mins = 7;
+
+  // Ticks per second - sysconf(_SC_CLK_TCK).
+  // Not serialised as of perfetto v44.
+  optional int64 hz = 3;
+}
+
+// End of protos/perfetto/trace/system_info.proto
+
+// Begin of protos/perfetto/trace/system_info/cpu_info.proto
+
+// Information about CPUs from procfs and sysfs.
+message CpuInfo {
+  // Information about a single CPU.
+  message Cpu {
+    // Value of "Processor" field from /proc/cpuinfo for this CPU.
+    // Example: "AArch64 Processor rev 12 (aarch64)"
+    optional string processor = 1;
+
+    // Frequencies from
+    // /sys/devices/system/cpu/cpuX/cpufreq/scaling_available_frequencies
+    // where X is the index of this CPU.
+    repeated uint32 frequencies = 2;
+  }
+
+  // Describes available CPUs, one entry per CPU.
+  repeated Cpu cpus = 1;
+}
+
+// End of protos/perfetto/trace/system_info/cpu_info.proto
+
+// Begin of protos/perfetto/trace/test_event.proto
+
+// Event used by testing code.
+message TestEvent {
+  // Arbitrary string used in tests.
+  optional string str = 1;
+
+  // The current value of the random number sequence used in tests.
+  optional uint32 seq_value = 2;
+
+  // Monotonically increased on each packet.
+  optional uint64 counter = 3;
+
+  // No more packets should follow (from the current sequence).
+  optional bool is_last = 4;
+
+  message TestPayload {
+    repeated string str = 1;
+    repeated TestPayload nested = 2;
+
+    optional string single_string = 4;
+
+    optional int32 single_int = 5;
+    repeated int32 repeated_ints = 6;
+
+    // When 0 this is the bottom-most nested message.
+    optional uint32 remaining_nesting_depth = 3;
+
+    repeated DebugAnnotation debug_annotations = 7;
+  }
+  optional TestPayload payload = 5;
+}
+
+// End of protos/perfetto/trace/test_event.proto
+
+// Begin of protos/perfetto/trace/trace_packet_defaults.proto
+
+// Default values for TracePacket fields that hold for a particular TraceWriter
+// packet sequence. This message contains a subset of the TracePacket fields
+// with matching IDs. When provided, these fields define the default values
+// that should be applied, at import time, to all TracePacket(s) with the same
+// |trusted_packet_sequence_id|, unless otherwise specified in each packet.
+//
+// Should be reemitted whenever incremental state is cleared on the sequence.
+message TracePacketDefaults {
+  optional uint32 timestamp_clock_id = 58;
+
+  // Default values for TrackEvents (e.g. default track).
+  optional TrackEventDefaults track_event_defaults = 11;
+
+  // Defaults for perf profiler packets (PerfSample).
+  optional PerfSampleDefaults perf_sample_defaults = 12;
+
+  // Defaults for V8 code packets (V8JsCode, V8InternalCode, V8WasmCode,
+  // V8RegexpCode)
+  optional V8CodeDefaults v8_code_defaults = 99;
+}
+// End of protos/perfetto/trace/trace_packet_defaults.proto
+
+// Begin of protos/perfetto/trace/trace_uuid.proto
+
+// A random unique ID that identifies the trace.
+// This message has been introduced in v32. Prior to that, the UUID was
+// only (optionally) present in the TraceConfig.trace_uuid_msb/lsb fields.
+// This has been moved to a standalone packet to deal with new use-cases for
+// go/gapless-aot, where the same tracing session can be serialized several
+// times, in which case the UUID is changed on each snapshot and does not match
+// the one in the TraceConfig.
+message TraceUuid {
+  optional int64 msb = 1;
+  optional int64 lsb = 2;
+}
+
+// End of protos/perfetto/trace/trace_uuid.proto
+
+// Begin of protos/perfetto/trace/track_event/process_descriptor.proto
+
+// Describes a process's attributes. Emitted as part of a TrackDescriptor,
+// usually by the process's main thread.
+//
+// Next id: 9.
+message ProcessDescriptor {
+  optional int32 pid = 1;
+  repeated string cmdline = 2;
+  optional string process_name = 6;
+
+  optional int32 process_priority = 5;
+  // Process start time in nanoseconds.
+  // The timestamp refers to the trace clock by default. Other clock IDs
+  // provided in TracePacket are not supported.
+  optional int64 start_timestamp_ns = 7;
+
+  // ---------------------------------------------------------------------------
+  // Deprecated / legacy fields, which will be removed in the future:
+  // ---------------------------------------------------------------------------
+
+  // See chromium's content::ProcessType.
+  enum ChromeProcessType {
+    PROCESS_UNSPECIFIED = 0;
+    PROCESS_BROWSER = 1;
+    PROCESS_RENDERER = 2;
+    PROCESS_UTILITY = 3;
+    PROCESS_ZYGOTE = 4;
+    PROCESS_SANDBOX_HELPER = 5;
+    PROCESS_GPU = 6;
+    PROCESS_PPAPI_PLUGIN = 7;
+    PROCESS_PPAPI_BROKER = 8;
+  }
+  optional ChromeProcessType chrome_process_type = 4;
+
+  // To support old UI. New UI should determine default sorting by process_type.
+  optional int32 legacy_sort_index = 3;
+
+  // Labels can be used to further describe properties of the work performed by
+  // the process. For example, these can be used by Chrome renderer process to
+  // provide titles of frames being rendered.
+  repeated string process_labels = 8;
+}
+
+// End of protos/perfetto/trace/track_event/process_descriptor.proto
+
+// Begin of protos/perfetto/trace/track_event/range_of_interest.proto
+
+// This message specifies the "range of interest" for track events. With the
+// `drop_track_event_data_before` option set to `kTrackEventRangeOfInterest`,
+// Trace Processor drops track events outside of this range.
+message TrackEventRangeOfInterest {
+  optional int64 start_us = 1;
+}
+// End of protos/perfetto/trace/track_event/range_of_interest.proto
+
+// Begin of protos/perfetto/trace/track_event/thread_descriptor.proto
+
+// Describes a thread's attributes. Emitted as part of a TrackDescriptor,
+// usually by the thread's trace writer.
+//
+// Next id: 9.
+message ThreadDescriptor {
+  optional int32 pid = 1;
+  optional int32 tid = 2;
+
+  optional string thread_name = 5;
+
+  // ---------------------------------------------------------------------------
+  // Deprecated / legacy fields, which will be removed in the future:
+  // ---------------------------------------------------------------------------
+
+  enum ChromeThreadType {
+    CHROME_THREAD_UNSPECIFIED = 0;
+
+    CHROME_THREAD_MAIN = 1;
+    CHROME_THREAD_IO = 2;
+
+    // Scheduler:
+    CHROME_THREAD_POOL_BG_WORKER = 3;
+    CHROME_THREAD_POOL_FG_WORKER = 4;
+    CHROME_THREAD_POOL_FB_BLOCKING = 5;
+    CHROME_THREAD_POOL_BG_BLOCKING = 6;
+    CHROME_THREAD_POOL_SERVICE = 7;
+
+    // Compositor:
+    CHROME_THREAD_COMPOSITOR = 8;
+    CHROME_THREAD_VIZ_COMPOSITOR = 9;
+    CHROME_THREAD_COMPOSITOR_WORKER = 10;
+
+    // Renderer:
+    CHROME_THREAD_SERVICE_WORKER = 11;
+
+    // Tracing related threads:
+    CHROME_THREAD_MEMORY_INFRA = 50;
+    CHROME_THREAD_SAMPLING_PROFILER = 51;
+  };
+  optional ChromeThreadType chrome_thread_type = 4;
+
+  // Deprecated. Use ClockSnapshot in combination with TracePacket's timestamp
+  // and timestamp_clock_id fields instead.
+  optional int64 reference_timestamp_us = 6;
+
+  // Absolute reference values. Clock values in subsequent TrackEvents can be
+  // encoded accumulatively and relative to these. This reduces their var-int
+  // encoding size.
+  // TODO(eseckler): Deprecated. Replace these with ClockSnapshot encoding.
+  optional int64 reference_thread_time_us = 7;
+  optional int64 reference_thread_instruction_count = 8;
+
+  // To support old UI. New UI should determine default sorting by thread_type.
+  optional int32 legacy_sort_index = 3;
+}
+
+// End of protos/perfetto/trace/track_event/thread_descriptor.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_process_descriptor.proto
+
+// Describes the attributes for a Chrome process. Must be paired with a
+// ProcessDescriptor in the same TrackDescriptor.
+//
+// Next id: 6.
+message ChromeProcessDescriptor {
+  // See chromium's content::ProcessType.
+  enum ProcessType {
+    PROCESS_UNSPECIFIED = 0;
+    PROCESS_BROWSER = 1;
+    PROCESS_RENDERER = 2;
+    PROCESS_UTILITY = 3;
+    PROCESS_ZYGOTE = 4;
+    PROCESS_SANDBOX_HELPER = 5;
+    PROCESS_GPU = 6;
+    PROCESS_PPAPI_PLUGIN = 7;
+    PROCESS_PPAPI_BROKER = 8;
+    PROCESS_SERVICE_NETWORK = 9;
+    PROCESS_SERVICE_TRACING = 10;
+    PROCESS_SERVICE_STORAGE = 11;
+    PROCESS_SERVICE_AUDIO = 12;
+    PROCESS_SERVICE_DATA_DECODER = 13;
+    PROCESS_SERVICE_UTIL_WIN = 14;
+    PROCESS_SERVICE_PROXY_RESOLVER = 15;
+    PROCESS_SERVICE_CDM = 16;
+    PROCESS_SERVICE_VIDEO_CAPTURE = 17;
+    PROCESS_SERVICE_UNZIPPER = 18;
+    PROCESS_SERVICE_MIRRORING = 19;
+    PROCESS_SERVICE_FILEPATCHER = 20;
+    PROCESS_SERVICE_TTS = 21;
+    PROCESS_SERVICE_PRINTING = 22;
+    PROCESS_SERVICE_QUARANTINE = 23;
+    PROCESS_SERVICE_CROS_LOCALSEARCH = 24;
+    PROCESS_SERVICE_CROS_ASSISTANT_AUDIO_DECODER = 25;
+    PROCESS_SERVICE_FILEUTIL = 26;
+    PROCESS_SERVICE_PRINTCOMPOSITOR = 27;
+    PROCESS_SERVICE_PAINTPREVIEW = 28;
+    PROCESS_SERVICE_SPEECHRECOGNITION = 29;
+    PROCESS_SERVICE_XRDEVICE = 30;
+    PROCESS_SERVICE_READICON = 31;
+    PROCESS_SERVICE_LANGUAGEDETECTION = 32;
+    PROCESS_SERVICE_SHARING = 33;
+    PROCESS_SERVICE_MEDIAPARSER = 34;
+    PROCESS_SERVICE_QRCODEGENERATOR = 35;
+    PROCESS_SERVICE_PROFILEIMPORT = 36;
+    PROCESS_SERVICE_IME = 37;
+    PROCESS_SERVICE_RECORDING = 38;
+    PROCESS_SERVICE_SHAPEDETECTION = 39;
+    PROCESS_RENDERER_EXTENSION = 40;
+    PROCESS_SERVICE_MEDIA_FOUNDATION = 41;
+  }
+  optional ProcessType process_type = 1;
+  optional int32 process_priority = 2;
+
+  // To support old UI. New UI should determine default sorting by process_type.
+  optional int32 legacy_sort_index = 3;
+
+  // Name of the hosting app for WebView. Used to match renderer processes to
+  // their hosting apps.
+  optional string host_app_package_name = 4;
+
+  // The ID to link crashes to trace.
+  // Notes:
+  // * The ID is per process. So, each trace may contain many IDs, and you need
+  //   to look for the ID from crashed process to find the crash report.
+  // * Having a "chrome-trace-id" in crash doesn't necessarily mean we can
+  //   get an uploaded trace, since uploads could have failed.
+  // * On the other hand, if there was a crash during the session and trace was
+  //   uploaded, it is very likely to find a crash report with the trace ID.
+  // * This is not crash ID or trace ID. It is just a random 64-bit number
+  //   recorded in both traces and crashes. It is possible to have collisions,
+  //   though very rare.
+  optional uint64 crash_trace_id = 5;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_process_descriptor.proto
+
+// Begin of protos/perfetto/trace/track_event/chrome_thread_descriptor.proto
+
+// Describes a Chrome thread's attributes. Emitted as part of a TrackDescriptor,
+// usually by the thread's trace writer. Must be paired with a ThreadDescriptor
+// in the same TrackDescriptor.
+//
+// Next id: 3.
+message ChromeThreadDescriptor {
+  enum ThreadType {
+    THREAD_UNSPECIFIED = 0;
+
+    THREAD_MAIN = 1;
+    THREAD_IO = 2;
+
+    THREAD_POOL_BG_WORKER = 3;
+    THREAD_POOL_FG_WORKER = 4;
+    THREAD_POOL_FG_BLOCKING = 5;
+    THREAD_POOL_BG_BLOCKING = 6;
+    THREAD_POOL_SERVICE = 7;
+
+    THREAD_COMPOSITOR = 8;
+    THREAD_VIZ_COMPOSITOR = 9;
+    THREAD_COMPOSITOR_WORKER = 10;
+
+    THREAD_SERVICE_WORKER = 11;
+    THREAD_NETWORK_SERVICE = 12;
+
+    THREAD_CHILD_IO = 13;
+    THREAD_BROWSER_IO = 14;
+
+    THREAD_BROWSER_MAIN = 15;
+    THREAD_RENDERER_MAIN = 16;
+    THREAD_UTILITY_MAIN = 17;
+    THREAD_GPU_MAIN = 18;
+
+    THREAD_CACHE_BLOCKFILE = 19;
+    THREAD_MEDIA = 20;
+    THREAD_AUDIO_OUTPUTDEVICE = 21;
+    THREAD_AUDIO_INPUTDEVICE = 22;
+    THREAD_GPU_MEMORY = 23;
+    THREAD_GPU_VSYNC = 24;
+    THREAD_DXA_VIDEODECODER = 25;
+    THREAD_BROWSER_WATCHDOG = 26;
+    THREAD_WEBRTC_NETWORK = 27;
+    THREAD_WINDOW_OWNER = 28;
+    THREAD_WEBRTC_SIGNALING = 29;
+    THREAD_WEBRTC_WORKER = 30;
+    THREAD_PPAPI_MAIN = 31;
+    THREAD_GPU_WATCHDOG = 32;
+    THREAD_SWAPPER = 33;
+    THREAD_GAMEPAD_POLLING = 34;
+    THREAD_WEBCRYPTO = 35;
+    THREAD_DATABASE = 36;
+    THREAD_PROXYRESOLVER = 37;
+    THREAD_DEVTOOLSADB = 38;
+    THREAD_NETWORKCONFIGWATCHER = 39;
+    THREAD_WASAPI_RENDER = 40;
+    THREAD_LOADER_LOCK_SAMPLER = 41;
+
+    THREAD_MEMORY_INFRA = 50;
+    THREAD_SAMPLING_PROFILER = 51;
+  };
+
+  optional ThreadType thread_type = 1;
+
+  // To support old UI. New UI should determine default sorting by thread_type.
+  optional int32 legacy_sort_index = 2;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_thread_descriptor.proto
+
+// Begin of protos/perfetto/trace/track_event/counter_descriptor.proto
+
+// Defines properties of a counter track, e.g. for built-in counters (thread
+// time, instruction count, ..) or user-specified counters (e.g. memory usage of
+// a specific app component).
+//
+// Counter tracks only support TYPE_COUNTER track events, which specify new
+// values for the counter. For counters that require per-slice values, counter
+// values can instead be provided in a more efficient encoding via TrackEvent's
+// |extra_counter_track_uuids| and |extra_counter_values| fields. However,
+// slice-type events cannot be emitted onto a counter track.
+//
+// Values for counters that are only emitted on a single packet sequence can
+// optionally be delta-encoded, see |is_incremental|.
+//
+// Next id: 7.
+message CounterDescriptor {
+  // Built-in counters, usually with special meaning in the client library,
+  // trace processor, legacy JSON format, or UI. Trace processor will infer a
+  // track name from the enum value if none is provided in TrackDescriptor.
+  enum BuiltinCounterType {
+    COUNTER_UNSPECIFIED = 0;
+
+    // Thread-scoped counters. The thread's track should be specified via
+    // |parent_uuid| in the TrackDescriptor for such a counter.
+
+    // implies UNIT_TIME_NS.
+    COUNTER_THREAD_TIME_NS = 1;
+
+    // implies UNIT_COUNT.
+    COUNTER_THREAD_INSTRUCTION_COUNT = 2;
+  }
+
+  // Type of the values for the counters - to supply lower granularity units,
+  // see also |unit_multiplier|.
+  enum Unit {
+    UNIT_UNSPECIFIED = 0;
+    UNIT_TIME_NS = 1;
+    UNIT_COUNT = 2;
+    UNIT_SIZE_BYTES = 3;
+    // TODO(eseckler): Support more units as necessary.
+  }
+
+  // For built-in counters (e.g. thread time). Custom user-specified counters
+  // (e.g. those emitted by TRACE_COUNTER macros of the client library)
+  // shouldn't set this, and instead provide a counter name via TrackDescriptor.
+  optional BuiltinCounterType type = 1;
+
+  // Names of categories of the counter (usually for user-specified counters).
+  // In the client library, categories are a way to turn groups of individual
+  // counters (or events) on or off.
+  repeated string categories = 2;
+
+  // Type of the counter's values. Built-in counters imply a value for this
+  // field.
+  optional Unit unit = 3;
+
+  // In order to use a unit not defined as a part of |Unit|, a free-form unit
+  // name can be used instead.
+  optional string unit_name = 6;
+
+  // Multiplication factor of this counter's values, e.g. to supply
+  // COUNTER_THREAD_TIME_NS timestamps in microseconds instead.
+  optional int64 unit_multiplier = 4;
+
+  // Whether values for this counter are provided as delta values. Only
+  // supported for counters that are emitted on a single packet-sequence (e.g.
+  // thread time). Counter values in subsequent packets on the current packet
+  // sequence will be interpreted as delta values from the sequence's most
+  // recent value for the counter. When incremental state is cleared, the
+  // counter value is considered to be reset to 0. Thus, the first value after
+  // incremental state is cleared is effectively an absolute value.
+  optional bool is_incremental = 5;
+
+  // TODO(eseckler): Support arguments describing the counter (?).
+  // repeated DebugAnnotation debug_annotations;
+}
+
+// End of protos/perfetto/trace/track_event/counter_descriptor.proto
+
+// Begin of protos/perfetto/trace/track_event/track_descriptor.proto
+
+// Defines a track for TrackEvents. Slices and instant events on the same track
+// will be nested based on their timestamps, see TrackEvent::Type.
+//
+// A TrackDescriptor only needs to be emitted by one trace writer / producer and
+// is valid for the entirety of the trace. To ensure the descriptor isn't lost
+// when the ring buffer wraps, it should be reemitted whenever incremental state
+// is cleared.
+//
+// As a fallback, TrackEvents emitted without an explicit track association will
+// be associated with an implicit trace-global track (uuid = 0), see also
+// |TrackEvent::track_uuid|. It is possible but not necessary to emit a
+// TrackDescriptor for this implicit track.
+//
+// Next id: 10.
+message TrackDescriptor {
+  // Unique ID that identifies this track. This ID is global to the whole trace.
+  // Producers should ensure that it is unlikely to clash with IDs emitted by
+  // other producers. A value of 0 denotes the implicit trace-global track.
+  //
+  // For example, legacy TRACE_EVENT macros may use a hash involving the async
+  // event id + id_scope, pid, and/or tid to compute this ID.
+  optional uint64 uuid = 1;
+
+  // A parent track reference can be used to describe relationships between
+  // tracks. For example, to define an asynchronous track which is scoped to a
+  // specific process, specify the uuid for that process's process track here.
+  // Similarly, to associate a COUNTER_THREAD_TIME_NS counter track with a
+  // thread, specify the uuid for that thread's thread track here.
+  optional uint64 parent_uuid = 5;
+
+  // Name of the track. Optional - if unspecified, it may be derived from the
+  // process/thread name (process/thread tracks), the first event's name (async
+  // tracks), or counter name (counter tracks).
+  optional string name = 2;
+
+  // Associate the track with a process, making it the process-global track.
+  // There should only be one such track per process (usually for instant
+  // events; trace processor uses this fact to detect pid reuse). If you need
+  // more (e.g. for asynchronous events), create child tracks using parent_uuid.
+  //
+  // Trace processor will merge events on a process track with slice-type events
+  // from other sources (e.g. ftrace) for the same process into a single
+  // timeline view.
+  optional ProcessDescriptor process = 3;
+  optional ChromeProcessDescriptor chrome_process = 6;
+
+  // Associate the track with a thread, indicating that the track's events
+  // describe synchronous code execution on the thread. There should only be one
+  // such track per thread (trace processor uses this fact to detect tid reuse).
+  //
+  // Trace processor will merge events on a thread track with slice-type events
+  // from other sources (e.g. ftrace) for the same thread into a single timeline
+  // view.
+  optional ThreadDescriptor thread = 4;
+  optional ChromeThreadDescriptor chrome_thread = 7;
+
+  // Descriptor for a counter track. If set, the track will only support
+  // TYPE_COUNTER TrackEvents (and values provided via TrackEvent's
+  // |extra_counter_values|).
+  optional CounterDescriptor counter = 8;
+
+  // If true, forces Trace Processor to use separate tracks for track events
+  // and system events for the same thread.
+  // Track events timestamps in Chrome have microsecond resolution, while
+  // system events use nanoseconds. It results in broken event nesting when
+  // track events and system events share a track.
+  optional bool disallow_merging_with_system_tracks = 9;
+}
+
+// End of protos/perfetto/trace/track_event/track_descriptor.proto
+
+// Begin of protos/perfetto/trace/translation/translation_table.proto
+
+// Translation rules for the trace processor.
+// See the comments for each rule type for specific meaning.
+message TranslationTable {
+  oneof table {
+    ChromeHistorgramTranslationTable chrome_histogram = 1;
+    ChromeUserEventTranslationTable chrome_user_event = 2;
+    ChromePerformanceMarkTranslationTable chrome_performance_mark = 3;
+    SliceNameTranslationTable slice_name = 4;
+  }
+}
+
+// Chrome histogram sample hash -> name translation rules.
+message ChromeHistorgramTranslationTable {
+  map<uint64, string> hash_to_name = 1;
+}
+
+// Chrome user event action hash -> name translation rules.
+message ChromeUserEventTranslationTable {
+  map<uint64, string> action_hash_to_name = 1;
+}
+
+// Chrome performance mark translation rules.
+message ChromePerformanceMarkTranslationTable {
+  map<uint32, string> site_hash_to_name = 1;
+  map<uint32, string> mark_hash_to_name = 2;
+};
+
+// Raw -> deobfuscated slice name translation rules.
+message SliceNameTranslationTable {
+  map<string, string> raw_to_deobfuscated_name = 1;
+};
+
+// End of protos/perfetto/trace/translation/translation_table.proto
+
+// Begin of protos/perfetto/trace/trigger.proto
+
+// When a TracingSession receives a trigger it records the boot time nanoseconds
+// in the TracePacket's timestamp field as well as the name of the producer that
+// triggered it. We emit this data so filtering can be done on triggers received
+// in the trace.
+message Trigger {
+  // Name of the trigger which was received.
+  optional string trigger_name = 1;
+  // The actual producer that activated |trigger|.
+  optional string producer_name = 2;
+  // The verified UID of the producer.
+  optional int32 trusted_producer_uid = 3;
+}
+
+// End of protos/perfetto/trace/trigger.proto
+
+// Begin of protos/perfetto/trace/ui_state.proto
+
+// Common state for UIs visualizing Perfetto traces.
+// This message can be appended as a TracePacket by UIs to save the
+// visible state (e.g. scroll position/zoom state) for future opening
+// of the trace.
+// Design doc: go/trace-ui-state.
+message UiState {
+  // The start and end bounds of the viewport of the UI in nanoseconds.
+  //
+  // This is the absolute time associated to slices and other events in
+  // trace processor tables (i.e. the |ts| column of most tables)
+  optional int64 timeline_start_ts = 1;
+  optional int64 timeline_end_ts = 2;
+
+  // Indicates that the given process should be highlighted by the UI.
+  message HighlightProcess {
+    oneof selector {
+      // The pid of the process to highlight. This is useful for UIs to focus
+      // on tracks of a particular process in the trace.
+      //
+      // If more than one process in a trace has the same pid, it is UI
+      // implementation specific how the process to be focused will be
+      // chosen.
+      uint32 pid = 1;
+
+      // The command line of the process to highlight; for most Android apps,
+      // this is the package name of the app. This is useful for UIs to focus
+      // on a particular app in the trace.
+      //
+      // If more than one process hasthe same cmdline, it is UI implementation
+      // specific how the process to be focused will be chosen.
+      string cmdline = 2;
+    }
+  }
+  optional HighlightProcess highlight_process = 3;
+}
+// End of protos/perfetto/trace/ui_state.proto
+
+// Begin of protos/perfetto/trace/trace_packet.proto
+
+// TracePacket is the root object of a Perfetto trace.
+// A Perfetto trace is a linear sequence of TracePacket(s).
+//
+// The tracing service guarantees that all TracePacket(s) written by a given
+// TraceWriter are seen in-order, without gaps or duplicates. If, for any
+// reason, a TraceWriter sequence becomes invalid, no more packets are returned
+// to the Consumer (or written into the trace file).
+// TracePacket(s) written by different TraceWriter(s), hence even different
+// data sources, can be seen in arbitrary order.
+// The consumer can re-establish a total order, if interested, using the packet
+// timestamps, after having synchronized the different clocks onto a global
+// clock.
+//
+// The tracing service is agnostic of the content of TracePacket, with the
+// exception of few fields (e.g.. trusted_*, trace_config) that are written by
+// the service itself.
+//
+// See the [Buffers and Dataflow](/docs/concepts/buffers.md) doc for details.
+//
+// Next reserved id: 14 (up to 15).
+// Next id: 109.
+message TracePacket {
+  // The timestamp of the TracePacket.
+  // By default this timestamps refers to the trace clock (CLOCK_BOOTTIME on
+  // Android). It can be overridden using a different timestamp_clock_id.
+  // The clock domain definition in ClockSnapshot can also override:
+  // - The unit (default: 1ns).
+  // - The absolute vs delta encoding (default: absolute timestamp).
+  optional uint64 timestamp = 8;
+
+  // Specifies the ID of the clock used for the TracePacket |timestamp|. Can be
+  // one of the built-in types from ClockSnapshot::BuiltinClocks, or a
+  // producer-defined clock id.
+  // If unspecified and if no default per-sequence value has been provided via
+  // TracePacketDefaults, it defaults to BuiltinClocks::BOOTTIME.
+  optional uint32 timestamp_clock_id = 58;
+
+  oneof data {
+    ProcessTree process_tree = 2;
+    ProcessStats process_stats = 9;
+    InodeFileMap inode_file_map = 4;
+    ChromeEventBundle chrome_events = 5;
+    ClockSnapshot clock_snapshot = 6;
+    SysStats sys_stats = 7;
+    TrackEvent track_event = 11;
+
+    // IDs up to 15 are reserved. They take only one byte to encode their
+    // preamble so should be used for frequent events.
+
+    TraceUuid trace_uuid = 89;
+    TraceConfig trace_config = 33;
+    FtraceStats ftrace_stats = 34;
+    TraceStats trace_stats = 35;
+    ProfilePacket profile_packet = 37;
+    StreamingAllocation streaming_allocation = 74;
+    StreamingFree streaming_free = 75;
+    BatteryCounters battery = 38;
+    PowerRails power_rails = 40;
+    AndroidLogPacket android_log = 39;
+    SystemInfo system_info = 45;
+    Trigger trigger = 46;
+    ChromeTrigger chrome_trigger = 109;
+    PackagesList packages_list = 47;
+    ChromeBenchmarkMetadata chrome_benchmark_metadata = 48;
+    PerfettoMetatrace perfetto_metatrace = 49;
+    ChromeMetadataPacket chrome_metadata = 51;
+    GpuCounterEvent gpu_counter_event = 52;
+    GpuRenderStageEvent gpu_render_stage_event = 53;
+    StreamingProfilePacket streaming_profile_packet = 54;
+    HeapGraph heap_graph = 56;
+    GraphicsFrameEvent graphics_frame_event = 57;
+    VulkanMemoryEvent vulkan_memory_event = 62;
+    GpuLog gpu_log = 63;
+    VulkanApiEvent vulkan_api_event = 65;
+    PerfSample perf_sample = 66;
+    CpuInfo cpu_info = 67;
+    SmapsPacket smaps_packet = 68;
+    TracingServiceEvent service_event = 69;
+    InitialDisplayState initial_display_state = 70;
+    GpuMemTotalEvent gpu_mem_total_event = 71;
+    MemoryTrackerSnapshot memory_tracker_snapshot = 73;
+    FrameTimelineEvent frame_timeline_event = 76;
+    AndroidEnergyEstimationBreakdown android_energy_estimation_breakdown = 77;
+    UiState ui_state = 78;
+    AndroidCameraFrameEvent android_camera_frame_event = 80;
+    AndroidCameraSessionStats android_camera_session_stats = 81;
+    TranslationTable translation_table = 82;
+    AndroidGameInterventionList android_game_intervention_list = 83;
+    StatsdAtom statsd_atom = 84;
+    AndroidSystemProperty android_system_property = 86;
+    EntityStateResidency entity_state_residency = 91;
+
+    // Only used in profile packets.
+    ProfiledFrameSymbols profiled_frame_symbols = 55;
+    ModuleSymbols module_symbols = 61;
+    DeobfuscationMapping deobfuscation_mapping = 64;
+
+    // Only used by TrackEvent.
+    TrackDescriptor track_descriptor = 60;
+
+    // Deprecated, use TrackDescriptor instead.
+    ProcessDescriptor process_descriptor = 43;
+
+    // Deprecated, use TrackDescriptor instead.
+    ThreadDescriptor thread_descriptor = 44;
+
+    // Events from the Linux kernel ftrace infrastructure.
+    FtraceEventBundle ftrace_events = 1;
+
+    // This field is emitted at periodic intervals (~10s) and
+    // contains always the binary representation of the UUID
+    // {82477a76-b28d-42ba-81dc-33326d57a079}. This is used to be able to
+    // efficiently partition long traces without having to fully parse them.
+    bytes synchronization_marker = 36;
+
+    // Zero or more proto encoded trace packets compressed using deflate.
+    // Each compressed_packets TracePacket (including the two field ids and
+    // sizes) should be less than 512KB.
+    bytes compressed_packets = 50;
+
+    // Data sources can extend the trace proto with custom extension protos (see
+    // docs/design-docs/extensions.md). When they do that, the descriptor of
+    // their extension proto descriptor is serialized in this packet. This
+    // allows trace_processor to deserialize extended messages using reflection
+    // even if the extension proto is not checked in the Perfetto repo.
+    ExtensionDescriptor extension_descriptor = 72;
+
+    // Represents a single packet sent or received by the network.
+    NetworkPacketEvent network_packet = 88;
+
+    // Represents one or more packets sent or received by the network.
+    NetworkPacketBundle network_packet_bundle = 92;
+
+    // The "range of interest" for track events. See the message definition
+    // comments for more details.
+    TrackEventRangeOfInterest track_event_range_of_interest = 90;
+
+    // Winscope traces
+    LayersSnapshotProto surfaceflinger_layers_snapshot = 93;
+    TransactionTraceEntry surfaceflinger_transactions = 94;
+    ShellTransition shell_transition = 96;
+    ShellHandlerMappings shell_handler_mappings = 97;
+    ProtoLogMessage protolog_message = 104;
+    ProtoLogViewerConfig protolog_viewer_config = 105;
+
+    // Events from the Windows etw infrastructure.
+    EtwTraceEventBundle etw_events = 95;
+
+    V8JsCode v8_js_code = 99;
+    V8InternalCode v8_internal_code = 100;
+    V8WasmCode v8_wasm_code = 101;
+    V8RegExpCode v8_reg_exp_code = 102;
+    V8CodeMove v8_code_move = 103;
+
+    // InputFlinger traces
+    AndroidInputEvent android_input_event = 106;
+
+    // Clock synchronization with remote machines.
+    RemoteClockSync remote_clock_sync = 107;
+
+    // This field is only used for testing.
+    // In previous versions of this proto this field had the id 268435455
+    // This caused many problems:
+    // - protozero decoder does not handle field ids larger than 999.
+    // - old versions of protoc produce Java bindings with syntax errors when
+    //   the field id is large enough.
+    TestEvent for_testing = 900;
+  }
+
+  // Trusted user id of the producer which generated this packet. Keep in sync
+  // with TrustedPacket.trusted_uid.
+  //
+  // TODO(eseckler): Emit this field in a PacketSequenceDescriptor message
+  // instead.
+  oneof optional_trusted_uid { int32 trusted_uid = 3; };
+
+  // Service-assigned identifier of the packet sequence this packet belongs to.
+  // Uniquely identifies a producer + writer pair within the tracing session. A
+  // value of zero denotes an invalid ID. Keep in sync with
+  // TrustedPacket.trusted_packet_sequence_id.
+  oneof optional_trusted_packet_sequence_id {
+    uint32 trusted_packet_sequence_id = 10;
+  }
+
+  // Trusted process id of the producer which generated this packet, written by
+  // the service.
+  optional int32 trusted_pid = 79;
+
+  // Incrementally emitted interned data, valid only on the packet's sequence
+  // (packets with the same |trusted_packet_sequence_id|). The writer will
+  // usually emit new interned data in the same TracePacket that first refers to
+  // it (since the last reset of interning state). It may also be emitted
+  // proactively in advance of referring to them in later packets.
+  optional InternedData interned_data = 12;
+
+  enum SequenceFlags {
+    SEQ_UNSPECIFIED = 0;
+
+    // Set by the writer to indicate that it will re-emit any incremental data
+    // for the packet's sequence before referring to it again. This includes
+    // interned data as well as periodically emitted data like
+    // Process/ThreadDescriptors. This flag only affects the current packet
+    // sequence (see |trusted_packet_sequence_id|).
+    //
+    // When set, this TracePacket and subsequent TracePackets on the same
+    // sequence will not refer to any incremental data emitted before this
+    // TracePacket. For example, previously emitted interned data will be
+    // re-emitted if it is referred to again.
+    //
+    // When the reader detects packet loss (|previous_packet_dropped|), it needs
+    // to skip packets in the sequence until the next one with this flag set, to
+    // ensure intact incremental data.
+    SEQ_INCREMENTAL_STATE_CLEARED = 1;
+
+    // This packet requires incremental state, such as TracePacketDefaults or
+    // InternedData, to be parsed correctly. The trace reader should skip this
+    // packet if incremental state is not valid on this sequence, i.e. if no
+    // packet with the SEQ_INCREMENTAL_STATE_CLEARED flag has been seen on the
+    // current |trusted_packet_sequence_id|.
+    SEQ_NEEDS_INCREMENTAL_STATE = 2;
+  };
+  optional uint32 sequence_flags = 13;
+
+  // DEPRECATED. Moved to SequenceFlags::SEQ_INCREMENTAL_STATE_CLEARED.
+  optional bool incremental_state_cleared = 41;
+
+  // Default values for fields of later TracePackets emitted on this packet's
+  // sequence (TracePackets with the same |trusted_packet_sequence_id|).
+  // It must be reemitted when incremental state is cleared (see
+  // |incremental_state_cleared|).
+  // Requires that any future packet emitted on the same sequence specifies
+  // the SEQ_NEEDS_INCREMENTAL_STATE flag.
+  // TracePacketDefaults always override the global defaults for any future
+  // packet on this sequence (regardless of SEQ_NEEDS_INCREMENTAL_STATE).
+  optional TracePacketDefaults trace_packet_defaults = 59;
+
+  // Flag set by the service if, for the current packet sequence (see
+  // |trusted_packet_sequence_id|), either:
+  // * this is the first packet, or
+  // * one or multiple packets were dropped since the last packet that the
+  //   consumer read from the sequence. This can happen if chunks in the trace
+  //   buffer are overridden before the consumer could read them when the trace
+  //   is configured in ring buffer mode.
+  //
+  // When packet loss occurs, incrementally emitted data (including interned
+  // data) on the sequence should be considered invalid up until the next packet
+  // with SEQ_INCREMENTAL_STATE_CLEARED set.
+  optional bool previous_packet_dropped = 42;
+
+  // Flag set by a producer (starting from SDK v29) if, for the current packet
+  // sequence (see |trusted_packet_sequence_id|), this is the first packet.
+  //
+  // This flag can be used for distinguishing the two situations when
+  // processing the trace:
+  // 1. There are no prior events for the sequence because of data loss, e.g.
+  //    due to ring buffer wrapping.
+  // 2. There are no prior events for the sequence because it didn't start
+  //    before this packet (= there's definitely no preceding data loss).
+  //
+  // Given that older SDK versions do not support this flag, this flag not
+  // being present for a particular sequence does not necessarily imply data
+  // loss.
+  optional bool first_packet_on_sequence = 87;
+
+  // The machine ID for identifying trace packets in a multi-machine tracing
+  // session. Is emitted by the tracing service for producers running on a
+  // remote host (e.g. a VM guest). For more context: go/crosetto-vm-tracing.
+  optional uint32 machine_id = 98;
+}
+
+// End of protos/perfetto/trace/trace_packet.proto
+
+// Begin of protos/perfetto/trace/trace.proto
+
+message Trace {
+  repeated TracePacket packet = 1;
+
+  // Do NOT add any other field here. This is just a convenience wrapper for
+  // the use case of a trace being saved to a file. There are other cases
+  // (streaming) where TracePacket are directly streamed without being wrapped
+  // in a Trace proto. Nothing should ever rely on the full trace, all the
+  // logic should be based on TracePacket(s).
+}
+
+// End of protos/perfetto/trace/trace.proto
diff --git a/src/libtracing/protos/perfetto/trace/power/android_energy_estimation_breakdown.proto b/src/libtracing/protos/perfetto/trace/power/android_energy_estimation_breakdown.proto
new file mode 100644
index 000000000..2ad4dd151
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/power/android_energy_estimation_breakdown.proto
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+import "protos/perfetto/common/android_energy_consumer_descriptor.proto";
+
+// Energy data retrieve using the ODPM(On Device Power Monitor) API.
+// This proto represents the aidl class:
+// android.hardware.power.stats.EnergyConsumerResult.
+message AndroidEnergyEstimationBreakdown {
+  // The first trace packet of each session should include a energy consumer
+  // descriptor.
+  optional AndroidEnergyConsumerDescriptor energy_consumer_descriptor = 1;
+
+  // ID of the AndroidEnergyConsumer associated with this result.  Matches
+  // the energy_consumer_id in the AndroidEnergyConsumerDescriptor that
+  // should be sent at the beginning of a trace.
+  optional int32 energy_consumer_id = 2;
+
+  // Total accumulated energy since boot in microwatt-seconds (uWs)
+  optional int64 energy_uws = 3;
+
+  message EnergyUidBreakdown {
+    // Android ID/Linux UID, the accumulated energy is attributed to.
+    optional int32 uid = 1;
+
+    // Accumulated energy since boot in microwatt-seconds (uWs).
+    optional int64 energy_uws = 2;
+  }
+  // Optional attributed energy per Android ID / Linux UID for this
+  // EnergyConsumer. Sum total of attributed energy must be less than or equal
+  // to total accumulated energy.
+  repeated EnergyUidBreakdown per_uid_breakdown = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/power/android_entity_state_residency.proto b/src/libtracing/protos/perfetto/trace/power/android_entity_state_residency.proto
new file mode 100644
index 000000000..e216bd94a
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/power/android_entity_state_residency.proto
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message EntityStateResidency {
+  message PowerEntityState {
+    // Index corresponding to the entity
+    optional int32 entity_index = 1;
+
+    // Index corresponding to the state
+    optional int32 state_index = 2;
+
+    // Name of the entity. This is device-specific, determined by the PowerStats
+    // HAL, and cannot be configured by the user. An example would be
+    // "Bluetooth".
+    optional string entity_name = 3;
+
+    // Name of the state. This is device-specific, determined by the PowerStats
+    // HAL, and cannot be configured by the user. An example would be
+    // "Active".
+    optional string state_name = 4;
+  }
+
+  // This is only emitted at the beginning of the trace.
+  repeated PowerEntityState power_entity_state = 1;
+
+  message StateResidency {
+    // Index corresponding to PowerEntityState.entity_index
+    optional int32 entity_index = 1;
+
+    // Index corresponding to PowerEntityState.state_index
+    optional int32 state_index = 2;
+
+    // Time since boot that this entity has been in this state
+    optional uint64 total_time_in_state_ms = 3;
+
+    // Total number of times since boot that the entity has entered this state
+    optional uint64 total_state_entry_count = 4;
+
+    // Timestamp of the last time the entity entered this state
+    optional uint64 last_entry_timestamp_ms = 5;
+  }
+
+  repeated StateResidency residency = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/power/battery_counters.proto b/src/libtracing/protos/perfetto/trace/power/battery_counters.proto
new file mode 100644
index 000000000..fa2000519
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/power/battery_counters.proto
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message BatteryCounters {
+  // Battery capacity in microampere-hours(µAh). Also known as Coulomb counter.
+  optional int64 charge_counter_uah = 1;
+
+  // Remaining battery capacity percentage of total capacity
+  optional float capacity_percent = 2;
+
+  // Instantaneous battery current in microamperes(µA).
+  // Negative values indicate current being drained from the battery and
+  // positive values indicate current feeding the battery from a charge source
+  // (USB).
+  //
+  // See https://perfetto.dev/docs/data-sources/battery-counters for more info.
+  optional int64 current_ua = 3;
+
+  // Instantaneous battery current in microamperes(µA).
+  optional int64 current_avg_ua = 4;
+
+  // Battery name, emitted only on multiple batteries.
+  optional string name = 5;
+
+  // Battery capacity in microwatt-hours(µWh).
+  optional int64 energy_counter_uwh = 6;
+
+  // Battery voltage in microvolts(µV).
+  optional int64 voltage_uv = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/power/power_rails.proto b/src/libtracing/protos/perfetto/trace/power/power_rails.proto
new file mode 100644
index 000000000..efe8a520e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/power/power_rails.proto
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+message PowerRails {
+
+  message RailDescriptor {
+    // Index corresponding to the rail
+    optional uint32 index = 1;
+
+    // Name of the rail
+    optional string rail_name = 2;
+
+    // Name of the subsystem to which this rail belongs
+    optional string subsys_name = 3;
+
+    // Hardware sampling rate (Hz).
+    optional uint32 sampling_rate = 4;
+  }
+
+  // This is only emitted at the beginning of the trace.
+  repeated RailDescriptor rail_descriptor = 1;
+
+  message EnergyData {
+    // Index corresponding to RailDescriptor.index
+    optional uint32 index = 1;
+
+    // Time since device boot(CLOCK_BOOTTIME) in milli-seconds.
+    optional uint64 timestamp_ms = 2;
+
+    // Accumulated energy since device boot in microwatt-seconds (uWs).
+    optional uint64 energy = 3;
+  }
+
+  repeated EnergyData energy_data = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/profiling/deobfuscation.proto b/src/libtracing/protos/perfetto/trace/profiling/deobfuscation.proto
new file mode 100644
index 000000000..e9437f91b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/profiling/deobfuscation.proto
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message ObfuscatedMember {
+  // This is the obfuscated field name relative to the class containing the
+  // ObfuscatedMember.
+  optional string obfuscated_name = 1;
+  // If this is fully qualified (i.e. contains a '.') this is the deobfuscated
+  // field name including its class. Otherwise, this is this the unqualified
+  // deobfuscated field name relative to the class containing this
+  // ObfuscatedMember.
+  optional string deobfuscated_name = 2;
+}
+
+message ObfuscatedClass {
+  optional string obfuscated_name = 1;
+  optional string deobfuscated_name = 2;
+  // fields.
+  repeated ObfuscatedMember obfuscated_members = 3;
+  repeated ObfuscatedMember obfuscated_methods = 4;
+}
+
+message DeobfuscationMapping {
+  optional string package_name = 1;
+  optional int64 version_code = 2;
+  repeated ObfuscatedClass obfuscated_classes = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/profiling/heap_graph.proto b/src/libtracing/protos/perfetto/trace/profiling/heap_graph.proto
new file mode 100644
index 000000000..d57568fcb
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/profiling/heap_graph.proto
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+// TODO(fmayer): Remove this import once clients are migrated to the new
+// location.
+import public "protos/perfetto/trace/profiling/deobfuscation.proto";
+import "protos/perfetto/trace/profiling/profile_common.proto";
+
+// These messages encode a graph of objects that retain one another. Currently
+// this is used for Android Runtime (i.e. Java and Kotlin) heap graphs.
+
+package perfetto.protos;
+
+message HeapGraphRoot {
+  enum Type {
+    ROOT_UNKNOWN = 0;
+    ROOT_JNI_GLOBAL = 1;
+    ROOT_JNI_LOCAL = 2;
+    ROOT_JAVA_FRAME = 3;
+    ROOT_NATIVE_STACK = 4;
+    ROOT_STICKY_CLASS = 5;
+    ROOT_THREAD_BLOCK = 6;
+    ROOT_MONITOR_USED = 7;
+    ROOT_THREAD_OBJECT = 8;
+    ROOT_INTERNED_STRING = 9;
+    ROOT_FINALIZING = 10;
+    ROOT_DEBUGGER = 11;
+    ROOT_REFERENCE_CLEANUP = 12;
+    ROOT_VM_INTERNAL = 13;
+    ROOT_JNI_MONITOR = 14;
+  };
+  // Objects retained by this root.
+  repeated uint64 object_ids = 1 [packed = true];
+
+  optional Type root_type = 2;
+}
+
+message HeapGraphType {
+  enum Kind {
+    KIND_UNKNOWN = 0;
+    KIND_NORMAL = 1;
+    KIND_NOREFERENCES = 2;
+    KIND_STRING = 3;
+    KIND_ARRAY = 4;
+    KIND_CLASS = 5;
+    KIND_CLASSLOADER = 6;
+    KIND_DEXCACHE = 7;
+    KIND_SOFT_REFERENCE = 8;
+    KIND_WEAK_REFERENCE = 9;
+    KIND_FINALIZER_REFERENCE = 10;
+    KIND_PHANTOM_REFERENCE = 11;
+  };
+  // TODO(fmayer): Consider removing this and using the index in the repeaed
+  // field to save space.
+  optional uint64 id = 1;
+  optional uint64 location_id = 2;
+  optional string class_name = 3;
+  // Size of objects of this type.
+  optional uint64 object_size = 4;
+  optional uint64 superclass_id = 5;
+  // Indices for InternedData.field_names for the names of the fields of
+  // instances of this class. This does NOT include the fields from
+  // superclasses. The consumer of this data needs to walk all super
+  // classes to get a full lists of fields. Objects always write the
+  // fields in order of most specific class to the furthest up superclass.
+  repeated uint64 reference_field_id = 6 [packed = true];
+  optional Kind kind = 7;
+  optional uint64 classloader_id = 8;
+}
+
+message HeapGraphObject {
+  oneof identifier {
+    uint64 id = 1;
+    uint64 id_delta = 7;
+  }
+
+  // Index for InternedData.types for the name of the type of this object.
+  optional uint64 type_id = 2;
+
+  // Bytes occupied by this objects.
+  optional uint64 self_size = 3;
+
+  // Add this to all non-zero values in reference_object_id. This is used to
+  // get more compact varint encoding.
+  //
+  // The name is confusing, but this has always been used as a base for
+  // reference_object_id. The field should be named reference_object_id_base.
+  optional uint64 reference_field_id_base = 6;
+
+  // Indices for InternedData.field_names for the name of the field referring
+  // to the object. For Android S+ and for instances of normal classes (e.g.
+  // not instances of java.lang.Class or arrays), this is instead set in the
+  // corresponding HeapGraphType, and this is left empty.
+  repeated uint64 reference_field_id = 4 [packed = true];
+
+  // Ids of the Object that is referred to.
+  repeated uint64 reference_object_id = 5 [packed = true];
+
+  // If this object is an instance of `libcore.util.NativeAllocationRegistry`,
+  // the value of the `size` field.
+  //
+  // N.B. This is not the native size of this object.
+  optional int64 native_allocation_registry_size_field = 8;
+}
+
+message HeapGraph {
+  optional int32 pid = 1;
+
+  // This contains all objects at the time this dump was taken. Some of these
+  // will be live, some of those unreachable (garbage). To find the live
+  // objects, the client needs to build the transitive closure of objects
+  // reachable from |roots|.
+  // All objects not contained within that transitive closure are garbage that
+  // has not yet been collected.
+  repeated HeapGraphObject objects = 2;
+
+  // Roots at the time this dump was taken.
+  // All live objects are reachable from the roots. All other objects are
+  // garbage.
+  repeated HeapGraphRoot roots = 7;
+
+  // Types used in HeapGraphObjects.
+  repeated HeapGraphType types = 9;
+
+  reserved 3;
+
+  // Field names for references in managed heap graph.
+  repeated InternedString field_names = 4;
+
+  // Paths of files used in managed heap graph.
+  repeated InternedString location_names = 8;
+
+  optional bool continued = 5;
+  optional uint64 index = 6;
+}
diff --git a/src/libtracing/protos/perfetto/trace/profiling/profile_common.proto b/src/libtracing/protos/perfetto/trace/profiling/profile_common.proto
new file mode 100644
index 000000000..c05839556
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/profiling/profile_common.proto
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// TODO(fmayer): Figure out naming thoroughout this file to get a
+// nomenclature that works between Windows and Linux.
+
+// The interning fields in this file can refer to 2 different intern tables,
+// depending on the message they are used in. If the interned fields are present
+// in ProfilePacket proto, then the intern tables included in the ProfilePacket
+// should be used. If the intered fields are present in the
+// StreamingProfilePacket proto, then the intern tables included in all of the
+// previous InternedData message with same sequence ID should be used.
+// TODO(fmayer): Move to the intern tables to a common location.
+message InternedString {
+  optional uint64 iid = 1;
+  optional bytes str = 2;
+}
+
+// A symbol field that is emitted after the trace is written. These tables would
+// be appended as the last packets in the trace that the profiler will use, so
+// that the actual trace need not be rewritten to symbolize the profiles.
+message ProfiledFrameSymbols {
+  // Use the frame id as the interning key for the symbols.
+  optional uint64 frame_iid = 1;
+
+  // These are repeated because when inlining happens, multiple functions'
+  // frames can be at a single address. Imagine function Foo calling the
+  // std::vector<int> constructor, which gets inlined at 0xf00. We then get
+  // both Foo and the std::vector<int> constructor when we symbolize the
+  // address.
+
+  // key to InternedString
+  repeated uint64 function_name_id = 2;
+
+  // key to InternedString
+  repeated uint64 file_name_id = 3;
+
+  repeated uint32 line_number = 4;
+}
+
+message Line {
+  optional string function_name = 1;
+  optional string source_file_name = 2;
+  optional uint32 line_number = 3;
+}
+
+// Symbols for a given address in a module.
+message AddressSymbols {
+  optional uint64 address = 1;
+
+  // Source lines that correspond to this address.
+  //
+  // These are repeated because when inlining happens, multiple functions'
+  // frames can be at a single address. Imagine function Foo calling the
+  // std::vector<int> constructor, which gets inlined at 0xf00. We then get
+  // both Foo and the std::vector<int> constructor when we symbolize the
+  // address.
+  repeated Line lines = 2;
+}
+
+// Symbols for addresses seen in a module.
+message ModuleSymbols {
+  // Fully qualified path to the mapping.
+  // E.g. /system/lib64/libc.so.
+  optional string path = 1;
+
+  // .note.gnu.build-id on Linux (not hex encoded).
+  // uuid on MacOS.
+  // Module GUID on Windows.
+  optional string build_id = 2;
+  repeated AddressSymbols address_symbols = 3;
+}
+
+message Mapping {
+  // Interning key.
+  optional uint64 iid = 1;
+
+  // Interning key.
+  optional uint64 build_id = 2;
+
+  // The linker may create multiple memory mappings for the same shared
+  // library.
+  // This is so that the ELF header is mapped as read only, while the
+  // executable memory is mapped as executable only.
+  // The details of this depend on the linker, a possible mapping of an ELF
+  // file is this:
+  //         +----------------------+
+  // ELF     |xxxxxxxxxyyyyyyyyyyyyy|
+  //         +---------+------------+
+  //         |         |
+  //         | read    | executable
+  //         v mapping v mapping
+  //         +----------------------+
+  // Memory  |xxxxxxxxx|yyyyyyyyyyyy|
+  //         +------------------+---+
+  //         ^         ^        ^
+  //         +         +        +
+  //       start     exact    relpc
+  //       offset   offset    0x1800
+  //       0x0000   0x1000
+  //
+  // exact_offset is the offset into the library file of this mapping.
+  // start_offset is the offset into the library file of the first mapping
+  // for that library. For native libraries (.so files) this should be 0.
+
+  // This is not set on Android 10.
+  optional uint64 exact_offset = 8;
+
+  optional uint64 start_offset = 3;
+  optional uint64 start = 4;
+  optional uint64 end = 5;
+  optional uint64 load_bias = 6;
+
+  // E.g. ["system", "lib64", "libc.so"]
+  // id of string.
+  repeated uint64 path_string_ids = 7;
+}
+
+message Frame {
+  // Interning key
+  optional uint64 iid = 1;
+
+  // E.g. "fopen"
+  // id of string.
+  optional uint64 function_name_id = 2;
+
+  optional uint64 mapping_id = 3;
+  optional uint64 rel_pc = 4;
+}
+
+message Callstack {
+  optional uint64 iid = 1;
+  // Frames of this callstack. Bottom frame first.
+  repeated uint64 frame_ids = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/profiling/profile_packet.proto b/src/libtracing/protos/perfetto/trace/profiling/profile_packet.proto
new file mode 100644
index 000000000..df466f7bc
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/profiling/profile_packet.proto
@@ -0,0 +1,363 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/perf_events.proto";
+import "protos/perfetto/trace/profiling/profile_common.proto";
+
+package perfetto.protos;
+
+// This file contains a mixture of messages emitted by various sampling
+// profilers:
+//
+// Memory allocator profiling
+// ----------------
+// ProfilePacket:
+//   The packet emitted by heapprofd, which started off as a native heap
+//   (malloc/free) profiler, but now supports custom allocators as well. Each
+//   packet contains a preaggregated state of the heap at snapshot time, which
+//   report the total allocated/free bytes per callstack (plus other info such
+//   as the number of samples).
+// StreamingAllocation/StreamingFree:
+//   Emitted by heapprofd when configured in streaming mode (i.e. when
+//   stream_allocations = true). This is only for local testing, and doesn't
+//   report callstacks (only address time and size of each alloc/free). It can
+//   lead to enormous traces, as it contains the stream of each alloc/free call.
+//
+// Callstack sampling
+// ------------------
+// StreamingProfilePacket:
+//   The packet emitted by the chromium in-process sampling profiler, which is
+//   based on periodically sending a signal to itself, and unwinding the stack
+//   in the signal handler. Each packet contains a series of individual stack
+//   samples for a Chromium thread.
+//
+// Callstack and performance counter sampling
+// ---------------------
+// PerfSample:
+//   The packet emitted by traced_perf sampling performance profiler based on
+//   the perf_event_open syscall. Each packet represents an individual sample
+//   of a performance counter (which might be a timer), and optionally a
+//   callstack of the process that was scheduled at the time of the sample.
+//
+
+// The packet emitted by heapprofd for each heap snapshot. A snapshot can
+// involve more than one ProfilePacket if the snapshot is big (when |continued|
+// is true). The cardinality and grouping is as follows:
+// A ProfilePacket contains:
+//  - 1+ per-process heap snapshots (ProcessHeapSamples). Normally there is only
+//    one heap per process (the main malloc/free heap), but there can be more if
+//    the process is using the heapprofd API to profile custom allocators.
+//  - Globally interned strings, mappings and frames (to allow de-duplicating
+//    frames/mapping in common between different processes).
+// A ProcessHeapSamples contains:
+//  - The process and heap identifier.
+//  - A number of HeapSample, one for each callsite that had some alloc/frees.
+//  - Statistics about heapprofd internals (e.g., sampling/unwinding timings).
+// A HeapSample contains statistics about callsites:
+//  - Total number of bytes allocated and freed from that callsite.
+//  - Total number of alloc/free calls sampled.
+//  - Stats at the local maximum when dump_at_max = true.
+// See https://perfetto.dev/docs/data-sources/native-heap-profiler for more.
+message ProfilePacket {
+  // The following interning tables are only used in Android version Q.
+  // In newer versions, these tables are in InternedData
+  // (see protos/perfetto/trace/interned_data) and are shared across
+  // multiple ProfilePackets.
+  // For backwards compatibility, consumers need to first look up interned
+  // data in the tables within the ProfilePacket, and then, if they are empty,
+  // look up in the InternedData instead.
+  repeated InternedString strings = 1;
+  repeated Mapping mappings = 4;
+  repeated Frame frames = 2;
+  repeated Callstack callstacks = 3;
+
+  // Next ID: 9
+  message HeapSample {
+    optional uint64 callstack_id = 1;
+    // bytes allocated at this callstack.
+    optional uint64 self_allocated = 2;
+    // bytes allocated at this callstack that have been freed.
+    optional uint64 self_freed = 3;
+    // deprecated self_idle.
+    reserved 7;
+    // Bytes allocated by this callstack but not freed at the time the malloc
+    // heap usage of this process was maximal. This is only set if dump_at_max
+    // is true in HeapprofdConfig. In that case, self_allocated, self_freed and
+    // self_idle will not be set.
+    optional uint64 self_max = 8;
+    // Number of allocations that were sampled at this callstack but not freed
+    // at the time the malloc heap usage of this process was maximal. This is
+    // only set if dump_at_max is true in HeapprofdConfig. In that case,
+    // self_allocated, self_freed and self_idle will not be set.
+    optional uint64 self_max_count = 9;
+    // timestamp [opt]
+    optional uint64 timestamp = 4;
+    // Number of allocations that were sampled at this callstack.
+    optional uint64 alloc_count = 5;
+    // Number of allocations that were sampled at this callstack that have been
+    // freed.
+    optional uint64 free_count = 6;
+  }
+
+  message Histogram {
+    message Bucket {
+      // This bucket counts values from the previous bucket's (or -infinity if
+      // this is the first bucket) upper_limit (inclusive) to this upper_limit
+      // (exclusive).
+      optional uint64 upper_limit = 1;
+      // This is the highest bucket. This is set instead of the upper_limit. Any
+      // values larger or equal to the previous bucket's upper_limit are counted
+      // in this bucket.
+      optional bool max_bucket = 2;
+      // Number of values that fall into this range.
+      optional uint64 count = 3;
+    }
+    repeated Bucket buckets = 1;
+  }
+
+  message ProcessStats {
+    optional uint64 unwinding_errors = 1;
+    optional uint64 heap_samples = 2;
+    optional uint64 map_reparses = 3;
+    optional Histogram unwinding_time_us = 4;
+    optional uint64 total_unwinding_time_us = 5;
+    optional uint64 client_spinlock_blocked_us = 6;
+  }
+
+  repeated ProcessHeapSamples process_dumps = 5;
+  message ProcessHeapSamples {
+    enum ClientError {
+      CLIENT_ERROR_NONE = 0;
+      CLIENT_ERROR_HIT_TIMEOUT = 1;
+      CLIENT_ERROR_INVALID_STACK_BOUNDS = 2;
+    }
+    optional uint64 pid = 1;
+
+    // This process was profiled from startup.
+    // If false, this process was already running when profiling started.
+    optional bool from_startup = 3;
+
+    // This process was not profiled because a concurrent session was active.
+    // If this is true, samples will be empty.
+    optional bool rejected_concurrent = 4;
+
+    // This process disconnected while it was profiled.
+    // If false, the process outlived the profiling session.
+    optional bool disconnected = 6;
+
+    // If disconnected, this disconnect was caused by the client overrunning
+    // the buffer.
+    // Equivalent to client_error == CLIENT_ERROR_HIT_TIMEOUT
+    // on new S builds.
+    optional bool buffer_overran = 7;
+
+    optional ClientError client_error = 14;
+
+    // If disconnected, this disconnected was caused by the shared memory
+    // buffer being corrupted. THIS IS ALWAYS A BUG IN HEAPPROFD OR CLIENT
+    // MEMORY CORRUPTION.
+    optional bool buffer_corrupted = 8;
+
+    // If disconnected, this disconnect was caused by heapprofd exceeding
+    // guardrails during this profiling session.
+    optional bool hit_guardrail = 10;
+
+    optional string heap_name = 11;
+    optional uint64 sampling_interval_bytes = 12;
+    optional uint64 orig_sampling_interval_bytes = 13;
+
+    // Timestamp of the state of the target process that this dump represents.
+    // This can be different to the timestamp of the TracePackets for various
+    // reasons:
+    // * If disconnected is set above, this is the timestamp of last state
+    //   heapprofd had of the process before it disconnected.
+    // * Otherwise, if the rate of events produced by the process is high,
+    //   heapprofd might be behind.
+    //
+    // TODO(fmayer): This is MONOTONIC_COARSE. Refactor ClockSnapshot::Clock
+    //               to have a type enum that we can reuse here.
+    optional uint64 timestamp = 9;
+
+    // Metadata about heapprofd.
+    optional ProcessStats stats = 5;
+
+    repeated HeapSample samples = 2;
+  }
+
+  // If this is true, the next ProfilePacket in this package_sequence_id is a
+  // continuation of this one.
+  // To get all samples for a process, accummulate its
+  // ProcessHeapSamples.samples until you see continued=false.
+  optional bool continued = 6;
+
+  // Index of this ProfilePacket on its package_sequence_id. Can be used
+  // to detect dropped data.
+  // Verify these are consecutive.
+  optional uint64 index = 7;
+}
+
+// Packet emitted by heapprofd when stream_allocations = true. Only for local
+// testing. Doesn't report the callsite.
+message StreamingAllocation {
+  // TODO(fmayer): Add callstack.
+  repeated uint64 address = 1;
+  repeated uint64 size = 2;
+  repeated uint64 sample_size = 3;
+  repeated uint64 clock_monotonic_coarse_timestamp = 4;
+  repeated uint32 heap_id = 5;
+  repeated uint64 sequence_number = 6;
+};
+
+// Packet emitted by heapprofd when stream_allocations = true. Only for local
+// testing. Doesn't report the callsite.
+message StreamingFree {
+  // TODO(fmayer): Add callstack.
+  repeated uint64 address = 1;
+  repeated uint32 heap_id = 2;
+  repeated uint64 sequence_number = 3;
+};
+
+// Packet emitted by the chromium in-process signal-based callstack sampler.
+// Represents a series of individual stack samples (sampled at discrete points
+// in time), rather than aggregated over an interval.
+message StreamingProfilePacket {
+  // Index into InternedData.callstacks
+  repeated uint64 callstack_iid = 1;
+  // TODO(eseckler): ThreadDescriptor-based timestamps are deprecated. Replace
+  // this with ClockSnapshot-based delta encoding instead.
+  repeated int64 timestamp_delta_us = 2;
+  optional int32 process_priority = 3;
+}
+
+// Namespace for the contained enums.
+message Profiling {
+  enum CpuMode {
+    MODE_UNKNOWN = 0;
+    MODE_KERNEL = 1;
+    MODE_USER = 2;
+    // The following values aren't expected, but included for completeness:
+    MODE_HYPERVISOR = 3;
+    MODE_GUEST_KERNEL = 4;
+    MODE_GUEST_USER = 5;
+  }
+
+  // Enumeration of libunwindstack's error codes.
+  // NB: the integral representations of the two enums are different.
+  enum StackUnwindError {
+    UNWIND_ERROR_UNKNOWN = 0;
+    UNWIND_ERROR_NONE = 1;
+    UNWIND_ERROR_MEMORY_INVALID = 2;
+    UNWIND_ERROR_UNWIND_INFO = 3;
+    UNWIND_ERROR_UNSUPPORTED = 4;
+    UNWIND_ERROR_INVALID_MAP = 5;
+    UNWIND_ERROR_MAX_FRAMES_EXCEEDED = 6;
+    UNWIND_ERROR_REPEATED_FRAME = 7;
+    UNWIND_ERROR_INVALID_ELF = 8;
+    UNWIND_ERROR_SYSTEM_CALL = 9;
+    UNWIND_ERROR_THREAD_TIMEOUT = 10;
+    UNWIND_ERROR_THREAD_DOES_NOT_EXIST = 11;
+    UNWIND_ERROR_BAD_ARCH = 12;
+    UNWIND_ERROR_MAPS_PARSE = 13;
+    UNWIND_ERROR_INVALID_PARAMETER = 14;
+    UNWIND_ERROR_PTRACE_CALL = 15;
+  }
+}
+
+// Packet emitted by the traced_perf sampling performance profiler, which
+// gathers data via the perf_event_open syscall. Each packet contains an
+// individual sample with a counter value, and optionally a
+// callstack.
+//
+// Timestamps are within the root packet. The config can specify the clock, or
+// the implementation will default to CLOCK_MONOTONIC_RAW. Within the Android R
+// timeframe, the default was CLOCK_BOOTTIME.
+//
+// There are several distinct views of this message:
+// * indication of kernel buffer data loss (kernel_records_lost set)
+// * indication of skipped samples (sample_skipped_reason set)
+// * notable event in the sampling implementation (producer_event set)
+// * normal sample (timebase_count set, typically also callstack_iid)
+message PerfSample {
+  optional uint32 cpu = 1;
+  optional uint32 pid = 2;
+  optional uint32 tid = 3;
+
+  // Execution state that the process was sampled at.
+  optional Profiling.CpuMode cpu_mode = 5;
+
+  // Value of the timebase counter (since the event was configured, no deltas).
+  optional uint64 timebase_count = 6;
+
+  // Unwound callstack. Might be partial, in which case a synthetic "error"
+  // frame is appended, and |unwind_error| is set accordingly.
+  optional uint64 callstack_iid = 4;
+
+  // If set, stack unwinding was incomplete due to an error.
+  // Unset values should be treated as UNWIND_ERROR_NONE.
+  oneof optional_unwind_error { Profiling.StackUnwindError unwind_error = 16; };
+
+  // If set, indicates that this message is not a sample, but rather an
+  // indication of data loss in the ring buffer allocated for |cpu|. Such data
+  // loss occurs when the kernel has insufficient ring buffer capacity to write
+  // a record (which gets discarded). A record in this context is an individual
+  // ring buffer entry, and counts more than just sample records.
+  //
+  // The |timestamp| of the packet corresponds to the time that the producer
+  // wrote the packet for trace-sorting purposes alone, and should not be
+  // interpreted relative to the sample timestamps. This field is sufficient to
+  // detect that *some* kernel data loss happened within the trace, but not the
+  // specific time bounds of that loss (which would require tracking precedessor
+  // & successor timestamps, which is not deemed necessary at the moment).
+  optional uint64 kernel_records_lost = 17;
+
+  // If set, indicates that the profiler encountered a sample that was relevant,
+  // but was skipped.
+  enum SampleSkipReason {
+    PROFILER_SKIP_UNKNOWN = 0;
+    PROFILER_SKIP_READ_STAGE = 1;
+    PROFILER_SKIP_UNWIND_STAGE = 2;
+    PROFILER_SKIP_UNWIND_ENQUEUE = 3;
+  }
+  oneof optional_sample_skipped_reason {
+    SampleSkipReason sample_skipped_reason = 18;
+  };
+
+  // A notable event within the sampling implementation.
+  message ProducerEvent {
+    enum DataSourceStopReason {
+      PROFILER_STOP_UNKNOWN = 0;
+      PROFILER_STOP_GUARDRAIL = 1;
+    }
+    oneof optional_source_stop_reason {
+      DataSourceStopReason source_stop_reason = 1;
+    }
+  }
+  optional ProducerEvent producer_event = 19;
+}
+
+// Submessage for TracePacketDefaults.
+message PerfSampleDefaults {
+  // The sampling timebase. Might not be identical to the data source config if
+  // the implementation decided to default/override some parameters.
+  optional PerfEvents.Timebase timebase = 1;
+
+  // If the config requested process sharding, report back the count and which
+  // of those bins was selected. Never changes for the duration of a trace.
+  optional uint32 process_shard_count = 2;
+  optional uint32 chosen_process_shard = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/profiling/smaps.proto b/src/libtracing/protos/perfetto/trace/profiling/smaps.proto
new file mode 100644
index 000000000..92521c393
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/profiling/smaps.proto
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message SmapsEntry {
+  optional string path = 1;
+  optional uint64 size_kb = 2;
+  optional uint64 private_dirty_kb = 3;
+  optional uint64 swap_kb = 4;
+
+  // for field upload (instead of path).
+  optional string file_name = 5;
+
+  // TODO(crbug.com/1098746): Consider encoding this as incremental values.
+  optional uint64 start_address = 6;
+  optional uint64 module_timestamp = 7;
+  optional string module_debugid = 8;
+  optional string module_debug_path = 9;
+  optional uint32 protection_flags = 10;
+
+  optional uint64 private_clean_resident_kb = 11;
+  optional uint64 shared_dirty_resident_kb = 12;
+  optional uint64 shared_clean_resident_kb = 13;
+  optional uint64 locked_kb = 14;
+  optional uint64 proportional_resident_kb = 15;
+};
+
+message SmapsPacket {
+  optional uint32 pid = 1;
+  repeated SmapsEntry entries = 2;
+};
diff --git a/src/libtracing/protos/perfetto/trace/ps/process_stats.proto b/src/libtracing/protos/perfetto/trace/ps/process_stats.proto
new file mode 100644
index 000000000..51756257d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ps/process_stats.proto
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Per-process periodically sampled stats. These samples are wrapped in a
+// dedicated message (as opposite to be fields in process_tree.proto) because
+// they are dumped at a different rate than cmdline and thread list.
+// Note: not all of these stats will be present in every ProcessStats message
+// and sometimes processes may be missing. This is because counters are
+// cached to reduce emission of counters which do not change.
+message ProcessStats {
+  // Per-thread periodically sampled stats.
+  // Note: not all of these stats will be present in every message. See the note
+  // for ProcessStats.
+  message Thread {
+    optional int32 tid = 1;
+
+    // DEPRECATED cpu_freq_indices
+    reserved 2;
+
+    // DEPRECATED cpu_freq_ticks
+    reserved 3;
+
+    // DEPRECATED cpu_freq_full
+    reserved 4;
+  }
+
+  message FDInfo {
+    optional uint64 fd = 1;
+    optional string path = 2;
+  }
+
+  message Process {
+    optional int32 pid = 1;
+
+    repeated Thread threads = 11;
+
+    // See /proc/[pid]/status in `man 5 proc` for a description of these fields.
+    optional uint64 vm_size_kb = 2;
+    optional uint64 vm_rss_kb = 3;
+    optional uint64 rss_anon_kb = 4;
+    optional uint64 rss_file_kb = 5;
+    optional uint64 rss_shmem_kb = 6;
+    optional uint64 vm_swap_kb = 7;
+    optional uint64 vm_locked_kb = 8;
+    optional uint64 vm_hwm_kb = 9;
+    // When adding a new field remember to update kProcMemCounterSize in
+    // the trace processor.
+
+    optional int64 oom_score_adj = 10;
+
+    // The peak resident set size is resettable in newer Posix kernels.
+    // This field specifies if reset is supported and if the writer had reset
+    // the peaks after each process stats recording.
+    optional bool is_peak_rss_resettable = 12;
+
+    // Private, shared and swap footprint of the process as measured by
+    // Chrome. To know more about these metrics refer to:
+    // https://docs.google.com/document/d/1_WmgE1F5WUrhwkPqJis3dWyOiUmQKvpXp5cd4w86TvA
+    optional uint32 chrome_private_footprint_kb = 13;
+    optional uint32 chrome_peak_resident_set_kb = 14;
+
+    repeated FDInfo fds = 15;
+
+    // These fields are set only when scan_smaps_rollup=true
+    optional uint64 smr_rss_kb = 16;
+    optional uint64 smr_pss_kb = 17;
+    optional uint64 smr_pss_anon_kb = 18;
+    optional uint64 smr_pss_file_kb = 19;
+    optional uint64 smr_pss_shmem_kb = 20;
+
+    // Time spent scheduled in user mode in nanoseconds. Parsed from utime in
+    // /proc/pid/stat. Recorded if record_process_runtime config option is set.
+    // Resolution of "clock ticks", usually 10ms.
+    optional uint64 runtime_user_mode = 21;
+
+    // Time spent scheduled in kernel mode in nanoseconds. Parsed from stime in
+    // /proc/pid/stat. Recorded if record_process_runtime config option is set.
+    // Resolution of "clock ticks", usually 10ms.
+    optional uint64 runtime_kernel_mode = 22;
+  }
+  repeated Process processes = 1;
+
+  // The time at which we finish collecting this batch of samples;
+  // the top-level packet timestamp is the time at which
+  // we begin collection.
+  optional uint64 collection_end_timestamp = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ps/process_tree.proto b/src/libtracing/protos/perfetto/trace/ps/process_tree.proto
new file mode 100644
index 000000000..0b9f04ce0
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ps/process_tree.proto
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Metadata about the processes and threads in the trace.
+// Note: this proto was designed to be filled in by traced_probes and should
+// only be populated with accurate information coming from the system. Other
+// trace writers should prefer to fill ThreadDescriptor and ProcessDescriptor
+// in TrackDescriptor.
+message ProcessTree {
+  // Representation of a thread.
+  message Thread {
+    // The thread ID (as per gettid()) in the root PID namespace.
+    optional int32 tid = 1;
+
+    // Thread group id (i.e. the PID of the process, == TID of the main thread)
+    optional int32 tgid = 3;
+
+    // The name of the thread.
+    optional string name = 2;
+
+    // The non-root-level thread IDs if the thread runs in a PID namespace. Read
+    // from the NSpid entry of /proc/<tid>/status, with the first element (root-
+    // level thread ID) omitted.
+    repeated int32 nstid = 4;
+  }
+
+  // Representation of a process.
+  message Process {
+    // The UNIX process ID, aka thread group ID (as per getpid()) in the root
+    // PID namespace.
+    optional int32 pid = 1;
+
+    // The parent process ID, as per getppid().
+    optional int32 ppid = 2;
+
+    // The command line for the process, as per /proc/pid/cmdline.
+    // If it is a kernel thread there will only be one cmdline field
+    // and it will contain /proc/pid/comm.
+    repeated string cmdline = 3;
+
+    // The uid for the process, as per /proc/pid/status.
+    optional int32 uid = 5;
+
+    // The non-root-level process IDs if the process runs in a PID namespace.
+    // Read from the NSpid entry of /proc/<pid>/status, with the first element
+    // (root-level process ID) omitted.
+    repeated int32 nspid = 6;
+
+    // Timestamp of when the process was created, in nanoseconds
+    // from boot. Parsed from starttime in /proc/pid/stat.
+    // Recorded if record_process_age config option is set.
+    // Resolution of "clock ticks", usually 10ms.
+    optional uint64 process_start_from_boot = 7;
+
+    // threads_deprecated
+    reserved 4;
+  }
+
+  // List of processes and threads in the client. These lists are incremental
+  // and not exhaustive. A process and its threads might show up separately in
+  // different ProcessTree messages. A thread might event not show up at all, if
+  // no sched_switch activity was detected, for instance:
+  // #0 { processes: [{pid: 10, ...}], threads: [{pid: 11, tgid: 10}] }
+  // #1 { threads: [{pid: 12, tgid: 10}] }
+  // #2 { processes: [{pid: 20, ...}], threads: [{pid: 13, tgid: 10}] }
+  repeated Process processes = 1;
+  repeated Thread threads = 2;
+
+  // The time at which we finish collecting this process tree;
+  // the top-level packet timestamp is the time at which
+  // we begin collection.
+  optional uint64 collection_end_timestamp = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/remote_clock_sync.proto b/src/libtracing/protos/perfetto/trace/remote_clock_sync.proto
new file mode 100644
index 000000000..a9d078cf7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/remote_clock_sync.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/clock_snapshot.proto";
+
+package perfetto.protos;
+
+// Records the parameters for aligning clock readings between machines.
+message RemoteClockSync {
+  // Synchronized clock snapshots taken on both sides of the relay port (the
+  // tracing service and the relay service). A round of clock synchronization
+  // IPC takes emits 2 SyncedClocks messages, i.e., client snapshot -> host
+  // snapshot -> client snapshot -> host snapshot.
+  message SyncedClocks {
+    optional ClockSnapshot client_clocks = 2;
+    optional ClockSnapshot host_clocks = 3;
+  }
+
+  repeated SyncedClocks synced_clocks = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/statsd/statsd_atom.proto b/src/libtracing/protos/perfetto/trace/statsd/statsd_atom.proto
new file mode 100644
index 000000000..8e487e8f9
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/statsd/statsd_atom.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Deliberate empty message. See comment on StatsdAtom#atom below.
+message Atom {}
+
+// One or more statsd atoms. This must continue to match:
+// perfetto/protos/third_party/statsd/shell_data.proto
+// So that we can efficiently add data from statsd directly to the
+// trace.
+message StatsdAtom {
+  // Atom should be filled with an Atom proto from:
+  // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/proto_logging/stats/atoms.proto?q=f:stats%2Fatoms.proto$%20message%5C%20Atom
+  // We don't reference Atom directly here since we don't want to import
+  // Atom.proto and all its transitive dependencies into Perfetto.
+  // atom and timestamp_nanos have the same cardinality
+  repeated Atom atom = 1;
+  repeated int64 timestamp_nanos = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/sys_stats/sys_stats.proto b/src/libtracing/protos/perfetto/trace/sys_stats/sys_stats.proto
new file mode 100644
index 000000000..60883cf55
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/sys_stats/sys_stats.proto
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+import "protos/perfetto/common/sys_stats_counters.proto";
+
+// Various Linux system stat counters from /proc.
+// The fields in this message can be reported at different rates and with
+// different granularity. See sys_stats_config.proto.
+message SysStats {
+  // Counters from /proc/meminfo. Values are in KB.
+  message MeminfoValue {
+    optional MeminfoCounters key = 1;
+    optional uint64 value = 2;
+  };
+  repeated MeminfoValue meminfo = 1;
+
+  // Counter from /proc/vmstat. Units are often pages, not KB.
+  message VmstatValue {
+    optional VmstatCounters key = 1;
+    optional uint64 value = 2;
+  };
+  repeated VmstatValue vmstat = 2;
+
+  // Times in each mode, since boot. Unit: nanoseconds.
+  message CpuTimes {
+    optional uint32 cpu_id = 1;
+
+    // Time spent in user mode.
+    optional uint64 user_ns = 2;
+
+    // Time spent in user mode (low prio).
+    optional uint64 user_nice_ns = 3;
+
+    // Time spent in system mode.
+    optional uint64 system_mode_ns = 4;
+
+    // Time spent in the idle task.
+    optional uint64 idle_ns = 5;
+
+    // Time spent waiting for I/O.
+    optional uint64 io_wait_ns = 6;
+
+    // Time spent servicing interrupts.
+    optional uint64 irq_ns = 7;
+
+    // Time spent servicing softirqs.
+    optional uint64 softirq_ns = 8;
+  }
+  // One entry per cpu.
+  repeated CpuTimes cpu_stat = 3;
+
+  // Num processes forked since boot.
+  // Populated only if FORK_COUNT in config.stat_counters.
+  optional uint64 num_forks = 4;
+
+  message InterruptCount {
+    optional int32 irq = 1;
+    optional uint64 count = 2;
+  }
+
+  // Number of interrupts, broken by IRQ number.
+  // Populated only if IRQ_COUNTS in config.stat_counters.
+
+  // Total num of irqs serviced since boot.
+  optional uint64 num_irq_total = 5;
+  repeated InterruptCount num_irq = 6;
+
+  // Number of softirqs, broken by softirq number.
+  // Populated only if SOFTIRQ_COUNTS in config.stat_counters.
+
+  // Total num of softirqs since boot.
+  optional uint64 num_softirq_total = 7;
+
+  // Per-softirq count.
+  repeated InterruptCount num_softirq = 8;
+
+  // The time at which we finish collecting this set of samples;
+  // the top-level packet timestamp is the time at which
+  // we begin collection.
+  optional uint64 collection_end_timestamp = 9;
+
+  // Frequencies for /sys/class/devfreq/ entries in kHz.
+  message DevfreqValue {
+    optional string key = 1;
+    optional uint64 value = 2;
+  };
+
+  // One entry per device.
+  repeated DevfreqValue devfreq = 10;
+
+  // Cpu current frequency from
+  // /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_cur_freq in kHz.
+  // One entry per cpu. Report 0 for offline cpu
+  repeated uint32 cpufreq_khz = 11;
+
+  message BuddyInfo {
+    optional string node = 1;
+    optional string zone = 2;
+    repeated uint32 order_pages = 3;
+  }
+  // One entry per each node's zones.
+  repeated BuddyInfo buddy_info = 12;
+
+  // Counters from /proc/diskstats.
+  message DiskStat {
+    optional string device_name = 1;
+    optional uint64 read_sectors = 2;
+    optional uint64 read_time_ms = 3;
+    optional uint64 write_sectors = 4;
+    optional uint64 write_time_ms = 5;
+    optional uint64 discard_sectors = 6;
+    optional uint64 discard_time_ms = 7;
+    optional uint64 flush_count = 8;
+    optional uint64 flush_time_ms = 9;
+  }
+  // One entry per disk device.
+  repeated DiskStat disk_stat = 13;
+
+  // Reading from /proc/pressure/*.
+  message PsiSample {
+    // Type of resource that may have exhibited pressure stalls.
+    //    * _SOME indicates some resource tasks stalled.
+    //    * _FULL indicates all non-idle resource tasks stalled simultaneously.
+    enum PsiResource {
+      PSI_RESOURCE_UNSPECIFIED = 0;
+      PSI_RESOURCE_CPU_SOME = 1;
+      PSI_RESOURCE_CPU_FULL = 2;
+      PSI_RESOURCE_IO_SOME = 3;
+      PSI_RESOURCE_IO_FULL = 4;
+      PSI_RESOURCE_MEMORY_SOME = 5;
+      PSI_RESOURCE_MEMORY_FULL = 6;
+    }
+    optional PsiResource resource = 1;
+
+    // Total absolute stall time (in nanos) for a given resource.
+    // While PSI readings are in micros, we store in nanos for consistency with
+    // most other time-based counters.
+    optional uint64 total_ns = 2;
+
+    // Note that /proc/pressure/* exposes historical average utilization values
+    // (as a %), but we don't yet sample those. They could easily be added as
+    // additional fields should the total stall time readings be insufficient.
+  }
+  // One entry per PsiResource type.
+  repeated PsiSample psi = 14;
+}
diff --git a/src/libtracing/protos/perfetto/trace/system_info.proto b/src/libtracing/protos/perfetto/trace/system_info.proto
new file mode 100644
index 000000000..9f3884899
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/system_info.proto
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message Utsname {
+  optional string sysname = 1;
+  optional string version = 2;
+  optional string release = 3;
+  optional string machine = 4;
+}
+
+message SystemInfo {
+  optional Utsname utsname = 1;
+  optional string android_build_fingerprint = 2;
+
+  // The version of traced (the same returned by `traced --version`).
+  // This is a human readable string with and its format varies depending on
+  // the build system and the repo (standalone vs AOSP).
+  // This is intended for human debugging only.
+  optional string tracing_service_version = 4;
+
+  // The Android SDK vesion (e.g. 21 for L, 31 for S etc).
+  // Introduced in Android T.
+  optional uint64 android_sdk_version = 5;
+
+  // Kernel page size - sysconf(_SC_PAGESIZE).
+  optional uint32 page_size = 6;
+
+  // Number of cpus - sysconf(_SC_NPROCESSORS_CONF).
+  // Might be different to the number of online cpus.
+  // Introduced in perfetto v44.
+  optional uint32 num_cpus = 8;
+
+  // The timezone offset from UTC, as per strftime("%z"), in minutes.
+  // Introduced in v38 / Android V.
+  optional int32 timezone_off_mins = 7;
+
+  // Ticks per second - sysconf(_SC_CLK_TCK).
+  // Not serialised as of perfetto v44.
+  optional int64 hz = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/system_info/cpu_info.proto b/src/libtracing/protos/perfetto/trace/system_info/cpu_info.proto
new file mode 100644
index 000000000..62f17e039
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/system_info/cpu_info.proto
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+package perfetto.protos;
+
+// Information about CPUs from procfs and sysfs.
+message CpuInfo {
+  // Information about a single CPU.
+  message Cpu {
+    // Value of "Processor" field from /proc/cpuinfo for this CPU.
+    // Example: "AArch64 Processor rev 12 (aarch64)"
+    optional string processor = 1;
+
+    // Frequencies from
+    // /sys/devices/system/cpu/cpuX/cpufreq/scaling_available_frequencies
+    // where X is the index of this CPU.
+    repeated uint32 frequencies = 2;
+  }
+
+  // Describes available CPUs, one entry per CPU.
+  repeated Cpu cpus = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/test_event.proto b/src/libtracing/protos/perfetto/trace/test_event.proto
new file mode 100644
index 000000000..023343e19
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/test_event.proto
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/track_event/debug_annotation.proto";
+
+package perfetto.protos;
+
+// Event used by testing code.
+message TestEvent {
+  // Arbitrary string used in tests.
+  optional string str = 1;
+
+  // The current value of the random number sequence used in tests.
+  optional uint32 seq_value = 2;
+
+  // Monotonically increased on each packet.
+  optional uint64 counter = 3;
+
+  // No more packets should follow (from the current sequence).
+  optional bool is_last = 4;
+
+  message TestPayload {
+    repeated string str = 1;
+    repeated TestPayload nested = 2;
+
+    optional string single_string = 4;
+
+    optional int32 single_int = 5;
+    repeated int32 repeated_ints = 6;
+
+    // When 0 this is the bottom-most nested message.
+    optional uint32 remaining_nesting_depth = 3;
+
+    repeated DebugAnnotation debug_annotations = 7;
+  }
+  optional TestPayload payload = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/test_extensions.proto b/src/libtracing/protos/perfetto/trace/test_extensions.proto
new file mode 100644
index 000000000..2d21e9214
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/test_extensions.proto
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import public "protos/perfetto/trace/track_event/track_event.proto";
+import "protos/perfetto/trace/track_event/debug_annotation.proto";
+
+package perfetto.protos;
+
+// Extensions for TrackEvent used for integration testing. This proto file is
+// compiled to descriptor and is used in tools/diff_test_trace_processor.py.
+//
+// See docs/design-docs/extensions.md for more details.
+message TestExtension {
+  extend TrackEvent {
+    optional string string_extension_for_testing = 9900;
+    optional string string_extension_for_testing2 = 9905;
+    repeated int32 int_extension_for_testing = 9901;
+    optional string omitted_extension_for_testing = 9902;
+    optional TestExtensionChild nested_message_extension_for_testing = 9903;
+    optional uint32 uint_extension_for_testing = 9904;
+  }
+}
+
+message TestExtensionChild {
+  optional string child_field_for_testing = 1;
+
+  repeated DebugAnnotation debug_annotations = 99;
+}
diff --git a/src/libtracing/protos/perfetto/trace/trace.proto b/src/libtracing/protos/perfetto/trace/trace.proto
new file mode 100644
index 000000000..2a1cd7984
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/trace.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/trace_packet.proto";
+
+package perfetto.protos;
+
+message Trace {
+  repeated TracePacket packet = 1;
+
+  // Do NOT add any other field here. This is just a convenience wrapper for
+  // the use case of a trace being saved to a file. There are other cases
+  // (streaming) where TracePacket are directly streamed without being wrapped
+  // in a Trace proto. Nothing should ever rely on the full trace, all the
+  // logic should be based on TracePacket(s).
+}
diff --git a/src/libtracing/protos/perfetto/trace/trace_packet.proto b/src/libtracing/protos/perfetto/trace/trace_packet.proto
new file mode 100644
index 000000000..93fb7d3e9
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/trace_packet.proto
@@ -0,0 +1,354 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/common/trace_stats.proto";
+import "protos/perfetto/config/trace_config.proto";
+import "protos/perfetto/trace/extension_descriptor.proto";
+import "protos/perfetto/trace/android/android_game_intervention_list.proto";
+import "protos/perfetto/trace/android/android_input_event.proto";
+import "protos/perfetto/trace/android/android_log.proto";
+import "protos/perfetto/trace/android/android_system_property.proto";
+import "protos/perfetto/trace/android/camera_event.proto";
+import "protos/perfetto/trace/android/frame_timeline_event.proto";
+import "protos/perfetto/trace/android/gpu_mem_event.proto";
+import "protos/perfetto/trace/android/graphics_frame_event.proto";
+import "protos/perfetto/trace/android/initial_display_state.proto";
+import "protos/perfetto/trace/android/network_trace.proto";
+import "protos/perfetto/trace/android/packages_list.proto";
+import "protos/perfetto/trace/android/protolog.proto";
+import "protos/perfetto/trace/android/shell_transition.proto";
+import "protos/perfetto/trace/android/surfaceflinger_layers.proto";
+import "protos/perfetto/trace/android/surfaceflinger_transactions.proto";
+import "protos/perfetto/trace/chrome/chrome_benchmark_metadata.proto";
+import "protos/perfetto/trace/chrome/chrome_metadata.proto";
+import "protos/perfetto/trace/chrome/chrome_trace_event.proto";
+import "protos/perfetto/trace/chrome/chrome_trigger.proto";
+import "protos/perfetto/trace/chrome/v8.proto";
+import "protos/perfetto/trace/clock_snapshot.proto";
+import "protos/perfetto/trace/etw/etw_event_bundle.proto";
+import "protos/perfetto/trace/filesystem/inode_file_map.proto";
+import "protos/perfetto/trace/ftrace/ftrace_event_bundle.proto";
+import "protos/perfetto/trace/ftrace/ftrace_stats.proto";
+import "protos/perfetto/trace/gpu/gpu_counter_event.proto";
+import "protos/perfetto/trace/gpu/gpu_log.proto";
+import "protos/perfetto/trace/gpu/gpu_render_stage_event.proto";
+import "protos/perfetto/trace/gpu/vulkan_memory_event.proto";
+import "protos/perfetto/trace/gpu/vulkan_api_event.proto";
+import "protos/perfetto/trace/interned_data/interned_data.proto";
+import "protos/perfetto/trace/memory_graph.proto";
+import "protos/perfetto/trace/perfetto/perfetto_metatrace.proto";
+import "protos/perfetto/trace/perfetto/tracing_service_event.proto";
+import "protos/perfetto/trace/power/android_energy_estimation_breakdown.proto";
+import "protos/perfetto/trace/power/android_entity_state_residency.proto";
+import "protos/perfetto/trace/power/battery_counters.proto";
+import "protos/perfetto/trace/power/power_rails.proto";
+import "protos/perfetto/trace/statsd/statsd_atom.proto";
+import "protos/perfetto/trace/profiling/deobfuscation.proto";
+import "protos/perfetto/trace/profiling/heap_graph.proto";
+import "protos/perfetto/trace/profiling/profile_common.proto";
+import "protos/perfetto/trace/profiling/profile_packet.proto";
+import "protos/perfetto/trace/profiling/smaps.proto";
+import "protos/perfetto/trace/ps/process_stats.proto";
+import "protos/perfetto/trace/ps/process_tree.proto";
+import "protos/perfetto/trace/remote_clock_sync.proto";
+import "protos/perfetto/trace/sys_stats/sys_stats.proto";
+import "protos/perfetto/trace/system_info.proto";
+import "protos/perfetto/trace/system_info/cpu_info.proto";
+import "protos/perfetto/trace/trace_packet_defaults.proto";
+import "protos/perfetto/trace/track_event/process_descriptor.proto";
+import "protos/perfetto/trace/track_event/range_of_interest.proto";
+import "protos/perfetto/trace/track_event/thread_descriptor.proto";
+import "protos/perfetto/trace/track_event/track_descriptor.proto";
+import "protos/perfetto/trace/track_event/track_event.proto";
+import "protos/perfetto/trace/translation/translation_table.proto";
+import "protos/perfetto/trace/trace_uuid.proto";
+import "protos/perfetto/trace/trigger.proto";
+import "protos/perfetto/trace/test_event.proto";
+import "protos/perfetto/trace/ui_state.proto";
+
+package perfetto.protos;
+
+// TracePacket is the root object of a Perfetto trace.
+// A Perfetto trace is a linear sequence of TracePacket(s).
+//
+// The tracing service guarantees that all TracePacket(s) written by a given
+// TraceWriter are seen in-order, without gaps or duplicates. If, for any
+// reason, a TraceWriter sequence becomes invalid, no more packets are returned
+// to the Consumer (or written into the trace file).
+// TracePacket(s) written by different TraceWriter(s), hence even different
+// data sources, can be seen in arbitrary order.
+// The consumer can re-establish a total order, if interested, using the packet
+// timestamps, after having synchronized the different clocks onto a global
+// clock.
+//
+// The tracing service is agnostic of the content of TracePacket, with the
+// exception of few fields (e.g.. trusted_*, trace_config) that are written by
+// the service itself.
+//
+// See the [Buffers and Dataflow](/docs/concepts/buffers.md) doc for details.
+//
+// Next reserved id: 14 (up to 15).
+// Next id: 109.
+message TracePacket {
+  // The timestamp of the TracePacket.
+  // By default this timestamps refers to the trace clock (CLOCK_BOOTTIME on
+  // Android). It can be overridden using a different timestamp_clock_id.
+  // The clock domain definition in ClockSnapshot can also override:
+  // - The unit (default: 1ns).
+  // - The absolute vs delta encoding (default: absolute timestamp).
+  optional uint64 timestamp = 8;
+
+  // Specifies the ID of the clock used for the TracePacket |timestamp|. Can be
+  // one of the built-in types from ClockSnapshot::BuiltinClocks, or a
+  // producer-defined clock id.
+  // If unspecified and if no default per-sequence value has been provided via
+  // TracePacketDefaults, it defaults to BuiltinClocks::BOOTTIME.
+  optional uint32 timestamp_clock_id = 58;
+
+  oneof data {
+    ProcessTree process_tree = 2;
+    ProcessStats process_stats = 9;
+    InodeFileMap inode_file_map = 4;
+    ChromeEventBundle chrome_events = 5;
+    ClockSnapshot clock_snapshot = 6;
+    SysStats sys_stats = 7;
+    TrackEvent track_event = 11;
+
+    // IDs up to 15 are reserved. They take only one byte to encode their
+    // preamble so should be used for frequent events.
+
+    TraceUuid trace_uuid = 89;
+    TraceConfig trace_config = 33;
+    FtraceStats ftrace_stats = 34;
+    TraceStats trace_stats = 35;
+    ProfilePacket profile_packet = 37;
+    StreamingAllocation streaming_allocation = 74;
+    StreamingFree streaming_free = 75;
+    BatteryCounters battery = 38;
+    PowerRails power_rails = 40;
+    AndroidLogPacket android_log = 39;
+    SystemInfo system_info = 45;
+    Trigger trigger = 46;
+    ChromeTrigger chrome_trigger = 109;
+    PackagesList packages_list = 47;
+    ChromeBenchmarkMetadata chrome_benchmark_metadata = 48;
+    PerfettoMetatrace perfetto_metatrace = 49;
+    ChromeMetadataPacket chrome_metadata = 51;
+    GpuCounterEvent gpu_counter_event = 52;
+    GpuRenderStageEvent gpu_render_stage_event = 53;
+    StreamingProfilePacket streaming_profile_packet = 54;
+    HeapGraph heap_graph = 56;
+    GraphicsFrameEvent graphics_frame_event = 57;
+    VulkanMemoryEvent vulkan_memory_event = 62;
+    GpuLog gpu_log = 63;
+    VulkanApiEvent vulkan_api_event = 65;
+    PerfSample perf_sample = 66;
+    CpuInfo cpu_info = 67;
+    SmapsPacket smaps_packet = 68;
+    TracingServiceEvent service_event = 69;
+    InitialDisplayState initial_display_state = 70;
+    GpuMemTotalEvent gpu_mem_total_event = 71;
+    MemoryTrackerSnapshot memory_tracker_snapshot = 73;
+    FrameTimelineEvent frame_timeline_event = 76;
+    AndroidEnergyEstimationBreakdown android_energy_estimation_breakdown = 77;
+    UiState ui_state = 78;
+    AndroidCameraFrameEvent android_camera_frame_event = 80;
+    AndroidCameraSessionStats android_camera_session_stats = 81;
+    TranslationTable translation_table = 82;
+    AndroidGameInterventionList android_game_intervention_list = 83;
+    StatsdAtom statsd_atom = 84;
+    AndroidSystemProperty android_system_property = 86;
+    EntityStateResidency entity_state_residency = 91;
+
+    // Only used in profile packets.
+    ProfiledFrameSymbols profiled_frame_symbols = 55;
+    ModuleSymbols module_symbols = 61;
+    DeobfuscationMapping deobfuscation_mapping = 64;
+
+    // Only used by TrackEvent.
+    TrackDescriptor track_descriptor = 60;
+
+    // Deprecated, use TrackDescriptor instead.
+    ProcessDescriptor process_descriptor = 43;
+
+    // Deprecated, use TrackDescriptor instead.
+    ThreadDescriptor thread_descriptor = 44;
+
+    // Events from the Linux kernel ftrace infrastructure.
+    FtraceEventBundle ftrace_events = 1;
+
+    // This field is emitted at periodic intervals (~10s) and
+    // contains always the binary representation of the UUID
+    // {82477a76-b28d-42ba-81dc-33326d57a079}. This is used to be able to
+    // efficiently partition long traces without having to fully parse them.
+    bytes synchronization_marker = 36;
+
+    // Zero or more proto encoded trace packets compressed using deflate.
+    // Each compressed_packets TracePacket (including the two field ids and
+    // sizes) should be less than 512KB.
+    bytes compressed_packets = 50;
+
+    // Data sources can extend the trace proto with custom extension protos (see
+    // docs/design-docs/extensions.md). When they do that, the descriptor of
+    // their extension proto descriptor is serialized in this packet. This
+    // allows trace_processor to deserialize extended messages using reflection
+    // even if the extension proto is not checked in the Perfetto repo.
+    ExtensionDescriptor extension_descriptor = 72;
+
+    // Represents a single packet sent or received by the network.
+    NetworkPacketEvent network_packet = 88;
+
+    // Represents one or more packets sent or received by the network.
+    NetworkPacketBundle network_packet_bundle = 92;
+
+    // The "range of interest" for track events. See the message definition
+    // comments for more details.
+    TrackEventRangeOfInterest track_event_range_of_interest = 90;
+
+    // Winscope traces
+    LayersSnapshotProto surfaceflinger_layers_snapshot = 93;
+    TransactionTraceEntry surfaceflinger_transactions = 94;
+    ShellTransition shell_transition = 96;
+    ShellHandlerMappings shell_handler_mappings = 97;
+    ProtoLogMessage protolog_message = 104;
+    ProtoLogViewerConfig protolog_viewer_config = 105;
+
+    // Events from the Windows etw infrastructure.
+    EtwTraceEventBundle etw_events = 95;
+
+    V8JsCode v8_js_code = 99;
+    V8InternalCode v8_internal_code = 100;
+    V8WasmCode v8_wasm_code = 101;
+    V8RegExpCode v8_reg_exp_code = 102;
+    V8CodeMove v8_code_move = 103;
+
+    // InputFlinger traces
+    AndroidInputEvent android_input_event = 106;
+
+    // Clock synchronization with remote machines.
+    RemoteClockSync remote_clock_sync = 107;
+
+    // This field is only used for testing.
+    // In previous versions of this proto this field had the id 268435455
+    // This caused many problems:
+    // - protozero decoder does not handle field ids larger than 999.
+    // - old versions of protoc produce Java bindings with syntax errors when
+    //   the field id is large enough.
+    TestEvent for_testing = 900;
+  }
+
+  // Trusted user id of the producer which generated this packet. Keep in sync
+  // with TrustedPacket.trusted_uid.
+  //
+  // TODO(eseckler): Emit this field in a PacketSequenceDescriptor message
+  // instead.
+  oneof optional_trusted_uid { int32 trusted_uid = 3; };
+
+  // Service-assigned identifier of the packet sequence this packet belongs to.
+  // Uniquely identifies a producer + writer pair within the tracing session. A
+  // value of zero denotes an invalid ID. Keep in sync with
+  // TrustedPacket.trusted_packet_sequence_id.
+  oneof optional_trusted_packet_sequence_id {
+    uint32 trusted_packet_sequence_id = 10;
+  }
+
+  // Trusted process id of the producer which generated this packet, written by
+  // the service.
+  optional int32 trusted_pid = 79;
+
+  // Incrementally emitted interned data, valid only on the packet's sequence
+  // (packets with the same |trusted_packet_sequence_id|). The writer will
+  // usually emit new interned data in the same TracePacket that first refers to
+  // it (since the last reset of interning state). It may also be emitted
+  // proactively in advance of referring to them in later packets.
+  optional InternedData interned_data = 12;
+
+  enum SequenceFlags {
+    SEQ_UNSPECIFIED = 0;
+
+    // Set by the writer to indicate that it will re-emit any incremental data
+    // for the packet's sequence before referring to it again. This includes
+    // interned data as well as periodically emitted data like
+    // Process/ThreadDescriptors. This flag only affects the current packet
+    // sequence (see |trusted_packet_sequence_id|).
+    //
+    // When set, this TracePacket and subsequent TracePackets on the same
+    // sequence will not refer to any incremental data emitted before this
+    // TracePacket. For example, previously emitted interned data will be
+    // re-emitted if it is referred to again.
+    //
+    // When the reader detects packet loss (|previous_packet_dropped|), it needs
+    // to skip packets in the sequence until the next one with this flag set, to
+    // ensure intact incremental data.
+    SEQ_INCREMENTAL_STATE_CLEARED = 1;
+
+    // This packet requires incremental state, such as TracePacketDefaults or
+    // InternedData, to be parsed correctly. The trace reader should skip this
+    // packet if incremental state is not valid on this sequence, i.e. if no
+    // packet with the SEQ_INCREMENTAL_STATE_CLEARED flag has been seen on the
+    // current |trusted_packet_sequence_id|.
+    SEQ_NEEDS_INCREMENTAL_STATE = 2;
+  };
+  optional uint32 sequence_flags = 13;
+
+  // DEPRECATED. Moved to SequenceFlags::SEQ_INCREMENTAL_STATE_CLEARED.
+  optional bool incremental_state_cleared = 41;
+
+  // Default values for fields of later TracePackets emitted on this packet's
+  // sequence (TracePackets with the same |trusted_packet_sequence_id|).
+  // It must be reemitted when incremental state is cleared (see
+  // |incremental_state_cleared|).
+  // Requires that any future packet emitted on the same sequence specifies
+  // the SEQ_NEEDS_INCREMENTAL_STATE flag.
+  // TracePacketDefaults always override the global defaults for any future
+  // packet on this sequence (regardless of SEQ_NEEDS_INCREMENTAL_STATE).
+  optional TracePacketDefaults trace_packet_defaults = 59;
+
+  // Flag set by the service if, for the current packet sequence (see
+  // |trusted_packet_sequence_id|), either:
+  // * this is the first packet, or
+  // * one or multiple packets were dropped since the last packet that the
+  //   consumer read from the sequence. This can happen if chunks in the trace
+  //   buffer are overridden before the consumer could read them when the trace
+  //   is configured in ring buffer mode.
+  //
+  // When packet loss occurs, incrementally emitted data (including interned
+  // data) on the sequence should be considered invalid up until the next packet
+  // with SEQ_INCREMENTAL_STATE_CLEARED set.
+  optional bool previous_packet_dropped = 42;
+
+  // Flag set by a producer (starting from SDK v29) if, for the current packet
+  // sequence (see |trusted_packet_sequence_id|), this is the first packet.
+  //
+  // This flag can be used for distinguishing the two situations when
+  // processing the trace:
+  // 1. There are no prior events for the sequence because of data loss, e.g.
+  //    due to ring buffer wrapping.
+  // 2. There are no prior events for the sequence because it didn't start
+  //    before this packet (= there's definitely no preceding data loss).
+  //
+  // Given that older SDK versions do not support this flag, this flag not
+  // being present for a particular sequence does not necessarily imply data
+  // loss.
+  optional bool first_packet_on_sequence = 87;
+
+  // The machine ID for identifying trace packets in a multi-machine tracing
+  // session. Is emitted by the tracing service for producers running on a
+  // remote host (e.g. a VM guest). For more context: go/crosetto-vm-tracing.
+  optional uint32 machine_id = 98;
+}
diff --git a/src/libtracing/protos/perfetto/trace/trace_packet_defaults.proto b/src/libtracing/protos/perfetto/trace/trace_packet_defaults.proto
new file mode 100644
index 000000000..bd8be2c45
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/trace_packet_defaults.proto
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/chrome/v8.proto";
+import "protos/perfetto/trace/profiling/profile_packet.proto";
+import "protos/perfetto/trace/track_event/track_event.proto";
+
+package perfetto.protos;
+
+// Default values for TracePacket fields that hold for a particular TraceWriter
+// packet sequence. This message contains a subset of the TracePacket fields
+// with matching IDs. When provided, these fields define the default values
+// that should be applied, at import time, to all TracePacket(s) with the same
+// |trusted_packet_sequence_id|, unless otherwise specified in each packet.
+//
+// Should be reemitted whenever incremental state is cleared on the sequence.
+message TracePacketDefaults {
+  optional uint32 timestamp_clock_id = 58;
+
+  // Default values for TrackEvents (e.g. default track).
+  optional TrackEventDefaults track_event_defaults = 11;
+
+  // Defaults for perf profiler packets (PerfSample).
+  optional PerfSampleDefaults perf_sample_defaults = 12;
+
+  // Defaults for V8 code packets (V8JsCode, V8InternalCode, V8WasmCode,
+  // V8RegexpCode)
+  optional V8CodeDefaults v8_code_defaults = 99;
+}
diff --git a/src/libtracing/protos/perfetto/trace/trace_uuid.proto b/src/libtracing/protos/perfetto/trace/trace_uuid.proto
new file mode 100644
index 000000000..1e6657cdc
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/trace_uuid.proto
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+// A random unique ID that identifies the trace.
+// This message has been introduced in v32. Prior to that, the UUID was
+// only (optionally) present in the TraceConfig.trace_uuid_msb/lsb fields.
+// This has been moved to a standalone packet to deal with new use-cases for
+// go/gapless-aot, where the same tracing session can be serialized several
+// times, in which case the UUID is changed on each snapshot and does not match
+// the one in the TraceConfig.
+message TraceUuid {
+  optional int64 msb = 1;
+  optional int64 lsb = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_active_processes.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_active_processes.proto
new file mode 100644
index 000000000..d90a73a0d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_active_processes.proto
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// A list of processes connected to the tracing service.
+message ChromeActiveProcesses {
+  repeated int32 pid = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_application_state_info.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_application_state_info.proto
new file mode 100644
index 000000000..f5884a22b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_application_state_info.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+
+// Trace event arguments for application state changes.
+message ChromeApplicationStateInfo {
+  // Enum definition taken from:
+  // https://source.chromium.org/chromium/chromium/src/+/master:base/android/application_status_listener.h
+  enum ChromeApplicationState {
+    APPLICATION_STATE_UNKNOWN = 0;
+    APPLICATION_STATE_HAS_RUNNING_ACTIVITIES = 1;
+    APPLICATION_STATE_HAS_PAUSED_ACTIVITIES = 2;
+    APPLICATION_STATE_HAS_STOPPED_ACTIVITIES = 3;
+    APPLICATION_STATE_HAS_DESTROYED_ACTIVITIES = 4;
+  };
+  optional ChromeApplicationState application_state = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto
new file mode 100644
index 000000000..476ed3887
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto
@@ -0,0 +1,270 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/track_event/source_location.proto";
+
+package perfetto.protos;
+
+// Describes Chrome's Compositor scheduler's current state and associated
+// variables.
+//
+// These protos and enums were adapted from the corresponding original JSON
+// trace event for the scheduler state. In contrast to the JSON, we use strongly
+// typed enum values instead of strings for many fields, and
+// microsecond-granularity timestamps.
+//
+// The original format was generated in JSON by the code at
+// https://cs.chromium.org/chromium/src/cc/scheduler/scheduler.cc?l=870&rcl=5e15eabc9c0eec8daf94fdf78e93f13b6e3b63dd
+//
+// And is now generated as protozero:
+// https://cs.chromium.org/chromium/src/cc/scheduler/scheduler.cc?q=Scheduler::AsPro
+//
+// All non-delta-timestamps are absolute CLOCK_MONOTONIC timestamps.
+
+enum ChromeCompositorSchedulerAction {
+  CC_SCHEDULER_ACTION_UNSPECIFIED = 0;
+  CC_SCHEDULER_ACTION_NONE = 1;
+  CC_SCHEDULER_ACTION_SEND_BEGIN_MAIN_FRAME = 2;
+  CC_SCHEDULER_ACTION_COMMIT = 3;
+  CC_SCHEDULER_ACTION_ACTIVATE_SYNC_TREE = 4;
+  CC_SCHEDULER_ACTION_DRAW_IF_POSSIBLE = 5;
+  CC_SCHEDULER_ACTION_DRAW_FORCED = 6;
+  CC_SCHEDULER_ACTION_DRAW_ABORT = 7;
+  CC_SCHEDULER_ACTION_BEGIN_LAYER_TREE_FRAME_SINK_CREATION = 8;
+  CC_SCHEDULER_ACTION_PREPARE_TILES = 9;
+  CC_SCHEDULER_ACTION_INVALIDATE_LAYER_TREE_FRAME_SINK = 10;
+  CC_SCHEDULER_ACTION_PERFORM_IMPL_SIDE_INVALIDATION = 11;
+  CC_SCHEDULER_ACTION_NOTIFY_BEGIN_MAIN_FRAME_NOT_EXPECTED_UNTIL = 12;
+  CC_SCHEDULER_ACTION_NOTIFY_BEGIN_MAIN_FRAME_NOT_EXPECTED_SOON = 13;
+}
+
+// Next id: 18
+message ChromeCompositorSchedulerState {
+  enum BeginImplFrameDeadlineMode {
+    DEADLINE_MODE_UNSPECIFIED = 0;
+    DEADLINE_MODE_NONE = 1;
+    DEADLINE_MODE_IMMEDIATE = 2;
+    DEADLINE_MODE_REGULAR = 3;
+    DEADLINE_MODE_LATE = 4;
+    DEADLINE_MODE_BLOCKED = 5;
+  }
+  optional ChromeCompositorStateMachine state_machine = 1;
+  optional bool observing_begin_frame_source = 2;
+  optional bool begin_impl_frame_deadline_task = 3;
+  optional bool pending_begin_frame_task = 4;
+  optional bool skipped_last_frame_missed_exceeded_deadline = 5;
+  optional ChromeCompositorSchedulerAction inside_action = 7;
+  optional BeginImplFrameDeadlineMode deadline_mode = 8;
+  optional int64 deadline_us = 9;
+  optional int64 deadline_scheduled_at_us = 10;
+  optional int64 now_us = 11;
+  optional int64 now_to_deadline_delta_us = 12;
+  optional int64 now_to_deadline_scheduled_at_delta_us = 13;
+  optional BeginImplFrameArgs begin_impl_frame_args = 14;
+  optional BeginFrameObserverState begin_frame_observer_state = 15;
+  optional BeginFrameSourceState begin_frame_source_state = 16;
+  optional CompositorTimingHistory compositor_timing_history = 17;
+
+  reserved 6;
+}
+
+// Describes the current values stored in the Chrome Compositor state machine.
+// Next id: 3
+message ChromeCompositorStateMachine {
+  // Next id: 6
+  message MajorState {
+    enum BeginImplFrameState {
+      BEGIN_IMPL_FRAME_UNSPECIFIED = 0;
+      BEGIN_IMPL_FRAME_IDLE = 1;
+      BEGIN_IMPL_FRAME_INSIDE_BEGIN_FRAME = 2;
+      BEGIN_IMPL_FRAME_INSIDE_DEADLINE = 3;
+    }
+    enum BeginMainFrameState {
+      BEGIN_MAIN_FRAME_UNSPECIFIED = 0;
+      BEGIN_MAIN_FRAME_IDLE = 1;
+      BEGIN_MAIN_FRAME_SENT = 2;
+      BEGIN_MAIN_FRAME_READY_TO_COMMIT = 3;
+    }
+    enum LayerTreeFrameSinkState {
+      LAYER_TREE_FRAME_UNSPECIFIED = 0;
+      LAYER_TREE_FRAME_NONE = 1;
+      LAYER_TREE_FRAME_ACTIVE = 2;
+      LAYER_TREE_FRAME_CREATING = 3;
+      LAYER_TREE_FRAME_WAITING_FOR_FIRST_COMMIT = 4;
+      LAYER_TREE_FRAME_WAITING_FOR_FIRST_ACTIVATION = 5;
+    }
+    enum ForcedRedrawOnTimeoutState {
+      FORCED_REDRAW_UNSPECIFIED = 0;
+      FORCED_REDRAW_IDLE = 1;
+      FORCED_REDRAW_WAITING_FOR_COMMIT = 2;
+      FORCED_REDRAW_WAITING_FOR_ACTIVATION = 3;
+      FORCED_REDRAW_WAITING_FOR_DRAW = 4;
+    }
+    optional ChromeCompositorSchedulerAction next_action = 1;
+    optional BeginImplFrameState begin_impl_frame_state = 2;
+    optional BeginMainFrameState begin_main_frame_state = 3;
+    optional LayerTreeFrameSinkState layer_tree_frame_sink_state = 4;
+    optional ForcedRedrawOnTimeoutState forced_redraw_state = 5;
+  }
+  optional MajorState major_state = 1;
+
+  // Next id: 47
+  message MinorState {
+    enum TreePriority {
+      TREE_PRIORITY_UNSPECIFIED = 0;
+      TREE_PRIORITY_SAME_PRIORITY_FOR_BOTH_TREES = 1;
+      TREE_PRIORITY_SMOOTHNESS_TAKES_PRIORITY = 2;
+      TREE_PRIORITY_NEW_CONTENT_TAKES_PRIORITY = 3;
+    }
+    enum ScrollHandlerState {
+      SCROLL_HANDLER_UNSPECIFIED = 0;
+      SCROLL_AFFECTS_SCROLL_HANDLER = 1;
+      SCROLL_DOES_NOT_AFFECT_SCROLL_HANDLER = 2;
+    }
+    optional int32 commit_count = 1;
+    optional int32 current_frame_number = 2;
+    optional int32 last_frame_number_submit_performed = 3;
+    optional int32 last_frame_number_draw_performed = 4;
+    optional int32 last_frame_number_begin_main_frame_sent = 5;
+    optional bool did_draw = 6;
+    optional bool did_send_begin_main_frame_for_current_frame = 7;
+    optional bool did_notify_begin_main_frame_not_expected_until = 8;
+    optional bool did_notify_begin_main_frame_not_expected_soon = 9;
+    optional bool wants_begin_main_frame_not_expected = 10;
+    optional bool did_commit_during_frame = 11;
+    optional bool did_invalidate_layer_tree_frame_sink = 12;
+    optional bool did_perform_impl_side_invalidaion = 13;
+    optional bool did_prepare_tiles = 14;
+    optional int32 consecutive_checkerboard_animations = 15;
+    optional int32 pending_submit_frames = 16;
+    optional int32 submit_frames_with_current_layer_tree_frame_sink = 17;
+    optional bool needs_redraw = 18;
+    optional bool needs_prepare_tiles = 19;
+    optional bool needs_begin_main_frame = 20;
+    optional bool needs_one_begin_impl_frame = 21;
+    optional bool visible = 22;
+    optional bool begin_frame_source_paused = 23;
+    optional bool can_draw = 24;
+    optional bool resourceless_draw = 25;
+    optional bool has_pending_tree = 26;
+    optional bool pending_tree_is_ready_for_activation = 27;
+    optional bool active_tree_needs_first_draw = 28;
+    optional bool active_tree_is_ready_to_draw = 29;
+    optional bool did_create_and_initialize_first_layer_tree_frame_sink = 30;
+    optional TreePriority tree_priority = 31;
+    optional ScrollHandlerState scroll_handler_state = 32;
+    optional bool critical_begin_main_frame_to_activate_is_fast = 33;
+    optional bool main_thread_missed_last_deadline = 34;
+    optional bool video_needs_begin_frames = 36;
+    optional bool defer_begin_main_frame = 37;
+    optional bool last_commit_had_no_updates = 38;
+    optional bool did_draw_in_last_frame = 39;
+    optional bool did_submit_in_last_frame = 40;
+    optional bool needs_impl_side_invalidation = 41;
+    optional bool current_pending_tree_is_impl_side = 42;
+    optional bool previous_pending_tree_was_impl_side = 43;
+    optional bool processing_animation_worklets_for_active_tree = 44;
+    optional bool processing_animation_worklets_for_pending_tree = 45;
+    optional bool processing_paint_worklets_for_pending_tree = 46;
+
+    reserved 35;
+  }
+  optional MinorState minor_state = 2;
+}
+
+// Next id: 13
+message BeginFrameArgs {
+  // JSON format has a "type" field that was always just "BeginFrameArgs" we
+  // drop this in the proto representation, and instead make the JSON format
+  // "subtype" field become the type field.
+  enum BeginFrameArgsType {
+    BEGIN_FRAME_ARGS_TYPE_UNSPECIFIED = 0;
+    BEGIN_FRAME_ARGS_TYPE_INVALID = 1;
+    BEGIN_FRAME_ARGS_TYPE_NORMAL = 2;
+    BEGIN_FRAME_ARGS_TYPE_MISSED = 3;
+  }
+  optional BeginFrameArgsType type = 1;
+  optional uint64 source_id = 2;
+  optional uint64 sequence_number = 3;
+  optional int64 frame_time_us = 4;
+  optional int64 deadline_us = 5;
+  optional int64 interval_delta_us = 6;
+  optional bool on_critical_path = 7;
+  optional bool animate_only = 8;
+  oneof created_from {
+    // The interned SourceLocation.
+    uint64 source_location_iid = 9;
+    // The SourceLocation that this args was created from.
+    // TODO(nuskos): Eventually we will support interning inside of
+    // TypedArgument TraceEvents and then we shouldn't need this SourceLocation
+    // since we can emit it as part of the InternedData message. When we can
+    // remove this |source_location|.
+    SourceLocation source_location = 10;
+  }
+  optional int64 frames_throttled_since_last = 12;
+}
+
+// Next id: 7
+message BeginImplFrameArgs {
+  optional int64 updated_at_us = 1;
+  optional int64 finished_at_us = 2;
+  enum State {
+    BEGIN_FRAME_FINISHED = 0;
+    BEGIN_FRAME_USING = 1;
+  }
+  optional State state = 3;
+  oneof args {
+    // Only set if |state| is BEGIN_FRAME_FINISHED.
+    BeginFrameArgs current_args = 4;
+    // Only set if |state| is BEGIN_FRAME_USING.
+    BeginFrameArgs last_args = 5;
+  }
+  message TimestampsInUs {
+    optional int64 interval_delta = 1;
+    optional int64 now_to_deadline_delta = 2;
+    optional int64 frame_time_to_now_delta = 3;
+    optional int64 frame_time_to_deadline_delta = 4;
+    optional int64 now = 5;
+    optional int64 frame_time = 6;
+    optional int64 deadline = 7;
+  }
+  optional TimestampsInUs timestamps_in_us = 6;
+}
+
+message BeginFrameObserverState {
+  optional int64 dropped_begin_frame_args = 1;
+  optional BeginFrameArgs last_begin_frame_args = 2;
+}
+
+message BeginFrameSourceState {
+  optional uint32 source_id = 1;
+  optional bool paused = 2;
+  optional uint32 num_observers = 3;
+  optional BeginFrameArgs last_begin_frame_args = 4;
+}
+
+message CompositorTimingHistory {
+  optional int64 begin_main_frame_queue_critical_estimate_delta_us = 1;
+  optional int64 begin_main_frame_queue_not_critical_estimate_delta_us = 2;
+  optional int64 begin_main_frame_start_to_ready_to_commit_estimate_delta_us =
+      3;
+  optional int64 commit_to_ready_to_activate_estimate_delta_us = 4;
+  optional int64 prepare_tiles_estimate_delta_us = 5;
+  optional int64 activate_estimate_delta_us = 6;
+  optional int64 draw_estimate_delta_us = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto
new file mode 100644
index 000000000..18893256f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Details about ContentSettings trace events.
+message ChromeContentSettingsEventInfo {
+  // The number of user defined hostname patterns for content settings at
+  // browser start. Similar to UMA histogram
+  // 'ContentSettings.NumberOfExceptions'.
+  optional uint32 number_of_exceptions = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_frame_reporter.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_frame_reporter.proto
new file mode 100644
index 000000000..cc841df8b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_frame_reporter.proto
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message ChromeFrameReporter {
+  enum State {
+    // The frame did not have any updates to present.
+    STATE_NO_UPDATE_DESIRED = 0;
+
+    // The frame presented all the desired updates (i.e. any updates requested
+    // from both the compositor thread and main-threads were handled).
+    STATE_PRESENTED_ALL = 1;
+
+    // The frame was presented with some updates, but also missed some updates
+    // (e.g. missed updates from the main-thread, but included updates from the
+    // compositor thread).
+    STATE_PRESENTED_PARTIAL = 2;
+
+    // The frame was dropped, i.e. some updates were desired for the frame, but
+    // was not presented.
+    STATE_DROPPED = 3;
+  };
+
+  optional State state = 1;
+
+  enum FrameDropReason {
+    REASON_UNSPECIFIED = 0;
+
+    // Frame was dropped by the display-compositor.
+    // The display-compositor may drop a frame some times (e.g. the frame missed
+    // the deadline, or was blocked on surface-sync, etc.)
+    REASON_DISPLAY_COMPOSITOR = 1;
+
+    // Frame was dropped because of the main-thread.
+    // The main-thread may cause a frame to be dropped, e.g. if the main-thread
+    // is running expensive javascript, or doing a lot of layout updates, etc.
+    REASON_MAIN_THREAD = 2;
+
+    // Frame was dropped by the client compositor.
+    // The client compositor can drop some frames too (e.g. attempting to
+    // recover latency, missing the deadline, etc.).
+    REASON_CLIENT_COMPOSITOR = 3;
+  };
+
+  // The reason is set only if |state| is not |STATE_UPDATED_ALL|.
+  optional FrameDropReason reason = 2;
+
+  optional uint64 frame_source = 3;
+  optional uint64 frame_sequence = 4;
+
+  // If this is a droped frame (i.e. if |state| is set to |STATE_DROPPED| or
+  // |STATE_PRESENTED_PARTIAL|), then indicates whether this frame impacts
+  // smoothness.
+  optional bool affects_smoothness = 5;
+
+  enum ScrollState {
+    SCROLL_NONE = 0;
+    SCROLL_MAIN_THREAD = 1;
+    SCROLL_COMPOSITOR_THREAD = 2;
+
+    // Used when it can't be determined whether a scroll is in progress or not.
+    SCROLL_UNKNOWN = 3;
+  }
+
+  // The type of active scroll.
+  optional ScrollState scroll_state = 6;
+
+  // If any main thread animation is active during this frame.
+  optional bool has_main_animation = 7;
+  // If any compositor thread animation is active during this frame.
+  optional bool has_compositor_animation = 8;
+  // If any touch-driven UX (not scroll) is active during this frame.
+  optional bool has_smooth_input_main = 9;
+
+  // Whether the frame contained any missing content (i.e. whether there was
+  // checkerboarding in the frame).
+  optional bool has_missing_content = 10;
+
+  // The id of layer_tree_host that the frame has been produced for.
+  optional uint64 layer_tree_host_id = 11;
+
+  // If total latency of PipelineReporter exceeds a certain limit.
+  optional bool has_high_latency = 12;
+
+  enum FrameType {
+    FORKED = 0;
+    BACKFILL = 1;
+  }
+
+  // Indicate if the frame is "FORKED" (i.e. a PipelineReporter event starts at
+  // the same frame sequence as another PipelineReporter) or "BACKFILL"
+  // (i.e. dropped frames when there are no partial compositor updates).
+  optional FrameType frame_type = 13;
+
+  // The breakdown stage of PipelineReporter that is most likely accountable for
+  // high latency.
+  repeated string high_latency_contribution_stage = 14;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_histogram_sample.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_histogram_sample.proto
new file mode 100644
index 000000000..d326b62fa
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_histogram_sample.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message HistogramName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+// An individual histogram sample logged via Chrome's UMA metrics system.
+message ChromeHistogramSample {
+  // MD5 hash of the metric name. Either |name_hash| or |name|/|name_iid| or
+  // both must be present.
+  optional uint64 name_hash = 1;
+  optional string name = 2;
+  optional int64 sample = 3;
+  // Interned HistogramName. Only one of |name|, |name_iid| can be set.
+  optional uint64 name_iid = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_keyed_service.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_keyed_service.proto
new file mode 100644
index 000000000..1cb3e09db
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_keyed_service.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Details about one of Chrome's keyed services associated with the event.
+message ChromeKeyedService {
+  // Name of the service, e.g. "MediaRouter", "PreviewsService", etc. (in
+  // Chrome, these are static strings known at compile time).
+  optional string name = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_latency_info.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_latency_info.proto
new file mode 100644
index 000000000..75113ea33
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_latency_info.proto
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message ChromeLatencyInfo {
+  optional int64 trace_id = 1;
+
+  // NEXT ID: 12
+  // All step are optional but the enum is ordered (not by number) below in the
+  // order we expect them to appear if they are emitted in trace in a blocking
+  // fashion.
+  enum Step {
+    STEP_UNSPECIFIED = 0;
+    // Emitted on the browser main thread.
+    STEP_SEND_INPUT_EVENT_UI = 3;
+    // Happens on the renderer's compositor.
+    STEP_HANDLE_INPUT_EVENT_IMPL = 5;
+    STEP_DID_HANDLE_INPUT_AND_OVERSCROLL = 8;
+    // Occurs on the Renderer's main thread.
+    STEP_HANDLE_INPUT_EVENT_MAIN = 4;
+    STEP_MAIN_THREAD_SCROLL_UPDATE = 2;
+    STEP_HANDLE_INPUT_EVENT_MAIN_COMMIT = 1;
+    // Could be emitted on both the renderer's main OR compositor.
+    STEP_HANDLED_INPUT_EVENT_MAIN_OR_IMPL = 9;
+    // Optionally sometimes HANDLED_INPUT_EVENT_MAIN_OR_IMPL will proxy to the
+    // renderer's compositor and this will be emitted.
+    STEP_HANDLED_INPUT_EVENT_IMPL = 10;
+    // Renderer's compositor.
+    STEP_SWAP_BUFFERS = 6;
+    // Happens on the VizCompositor in the GPU process.
+    STEP_DRAW_AND_SWAP = 7;
+    // Happens on the GPU main thread after the swap has completed.
+    STEP_FINISHED_SWAP_BUFFERS = 11;
+    // See above for NEXT ID, enum steps are not ordered by tag number.
+  };
+
+  optional Step step = 2;
+  optional int32 frame_tree_node_id = 3;
+
+  // This enum is a copy of LatencyComponentType enum in Chrome, located in
+  // ui/latency/latency_info.h, modulo added UNKNOWN value per protobuf
+  // practices.
+  enum LatencyComponentType {
+    COMPONENT_UNSPECIFIED = 0;
+    COMPONENT_INPUT_EVENT_LATENCY_BEGIN_RWH = 1;
+    COMPONENT_INPUT_EVENT_LATENCY_SCROLL_UPDATE_ORIGINAL = 2;
+    COMPONENT_INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL = 3;
+    COMPONENT_INPUT_EVENT_LATENCY_ORIGINAL = 4;
+    COMPONENT_INPUT_EVENT_LATENCY_UI = 5;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERER_MAIN = 6;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_MAIN = 7;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_IMPL = 8;
+    COMPONENT_INPUT_EVENT_LATENCY_SCROLL_UPDATE_LAST_EVENT = 9;
+    COMPONENT_INPUT_EVENT_LATENCY_ACK_RWH = 10;
+    COMPONENT_INPUT_EVENT_LATENCY_RENDERER_SWAP = 11;
+    COMPONENT_DISPLAY_COMPOSITOR_RECEIVED_FRAME = 12;
+    COMPONENT_INPUT_EVENT_GPU_SWAP_BUFFER = 13;
+    COMPONENT_INPUT_EVENT_LATENCY_FRAME_SWAP = 14;
+  }
+
+  message ComponentInfo {
+    optional LatencyComponentType component_type = 1;
+
+    // Microsecond timestamp in CLOCK_MONOTONIC domain
+    optional uint64 time_us = 2;
+  };
+
+  repeated ComponentInfo component_info = 4;
+  optional bool is_coalesced = 5;
+  optional int64 gesture_scroll_id = 6;
+  optional int64 touch_id = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_legacy_ipc.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_legacy_ipc.proto
new file mode 100644
index 000000000..1b038894e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_legacy_ipc.proto
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Details about a legacy Chrome IPC message that is either sent by the event.
+// TODO(eseckler): Also use this message on the receiving side?
+message ChromeLegacyIpc {
+  enum MessageClass {
+    CLASS_UNSPECIFIED = 0;
+    CLASS_AUTOMATION = 1;
+    CLASS_FRAME = 2;
+    CLASS_PAGE = 3;
+    CLASS_VIEW = 4;
+    CLASS_WIDGET = 5;
+    CLASS_INPUT = 6;
+    CLASS_TEST = 7;
+    CLASS_WORKER = 8;
+    CLASS_NACL = 9;
+    CLASS_GPU_CHANNEL = 10;
+    CLASS_MEDIA = 11;
+    CLASS_PPAPI = 12;
+    CLASS_CHROME = 13;
+    CLASS_DRAG = 14;
+    CLASS_PRINT = 15;
+    CLASS_EXTENSION = 16;
+    CLASS_TEXT_INPUT_CLIENT = 17;
+    CLASS_BLINK_TEST = 18;
+    CLASS_ACCESSIBILITY = 19;
+    CLASS_PRERENDER = 20;
+    CLASS_CHROMOTING = 21;
+    CLASS_BROWSER_PLUGIN = 22;
+    CLASS_ANDROID_WEB_VIEW = 23;
+    CLASS_NACL_HOST = 24;
+    CLASS_ENCRYPTED_MEDIA = 25;
+    CLASS_CAST = 26;
+    CLASS_GIN_JAVA_BRIDGE = 27;
+    CLASS_CHROME_UTILITY_PRINTING = 28;
+    CLASS_OZONE_GPU = 29;
+    CLASS_WEB_TEST = 30;
+    CLASS_NETWORK_HINTS = 31;
+    CLASS_EXTENSIONS_GUEST_VIEW = 32;
+    CLASS_GUEST_VIEW = 33;
+    CLASS_MEDIA_PLAYER_DELEGATE = 34;
+    CLASS_EXTENSION_WORKER = 35;
+    CLASS_SUBRESOURCE_FILTER = 36;
+    CLASS_UNFREEZABLE_FRAME = 37;
+  }
+
+  // Corresponds to the message class type defined in Chrome's IPCMessageStart
+  // enum, e.g. FrameMsgStart,
+  optional MessageClass message_class = 1;
+
+  // Line number of the message definition. See Chrome's IPC_MESSAGE_ID and
+  // IPC_MESSAGE_START macros.
+  optional uint32 message_line = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_message_pump.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_message_pump.proto
new file mode 100644
index 000000000..866fdfbdc
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_message_pump.proto
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Details about Chrome message pump events
+message ChromeMessagePump {
+  // True if there are sent messages in the queue.
+  optional bool sent_messages_in_queue = 1;
+  // Interned SourceLocation of IO handler that MessagePumpForIO is about to
+  // invoke.
+  optional uint64 io_handler_location_iid = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_mojo_event_info.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_mojo_event_info.proto
new file mode 100644
index 000000000..4ce08498b
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_mojo_event_info.proto
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Contains information to identify mojo handling events. The trace events in
+// mojo are common for all mojo interfaces and this information is used to
+// identify who is the caller or callee.
+message ChromeMojoEventInfo {
+  // Contains the interface name or the file name of the creator of a mojo
+  // handle watcher, recorded when an event if notified to the watcher. The code
+  // that runs within the track event belongs to the interface.
+  optional string watcher_notify_interface_tag = 1;
+
+  // The hash of the IPC message that is being handled.
+  optional uint32 ipc_hash = 2;
+
+  // A static string representing the mojo interface name of the message that is
+  // being handled.
+  optional string mojo_interface_tag = 3;
+
+  // Refers to an interned UnsymbolizedSourceLocation.
+  // The UnsymbolizedSourceLocation contains the interface method that's being
+  // handled, represented as a native symbol.
+  // The native symbol can be symbolized after the trace is recorded.
+  // Not using a symbolized source location for official Chromium builds to
+  // reduce binary size - emitting file/function names as strings into the
+  // trace requires storing them in the binary, which causes a significant
+  // binary size bloat for Chromium.
+  optional uint64 mojo_interface_method_iid = 4;
+
+  // Indicate whether this is a message or reply.
+  optional bool is_reply = 5;
+
+  // The payload size of the message being sent through mojo messages.
+  optional uint64 payload_size = 6;
+
+  // Represents the size of the message. Includes all headers and user payload.
+  optional uint64 data_num_bytes = 7;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_process_descriptor.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_process_descriptor.proto
new file mode 100644
index 000000000..37fd77e3d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_process_descriptor.proto
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Describes the attributes for a Chrome process. Must be paired with a
+// ProcessDescriptor in the same TrackDescriptor.
+//
+// Next id: 6.
+message ChromeProcessDescriptor {
+  // See chromium's content::ProcessType.
+  enum ProcessType {
+    PROCESS_UNSPECIFIED = 0;
+    PROCESS_BROWSER = 1;
+    PROCESS_RENDERER = 2;
+    PROCESS_UTILITY = 3;
+    PROCESS_ZYGOTE = 4;
+    PROCESS_SANDBOX_HELPER = 5;
+    PROCESS_GPU = 6;
+    PROCESS_PPAPI_PLUGIN = 7;
+    PROCESS_PPAPI_BROKER = 8;
+    PROCESS_SERVICE_NETWORK = 9;
+    PROCESS_SERVICE_TRACING = 10;
+    PROCESS_SERVICE_STORAGE = 11;
+    PROCESS_SERVICE_AUDIO = 12;
+    PROCESS_SERVICE_DATA_DECODER = 13;
+    PROCESS_SERVICE_UTIL_WIN = 14;
+    PROCESS_SERVICE_PROXY_RESOLVER = 15;
+    PROCESS_SERVICE_CDM = 16;
+    PROCESS_SERVICE_VIDEO_CAPTURE = 17;
+    PROCESS_SERVICE_UNZIPPER = 18;
+    PROCESS_SERVICE_MIRRORING = 19;
+    PROCESS_SERVICE_FILEPATCHER = 20;
+    PROCESS_SERVICE_TTS = 21;
+    PROCESS_SERVICE_PRINTING = 22;
+    PROCESS_SERVICE_QUARANTINE = 23;
+    PROCESS_SERVICE_CROS_LOCALSEARCH = 24;
+    PROCESS_SERVICE_CROS_ASSISTANT_AUDIO_DECODER = 25;
+    PROCESS_SERVICE_FILEUTIL = 26;
+    PROCESS_SERVICE_PRINTCOMPOSITOR = 27;
+    PROCESS_SERVICE_PAINTPREVIEW = 28;
+    PROCESS_SERVICE_SPEECHRECOGNITION = 29;
+    PROCESS_SERVICE_XRDEVICE = 30;
+    PROCESS_SERVICE_READICON = 31;
+    PROCESS_SERVICE_LANGUAGEDETECTION = 32;
+    PROCESS_SERVICE_SHARING = 33;
+    PROCESS_SERVICE_MEDIAPARSER = 34;
+    PROCESS_SERVICE_QRCODEGENERATOR = 35;
+    PROCESS_SERVICE_PROFILEIMPORT = 36;
+    PROCESS_SERVICE_IME = 37;
+    PROCESS_SERVICE_RECORDING = 38;
+    PROCESS_SERVICE_SHAPEDETECTION = 39;
+    PROCESS_RENDERER_EXTENSION = 40;
+    PROCESS_SERVICE_MEDIA_FOUNDATION = 41;
+  }
+  optional ProcessType process_type = 1;
+  optional int32 process_priority = 2;
+
+  // To support old UI. New UI should determine default sorting by process_type.
+  optional int32 legacy_sort_index = 3;
+
+  // Name of the hosting app for WebView. Used to match renderer processes to
+  // their hosting apps.
+  optional string host_app_package_name = 4;
+
+  // The ID to link crashes to trace.
+  // Notes:
+  // * The ID is per process. So, each trace may contain many IDs, and you need
+  //   to look for the ID from crashed process to find the crash report.
+  // * Having a "chrome-trace-id" in crash doesn't necessarily mean we can
+  //   get an uploaded trace, since uploads could have failed.
+  // * On the other hand, if there was a crash during the session and trace was
+  //   uploaded, it is very likely to find a crash report with the trace ID.
+  // * This is not crash ID or trace ID. It is just a random 64-bit number
+  //   recorded in both traces and crashes. It is possible to have collisions,
+  //   though very rare.
+  optional uint64 crash_trace_id = 5;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto
new file mode 100644
index 000000000..043bbc061
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Describes the state of the RendererScheduler for a given Renderer Process.
+
+// RAIL Mode is an indication of the kind of work that a Renderer is currently
+// performing which is in turn used to prioritise work accordingly.
+// A fuller description of these modes can be found https://web.dev/rail/
+enum ChromeRAILMode {
+  RAIL_MODE_NONE = 0;
+  RAIL_MODE_RESPONSE = 1;
+  RAIL_MODE_ANIMATION = 2;
+  RAIL_MODE_IDLE = 3;
+  RAIL_MODE_LOAD = 4;
+}
+
+message ChromeRendererSchedulerState {
+  optional ChromeRAILMode rail_mode = 1;
+
+  optional bool is_backgrounded = 2;
+  optional bool is_hidden = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_thread_descriptor.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_thread_descriptor.proto
new file mode 100644
index 000000000..bd82b5a9d
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_thread_descriptor.proto
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Describes a Chrome thread's attributes. Emitted as part of a TrackDescriptor,
+// usually by the thread's trace writer. Must be paired with a ThreadDescriptor
+// in the same TrackDescriptor.
+//
+// Next id: 3.
+message ChromeThreadDescriptor {
+  enum ThreadType {
+    THREAD_UNSPECIFIED = 0;
+
+    THREAD_MAIN = 1;
+    THREAD_IO = 2;
+
+    THREAD_POOL_BG_WORKER = 3;
+    THREAD_POOL_FG_WORKER = 4;
+    THREAD_POOL_FG_BLOCKING = 5;
+    THREAD_POOL_BG_BLOCKING = 6;
+    THREAD_POOL_SERVICE = 7;
+
+    THREAD_COMPOSITOR = 8;
+    THREAD_VIZ_COMPOSITOR = 9;
+    THREAD_COMPOSITOR_WORKER = 10;
+
+    THREAD_SERVICE_WORKER = 11;
+    THREAD_NETWORK_SERVICE = 12;
+
+    THREAD_CHILD_IO = 13;
+    THREAD_BROWSER_IO = 14;
+
+    THREAD_BROWSER_MAIN = 15;
+    THREAD_RENDERER_MAIN = 16;
+    THREAD_UTILITY_MAIN = 17;
+    THREAD_GPU_MAIN = 18;
+
+    THREAD_CACHE_BLOCKFILE = 19;
+    THREAD_MEDIA = 20;
+    THREAD_AUDIO_OUTPUTDEVICE = 21;
+    THREAD_AUDIO_INPUTDEVICE = 22;
+    THREAD_GPU_MEMORY = 23;
+    THREAD_GPU_VSYNC = 24;
+    THREAD_DXA_VIDEODECODER = 25;
+    THREAD_BROWSER_WATCHDOG = 26;
+    THREAD_WEBRTC_NETWORK = 27;
+    THREAD_WINDOW_OWNER = 28;
+    THREAD_WEBRTC_SIGNALING = 29;
+    THREAD_WEBRTC_WORKER = 30;
+    THREAD_PPAPI_MAIN = 31;
+    THREAD_GPU_WATCHDOG = 32;
+    THREAD_SWAPPER = 33;
+    THREAD_GAMEPAD_POLLING = 34;
+    THREAD_WEBCRYPTO = 35;
+    THREAD_DATABASE = 36;
+    THREAD_PROXYRESOLVER = 37;
+    THREAD_DEVTOOLSADB = 38;
+    THREAD_NETWORKCONFIGWATCHER = 39;
+    THREAD_WASAPI_RENDER = 40;
+    THREAD_LOADER_LOCK_SAMPLER = 41;
+
+    THREAD_MEMORY_INFRA = 50;
+    THREAD_SAMPLING_PROFILER = 51;
+  };
+
+  optional ThreadType thread_type = 1;
+
+  // To support old UI. New UI should determine default sorting by thread_type.
+  optional int32 legacy_sort_index = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_user_event.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_user_event.proto
new file mode 100644
index 000000000..d071830f2
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_user_event.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Details about a UI interaction initiated by the user, such as opening or
+// closing a tab or a context menu.
+message ChromeUserEvent {
+  // Name of the action, e.g. "NewTab", "ShowBookmarkManager", etc. (in
+  // Chrome, these are usually static strings known at compile time, or
+  // concatenations of multiple such static strings).
+  optional string action = 1;
+
+  // MD5 hash of the action string.
+  optional uint64 action_hash = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto b/src/libtracing/protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto
new file mode 100644
index 000000000..8808a4582
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Details about HWNDMessageHandler trace events.
+message ChromeWindowHandleEventInfo {
+  optional uint32 dpi = 1;
+  optional uint32 message_id = 2;
+  optional fixed64 hwnd_ptr = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/counter_descriptor.proto b/src/libtracing/protos/perfetto/trace/track_event/counter_descriptor.proto
new file mode 100644
index 000000000..2cf776224
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/counter_descriptor.proto
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Defines properties of a counter track, e.g. for built-in counters (thread
+// time, instruction count, ..) or user-specified counters (e.g. memory usage of
+// a specific app component).
+//
+// Counter tracks only support TYPE_COUNTER track events, which specify new
+// values for the counter. For counters that require per-slice values, counter
+// values can instead be provided in a more efficient encoding via TrackEvent's
+// |extra_counter_track_uuids| and |extra_counter_values| fields. However,
+// slice-type events cannot be emitted onto a counter track.
+//
+// Values for counters that are only emitted on a single packet sequence can
+// optionally be delta-encoded, see |is_incremental|.
+//
+// Next id: 7.
+message CounterDescriptor {
+  // Built-in counters, usually with special meaning in the client library,
+  // trace processor, legacy JSON format, or UI. Trace processor will infer a
+  // track name from the enum value if none is provided in TrackDescriptor.
+  enum BuiltinCounterType {
+    COUNTER_UNSPECIFIED = 0;
+
+    // Thread-scoped counters. The thread's track should be specified via
+    // |parent_uuid| in the TrackDescriptor for such a counter.
+
+    // implies UNIT_TIME_NS.
+    COUNTER_THREAD_TIME_NS = 1;
+
+    // implies UNIT_COUNT.
+    COUNTER_THREAD_INSTRUCTION_COUNT = 2;
+  }
+
+  // Type of the values for the counters - to supply lower granularity units,
+  // see also |unit_multiplier|.
+  enum Unit {
+    UNIT_UNSPECIFIED = 0;
+    UNIT_TIME_NS = 1;
+    UNIT_COUNT = 2;
+    UNIT_SIZE_BYTES = 3;
+    // TODO(eseckler): Support more units as necessary.
+  }
+
+  // For built-in counters (e.g. thread time). Custom user-specified counters
+  // (e.g. those emitted by TRACE_COUNTER macros of the client library)
+  // shouldn't set this, and instead provide a counter name via TrackDescriptor.
+  optional BuiltinCounterType type = 1;
+
+  // Names of categories of the counter (usually for user-specified counters).
+  // In the client library, categories are a way to turn groups of individual
+  // counters (or events) on or off.
+  repeated string categories = 2;
+
+  // Type of the counter's values. Built-in counters imply a value for this
+  // field.
+  optional Unit unit = 3;
+
+  // In order to use a unit not defined as a part of |Unit|, a free-form unit
+  // name can be used instead.
+  optional string unit_name = 6;
+
+  // Multiplication factor of this counter's values, e.g. to supply
+  // COUNTER_THREAD_TIME_NS timestamps in microseconds instead.
+  optional int64 unit_multiplier = 4;
+
+  // Whether values for this counter are provided as delta values. Only
+  // supported for counters that are emitted on a single packet-sequence (e.g.
+  // thread time). Counter values in subsequent packets on the current packet
+  // sequence will be interpreted as delta values from the sequence's most
+  // recent value for the counter. When incremental state is cleared, the
+  // counter value is considered to be reset to 0. Thus, the first value after
+  // incremental state is cleared is effectively an absolute value.
+  optional bool is_incremental = 5;
+
+  // TODO(eseckler): Support arguments describing the counter (?).
+  // repeated DebugAnnotation debug_annotations;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/debug_annotation.proto b/src/libtracing/protos/perfetto/trace/track_event/debug_annotation.proto
new file mode 100644
index 000000000..6dba2ab92
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/debug_annotation.proto
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Proto representation of untyped key/value annotations provided in TRACE_EVENT
+// macros. Users of the Perfetto SDK should prefer to use the
+// perfetto::TracedValue API to fill these protos, rather than filling them
+// manually.
+//
+// Debug annotations are intended for debug use and are not considered a stable
+// API of the trace contents. Trace-based metrics that use debug annotation
+// values are prone to breakage, so please rely on typed TrackEvent fields for
+// these instead.
+//
+// DebugAnnotations support nested arrays and dictionaries. Each entry is
+// encoded as a single DebugAnnotation message. Only dictionary entries
+// set the "name" field. The TrackEvent message forms an implicit root
+// dictionary.
+//
+// Example TrackEvent with nested annotations:
+//   track_event {
+//     debug_annotations {
+//       name: "foo"
+//       dict_entries {
+//         name: "a"
+//         bool_value: true
+//       }
+//       dict_entries {
+//         name: "b"
+//         int_value: 123
+//       }
+//     }
+//     debug_annotations {
+//       name: "bar"
+//       array_values {
+//         string_value: "hello"
+//       }
+//       array_values {
+//         string_value: "world"
+//       }
+//     }
+//   }
+//
+// Next ID: 18.
+// Reserved ID: 15
+message DebugAnnotation {
+  // Name fields are set only for dictionary entries.
+  oneof name_field {
+    // interned DebugAnnotationName.
+    uint64 name_iid = 1;
+    // non-interned variant.
+    string name = 10;
+  }
+
+  oneof value {
+    bool bool_value = 2;
+    uint64 uint_value = 3;
+    int64 int_value = 4;
+    double double_value = 5;
+    // Pointers are stored in a separate type as the JSON output treats them
+    // differently from other uint64 values.
+    uint64 pointer_value = 7;
+
+    // Deprecated. Use dict_entries / array_values instead.
+    NestedValue nested_value = 8;
+
+    // Legacy instrumentation may not support conversion of nested data to
+    // NestedValue yet.
+    string legacy_json_value = 9;
+
+    // interned and non-interned variants of strings.
+    string string_value = 6;
+    // Corresponds to |debug_annotation_string_values| field in InternedData.
+    uint64 string_value_iid = 17;
+  }
+
+  // Used to embed arbitrary proto messages (which are also typically used to
+  // represent typed TrackEvent arguments). |proto_type_name| or
+  // |proto_type_name_iid| are storing the full name of the proto messages (e.g.
+  // .perfetto.protos.DebugAnnotation) and |proto_value| contains the serialised
+  // proto messages. See |TracedValue::WriteProto| for more details.
+  oneof proto_type_descriptor {
+    string proto_type_name = 16;
+    // interned DebugAnnotationValueTypeName.
+    uint64 proto_type_name_iid = 13;
+  }
+  optional bytes proto_value = 14;
+
+  repeated DebugAnnotation dict_entries = 11;
+  repeated DebugAnnotation array_values = 12;
+
+  // Deprecated legacy way to use nested values. Only kept for
+  // backwards-compatibility in TraceProcessor. May be removed in the future -
+  // code filling protos should use |dict_entries| and |array_values| instead.
+  message NestedValue {
+    enum NestedType {
+      // leaf value.
+      UNSPECIFIED = 0;
+      DICT = 1;
+      ARRAY = 2;
+    }
+    optional NestedType nested_type = 1;
+
+    repeated string dict_keys = 2;
+    repeated NestedValue dict_values = 3;
+    repeated NestedValue array_values = 4;
+    optional int64 int_value = 5;
+    optional double double_value = 6;
+    optional bool bool_value = 7;
+    optional string string_value = 8;
+  }
+}
+
+// --------------------
+// Interned data types:
+// --------------------
+
+message DebugAnnotationName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+// See the |proto_type_descriptor| comment.
+message DebugAnnotationValueTypeName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/log_message.proto b/src/libtracing/protos/perfetto/trace/track_event/log_message.proto
new file mode 100644
index 000000000..80fa0d7fe
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/log_message.proto
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message LogMessage {
+  // interned SourceLocation.
+  optional uint64 source_location_iid = 1;
+  // interned LogMessageBody.
+  optional uint64 body_iid = 2;
+  enum Priority {
+    PRIO_UNSPECIFIED = 0;
+    PRIO_UNUSED = 1;
+    PRIO_VERBOSE = 2;
+    PRIO_DEBUG = 3;
+    PRIO_INFO = 4;
+    PRIO_WARN = 5;
+    PRIO_ERROR = 6;
+    PRIO_FATAL = 7;
+  }
+  optional Priority prio = 3;
+}
+
+// --------------------
+// Interned data types:
+// --------------------
+
+message LogMessageBody {
+  optional uint64 iid = 1;
+  optional string body = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/pixel_modem.proto b/src/libtracing/protos/perfetto/trace/track_event/pixel_modem.proto
new file mode 100644
index 000000000..ffe906279
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/pixel_modem.proto
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Event insights emitted by the Pixel modem.
+message PixelModemEventInsight {
+  // Opaque string containing arguments from the modem.
+  optional string detokenized_message = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/process_descriptor.proto b/src/libtracing/protos/perfetto/trace/track_event/process_descriptor.proto
new file mode 100644
index 000000000..cacc6357f
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/process_descriptor.proto
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Describes a process's attributes. Emitted as part of a TrackDescriptor,
+// usually by the process's main thread.
+//
+// Next id: 9.
+message ProcessDescriptor {
+  optional int32 pid = 1;
+  repeated string cmdline = 2;
+  optional string process_name = 6;
+
+  optional int32 process_priority = 5;
+  // Process start time in nanoseconds.
+  // The timestamp refers to the trace clock by default. Other clock IDs
+  // provided in TracePacket are not supported.
+  optional int64 start_timestamp_ns = 7;
+
+  // ---------------------------------------------------------------------------
+  // Deprecated / legacy fields, which will be removed in the future:
+  // ---------------------------------------------------------------------------
+
+  // See chromium's content::ProcessType.
+  enum ChromeProcessType {
+    PROCESS_UNSPECIFIED = 0;
+    PROCESS_BROWSER = 1;
+    PROCESS_RENDERER = 2;
+    PROCESS_UTILITY = 3;
+    PROCESS_ZYGOTE = 4;
+    PROCESS_SANDBOX_HELPER = 5;
+    PROCESS_GPU = 6;
+    PROCESS_PPAPI_PLUGIN = 7;
+    PROCESS_PPAPI_BROKER = 8;
+  }
+  optional ChromeProcessType chrome_process_type = 4;
+
+  // To support old UI. New UI should determine default sorting by process_type.
+  optional int32 legacy_sort_index = 3;
+
+  // Labels can be used to further describe properties of the work performed by
+  // the process. For example, these can be used by Chrome renderer process to
+  // provide titles of frames being rendered.
+  repeated string process_labels = 8;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/range_of_interest.proto b/src/libtracing/protos/perfetto/trace/track_event/range_of_interest.proto
new file mode 100644
index 000000000..4cbb98c76
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/range_of_interest.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This message specifies the "range of interest" for track events. With the
+// `drop_track_event_data_before` option set to `kTrackEventRangeOfInterest`,
+// Trace Processor drops track events outside of this range.
+message TrackEventRangeOfInterest {
+  optional int64 start_us = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/screenshot.proto b/src/libtracing/protos/perfetto/trace/track_event/screenshot.proto
new file mode 100644
index 000000000..02e658cd3
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/screenshot.proto
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+message Screenshot {
+  optional bytes jpg_image = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/source_location.proto b/src/libtracing/protos/perfetto/trace/track_event/source_location.proto
new file mode 100644
index 000000000..2a6a6e875
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/source_location.proto
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// --------------------
+// Interned data types:
+// --------------------
+
+// A source location, represented as a native symbol.
+// This is similar to `message Frame` from
+// protos/perfetto/trace/profiling/profile_common.proto, but for abitrary
+// source code locations (for example in track event args), not stack frames.
+message UnsymbolizedSourceLocation {
+  optional uint64 iid = 1;
+  optional uint64 mapping_id = 2;
+  optional uint64 rel_pc = 3;
+}
+
+message SourceLocation {
+  optional uint64 iid = 1;
+  optional string file_name = 2;
+  optional string function_name = 3;
+  optional uint32 line_number = 4;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/task_execution.proto b/src/libtracing/protos/perfetto/trace/track_event/task_execution.proto
new file mode 100644
index 000000000..d120f8c83
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/task_execution.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// TrackEvent arguments describing the execution of a task.
+message TaskExecution {
+  // Source location that the task was posted from.
+  // interned SourceLocation.
+  optional uint64 posted_from_iid = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/thread_descriptor.proto b/src/libtracing/protos/perfetto/trace/track_event/thread_descriptor.proto
new file mode 100644
index 000000000..594c1b202
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/thread_descriptor.proto
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Describes a thread's attributes. Emitted as part of a TrackDescriptor,
+// usually by the thread's trace writer.
+//
+// Next id: 9.
+message ThreadDescriptor {
+  optional int32 pid = 1;
+  optional int32 tid = 2;
+
+  optional string thread_name = 5;
+
+  // ---------------------------------------------------------------------------
+  // Deprecated / legacy fields, which will be removed in the future:
+  // ---------------------------------------------------------------------------
+
+  enum ChromeThreadType {
+    CHROME_THREAD_UNSPECIFIED = 0;
+
+    CHROME_THREAD_MAIN = 1;
+    CHROME_THREAD_IO = 2;
+
+    // Scheduler:
+    CHROME_THREAD_POOL_BG_WORKER = 3;
+    CHROME_THREAD_POOL_FG_WORKER = 4;
+    CHROME_THREAD_POOL_FB_BLOCKING = 5;
+    CHROME_THREAD_POOL_BG_BLOCKING = 6;
+    CHROME_THREAD_POOL_SERVICE = 7;
+
+    // Compositor:
+    CHROME_THREAD_COMPOSITOR = 8;
+    CHROME_THREAD_VIZ_COMPOSITOR = 9;
+    CHROME_THREAD_COMPOSITOR_WORKER = 10;
+
+    // Renderer:
+    CHROME_THREAD_SERVICE_WORKER = 11;
+
+    // Tracing related threads:
+    CHROME_THREAD_MEMORY_INFRA = 50;
+    CHROME_THREAD_SAMPLING_PROFILER = 51;
+  };
+  optional ChromeThreadType chrome_thread_type = 4;
+
+  // Deprecated. Use ClockSnapshot in combination with TracePacket's timestamp
+  // and timestamp_clock_id fields instead.
+  optional int64 reference_timestamp_us = 6;
+
+  // Absolute reference values. Clock values in subsequent TrackEvents can be
+  // encoded accumulatively and relative to these. This reduces their var-int
+  // encoding size.
+  // TODO(eseckler): Deprecated. Replace these with ClockSnapshot encoding.
+  optional int64 reference_thread_time_us = 7;
+  optional int64 reference_thread_instruction_count = 8;
+
+  // To support old UI. New UI should determine default sorting by thread_type.
+  optional int32 legacy_sort_index = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/track_descriptor.proto b/src/libtracing/protos/perfetto/trace/track_event/track_descriptor.proto
new file mode 100644
index 000000000..d6db23396
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/track_descriptor.proto
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/track_event/chrome_process_descriptor.proto";
+import "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto";
+import "protos/perfetto/trace/track_event/process_descriptor.proto";
+import "protos/perfetto/trace/track_event/thread_descriptor.proto";
+import "protos/perfetto/trace/track_event/counter_descriptor.proto";
+
+package perfetto.protos;
+
+// Defines a track for TrackEvents. Slices and instant events on the same track
+// will be nested based on their timestamps, see TrackEvent::Type.
+//
+// A TrackDescriptor only needs to be emitted by one trace writer / producer and
+// is valid for the entirety of the trace. To ensure the descriptor isn't lost
+// when the ring buffer wraps, it should be reemitted whenever incremental state
+// is cleared.
+//
+// As a fallback, TrackEvents emitted without an explicit track association will
+// be associated with an implicit trace-global track (uuid = 0), see also
+// |TrackEvent::track_uuid|. It is possible but not necessary to emit a
+// TrackDescriptor for this implicit track.
+//
+// Next id: 10.
+message TrackDescriptor {
+  // Unique ID that identifies this track. This ID is global to the whole trace.
+  // Producers should ensure that it is unlikely to clash with IDs emitted by
+  // other producers. A value of 0 denotes the implicit trace-global track.
+  //
+  // For example, legacy TRACE_EVENT macros may use a hash involving the async
+  // event id + id_scope, pid, and/or tid to compute this ID.
+  optional uint64 uuid = 1;
+
+  // A parent track reference can be used to describe relationships between
+  // tracks. For example, to define an asynchronous track which is scoped to a
+  // specific process, specify the uuid for that process's process track here.
+  // Similarly, to associate a COUNTER_THREAD_TIME_NS counter track with a
+  // thread, specify the uuid for that thread's thread track here.
+  optional uint64 parent_uuid = 5;
+
+  // Name of the track. Optional - if unspecified, it may be derived from the
+  // process/thread name (process/thread tracks), the first event's name (async
+  // tracks), or counter name (counter tracks).
+  optional string name = 2;
+
+  // Associate the track with a process, making it the process-global track.
+  // There should only be one such track per process (usually for instant
+  // events; trace processor uses this fact to detect pid reuse). If you need
+  // more (e.g. for asynchronous events), create child tracks using parent_uuid.
+  //
+  // Trace processor will merge events on a process track with slice-type events
+  // from other sources (e.g. ftrace) for the same process into a single
+  // timeline view.
+  optional ProcessDescriptor process = 3;
+  optional ChromeProcessDescriptor chrome_process = 6;
+
+  // Associate the track with a thread, indicating that the track's events
+  // describe synchronous code execution on the thread. There should only be one
+  // such track per thread (trace processor uses this fact to detect tid reuse).
+  //
+  // Trace processor will merge events on a thread track with slice-type events
+  // from other sources (e.g. ftrace) for the same thread into a single timeline
+  // view.
+  optional ThreadDescriptor thread = 4;
+  optional ChromeThreadDescriptor chrome_thread = 7;
+
+  // Descriptor for a counter track. If set, the track will only support
+  // TYPE_COUNTER TrackEvents (and values provided via TrackEvent's
+  // |extra_counter_values|).
+  optional CounterDescriptor counter = 8;
+
+  // If true, forces Trace Processor to use separate tracks for track events
+  // and system events for the same thread.
+  // Track events timestamps in Chrome have microsecond resolution, while
+  // system events use nanoseconds. It results in broken event nesting when
+  // track events and system events share a track.
+  optional bool disallow_merging_with_system_tracks = 9;
+}
diff --git a/src/libtracing/protos/perfetto/trace/track_event/track_event.proto b/src/libtracing/protos/perfetto/trace/track_event/track_event.proto
new file mode 100644
index 000000000..2b9d35c25
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/track_event/track_event.proto
@@ -0,0 +1,435 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+import "protos/perfetto/trace/track_event/debug_annotation.proto";
+import "protos/perfetto/trace/track_event/log_message.proto";
+import "protos/perfetto/trace/track_event/task_execution.proto";
+import "protos/perfetto/trace/track_event/chrome_active_processes.proto";
+import "protos/perfetto/trace/track_event/chrome_application_state_info.proto";
+import "protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto";
+import "protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto";
+import "protos/perfetto/trace/track_event/chrome_frame_reporter.proto";
+import "protos/perfetto/trace/track_event/chrome_histogram_sample.proto";
+import "protos/perfetto/trace/track_event/chrome_keyed_service.proto";
+import "protos/perfetto/trace/track_event/chrome_latency_info.proto";
+import "protos/perfetto/trace/track_event/chrome_legacy_ipc.proto";
+import "protos/perfetto/trace/track_event/chrome_message_pump.proto";
+import "protos/perfetto/trace/track_event/chrome_mojo_event_info.proto";
+import "protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto";
+import "protos/perfetto/trace/track_event/chrome_user_event.proto";
+import "protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto";
+import "protos/perfetto/trace/track_event/pixel_modem.proto";
+import "protos/perfetto/trace/track_event/screenshot.proto";
+import "protos/perfetto/trace/track_event/source_location.proto";
+
+package perfetto.protos;
+
+// NOTE: Full TrackEvent support in the client lib and chrome is WIP, thus these
+// protos are still subject to change. Don't depend on them staying as they are.
+
+// Trace events emitted by client instrumentation library (TRACE_EVENT macros),
+// which describe activity on a track, such as a thread or asynchronous event
+// track. The track is specified using separate TrackDescriptor messages and
+// referred to via the track's UUID.
+//
+// A simple TrackEvent packet specifies a timestamp, category, name and type:
+// ```protobuf
+//   trace_packet {
+//     timestamp: 1000
+//     track_event {
+//       categories: ["my_cat"]
+//       name: "my_event"
+//       type: TYPE_INSTANT
+//      }
+//    }
+// ```
+//
+// To associate an event with a custom track (e.g. a thread), the track is
+// defined in a separate packet and referred to from the TrackEvent by its UUID:
+// ```protobuf
+//   trace_packet {
+//     track_descriptor {
+//       track_uuid: 1234
+//       name: "my_track"
+//
+//       // Optionally, associate the track with a thread.
+//       thread_descriptor {
+//         pid: 10
+//         tid: 10
+//         ..
+//       }
+//     }
+//   }
+// ```
+//
+// A pair of TYPE_SLICE_BEGIN and _END events form a slice on the track:
+//
+// ```protobuf
+//   trace_packet {
+//     timestamp: 1200
+//     track_event {
+//       track_uuid: 1234
+//       categories: ["my_cat"]
+//       name: "my_slice"
+//       type: TYPE_SLICE_BEGIN
+//     }
+//   }
+//   trace_packet {
+//     timestamp: 1400
+//     track_event {
+//       track_uuid: 1234
+//       type: TYPE_SLICE_END
+//     }
+//   }
+// ```
+// TrackEvents also support optimizations to reduce data repetition and encoded
+// data size, e.g. through data interning (names, categories, ...) and delta
+// encoding of timestamps/counters. For details, see the InternedData message.
+// Further, default values for attributes of events on the same sequence (e.g.
+// their default track association) can be emitted as part of a
+// TrackEventDefaults message.
+//
+// Next reserved id: 13 (up to 15). Next id: 52.
+message TrackEvent {
+  // Names of categories of the event. In the client library, categories are a
+  // way to turn groups of individual events on or off.
+  // interned EventCategoryName.
+  repeated uint64 category_iids = 3;
+  // non-interned variant.
+  repeated string categories = 22;
+
+  // Optional name of the event for its display in trace viewer. May be left
+  // unspecified for events with typed arguments.
+  //
+  // Note that metrics should not rely on event names, as they are prone to
+  // changing. Instead, they should use typed arguments to identify the events
+  // they are interested in.
+  oneof name_field {
+    // interned EventName.
+    uint64 name_iid = 10;
+    // non-interned variant.
+    string name = 23;
+  }
+
+  // TODO(eseckler): Support using binary symbols for category/event names.
+
+  // Type of the TrackEvent (required if |phase| in LegacyEvent is not set).
+  enum Type {
+    TYPE_UNSPECIFIED = 0;
+
+    // Slice events are events that have a begin and end timestamp, i.e. a
+    // duration. They can be nested similar to a callstack: If, on the same
+    // track, event B begins after event A, but before A ends, B is a child
+    // event of A and will be drawn as a nested event underneath A in the UI.
+    // Note that child events should always end before their parents (e.g. B
+    // before A).
+    //
+    // Each slice event is formed by a pair of BEGIN + END events. The END event
+    // does not need to repeat any TrackEvent fields it has in common with its
+    // corresponding BEGIN event. Arguments and debug annotations of the BEGIN +
+    // END pair will be merged during trace import.
+    //
+    // Note that we deliberately chose not to support COMPLETE events (which
+    // would specify a duration directly) since clients would need to delay
+    // writing them until the slice is completed, which can result in reordered
+    // events in the trace and loss of unfinished events at the end of a trace.
+    TYPE_SLICE_BEGIN = 1;
+    TYPE_SLICE_END = 2;
+
+    // Instant events are nestable events without duration. They can be children
+    // of slice events on the same track.
+    TYPE_INSTANT = 3;
+
+    // Event that provides a value for a counter track. |track_uuid| should
+    // refer to a counter track and |counter_value| set to the new value. Note
+    // that most other TrackEvent fields (e.g. categories, name, ..) are not
+    // supported for TYPE_COUNTER events. See also CounterDescriptor.
+    TYPE_COUNTER = 4;
+  }
+  optional Type type = 9;
+
+  // Identifies the track of the event. The default value may be overridden
+  // using TrackEventDefaults, e.g., to specify the track of the TraceWriter's
+  // sequence (in most cases sequence = one thread). If no value is specified
+  // here or in TrackEventDefaults, the TrackEvent will be associated with an
+  // implicit trace-global track (uuid 0). See TrackDescriptor::uuid.
+  optional uint64 track_uuid = 11;
+
+  // A new value for a counter track. |track_uuid| should refer to a track with
+  // a CounterDescriptor, and |type| should be TYPE_COUNTER. For a more
+  // efficient encoding of counter values that are sampled at the beginning/end
+  // of a slice, see |extra_counter_values| and |extra_counter_track_uuids|.
+  // Counter values can optionally be encoded in as delta values (positive or
+  // negative) on each packet sequence (see CounterIncrementalBase).
+  oneof counter_value_field {
+    int64 counter_value = 30;
+    double double_counter_value = 44;
+  }
+
+  // To encode counter values more efficiently, we support attaching additional
+  // counter values to a TrackEvent of any type. All values will share the same
+  // timestamp specified in the TracePacket. The value at
+  // extra_counter_values[N] is for the counter track referenced by
+  // extra_counter_track_uuids[N].
+  //
+  // |extra_counter_track_uuids| may also be set via TrackEventDefaults. There
+  // should always be equal or more uuids than values. It is valid to set more
+  // uuids (e.g. via defaults) than values. If uuids are specified in
+  // TrackEventDefaults and a TrackEvent, the TrackEvent uuids override the
+  // default uuid list.
+  //
+  // For example, this allows snapshotting the thread time clock at each
+  // thread-track BEGIN and END event to capture the cpu time delta of a slice.
+  repeated uint64 extra_counter_track_uuids = 31;
+  repeated int64 extra_counter_values = 12;
+
+  // Counter snapshots using floating point instead of integer values.
+  repeated uint64 extra_double_counter_track_uuids = 45;
+  repeated double extra_double_counter_values = 46;
+
+  // IDs of flows originating, passing through, or ending at this event.
+  // Flow IDs are global within a trace.
+  //
+  // A flow connects a sequence of TrackEvents within or across tracks, e.g.
+  // an input event may be handled on one thread but cause another event on
+  // a different thread - a flow between the two events can associate them.
+  //
+  // The direction of the flows between events is inferred from the events'
+  // timestamps. The earliest event with the same flow ID becomes the source
+  // of the flow. Any events thereafter are intermediate steps of the flow,
+  // until the flow terminates at the last event with the flow ID.
+  //
+  // Flows can also be explicitly terminated (see |terminating_flow_ids|), so
+  // that the same ID can later be reused for another flow.
+  // DEPRECATED. Only kept for backwards compatibility. Use |flow_ids|.
+  repeated uint64 flow_ids_old = 36 [deprecated = true];
+  // TODO(b/204341740): replace "flow_ids_old" with "flow_ids" to reduce memory
+  // consumption.
+  repeated fixed64 flow_ids = 47;
+
+  // List of flow ids which should terminate on this event, otherwise same as
+  // |flow_ids|.
+  // Any one flow ID should be either listed as part of |flow_ids| OR
+  // |terminating_flow_ids|, not both.
+  // DEPRECATED. Only kept for backwards compatibility.  Use
+  // |terminating_flow_ids|.
+  repeated uint64 terminating_flow_ids_old = 42 [deprecated = true];
+  // TODO(b/204341740): replace "terminating_flow_ids_old" with
+  // "terminating_flow_ids" to reduce memory consumption.
+  repeated fixed64 terminating_flow_ids = 48;
+
+  // ---------------------------------------------------------------------------
+  // TrackEvent arguments:
+  // ---------------------------------------------------------------------------
+
+  // Unstable key/value annotations shown in the trace viewer but not intended
+  // for metrics use.
+  repeated DebugAnnotation debug_annotations = 4;
+
+  // Typed event arguments:
+  optional TaskExecution task_execution = 5;
+  optional LogMessage log_message = 21;
+  optional ChromeCompositorSchedulerState cc_scheduler_state = 24;
+  optional ChromeUserEvent chrome_user_event = 25;
+  optional ChromeKeyedService chrome_keyed_service = 26;
+  optional ChromeLegacyIpc chrome_legacy_ipc = 27;
+  optional ChromeHistogramSample chrome_histogram_sample = 28;
+  optional ChromeLatencyInfo chrome_latency_info = 29;
+  optional ChromeFrameReporter chrome_frame_reporter = 32;
+  optional ChromeApplicationStateInfo chrome_application_state_info = 39;
+  optional ChromeRendererSchedulerState chrome_renderer_scheduler_state = 40;
+  optional ChromeWindowHandleEventInfo chrome_window_handle_event_info = 41;
+  optional ChromeContentSettingsEventInfo chrome_content_settings_event_info =
+      43;
+  optional ChromeActiveProcesses chrome_active_processes = 49;
+  optional Screenshot screenshot = 50;
+  optional PixelModemEventInsight pixel_modem_event_insight = 51;
+
+  // This field is used only if the source location represents the function that
+  // executes during this event.
+  oneof source_location_field {
+    // Non-interned field.
+    SourceLocation source_location = 33;
+    // Interned field.
+    uint64 source_location_iid = 34;
+  }
+
+  optional ChromeMessagePump chrome_message_pump = 35;
+  optional ChromeMojoEventInfo chrome_mojo_event_info = 38;
+
+  // New argument types go here :)
+
+  // Extension range for typed events defined externally.
+  // See docs/design-docs/extensions.md for more details.
+  //
+  // Extension support is work-in-progress, in the future the way to reserve a
+  // subrange for a particular project will be described here and in the design
+  // document linked above.
+  //
+  // Contact perfetto-dev@googlegroups.com if you are interested in a subrange
+  // for your project.
+
+  // Extension range reserved for chromium:
+  // https://source.chromium.org/chromium/chromium/src/+/main:base/tracing/protos/chrome_track_event.proto
+  extensions 1000 to 1999;
+  // Extension range reserved for https://b.corp.google.com/issues/301227627.
+  extensions 2000 to 2000;
+  // Extension range for future use.
+  extensions 2001 to 9899;
+  // Reserved for Perfetto unit and integration tests.
+  extensions 9900 to 10000;
+
+  // ---------------------------------------------------------------------------
+  // Deprecated / legacy event fields, which will be removed in the future:
+  // ---------------------------------------------------------------------------
+
+  // Deprecated. Use the |timestamp| and |timestamp_clock_id| fields in
+  // TracePacket instead.
+  //
+  // Timestamp in microseconds (usually CLOCK_MONOTONIC).
+  oneof timestamp {
+    // Delta timestamp value since the last TrackEvent or ThreadDescriptor. To
+    // calculate the absolute timestamp value, sum up all delta values of the
+    // preceding TrackEvents since the last ThreadDescriptor and add the sum to
+    // the |reference_timestamp| in ThreadDescriptor. This value should always
+    // be positive.
+    int64 timestamp_delta_us = 1;
+    // Absolute value (e.g. a manually specified timestamp in the macro).
+    // This is a one-off value that does not affect delta timestamp computation
+    // in subsequent TrackEvents.
+    int64 timestamp_absolute_us = 16;
+  }
+
+  // Deprecated. Use |extra_counter_values| and |extra_counter_track_uuids| to
+  // encode thread time instead.
+  //
+  // CPU time for the current thread (e.g., CLOCK_THREAD_CPUTIME_ID) in
+  // microseconds.
+  oneof thread_time {
+    // Delta timestamp value since the last TrackEvent or ThreadDescriptor. To
+    // calculate the absolute timestamp value, sum up all delta values of the
+    // preceding TrackEvents since the last ThreadDescriptor and add the sum to
+    // the |reference_timestamp| in ThreadDescriptor. This value should always
+    // be positive.
+    int64 thread_time_delta_us = 2;
+    // This is a one-off absolute value that does not affect delta timestamp
+    // computation in subsequent TrackEvents.
+    int64 thread_time_absolute_us = 17;
+  }
+
+  // Deprecated. Use |extra_counter_values| and |extra_counter_track_uuids| to
+  // encode thread instruction count instead.
+  //
+  // Value of the instruction counter for the current thread.
+  oneof thread_instruction_count {
+    // Same encoding as |thread_time| field above.
+    int64 thread_instruction_count_delta = 8;
+    int64 thread_instruction_count_absolute = 20;
+  }
+
+  // Apart from {category, time, thread time, tid, pid}, other legacy trace
+  // event attributes are initially simply proxied for conversion to a JSON
+  // trace. We intend to gradually transition these attributes to similar native
+  // features in TrackEvent (e.g. async + flow events), or deprecate them
+  // without replacement where transition is unsuitable.
+  //
+  // Next reserved id: 16 (up to 16).
+  // Next id: 20.
+  message LegacyEvent {
+    // Deprecated, use TrackEvent::name(_iid) instead.
+    // interned EventName.
+    optional uint64 name_iid = 1;
+    optional int32 phase = 2;
+    optional int64 duration_us = 3;
+    optional int64 thread_duration_us = 4;
+
+    // Elapsed retired instruction count during the event.
+    optional int64 thread_instruction_delta = 15;
+
+    // used to be |flags|.
+    reserved 5;
+
+    oneof id {
+      uint64 unscoped_id = 6;
+      uint64 local_id = 10;
+      uint64 global_id = 11;
+    }
+    // Additional optional scope for |id|.
+    optional string id_scope = 7;
+
+    // Consider the thread timestamps for async BEGIN/END event pairs as valid.
+    optional bool use_async_tts = 9;
+
+    // Idenfifies a flow. Flow events with the same bind_id are connected.
+    optional uint64 bind_id = 8;
+    // Use the enclosing slice as binding point for a flow end event instead of
+    // the next slice. Flow start/step events always bind to the enclosing
+    // slice.
+    optional bool bind_to_enclosing = 12;
+
+    enum FlowDirection {
+      FLOW_UNSPECIFIED = 0;
+      FLOW_IN = 1;
+      FLOW_OUT = 2;
+      FLOW_INOUT = 3;
+    }
+    optional FlowDirection flow_direction = 13;
+
+    enum InstantEventScope {
+      SCOPE_UNSPECIFIED = 0;
+      SCOPE_GLOBAL = 1;
+      SCOPE_PROCESS = 2;
+      SCOPE_THREAD = 3;
+    }
+    optional InstantEventScope instant_event_scope = 14;
+
+    // Override the pid/tid if the writer needs to emit events on behalf of
+    // another process/thread. This should be the exception. Normally, the
+    // pid+tid from ThreadDescriptor is used.
+    optional int32 pid_override = 18;
+    optional int32 tid_override = 19;
+  }
+
+  optional LegacyEvent legacy_event = 6;
+}
+
+// Default values for fields of all TrackEvents on the same packet sequence.
+// Should be emitted as part of TracePacketDefaults whenever incremental state
+// is cleared. It's defined here because field IDs should match those of the
+// corresponding fields in TrackEvent.
+message TrackEventDefaults {
+  optional uint64 track_uuid = 11;
+  repeated uint64 extra_counter_track_uuids = 31;
+  repeated uint64 extra_double_counter_track_uuids = 45;
+
+  // TODO(eseckler): Support default values for more TrackEvent fields.
+}
+
+// --------------------
+// Interned data types:
+// --------------------
+
+message EventCategory {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
+
+message EventName {
+  optional uint64 iid = 1;
+  optional string name = 2;
+}
diff --git a/src/libtracing/protos/perfetto/trace/translation/translation_table.proto b/src/libtracing/protos/perfetto/trace/translation/translation_table.proto
new file mode 100644
index 000000000..06cef3128
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/translation/translation_table.proto
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Translation rules for the trace processor.
+// See the comments for each rule type for specific meaning.
+message TranslationTable {
+  oneof table {
+    ChromeHistorgramTranslationTable chrome_histogram = 1;
+    ChromeUserEventTranslationTable chrome_user_event = 2;
+    ChromePerformanceMarkTranslationTable chrome_performance_mark = 3;
+    SliceNameTranslationTable slice_name = 4;
+  }
+}
+
+// Chrome histogram sample hash -> name translation rules.
+message ChromeHistorgramTranslationTable {
+  map<uint64, string> hash_to_name = 1;
+}
+
+// Chrome user event action hash -> name translation rules.
+message ChromeUserEventTranslationTable {
+  map<uint64, string> action_hash_to_name = 1;
+}
+
+// Chrome performance mark translation rules.
+message ChromePerformanceMarkTranslationTable {
+  map<uint32, string> site_hash_to_name = 1;
+  map<uint32, string> mark_hash_to_name = 2;
+};
+
+// Raw -> deobfuscated slice name translation rules.
+message SliceNameTranslationTable {
+  map<string, string> raw_to_deobfuscated_name = 1;
+};
diff --git a/src/libtracing/protos/perfetto/trace/trigger.proto b/src/libtracing/protos/perfetto/trace/trigger.proto
new file mode 100644
index 000000000..759eb4fce
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/trigger.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+// When a TracingSession receives a trigger it records the boot time nanoseconds
+// in the TracePacket's timestamp field as well as the name of the producer that
+// triggered it. We emit this data so filtering can be done on triggers received
+// in the trace.
+message Trigger {
+  // Name of the trigger which was received.
+  optional string trigger_name = 1;
+  // The actual producer that activated |trigger|.
+  optional string producer_name = 2;
+  // The verified UID of the producer.
+  optional int32 trusted_producer_uid = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace/ui_state.proto b/src/libtracing/protos/perfetto/trace/ui_state.proto
new file mode 100644
index 000000000..6f0c53bb7
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace/ui_state.proto
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Common state for UIs visualizing Perfetto traces.
+// This message can be appended as a TracePacket by UIs to save the
+// visible state (e.g. scroll position/zoom state) for future opening
+// of the trace.
+// Design doc: go/trace-ui-state.
+message UiState {
+  // The start and end bounds of the viewport of the UI in nanoseconds.
+  //
+  // This is the absolute time associated to slices and other events in
+  // trace processor tables (i.e. the |ts| column of most tables)
+  optional int64 timeline_start_ts = 1;
+  optional int64 timeline_end_ts = 2;
+
+  // Indicates that the given process should be highlighted by the UI.
+  message HighlightProcess {
+    oneof selector {
+      // The pid of the process to highlight. This is useful for UIs to focus
+      // on tracks of a particular process in the trace.
+      //
+      // If more than one process in a trace has the same pid, it is UI
+      // implementation specific how the process to be focused will be
+      // chosen.
+      uint32 pid = 1;
+
+      // The command line of the process to highlight; for most Android apps,
+      // this is the package name of the app. This is useful for UIs to focus
+      // on a particular app in the trace.
+      //
+      // If more than one process hasthe same cmdline, it is UI implementation
+      // specific how the process to be focused will be chosen.
+      string cmdline = 2;
+    }
+  }
+  optional HighlightProcess highlight_process = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace_processor/metatrace_categories.proto b/src/libtracing/protos/perfetto/trace_processor/metatrace_categories.proto
new file mode 100644
index 000000000..6b9ee2397
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace_processor/metatrace_categories.proto
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Bitmask of metatrace categories which can be enabled.
+// Keep in sync with TraceProcessor::MetatraceCategories.
+enum MetatraceCategories {
+  // 1 << 0.
+  QUERY_TIMELINE = 1;
+  // 1 << 1.
+  QUERY_DETAILED = 2;
+  // 1 << 2.
+  FUNCTION_CALL = 4;
+  // 1 << 3.
+  DB = 8;
+  // 1 << 4.
+  API_TIMELINE = 16;
+
+  // Aliases for common subsets.
+  NONE = 0;
+  ALL = 31;
+}
diff --git a/src/libtracing/protos/perfetto/trace_processor/metrics_impl.proto b/src/libtracing/protos/perfetto/trace_processor/metrics_impl.proto
new file mode 100644
index 000000000..8b9b6e1e5
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace_processor/metrics_impl.proto
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// The wrapping result of any metric builder function in trace processor. This
+// is an internal implementation detail of trace processor so should not be
+// relied on.
+message ProtoBuilderResult {
+  // Whether the result is a singular proto builder result or the result of
+  // a repeated field builder.
+  optional bool is_repeated = 1;
+  oneof result {
+    SingleBuilderResult single = 2;
+    RepeatedBuilderResult repeated = 3;
+  }
+}
+
+// The result of a repeated field function for a metric proto in trace
+// processor. This is an internal implementation detail of trace processor so
+// should not be relied on.
+message RepeatedBuilderResult {
+  repeated sfixed64 int_values = 1 [packed = true];
+  repeated double double_values = 2 [packed = true];
+  repeated string string_values = 3;
+  repeated bytes byte_values = 4;
+}
+
+// The result of a builder function for a metric proto in trace processor. This
+// is an internal implementation detail of trace processor so should not be
+// relied on.
+message SingleBuilderResult {
+  // The type of the result. The possible values are given by
+  // FieldDescriptorProto::Type.
+  optional uint32 type = 1;
+
+  // The type name of the result if the result is a message or enum type.
+  optional string type_name = 2;
+
+  // The raw proto bytes of a message.
+  optional bytes protobuf = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace_processor/proto_files.gni b/src/libtracing/protos/perfetto/trace_processor/proto_files.gni
new file mode 100644
index 000000000..f7d36e90c
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace_processor/proto_files.gni
@@ -0,0 +1,22 @@
+# Copyright (C) 2018 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This variable is used both by ./BUILD.gn (for the C++ proto codegen) and by
+# //ui/BUIlD.gn (for the TypeScript/JS proto codegen).
+trace_processor_protos = [
+  "metatrace_categories",
+  "serialization",
+  "stack",
+  "trace_processor",
+]
diff --git a/src/libtracing/protos/perfetto/trace_processor/serialization.proto b/src/libtracing/protos/perfetto/trace_processor/serialization.proto
new file mode 100644
index 000000000..2093d90bc
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace_processor/serialization.proto
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This file defines the schema for {, de}serializing contents of TraceProcessor
+// storage. This schema should is not an API and should not be dependent upon -
+// it is an implementation detail of Trace Processor and can be changed at any
+// time.
+
+// Outside level schema of all serialized objects. Each self contained
+// serialized object is a separate packet and they don't depend on each other
+// for serialization.
+message SerializedTraceProcessor {
+  repeated SerializedTraceProcessorPacket packet = 1;
+}
+
+// One of independent serialized objects.
+message SerializedTraceProcessorPacket {
+  oneof packet {
+    SerializedColumn column = 1;
+  }
+}
+
+// Schema for serializing the column of Trace Processor table.
+message SerializedColumn {
+  // Schema used to store a serialized |BitVector|.
+  message BitVector {
+    optional bytes words = 1;
+    optional bytes counts = 2;
+    optional uint32 size = 3;
+  }
+  // A schema for serialization of any of the descendants of |storage::Storage|.
+  message Storage {
+    // Dummy storage should not contain any data. It's used to signify that
+    // there is a column present, and it's not usable.
+    message DummyStorage {}
+
+    // A schema for serialization of |storage::IdStorage|.
+    message IdStorage {
+      optional uint64 size = 1;
+    }
+
+    // A schema for serialization of |storage::Numeric|.
+    message NumericStorage {
+      optional bytes values = 1;
+      optional bool is_sorted = 2;
+      optional uint32 column_type = 3;
+    }
+
+    // A schema for serialization of |storage::SetIdStorage|.
+    message SetIdStorage {
+      optional bytes values = 1;
+    }
+
+    // A schema for serialization of |storage::StringStorage|.
+    message StringStorage {
+      optional bytes values = 1;
+      optional bool is_sorted = 2;
+    }
+
+    // A schema for serialization of |storage::NullOverlay|.
+    message NullOverlay {
+      optional BitVector bit_vector = 1;
+      optional Storage storage = 2;
+    }
+
+    // A schema for serialization of |storage::ArrangementOverlay|.
+    message ArrangementOverlay {
+      optional bytes values = 1;
+      optional Storage storage = 2;
+    }
+
+    // A schema for serialization of |storage::SelectorOverlay|.
+    message SelectorOverlay {
+      optional BitVector bit_vector = 1;
+      optional Storage storage = 2;
+    }
+
+    // A schema for serialization of |storage::DenseNullOverlay|.
+    message DenseNullOverlay {
+      optional BitVector bit_vector = 1;
+      optional Storage storage = 2;
+    }
+
+    oneof data {
+      DummyStorage dummy_storage = 1;
+      IdStorage id_storage = 2;
+      NumericStorage numeric_storage = 3;
+      SetIdStorage set_id_storage = 4;
+      StringStorage string_storage = 5;
+      NullOverlay null_overlay = 6;
+      ArrangementOverlay arrangement_overlay = 7;
+      SelectorOverlay selector_overlay = 8;
+      DenseNullOverlay dense_null_overlay = 9;
+    }
+  }
+
+  // Name of the table this column is part of.
+  optional string table_name = 1;
+  optional string column_name = 2;
+  optional Storage storage = 3;
+}
diff --git a/src/libtracing/protos/perfetto/trace_processor/stack.proto b/src/libtracing/protos/perfetto/trace_processor/stack.proto
new file mode 100644
index 000000000..f140c814e
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace_processor/stack.proto
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// Representation of a stack. To be used as input to generate flame charts
+// or pprof.
+message Stack {
+  // A stack is an ordered list of these entries. Think of them as frames in the
+  // stack, although we support entire call stacks as an entry (for efficiency,
+  // no need to copy entire stacks around if we can just copy a callsite_id).
+  message Entry {
+    oneof entry {
+      string name = 1;
+      uint32 callsite_id = 2;
+      uint32 annotated_callsite_id = 3;
+      uint32 frame_id = 4;
+    }
+  }
+  // Ordered list of "frames" in the stack. Leaf is at index 0.
+  // Note that we call these entries and not frames because an entire call stack
+  // can be referenced in one entry (via callsite_id).
+  repeated Entry entries = 1;
+}
diff --git a/src/libtracing/protos/perfetto/trace_processor/trace_processor.proto b/src/libtracing/protos/perfetto/trace_processor/trace_processor.proto
new file mode 100644
index 000000000..e7a6cd5dd
--- /dev/null
+++ b/src/libtracing/protos/perfetto/trace_processor/trace_processor.proto
@@ -0,0 +1,330 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+import "protos/perfetto/common/descriptor.proto";
+import "protos/perfetto/trace_processor/metatrace_categories.proto";
+
+// This file defines the schema for {,un}marshalling arguments and return values
+// when interfacing to the trace processor binary interface.
+
+// The Trace Processor can be used in three modes:
+// 1. Fully native from C++ or directly using trace_processor_shell.
+//    In this case, this file isn't really relevant because no binary
+//    marshalling is involved. Look at include/trace_processor/trace_processor.h
+//    for the public C++ API definition.
+// 2. Using WASM within the HTML ui. In this case these messages are used to
+//    {,un}marshall calls made through the JS<>WASM interop in
+//    src/trace_processor/rpc/wasm_bridge.cc .
+// 3. Using the HTTP+RPC interface, by running trace_processor_shell -D.
+//    In this case these messages are used to {,un}marshall HTTP requests and
+//    response made through src/trace_processor/rpc/httpd.cc .
+
+enum TraceProcessorApiVersion {
+  // This variable has been introduced in v15 and is used to deal with API
+  // mismatches between UI and trace_processor_shell --httpd.
+  //
+  // Prior to API version 11 this was incremented every time a new
+  // feature that the UI depended on was introduced (e.g. new tables,
+  // new SQL operators, metrics that are required by the UI, etc).
+  // This:
+  // a. Tended to be forgotten
+  // b. Still led to issues when the TP dropped *backwards*
+  //    compatibility of a feature (since we checked TP >= UI
+  //    TRACE_PROCESSOR_CURRENT_API_VERSION).
+  // Now the UI attempts to redirect the user to the matched version
+  // of the UI if one exists.
+  // See also StatusResult.api_version (below).
+  // Changes:
+  // 7. Introduce GUESS_CPU_SIZE
+  // 8. Add 'json' option to ComputeMetricArgs
+  // 9. Add get_thread_state_summary_for_interval.
+  // 10. Add 'slice_is_ancestor' to stdlib.
+  // 11. Removal of experimental module from stdlib.
+  // 12. Changed UI to be more aggresive about version matching.
+  //     Added version_code.
+  TRACE_PROCESSOR_CURRENT_API_VERSION = 12;
+}
+
+// At lowest level, the wire-format of the RPC protocol is a linear sequence of
+// TraceProcessorRpc messages on each side of the byte pipe
+// Each message is prefixed by a tag (field = 1, type = length delimited) and a
+// varint encoding its size (this is so the whole stream can also be read /
+// written as if it was a repeated field of TraceProcessorRpcStream).
+
+message TraceProcessorRpcStream {
+  repeated TraceProcessorRpc msg = 1;
+}
+
+message TraceProcessorRpc {
+  // A monotonic counter used only for debugging purposes, to detect if the
+  // underlying stream is missing or duping data. The counter starts at 0 on
+  // each side of the pipe and is incremented on each message.
+  // Do NOT expect that a response has the same |seq| of its corresponding
+  // request: some requests (e.g., a query returning many rows) can yield more
+  // than one response message, bringing the tx and rq seq our of sync.
+  optional int64 seq = 1;
+
+  // This is returned when some unrecoverable error has been detected by the
+  // peer. The typical case is TraceProcessor detecting that the |seq| sequence
+  // is broken (e.g. when having two tabs open with the same --httpd instance).
+  optional string fatal_error = 5;
+
+  enum TraceProcessorMethod {
+    TPM_UNSPECIFIED = 0;
+    TPM_APPEND_TRACE_DATA = 1;
+    TPM_FINALIZE_TRACE_DATA = 2;
+    TPM_QUERY_STREAMING = 3;
+    // Previously: TPM_QUERY_RAW_DEPRECATED
+    reserved 4;
+    reserved "TPM_QUERY_RAW_DEPRECATED";
+    TPM_COMPUTE_METRIC = 5;
+    TPM_GET_METRIC_DESCRIPTORS = 6;
+    TPM_RESTORE_INITIAL_TABLES = 7;
+    TPM_ENABLE_METATRACE = 8;
+    TPM_DISABLE_AND_READ_METATRACE = 9;
+    TPM_GET_STATUS = 10;
+    TPM_RESET_TRACE_PROCESSOR = 11;
+  }
+
+  oneof type {
+    // Client -> TraceProcessor requests.
+    TraceProcessorMethod request = 2;
+
+    // TraceProcessor -> Client responses.
+    TraceProcessorMethod response = 3;
+
+    // This is sent back instead of filling |response| when the client sends a
+    // |request| which is not known by the TraceProcessor service. This can
+    // happen when the client is newer than the service.
+    TraceProcessorMethod invalid_request = 4;
+  }
+
+  // Request/Response arguments.
+  // Not all requests / responses require an argument.
+
+  oneof args {
+    // TraceProcessorMethod request args.
+
+    // For TPM_APPEND_TRACE_DATA.
+    bytes append_trace_data = 101;
+    // For TPM_QUERY_STREAMING.
+    QueryArgs query_args = 103;
+    // For TPM_COMPUTE_METRIC.
+    ComputeMetricArgs compute_metric_args = 105;
+    // For TPM_ENABLE_METATRACE.
+    EnableMetatraceArgs enable_metatrace_args = 106;
+    // For TPM_RESET_TRACE_PROCESSOR.
+    ResetTraceProcessorArgs reset_trace_processor_args = 107;
+
+    // TraceProcessorMethod response args.
+    // For TPM_APPEND_TRACE_DATA.
+    AppendTraceDataResult append_result = 201;
+    // For TPM_QUERY_STREAMING.
+    QueryResult query_result = 203;
+    // For TPM_COMPUTE_METRIC.
+    ComputeMetricResult metric_result = 205;
+    // For TPM_GET_METRIC_DESCRIPTORS.
+    DescriptorSet metric_descriptors = 206;
+    // For TPM_DISABLE_AND_READ_METATRACE.
+    DisableAndReadMetatraceResult metatrace = 209;
+    // For TPM_GET_STATUS.
+    StatusResult status = 210;
+  }
+
+  // Previously: RawQueryArgs for TPM_QUERY_RAW_DEPRECATED
+  reserved 104;
+  // Previously: RawQueryResult for TPM_QUERY_RAW_DEPRECATED
+  reserved 204;
+}
+
+message AppendTraceDataResult {
+  optional int64 total_bytes_parsed = 1;
+  optional string error = 2;
+}
+
+message QueryArgs {
+  optional string sql_query = 1;
+  // Was time_queued_ns
+  reserved 2;
+  // Optional string to tag this query with for performance diagnostic purposes.
+  optional string tag = 3;
+}
+
+// Output for the /query endpoint.
+// Returns a query result set, grouping cells into batches. Batching allows a
+// more efficient encoding of results, at the same time allowing to return
+// O(M) results in a pipelined fashion, without full-memory buffering.
+// Batches are split when either a large number of cells (~thousands) is reached
+// or the string/blob payload becomes too large (~hundreds of KB).
+// Data is batched in cells, scanning results by row -> column. e.g. if a query
+// returns 3 columns and 2 rows, the cells will be emitted in this order:
+// R0C0, R0C1, R0C2, R1C0, R1C1, R1C2.
+message QueryResult {
+  // This determines the number and names of columns.
+  repeated string column_names = 1;
+
+  // If non-emty the query returned an error. Note that some cells might still
+  // be present, if the error happened while iterating.
+  optional string error = 2;
+
+  // A batch contains an array of cell headers, stating the type of each cell.
+  // The payload of each cell is stored in the corresponding xxx_cells field
+  // below (unless the cell is NULL).
+  // So if |cells| contains: [VARINT, FLOAT64, VARINT, STRING], the results will
+  // be available as:
+  // [varint_cells[0], float64_cells[0], varint_cells[1], string_cells[0]].
+  message CellsBatch {
+    enum CellType {
+      CELL_INVALID = 0;
+      CELL_NULL = 1;
+      CELL_VARINT = 2;
+      CELL_FLOAT64 = 3;
+      CELL_STRING = 4;
+      CELL_BLOB = 5;
+    }
+    repeated CellType cells = 1 [packed = true];
+
+    repeated int64 varint_cells = 2 [packed = true];
+    repeated double float64_cells = 3 [packed = true];
+    repeated bytes blob_cells = 4;
+
+    // The string cells are concatenated in a single field. Each cell is
+    // NUL-terminated. This is because JS incurs into a non-negligible overhead
+    // when decoding strings and one decode + split('\0') is measurably faster
+    // than decoding N strings. See goto.google.com/postmessage-benchmark .
+    optional string string_cells = 5;
+
+    // If true this is the last batch for the query result.
+    optional bool is_last_batch = 6;
+
+    // Padding field. Used only to re-align and fill gaps in the binary format.
+    reserved 7;
+  }
+  repeated CellsBatch batch = 3;
+
+  // The number of statements in the provided SQL.
+  optional uint32 statement_count = 4;
+
+  // The number of statements which produced output rows in the provided SQL.
+  optional uint32 statement_with_output_count = 5;
+
+  // The last statement in the provided SQL.
+  optional string last_statement_sql = 6;
+}
+
+// Input for the /status endpoint.
+message StatusArgs {}
+
+// Output for the /status endpoint.
+message StatusResult {
+  // If present and not empty, a trace is already loaded already. This happens
+  // when using the HTTP+RPC mode nad passing a trace file to the shell, via
+  // trace_processor_shell -D trace_file.pftrace .
+  optional string loaded_trace_name = 1;
+
+  // Typically something like "v11.0.123", but could be just "v11" or "unknown",
+  // for binaries built from Bazel or other build configurations. This is for
+  // human presentation only, don't attempt to parse and reason on it.
+  optional string human_readable_version = 2;
+
+  // The API version is incremented every time a change that the UI depends
+  // on is introduced (e.g. adding a new table that the UI queries).
+  optional int32 api_version = 3;
+
+  // Typically something like "v42.1-deadbeef0", but could be just
+  // "v42", "v0.0", or unset for binaries built from Bazel or other
+  // build configurations. This can be compared with equality to other
+  // version codes to detect matched builds (for example to see if
+  // trace_processor_shell and the UI were built at the same revision)
+  // but you should not attempt to parse it as the format may change
+  // without warning.
+  optional string version_code = 4;
+}
+
+// Input for the /compute_metric endpoint.
+message ComputeMetricArgs {
+  enum ResultFormat {
+    BINARY_PROTOBUF = 0;
+    TEXTPROTO = 1;
+    JSON = 2;
+  }
+  repeated string metric_names = 1;
+  optional ResultFormat format = 2;
+}
+
+// Output for the /compute_metric endpoint.
+message ComputeMetricResult {
+  oneof result {
+    // This is meant to contain a perfetto.protos.TraceMetrics. We're using
+    // bytes instead of the actual type because we do not want to generate
+    // protozero code for the metrics protos. We always encode/decode metrics
+    // using a reflection based mechanism that does not require the compiled C++
+    // code. This allows us to read in new protos at runtime.
+    bytes metrics = 1;
+
+    // A perfetto.protos.TraceMetrics formatted as prototext.
+    string metrics_as_prototext = 3;
+
+    // A perfetto.protos.TraceMetrics formatted as json.
+    string metrics_as_json = 4;
+  }
+
+  optional string error = 2;
+}
+
+// Input for the /enable_metatrace endpoint.
+message EnableMetatraceArgs {
+  optional MetatraceCategories categories = 1;
+}
+
+// Output for the /enable_metatrace endpoint.
+message EnableMetatraceResult {}
+
+// Input for the /disable_and_read_metatrace endpoint.
+message DisableAndReadMetatraceArgs {}
+
+// Output for the /disable_and_read_metatrace endpoint.
+message DisableAndReadMetatraceResult {
+  // Bytes of perfetto.protos.Trace message. Stored as bytes
+  // to avoid adding a dependency on trace.proto.
+  optional bytes metatrace = 1;
+  optional string error = 2;
+}
+
+// Convenience wrapper for multiple descriptors, similar to FileDescriptorSet
+// in descriptor.proto.
+message DescriptorSet {
+  repeated DescriptorProto descriptors = 1;
+}
+
+// Input for setting Trace Processor config. This method works only in the WASM
+// mode. trace_processor_shell supports configuration through command line
+// flags.
+message ResetTraceProcessorArgs {
+  enum DropTrackEventDataBefore {
+    NO_DROP = 0;
+    TRACK_EVENT_RANGE_OF_INTEREST = 1;
+  }
+  // Mirror of the corresponding perfetto::trace_processor::Config fields.
+  optional DropTrackEventDataBefore drop_track_event_data_before = 1;
+  optional bool ingest_ftrace_in_raw_table = 2;
+  optional bool analyze_trace_proto_content = 3;
+  optional bool ftrace_drop_until_all_cpus_valid = 4;
+}
diff --git a/src/libtracing/protos/third_party/CHROMIUM_OWNERS b/src/libtracing/protos/third_party/CHROMIUM_OWNERS
new file mode 100644
index 000000000..0fa67ac86
--- /dev/null
+++ b/src/libtracing/protos/third_party/CHROMIUM_OWNERS
@@ -0,0 +1,21 @@
+# This list should contain at least everyone from woa-perf sheriffs
+# The current sheriffs are listed at:
+# https://oncall.corp.google.com/chrometto-sheriff
+
+agarwaltushar@google.com
+altimin@google.com
+carlscab@google.com
+ddrone@google.com
+eseckler@google.com
+hbolaria@google.com
+khokhlov@google.com
+kraskevich@google.com
+mekk@google.com
+mohitms@google.com
+nuskos@google.com
+oksamyt@google.com
+kartarsingh@google.com
+jkoshy@google.com
+amanvr@google.com
+rasikan@google.com
+violettfaid@google.com
diff --git a/src/libtracing/protos/third_party/OWNERS b/src/libtracing/protos/third_party/OWNERS
new file mode 100644
index 000000000..4a6df7fa8
--- /dev/null
+++ b/src/libtracing/protos/third_party/OWNERS
@@ -0,0 +1,3 @@
+# These can't be added inside chromium/ bacuase the whole directory is
+# blown away on every import.
+per-file chromium/* = file:CHROMIUM_OWNERS
diff --git a/src/libtracing/protos/third_party/chromium/chrome_track_event.proto b/src/libtracing/protos/third_party/chromium/chrome_track_event.proto
new file mode 100644
index 000000000..882d6ffed
--- /dev/null
+++ b/src/libtracing/protos/third_party/chromium/chrome_track_event.proto
@@ -0,0 +1,1974 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+syntax = "proto2";
+
+import public "protos/perfetto/trace/track_event/track_event.proto";
+import public "protos/perfetto/trace/track_event/debug_annotation.proto";
+import public "protos/perfetto/trace/track_event/source_location.proto";
+
+package perfetto.protos;
+
+enum ChromeAppState {
+  APP_STATE_FOREGROUND = 1;
+  APP_STATE_BACKGROUND = 2;
+}
+
+enum MemoryPressureLevel {
+  MEMORY_PRESSURE_LEVEL_NONE = 0;
+  MEMORY_PRESSURE_LEVEL_MODERATE = 1;
+  MEMORY_PRESSURE_LEVEL_CRITICAL = 2;
+}
+
+message ChromeMemoryPressureNotification {
+  optional MemoryPressureLevel level = 1;
+
+  // ID of interned source location where MemoryPressureListener was created
+  optional uint64 creation_location_iid = 2;
+}
+
+message BlinkTaskScope {
+  enum TaskScopeType {
+    TASK_SCOPE_UNKNOWN = 0;
+    TASK_SCOPE_CALLBACK = 1;
+    TASK_SCOPE_SCHEDULED_ACTION = 2;
+    TASK_SCOPE_SCRIPT_EXECUTION = 3;
+    TASK_SCOPE_POST_MESSAGE = 4;
+    TASK_SCOPE_POP_STATE = 5;
+    TASK_SCOPE_SCHEDULER_POST_TASK = 6;
+    TASK_SCOPE_REQUEST_IDLE_CALLBACK = 7;
+    TASK_SCOPE_XML_HTTP_REQUEST = 8;
+  }
+  optional TaskScopeType type = 1;
+  optional int64 scope_task_id = 2;
+  optional int64 running_task_id_to_be_restored = 3;
+
+  reserved 4, 5;
+  reserved "continuation_task_id_to_be_restored", "parent_task_id";
+}
+
+message ChromeTaskAnnotator {
+  enum DelayPolicy {
+    FLEXIBLE_NO_SOONER = 0;
+    FLEXIBLE_PREFER_EARLY = 1;
+    PRECISE = 2;
+  }
+  optional uint32 ipc_hash = 1;
+  // The delay in microseconds that was specified, if any, when this task was
+  // posted. This is only valid for delayed tasks.
+  optional uint64 task_delay_us = 2;
+  optional DelayPolicy delay_policy = 3;
+}
+
+message ChromeBrowserContext {
+  reserved 1;
+  optional string id = 2;
+}
+
+message ChromeProfileDestroyer {
+  optional fixed64 profile_ptr = 1;
+  optional bool is_off_the_record = 2;
+  optional string otr_profile_id = 3;
+  optional uint32 host_count_at_creation = 4;
+  optional uint32 host_count_at_destruction = 5;
+  optional fixed64 render_process_host_ptr = 6;
+}
+
+message ChromeTaskPostedToDisabledQueue {
+  optional string task_queue_name = 1;
+  optional uint64 time_since_disabled_ms = 2;
+  optional uint32 ipc_hash = 3;
+  optional uint64 source_location_iid = 4;
+}
+
+message ChromeRasterTask {
+  optional int64 source_frame_number = 1;
+}
+
+message ChromeMessagePumpForUI {
+  // The MSG defined in winuser.h.
+  optional uint32 message_id = 1;
+  // The result of the Win32 API call WaitForMultipleObjectsEx().
+  optional uint32 wait_for_object_result = 2;
+}
+
+// An enumeration specifying the reason of the RenderFrame deletion.
+// This is copied from content/common/frame.mojom.
+enum FrameDeleteIntention {
+  // The frame being deleted isn't a (speculative) main frame.
+  FRAME_DELETE_INTENTION_NOT_MAIN_FRAME = 0;
+
+  // The frame being deleted is a speculative main frame, and it is being
+  // deleted as part of the shutdown for that WebContents. The entire RenderView
+  // etc will be destroyed by a separate IPC sent later.
+  FRAME_DELETE_INTENTION_SPECULATIVE_MAIN_FRAME_FOR_SHUTDOWN = 1;
+
+  // The frame being deleted is a speculative main frame, and it is being
+  // deleted because the speculative navigation was cancelled. This is not part
+  // of shutdown.
+  FRAME_DELETE_INTENTION_SPECULATIVE_MAIN_FRAME_FOR_NAVIGATION_CANCELLED = 2;
+}
+
+message RenderFrameImplDeletion {
+  // The intent for the deletion.
+  optional FrameDeleteIntention intent = 1;
+
+  // Whether the frame that's about to be deleted has a pending navigation
+  // commit.
+  optional bool has_pending_commit = 2;
+
+  // Whether the frame that's about to be deleted has a pending cross-document
+  // navigation commit.
+  optional bool has_pending_cross_document_commit = 3;
+
+  // The FrameTreeNode ID of the frame that's about to be deleted.
+  optional uint64 frame_tree_node_id = 4;
+}
+
+// Matches content::ShouldSwapBrowsingInstance.
+enum ShouldSwapBrowsingInstance {
+  // Was used for all "no BrowsingInstance swap" scenarios, now broken down in
+  // separate reasons.
+  SHOULD_SWAP_BROWSING_INSTANCE_NO = 0;
+
+  // Forced BrowsingInstance swap.
+  SHOULD_SWAP_BROWSING_INSTANCE_YES_FORCE_SWAP = 1;
+
+  // Proactive BrowsingInstance swap for cross-site navigation.
+  SHOULD_SWAP_BROWSING_INSTANCE_YES_CROSS_SITE_PROACTIVE_SWAP = 2;
+
+  // Proactive BrowsingInstance swap for same-site navigation.
+  SHOULD_SWAP_BROWSING_INSTANCE_YES_SAME_SITE_PROACTIVE_SWAP = 3;
+
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_PROACTIVE_SWAP_DISABLED = 4;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_NOT_MAIN_FRAME = 5;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_HAS_RELATED_ACTIVE_CONTENTS = 6;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_DOES_NOT_HAVE_SITE = 7;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_SOURCE_URL_SCHEME_NOT_HTTP_OR_HTTPS = 8;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_DESTINATION_URL_SCHEME_NOT_HTTP_OR_HTTPS = 9;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_SAME_SITE_NAVIGATION = 10;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_RELOADING_ERROR_PAGE = 11;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_ALREADY_HAS_MATCHING_BROWSING_INSTANCE = 12;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_RENDERER_DEBUG_URL = 13;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_NOT_NEEDED_FOR_BACK_FORWARD_CACHE = 14;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_SAME_DOCUMENT_NAVIGATION = 15;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_SAME_URL_NAVIGATION = 16;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_WILL_REPLACE_ENTRY = 17;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_RELOAD = 18;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_GUEST = 19;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_HAS_NOT_COMMITTED_ANY_NAVIGATION = 20;
+  // The following reason was deprecated from https://crrev.com/c/3858766
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_UNLOAD_HANDLER_EXISTS_ON_SAME_SITE_NAVIGATION =
+      21;
+  SHOULD_SWAP_BROWSING_INSTANCE_NO_NOT_PRIMARY_MAIN_FRAME = 22;
+}
+
+message ShouldSwapBrowsingInstancesResult {
+  // The FrameTreeNode ID.
+  optional uint64 frame_tree_node_id = 1;
+
+  // Whether a navigation will do a BrowsingInstance swap or not.
+  optional ShouldSwapBrowsingInstance result = 2;
+}
+
+message FrameTreeNodeInfo {
+  // The FrameTreeNode ID.
+  optional uint64 frame_tree_node_id = 1;
+
+  // Whether the frame is a main frame or not.
+  optional bool is_main_frame = 2;
+
+  // Whether there's a speculative RenderFrameHost or not.
+  optional bool has_speculative_render_frame_host = 3;
+
+  optional RenderFrameHost current_frame_host = 4;
+  optional RenderFrameHost speculative_frame_host = 5;
+
+  // NOTE: this proto must be kept consistent with
+  // content::FrameType.
+  enum FrameType {
+    UNSPECIFIED_FRAME_TYPE = 0;
+    SUBFRAME = 1;
+    PRIMARY_MAIN_FRAME = 2;
+    PRERENDER_MAIN_FRAME = 3;
+    FENCED_FRAME_ROOT = 4;
+  }
+
+  optional FrameType frame_type = 6;
+
+  // Additional untyped debug information associated with this
+  // FrameTreeNode, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+message ChromeHashedPerformanceMark {
+  optional uint32 site_hash = 1;
+  optional string site = 2;
+  optional uint32 mark_hash = 3;
+  optional string mark = 4;
+
+  // A randomly generated unique identifier for a given ExecutionContext
+  // (document, worker, etc). Used to be able to correlate events in a process
+  // where there are multiple execution contexts from the same site.
+  optional uint32 execution_context_id = 5;
+
+  // Indicates the sequence number of this particular mark being emitted from
+  // a particular site in the scope of a single ExecutionContext. Typical
+  // sites emit batches of events that are correlated in time (a thing started,
+  // a thing reached a given milestone, a thing completed). When these events
+  // are intermixed it is useful to know which ones are semantically related.
+  // The value is generated by the content itself, but shifted by a fixed
+  // random offset at runtime so as to limit usage as a side channel.
+  optional uint32 sequence_number = 6;
+}
+
+// Sent on SQL errors where we need string diagnostics. Corresponds to
+// `Database::DatabaseDiagnostics` in the Chrome SQL code. Does not contain any
+// PII, because the bound values are not included in the SQL statement.
+message ChromeSqlDiagnostics {
+  optional int32 reported_sqlite_error_code = 1;
+  optional int32 error_code = 2;
+  optional int32 last_errno = 3;
+  optional string sql_statement = 4;
+  optional int32 version = 5;
+
+  // Most rows in 'sql_schema' have a non-NULL 'sql' column. Those rows' 'sql'
+  // contents are logged here, one element per row.
+  repeated string schema_sql_rows = 6;
+
+  // Some rows of 'sql_schema' have a NULL 'sql' column. They are typically
+  // autogenerated indices, like "sqlite_autoindex_downloads_slices_1". These
+  // are also logged here by their 'name' column, one element per row.
+  repeated string schema_other_row_names = 7;
+
+  optional bool has_valid_header = 8;
+  optional bool has_valid_schema = 9;
+  optional string error_message = 10;
+}
+
+message ChromeWebAppBadNavigate {
+  optional bool is_kiosk = 1;
+  optional bool has_hosted_app_controller = 2;
+  optional string app_name = 3;
+  optional uint32 system_app_type = 4;
+  optional bool web_app_provider_registry_ready = 5;
+  optional bool system_web_app_manager_synchronized = 6;
+}
+
+// These IDs are generated at compile time and differ for each chrome version.
+// IDs are stable on for a given chrome version but are changing when resources
+// are added or removed to chrome.
+message ResourceBundle {
+  optional uint32 resource_id = 1;
+}
+
+// Information about RenderProcessHost.
+message RenderProcessHost {
+  // Unique Id to identify the RenderProcessHost. This is the browser-side,
+  // persistent id for this RenderProcessHost that stays constant even across OS
+  // layer processes managed by this RenderProcessHost.
+  optional uint32 id = 1;
+  // See ProcessLock::ToString().
+  optional string process_lock = 2;
+  // The PID of the child process.
+  optional int32 child_process_id = 3;
+
+  // Details about the associated browser context.
+  optional ChromeBrowserContext browser_context = 4;
+
+  // Additional untyped debug information associated with this
+  // RenderProcessHost, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+message RenderProcessHostListener {
+  // Routing ID of the listener to the RenderProcessHost, recorded when a new ID
+  // is added or when an ID is removed.
+  optional uint32 routing_id = 1;
+}
+
+message RenderProcessHostCleanup {
+  // Number of IPC listeners registered to the host when Cleanup() was called.
+  optional uint32 listener_count = 1;
+  // Number of "keep alive" references active in the RenderProcessHost, recorded
+  // when Cleanup() was called.
+  optional uint32 keep_alive_ref_count = 2;
+  // Number of "shutdown delay" references active in the RenderProcessHost,
+  // recorded when Cleanup() was called.
+  optional uint32 shutdown_delay_ref_count = 3;
+  // Number of "worker delay" references active in the RenderProcessHost,
+  // recorded when Cleanup() was called.
+  optional uint32 worker_ref_count = 4;
+  // Number of "pending reuse" references active in the RenderProcessHost,
+  // recorded when Cleanup() was called.
+  optional uint32 pending_reuse_ref_count = 5;
+}
+
+message ChildProcessLauncherPriority {
+  // True if the new priority set to background.
+  optional bool is_backgrounded = 1;
+  // True if the renderer proecss has pending views.
+  optional bool has_pending_views = 2;
+
+  // Importance of the child process in Android.
+  enum Importance {
+    IMPORTANCE_NORMAL = 1;
+    IMPORTANCE_MODERATE = 2;
+    IMPORTANCE_IMPORTANT = 3;
+  }
+  optional Importance importance = 3;
+}
+
+// Information that identifies a Chrome Extension.
+message ChromeExtensionId {
+  // Unique id that identifies a Chrome Extension.
+  optional string extension_id = 1;
+
+  // Pseudonymized `extension_id` field (see also
+  // content::PseudonymizationUtil::PseudonymizeString method).
+  optional uint32 pseudonymized_extension_id = 2;
+}
+
+message SiteInstance {
+  // The ID of the SiteInstance.
+  optional int32 site_instance_id = 1;
+
+  // The ID of the BrowsingInstance that the SiteInstance belongs to.
+  optional int32 browsing_instance_id = 2;
+
+  // Whether the SiteInstance is the "default SiteInstance" or not. Non-isolated
+  // sites on Android are not assigned to their own specific per-site process,
+  // and shares SiteInstances with each other (the default SiteInstance).
+  optional bool is_default = 3;
+
+  // Whether this SiteInstance has a running process associated with it.
+  optional bool has_process = 4;
+
+  // Returns the total active WebContents count for this SiteInstance and all
+  // related SiteInstances in the same BrowsingInstance.
+  optional int32 related_active_contents_count = 5;
+
+  // The number of active RenderFrameHosts this SiteInstance's SiteInstanceGroup
+  // has.
+  optional int32 active_rfh_count = 6;
+
+  // The SiteInstanceGroup this SiteInstance belongs to.
+  optional SiteInstanceGroup site_instance_group = 7;
+
+  // Additional untyped debug information associated with this
+  // SiteInstance, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+message SiteInstanceGroup {
+  // The ID of the SiteInstanceGroup.
+  optional int32 site_instance_group_id = 1;
+
+  // The number of active frames in this SiteInstanceGroup.
+  optional int32 active_frame_count = 2;
+
+  // The process ID of the SiteInstanceGroup.
+  optional RenderProcessHost process = 3;
+
+  // Additional untyped debug information associated with this
+  // SiteInstanceGroup, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+// Next ID: 7
+message RenderViewHost {
+  // The RenderViewHostMapId for the RenderViewHost.
+  optional int32 rvh_map_id = 1;
+
+  // The routing ID for the RenderViewHost.
+  optional int32 routing_id = 2;
+
+  // The process ID of the RenderViewHost. Deprecated in favour of |process|.
+  optional int32 process_id = 3;
+
+  // Process this RenderViewHost is associated with.
+  optional RenderProcessHost process = 6;
+
+  // Whether the RenderViewHost is in back/forward cache or not.
+  optional bool is_in_back_forward_cache = 4;
+
+  // Whether the renderer-side RenderView is created.
+  optional bool renderer_view_created = 5;
+
+  // Additional untyped debug information associated with this
+  // RenderViewHost, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+message RenderFrameProxyHost {
+  // The routing ID for the RenderFrameProxyHost.
+  optional int32 routing_id = 1;
+
+  // The process ID of the RenderFrameProxyHost.
+  optional int32 process_id = 2;
+
+  // The RenderViewHostMapId of the RenderViewHost associated with the
+  // RenderFrameProxyHost.
+  optional int32 rvh_map_id = 3;
+
+  // The SiteInstanceId of the SiteInstance associated with the
+  // RenderFrameProxyHost.
+  optional int32 site_instance_id = 4;
+
+  // Whether the renderer-side RenderFrameProxy is live or not.
+  optional bool is_render_frame_proxy_live = 5;
+
+  // The SiteInstanceGroupId of the SiteInstanceGroup associated with the
+  // RenderFrameProxyHost.
+  optional int32 site_instance_group_id = 6;
+
+  // Additional untyped debug information associated with this
+  // RenderFrameProxyHost, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+message AndroidView {
+  optional int32 id = 1;
+  optional int32 parent_id = 2;
+  optional bool is_shown = 3;
+  optional bool is_dirty = 4;
+  optional string class_name = 5;
+  optional string resource_name = 6;
+}
+
+message AndroidActivity {
+  optional string name = 1;
+  repeated AndroidView view = 2;
+}
+
+message AndroidViewDump {
+  repeated AndroidActivity activity = 1;
+}
+
+message ParkableStringCompressInBackground {
+  // The size of the string that is being compressed, in bytes.
+  optional int32 size_bytes = 1;
+}
+
+message ParkableStringUnpark {
+  // The size of the string that is being unparked, in bytes.
+  optional int32 size_bytes = 1;
+
+  // The elapsed time since the string was written to disk (in seconds), or -1
+  // if it hadn't yet been written to disk.
+  optional int32 time_since_last_disk_write_sec = 2;
+}
+
+message ChromeSamplingProfilerSampleCollected {
+  optional int32 frame_count = 1;
+
+  enum WriteStatus {
+    WRITE_STATUS_NONE = 0;
+    WRITE_STATUS_BUFFERING_SAMPLE = 1;
+    WRITE_STATUS_WRITING_BUFFERED = 2;
+    WRITE_STATUS_WRITING_TO_TRACE = 3;
+  }
+  optional WriteStatus write_status = 2;
+
+  optional int32 sampled_thread_id = 3;
+}
+
+// Reports the latency caused by each breakdown in the
+// SendBeginMainFrameToCommit stage of the PipelineReporter.
+message SendBeginMainFrameToCommitBreakdown {
+  // Handle input events breakdown
+  optional uint64 handle_input_events_us = 1;
+
+  // Animate breakdown
+  optional uint64 animate_us = 2;
+
+  // Style update breakdown
+  optional uint64 style_update_us = 3;
+
+  // Layout update breakdown
+  optional uint64 layout_update_us = 4;
+
+  // Accessibility update breakdown
+  optional uint64 accessibility_update_us = 12;
+
+  // Prepaint breakdown
+  optional uint64 prepaint_us = 5;
+
+  // Compositing inputs breakdown
+  optional uint64 compositing_inputs_us = 6;
+
+  // Compositing assignments breakdown
+  optional uint64 compositing_assignments_us = 7;
+
+  // Paint breakdown
+  optional uint64 paint_us = 8;
+
+  // Composite commit breakdown
+  optional uint64 composite_commit_us = 9;
+
+  // Update layers breakdown
+  optional uint64 update_layers_us = 10;
+
+  // Beginmainsenttostarted breakdown
+  optional uint64 begin_main_sent_to_started_us = 11;
+}
+
+message GlobalRenderFrameHostId {
+  optional int32 routing_id = 1;
+  optional int32 process_id = 2;
+}
+
+message BrowsingContextState {
+  // The ID of the BrowsingInstance that the BrowsingContextState belongs to.
+  optional int32 browsing_instance_id = 1;
+
+  // The ID of the CoopRelatedGroup that the BrowsingContextState belongs to.
+  optional int32 coop_related_group_id = 2 [deprecated = true];
+
+  // The token of the CoopRelatedGroup that the BrowsingContextState belongs to.
+  optional string coop_related_group_token = 3;
+
+  // Additional untyped debug information associated with this
+  // FrameTreeNode, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+message RenderFrameHost {
+  optional RenderProcessHost process = 1;
+  optional GlobalRenderFrameHostId render_frame_host_id = 2;
+
+  // NOTE: this proto must be kept consistent with
+  // RenderFrameHostImpl::LifecycleStateImpl.
+  enum LifecycleState {
+    UNSPECIFIED = 0;
+    SPECULATIVE = 1;
+    PENDING_COMMIT = 2;
+    PRERENDERING = 3;
+    ACTIVE = 4;
+    IN_BACK_FORWARD_CACHE = 5;
+    RUNNING_UNLOAD_HANDLERS = 6;
+    READY_TO_BE_DELETED = 7;
+  }
+
+  optional LifecycleState lifecycle_state = 3;
+  optional string origin = 4;
+  optional string url = 5;
+  optional uint64 frame_tree_node_id = 6;
+  optional SiteInstance site_instance = 7;
+  optional RenderFrameHost parent = 8;
+  optional RenderFrameHost outer_document = 9;
+  optional RenderFrameHost embedder = 10;
+  optional BrowsingContextState browsing_context_state = 11;
+  optional FrameTreeNodeInfo.FrameType frame_type = 12;
+
+  // Additional untyped debug information associated with this
+  // RenderViewHost, populated via TracedProto::AddDebugAnnotations API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+message ChromeThreadPoolTask {
+  enum Priority {
+    PRIORITY_UNSPECIFIED = 0;
+    PRIORITY_BEST_EFFORT = 1;
+    PRIORITY_USER_VISIBLE = 2;
+    PRIORITY_USER_BLOCKING = 3;
+  }
+
+  enum ExecutionMode {
+    EXECTUION_MODE_UNSPECIFIED = 0;
+    EXECUTION_MODE_PARALLEL = 1;
+    EXECUTION_MODE_SEQUENCED = 2;
+    EXECUTION_MODE_SINGLE_THREAD = 3;
+    EXECUTION_MODE_JOB = 4;
+  }
+
+  enum ShutdownBehavior {
+    SHUTDOWN_BEHAVIOR_UNSPECIFIED = 0;
+    SHUTDOWN_BEHAVIOR_CONTINUE_ON_SHUTDOWN = 1;
+    SHUTDOWN_BEHAVIOR_SKIP_ON_SHUTDOWN = 2;
+    SHUTDOWN_BEHAVIOR_BLOCK_SHUTDOWN = 3;
+  }
+
+  optional Priority task_priority = 1;
+  optional ExecutionMode execution_mode = 2;
+  optional int64 sequence_token = 3;
+  optional ShutdownBehavior shutdown_behavior = 4;
+}
+
+// TODO(crbug.com/1258495): Add more information.
+message BackForwardCacheCanStoreDocumentResult {
+  enum BackForwardCacheNotRestoredReason {
+    NOT_MAIN_FRAME = 1;
+    // BackForwardCache is disabled due to low memory device, base::Feature or
+    // command line. Note that the more specific NotRestoredReasons
+    // BACK_FORWARD_CACHE_DISABLED_BY_LOW_MEMORY and
+    // BACK_FORWARD_CACHE_DISABLED_BY_COMMAND_LINE will also be set as other
+    // reasons along with this when appropriate.
+    BACK_FORWARD_CACHE_DISABLED = 2;
+    RELATED_ACTIVE_CONTENTS_EXIST = 3;
+    HTTP_STATUS_NOT_OK = 4;
+    SCHEME_NOT_HTTP_OR_HTTPS = 5;
+    LOADING = 6;
+    WAS_GRANTED_MEDIA_ACCESS = 7;
+    BLOCKLISTED_FEATURES = 8;
+    DISABLE_FOR_RENDER_FRAME_HOST_CALLED = 9;
+    DOMAIN_NOT_ALLOWED = 10;
+    HTTP_METHOD_NOT_GET = 11;
+    SUBFRAME_IS_NAVIGATING = 12;
+    TIMEOUT = 13;
+    CACHE_LIMIT = 14;
+    JAVASCRIPT_EXECUTION = 15;
+    RENDERER_PROCESS_KILLED = 16;
+    RENDERER_PROCESS_CRASHED = 17;
+    GRANTED_MEDIA_STREAM_ACCESS = 19;
+    SCHEDULER_TRACKED_FEATURE_USED = 20;
+    CONFLICTING_BROWSING_INSTANCE = 21;
+    CACHE_FLUSHED = 22;
+    SERVICE_WORKER_VERSION_ACTIVATION = 23;
+    SESSION_RESTORED = 24;
+    UNKNOWN = 25;
+    SERVICE_WORKER_POST_MESSAGE = 26;
+    ENTERED_BACK_FORWARD_CACHE_BEFORE_SERVICE_WORKER_HOST_ADDED = 27;
+    NOT_MOST_RECENT_NAVIGATION_ENTRY = 28;
+    SERVICE_WORKER_CLAIM = 29;
+    IGNORE_EVENT_AND_EVICT = 30;
+    HAVE_INNER_CONTENTS = 31;
+    TIMEOUT_PUTTING_IN_CACHE = 32;
+    // BackForwardCache is disabled due to low memory device.
+    BACK_FORWARD_CACHE_DISABLED_BY_LOW_MEMORY = 33;
+    // BackForwardCache is disabled due to command-line switch (may include
+    // cases where the embedder disabled it due to, e.g., enterprise policy).
+    BACK_FORWARD_CACHE_DISABLED_BY_COMMAND_LINE = 34;
+    NETWORK_REQUEST_REDIRECTED = 35;
+    NETWORK_REQUEST_TIMEOUT = 36;
+    NETWORK_EXCEEDS_BUFFER_LIMIT = 37;
+    NAVIGATION_CANCELLED_WHILE_RESTORING = 38;
+    BACK_FORWARD_CACHE_DISABLED_FOR_PRERENDER = 39;
+    USER_AGENT_OVERRIDE_DIFFERS = 40;
+    NETWORK_REQUEST_DATAPIPE_DRAINED_AS_BYTES_CONSUMER = 41;
+    FOREGROUND_CACHE_LIMIT = 42;
+    BROWSING_INSTANCE_NOT_SWAPPED = 43;
+    BACK_FORWARD_CACHE_DISABLED_FOR_DELEGATE = 44;
+    OPT_IN_UNLOAD_HEADER_NOT_PRESENT = 45;
+    UNLOAD_HANDLER_EXISTS_IN_MAIN_FRAME = 46;
+    UNLOAD_HANDLER_EXISTS_IN_SUBFRAME = 47;
+    SERVICE_WORKER_UNREGISTRATION = 48;
+    CACHE_CONTROL_NO_STORE = 49;
+    CACHE_CONTROL_NO_STORE_COOKIE_MODIFIED = 50;
+    CACHE_CONTROL_NO_STORE_HTTP_ONLY_COOKIE_MODIFIED = 51;
+    NO_RESPONSE_HEAD = 52;
+    ACTIVATION_NAVIGATION_DISALLOWED_FOR_BUG_1234857 = 53;
+    ERROR_DOCUMENT = 54;
+    FENCED_FRAMES_EMBEDDER = 55;
+    COOKIE_DISABLED = 56;
+    HTTP_AUTH_REQUIRED = 57;
+    COOKIE_FLUSHED = 58;
+    BROADCAST_CHANNEL_ON_MESSAGE = 59;
+  }
+
+  optional BackForwardCacheNotRestoredReason
+      back_forward_cache_not_restored_reason = 1;
+}
+
+message RendererMainThreadTaskExecution {
+  enum TaskType {
+    TASK_TYPE_UNKNOWN = 0;
+    TASK_TYPE_DOM_MANIPULATION = 1;
+    TASK_TYPE_USER_INTERACTION = 2;
+    TASK_TYPE_NETWORKING = 3;
+    TASK_TYPE_NETWORKING_CONTROL = 4;
+    TASK_TYPE_HISTORY_TRAVERSAL = 5;
+    TASK_TYPE_EMBED = 6;
+    TASK_TYPE_MEDIA_ELEMENT_EVENT = 7;
+    TASK_TYPE_CANVAS_BLOB_SERIALIZATION = 8;
+    TASK_TYPE_MICROTASK = 9;
+    TASK_TYPE_JAVASCRIPT_TIMER_DELAYED_HIGH_NESTING = 10;
+    TASK_TYPE_REMOTE_EVENT = 11;
+    TASK_TYPE_WEB_SOCKET = 12;
+    TASK_TYPE_POSTED_MESSAGE = 13;
+    TASK_TYPE_UNSHIPPED_PORT_MESSAGE = 14;
+    TASK_TYPE_FILE_READING = 15;
+    TASK_TYPE_DATABASE_ACCESS = 16;
+    TASK_TYPE_PRESENTATION = 17;
+    TASK_TYPE_SENSOR = 18;
+    TASK_TYPE_PERFORMANCE_TIMELINE = 19;
+    TASK_TYPE_WEB_GL = 20;
+    TASK_TYPE_IDLE_TASK = 21;
+    TASK_TYPE_MISC_PLATFORM_API = 22;
+    TASK_TYPE_INTERNAL_DEFAULT = 23;
+    TASK_TYPE_INTERNAL_LOADING = 24;
+
+    TASK_TYPE_INTERNAL_TEST = 26;
+    TASK_TYPE_INTERNAL_WEB_CRYPTO = 27;
+
+    TASK_TYPE_INTERNAL_MEDIA = 29;
+    TASK_TYPE_INTERNAL_MEDIA_REALTIME = 30;
+
+    TASK_TYPE_INTERNAL_USER_INTERACTION = 32;
+    TASK_TYPE_INTERNAL_INSPECTOR = 33;
+
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_V8 = 37;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_COMPOSITOR = 38;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_DEFAULT = 39;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_INPUT = 40;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_IDLE = 41;
+
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_CONTROL = 43;
+    TASK_TYPE_INTERNAL_INTERSECTION_OBSERVER = 44;
+    TASK_TYPE_COMPOSITOR_THREAD_TASK_QUEUE_DEFAULT = 45;
+    TASK_TYPE_WORKER_THREAD_TASK_QUEUE_DEFAULT = 46;
+    TASK_TYPE_WORKER_THREAD_TASK_QUEUE_V8 = 47;
+    TASK_TYPE_WORKER_THREAD_TASK_QUEUE_COMPOSITOR = 48;
+    TASK_TYPE_COMPOSITOR_THREAD_TASK_QUEUE_INPUT = 49;
+
+    // TODO(crbug.com/860545): Obsolete. Remove.
+    TASK_TYPE_NETWORKING_WITH_URL_LOADER_ANNOTATION = 50;
+
+    TASK_TYPE_WORKER_ANIMATION = 51;
+
+    TASK_TYPE_INTERNAL_TRANSLATION = 55;
+    TASK_TYPE_FONT_LOADING = 56;
+    TASK_TYPE_APPLICATION_LIFECYCLE = 57;
+    TASK_TYPE_BACKGROUND_FETCH = 58;
+    TASK_TYPE_PERMISSION = 59;
+    TASK_TYPE_SERVICE_WORKER_CLIENT_MESSAGE = 60;
+    TASK_TYPE_INTERNAL_CONTENT_CAPTURE = 61;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_MEMORY_PURGE = 62;
+    TASK_TYPE_INTERNAL_NAVIGATION_ASSOCIATED = 63;
+    TASK_TYPE_INTERNAL_NAVIGATION_ASSOCIATED_UNFREEZABLE = 64;
+    TASK_TYPE_INTERNAL_CONTINUE_SCRIPT_LOADING = 65;
+    TASK_TYPE_WEB_LOCKS = 66;
+    TASK_TYPE_WEB_SCHEDULING_POSTED_TASK = 67;
+    TASK_TYPE_INTERNAL_FRAME_LIFE_CYCLE_CONTROL = 68;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_NON_WAKING = 69;
+    TASK_TYPE_INTERNAL_FIND_IN_PAGE = 70;
+    TASK_TYPE_INTERNAL_HIGH_PRIORITY_LOCAL_FRAME = 71;
+    TASK_TYPE_JAVASCRIPT_TIMER_IMMEDIATE = 72;
+    TASK_TYPE_JAVASCRIPT_TIMER_DELAYED_LOW_NESTING = 73;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_IPC_TRACKING = 74;
+    TASK_TYPE_NETWORKING_UNFREEZABLE = 75;
+    TASK_TYPE_WAKE_LOCK = 76;
+    TASK_TYPE_INTERNAL_INPUT_BLOCKING = 77;
+    TASK_TYPE_WEB_GPU = 78;
+    TASK_TYPE_INTERNAL_POST_MESSAGE_FORWARDING = 79;
+    TASK_TYPE_INTERNAL_NAVIGATION_CANCELLATION = 80;
+    TASK_TYPE_LOW_PRIORITY_SCRIPT_EXECUTION = 81;
+    TASK_TYPE_STORAGE = 82;
+    TASK_TYPE_NETWORKING_UNFREEZABLE_RENDER_BLOCKING_LOADING = 83;
+    TASK_TYPE_MAIN_THREAD_TASK_QUEUE_V8_LOW_PRIORITY = 84;
+    TASK_TYPE_CLIPBOARD = 85;
+  }
+
+  enum FrameType {
+    FRAME_TYPE_UNSPECIFIED = 0;
+    FRAME_TYPE_MAIN_FRAME = 1;
+    FRAME_TYPE_SAME_ORIGIN_SUBFRAME = 2;
+    FRAME_TYPE_CROSS_ORIGIN_SUBFRAME = 3;
+  }
+
+  optional TaskType task_type = 1;
+
+  // FrameScheduler related data
+  optional bool frame_visible = 2;
+  optional bool page_visible = 3;
+  optional FrameType frame_type = 4;
+  optional bool is_ad_frame = 5;
+}
+
+message EventLatency {
+  enum EventType {
+    EVENT_TYPE_UNSPECIFIED = 0;
+    MOUSE_PRESSED = 1;
+    MOUSE_RELEASED = 2;
+    MOUSE_WHEEL = 3;
+    KEY_PRESSED = 4;
+    KEY_RELEASED = 5;
+    TOUCH_PRESSED = 6;
+    TOUCH_RELEASED = 7;
+    TOUCH_MOVED = 8;
+    GESTURE_SCROLL_BEGIN = 9;
+    GESTURE_SCROLL_UPDATE = 10;
+    GESTURE_SCROLL_END = 11;
+    GESTURE_DOUBLE_TAP = 12;
+    GESTURE_LONG_PRESS = 13;
+    GESTURE_LONG_TAP = 14;
+    GESTURE_SHOW_PRESS = 15;
+    GESTURE_TAP = 16;
+    GESTURE_TAP_CANCEL = 17;
+    GESTURE_TAP_DOWN = 18;
+    GESTURE_TAP_UNCONFIRMED = 19;
+    GESTURE_TWO_FINGER_TAP = 20;
+    FIRST_GESTURE_SCROLL_UPDATE = 21;
+    MOUSE_DRAGGED = 22;
+    GESTURE_PINCH_BEGIN = 23;
+    GESTURE_PINCH_END = 24;
+    GESTURE_PINCH_UPDATE = 25;
+    INERTIAL_GESTURE_SCROLL_UPDATE = 26;
+    MOUSE_MOVED_EVENT = 27;
+  }
+
+  optional EventType event_type = 1;
+  optional bool has_high_latency = 2;
+  repeated string high_latency_stage = 3;
+  // This is same as LatencyInfo's trace_id, using the name event_latency_id to
+  // move away from the generic trace_id name used at other places as well.
+  optional int64 event_latency_id = 4;
+  // This is set only for scroll updates and is based on the
+  // Event.ScrollJank.DelayedFramesPercentage.FixedWindow metric.
+  optional bool is_janky_scrolled_frame = 5;
+  // The interval that this frame was produced for according to the
+  // BeginFrameArgs.
+  optional double vsync_interval_ms = 6;
+}
+
+message ProcessSingleton {
+  enum RemoteProcessInteractionResult {
+    INTERACTION_RESULT_UNSPECIFIED = 0;
+    TERMINATE_FAILED = 1;
+    REMOTE_PROCESS_NOT_FOUND = 2;
+    TERMINATE_WAIT_TIMEOUT = 3;
+    RUNNING_PROCESS_NOTIFY_ERROR = 4;
+    TERMINATE_NOT_ENOUGH_PERMISSIONS = 5;
+    REMOTE_PROCESS_SHUTTING_DOWN = 6;
+    PROFILE_UNLOCKED = 7;
+    PROFILE_UNLOCKED_BEFORE_KILL = 8;
+    SAME_BROWSER_INSTANCE = 9;
+    SAME_BROWSER_INSTANCE_BEFORE_KILL = 10;
+    FAILED_TO_EXTRACT_PID = 11;
+    INVALID_LOCK_FILE = 12;
+    ORPHANED_LOCK_FILE = 13;
+    USER_REFUSED_TERMINATION = 14;
+    TERMINATE_SUCCEEDED = 100;
+  }
+
+  enum RemoteHungProcessTerminateReason {
+    TERMINATE_REASON_UNSPECIFIED = 0;
+    USER_ACCEPTED_TERMINATION = 1;
+    NO_VISIBLE_WINDOW_FOUND = 2;
+    NOTIFY_ATTEMPTS_EXCEEDED = 3;
+    SOCKET_WRITE_FAILED = 4;
+    SOCKET_READ_FAILED = 5;
+  }
+
+  optional RemoteProcessInteractionResult remote_process_interaction_result = 1;
+  optional RemoteHungProcessTerminateReason remote_process_terminate_reason = 2;
+}
+
+message NavigationHandle {
+  optional int64 navigation_id = 1;
+  optional bool has_committed = 2;
+  optional bool is_error_page = 3;
+  optional FrameTreeNodeInfo frame_tree_node = 4;
+  optional RenderFrameHost render_frame_host = 5;
+
+  // Additional untyped debug information associated with this
+  // NavigationHandle/Request, populated via TracedProto::AddDebugAnnotations
+  // API.
+  repeated DebugAnnotation debug_annotations = 99;
+}
+
+enum DeviceThermalState {
+  DEVICE_THERMAL_STATE_UNKNOWN = 0;
+  DEVICE_THERMAL_STATE_NOMINAL = 1;
+  DEVICE_THERMAL_STATE_FAIR = 2;
+  DEVICE_THERMAL_STATE_SERIOUS = 3;
+  DEVICE_THERMAL_STATE_CRITICAL = 4;
+}
+
+// Used to log which Android IPC was called and how long it took.
+message AndroidIPC {
+  optional string name = 1;
+  optional int64 dur_ms = 2;
+}
+
+message SequenceManagerTask {
+  enum Priority {
+    UNKNOWN = 0;
+    CONTROL_PRIORITY = 1;
+    HIGHEST_PRIORITY = 2;
+    VERY_HIGH_PRIORITY = 3;
+    HIGH_PRIORITY = 4;
+    NORMAL_PRIORITY = 5;
+    LOW_PRIORITY = 6;
+    BEST_EFFORT_PRIORITY = 7;
+
+    // Renderer-specific priorities.
+    HIGH_PRIORITY_CONTINUATION = 8;
+    NORMAL_PRIORITY_CONTINUATION = 9;
+    LOW_PRIORITY_CONTINUATION = 10;
+    EXTREMELY_HIGH_PRIORITY = 11;
+  }
+
+  enum QueueName {
+    UNKNOWN_TQ = 0;
+    DEFAULT_TQ = 1;
+    TASK_ENVIRONMENT_DEFAULT_TQ = 2;
+    TEST2_TQ = 3;
+    TEST_TQ = 4;
+    CONTROL_TQ = 5;
+
+    SUBTHREAD_CONTROL_TQ = 6;
+    SUBTHREAD_DEFAULT_TQ = 7;
+    SUBTHREAD_INPUT_TQ = 8;
+
+    UI_BEST_EFFORT_TQ = 9;
+    UI_BOOTSTRAP_TQ = 10;
+    UI_CONTROL_TQ = 11;
+    UI_DEFAULT_TQ = 12;
+    UI_NAVIGATION_NETWORK_RESPONSE_TQ = 13;
+    UI_RUN_ALL_PENDING_TQ = 14;
+    UI_SERVICE_WORKER_STORAGE_CONTROL_RESPONSE_TQ = 15;
+    UI_THREAD_TQ = 16;
+    UI_USER_BLOCKING_TQ = 17;
+    UI_USER_INPUT_TQ = 18;
+    UI_USER_VISIBLE_TQ = 19;
+
+    IO_BEST_EFFORT_TQ = 20;
+    IO_BOOTSTRAP_TQ = 21;
+    IO_CONTROL_TQ = 22;
+    IO_DEFAULT_TQ = 23;
+    IO_NAVIGATION_NETWORK_RESPONSE_TQ = 24;
+    IO_RUN_ALL_PENDING_TQ = 25;
+    IO_SERVICE_WORKER_STORAGE_CONTROL_RESPONSE_TQ = 26;
+    IO_THREAD_TQ = 27;
+    IO_USER_BLOCKING_TQ = 28;
+    IO_USER_INPUT_TQ = 29;
+    IO_USER_VISIBLE_TQ = 30;
+
+    COMPOSITOR_TQ = 31;
+    DETACHED_TQ = 32;
+    FRAME_DEFERRABLE_TQ = 33;
+    FRAME_LOADING_CONTROL_TQ = 34;
+    FRAME_LOADING_TQ = 35;
+    FRAME_PAUSABLE_TQ = 36;
+    FRAME_THROTTLEABLE_TQ = 37;
+    FRAME_UNPAUSABLE_TQ = 38;
+    IDLE_TQ = 39;
+    INPUT_TQ = 40;
+    IPC_TRACKING_FOR_CACHED_PAGES_TQ = 41;
+    NON_WAKING_TQ = 42;
+    OTHER_TQ = 43;
+    V8_TQ = 44;
+    WEB_SCHEDULING_TQ = 45;
+
+    WORKER_IDLE_TQ = 46;
+    WORKER_PAUSABLE_TQ = 47;
+    WORKER_THREAD_INTERNAL_TQ = 48;
+    WORKER_THROTTLEABLE_TQ = 49;
+    WORKER_UNPAUSABLE_TQ = 50;
+    WORKER_WEB_SCHEDULING_TQ = 51;
+
+    UI_USER_BLOCKING_DEFERRABLE_TQ = 52;
+    IO_USER_BLOCKING_DEFERRABLE_TQ = 53;
+
+    UI_BEFORE_UNLOAD_BROWSER_RESPONSE_TQ = 54;
+    IO_BEFORE_UNLOAD_BROWSER_RESPONSE_TQ = 55;
+
+    V8_LOW_PRIORITY_TQ = 56;
+  }
+
+  optional Priority priority = 1;
+  optional QueueName queue_name = 2;
+}
+
+message AndroidToolbar {
+  enum BlockCaptureReason {
+    BLOCKED_UNKNOWN = 0;
+    BLOCKED_TOOLBAR_OR_RESULT_NULL = 1;
+    BLOCKED_VIEW_NOT_DIRTY = 2;
+    BLOCKED_SNAPSHOT_SAME = 3;
+    BLOCKED_URL_BAR_HAS_FOCUS = 4;
+    BLOCKED_URL_BAR_FOCUS_IN_PROGRESS = 5;
+    BLOCKED_OPTIONAL_BUTTON_ANIMATION_IN_PROGRESS = 6;
+    BLOCKED_STATUS_ICON_ANIMATION_IN_PROGRESS = 7;
+    BLOCKED_SCROLL_ABLATION = 8;
+    BLOCKED_BROWSER_CONTROLS_LOCKED = 9;
+    BLOCKED_TAB_SWITCHER_MODE = 10;
+    BLOCKED_COMPOSITOR_IN_MOTION = 11;
+    BLOCKED_NTP_Y_TRANSLATION = 12;
+    BLOCKED_FULLSCREEN = 13;
+  }
+  enum AllowCaptureReason {
+    ALLOWED_UNKNOWN = 0;
+    ALLOWED_FORCE_CAPTURE = 1;
+    ALLOWED_SNAPSHOT_DIFFERENCE = 2;
+  }
+  enum SnapshotDifference {
+    DIFF_NONE = 0;
+    DIFF_NULL = 1;
+    DIFF_TINT = 2;
+    DIFF_TAB_COUNT = 3;
+    DIFF_OPTIONAL_BUTTON = 4;
+    DIFF_VISUAL_STATE = 5;
+    DIFF_SECURITY_ICON = 6;
+    DIFF_SHOWING_UPDATE_BADGE = 7;
+    DIFF_PAINT_PREVIEW = 8;
+    DIFF_PROGRESS = 9;
+    DIFF_LOCATION_BAR_WIDTH = 10;
+    DIFF_URL_TEXT = 11;
+    DIFF_HOME_BUTTON = 12;
+    DIFF_TITLE_TEXT = 13;
+    DIFF_CCT_ANIMATION = 14;
+    DIFF_BOOKMARK_BUTTON = 15;
+    DIFF_BACK_BUTTON = 16;
+    DIFF_FORWARD_BUTTON = 17;
+    DIFF_RELOAD_BUTTON = 18;
+  }
+
+  optional BlockCaptureReason block_capture_reason = 1;
+  optional AllowCaptureReason allow_capture_reason = 2;
+  optional SnapshotDifference snapshot_difference = 3;
+}
+
+message ActiveProcesses {
+  repeated int32 pid = 1;
+}
+
+message UkmPageLoadTimingUpdate {
+  // This can be used to uniquely identify a navigation from the point of view
+  // of UKM.
+  optional int64 ukm_source_id = 1;
+
+  // The URL of a page can change throughout its lifetime. This is the current
+  // url when this timing update was dispatched.
+  optional string latest_url = 2;
+
+  // Latest fully aggregated value of Cumulative Layout Shift.
+  optional float latest_cumulative_layout_shift = 3;
+
+  // Latest fully aggregated value of Largest Contentful Paint.
+  optional double latest_largest_contentful_paint_ms = 4;
+
+  optional double first_contentful_paint_ms = 5;
+}
+
+// A serialisation of v8StackFrame class.
+message V8StackFrame {
+  // Code location (path to the script and line/column number)
+  message ScriptLocation {
+    optional string source_url = 1;
+    optional int64 line_number = 2;
+    optional int64 column_number = 3;
+  }
+
+  // The name of the function that was called
+  optional string function_name = 1;
+
+  // If the function was defined in a script, contains the location within the
+  // script.
+  optional ScriptLocation script_location = 2;
+}
+
+// Serializes the blink::ExecutionContext object.
+message BlinkExecutionContext {
+  // Definition of different context types.
+  enum ContextType {
+    UNKNOWN_CONTEXT = 0;
+    WINDOW = 1;
+    WORKLET = 2;
+    DEDICATED_WORKER = 3;
+    SHARED_WORKER = 4;
+    SERVICE_WORKER = 5;
+  }
+
+  // Definition of world type.
+  enum WorldType {
+    WORLD_UNKNOWN = 0;
+    WORLD_MAIN = 1;
+    WORLD_ISOLATED = 2;
+    WORLD_INSPECTOR_ISOLATED = 3;
+    WORLD_REG_EXP = 4;
+    WORLD_FOR_V8_CONTEXT_SNAPSHOT_NON_MAIN = 5;
+    WORLD_WORKER = 6;
+    WORLD_SHADOW_REALM = 7;
+  }
+
+  optional ContextType type = 1;
+  // Contains url of frame or worker.
+  optional string url = 2;
+  // The origin of the execution context.
+  optional string origin = 3;
+  // The world type of the execution context.
+  optional WorldType world_type = 4;
+}
+
+// Serializes the blink::SourceLocation object.
+message BlinkSourceLocation {
+  optional string function_name = 1;
+  optional int32 script_id = 2;
+  optional string url = 3;
+  optional int32 line_number = 4;
+  optional int32 column_number = 5;
+  optional string stack_trace = 6;
+  repeated V8StackFrame stack_frames = 7;
+}
+
+// Contains the meta information for high entropy events (like api calls)
+// that are to be traced for debugging in the context of identifiability study.
+message BlinkHighEntropyAPI {
+  // Serialization of a parameter passed to a javascript function.
+  // Contains the stringified type of the object and some string representation
+  // of its value.
+  message JSFunctionArgument {
+    // Definition of different types of function parameters.
+    enum ArgumentType {
+      UNKNOWN_TYPE = 0;
+      NULL_TYPE = 1;
+      UNDEFINED = 2;
+      BIGINT = 3;
+      BOOLEAN = 4;
+      FUNCTION = 5;
+      NUMBER = 6;
+      STRING = 7;
+      SYMBOL = 8;
+      OBJECT = 9;
+    }
+    optional ArgumentType type = 1;
+    optional string value = 2;
+  }
+
+  // Describes a Javascript API call.
+  message CalledJsApi {
+    // Contains class and function name of api called
+    // similar to "Navigator.languages.get".
+    optional string identifier = 1;
+    repeated JSFunctionArgument func_arguments = 2;
+
+    // Deprecated in favour of outer source_location. Not filled anymore in
+    // newer versions of chrome.
+    optional BlinkSourceLocation source_location = 3 [deprecated = true];
+  }
+  optional BlinkExecutionContext execution_context = 1;
+  optional CalledJsApi called_api = 2;
+  optional BlinkSourceLocation source_location = 3;
+
+  // Describes lookup of a font.
+  message FontLookup {
+    enum FontLookupType {
+      FONT_LOOKUP_UNKNOWN_TYPE = 0;
+      FONT_LOOKUP_UNIQUE_OR_FAMILY_NAME = 1;
+      FONT_LOOKUP_UNIQUE_NAME_ONLY = 2;
+    }
+    optional FontLookupType type = 1;
+    optional string name = 2;
+    optional uint64 weight = 3;
+    optional uint64 width = 4;
+    optional uint64 slope = 5;
+  }
+  optional FontLookup font_lookup = 4;
+}
+
+// Contains information about a tab switch measurement.
+message TabSwitchMeasurement {
+  // Possible outcomes of a tab switch. Maps to
+  // blink::ContentToVisibleTimeReporter::TabSwitchResult.
+  enum Result {
+    RESULT_UNSPECIFIED = 0;
+    // A frame was successfully presented after a tab switch.
+    RESULT_SUCCESS = 1;
+    // Tab was hidden before a frame was presented after a tab switch.
+    RESULT_INCOMPLETE = 2;
+    // TabWasShown called twice for a frame without TabWasHidden between. Treat
+    // the first TabWasShown as an incomplete tab switch.
+    RESULT_MISSED_TAB_HIDE = 3;
+  }
+
+  // State of the target tab. Corresponds to the suffixes of the
+  // Browser.TabSwitchResult2.* histograms.
+  enum TabState {
+    STATE_UNSPECIFIED = 0;
+    // The tab has frames in the frame cache, which can be composited in the
+    // browser process.
+    STATE_WITH_SAVED_FRAMES = 1;
+    // The tab has no frames in the frame cache so must be rendered and
+    // composited in a renderer process.
+    STATE_LOADED_NO_SAVED_FRAMES = 2;
+    // The tab has no frames in the frame cache and is not fully loaded, so it
+    // must be reloaded before it can be rendered and composited in a renderer
+    // process.
+    STATE_NOT_LOADED_NO_SAVED_FRAMES = 3;
+  }
+
+  optional Result result = 1;
+  optional TabState tab_state = 2;
+}
+
+// Data about scroll deltas and offsets.
+// All values are in physical screen pixels.
+message ScrollDeltas {
+  // The trace_id of the current input.
+  optional int64 trace_id = 1;
+  // The original delta for current input. That is, this is the delta that
+  // the Browser receives from Android, but already scaled to the device's
+  // screen.
+  optional float original_delta_x = 2;
+  optional float original_delta_y = 3;
+  // The trace_id of the input that the current input is coalesced with.
+  // If input is not coalesced, this field is null.
+  optional int64 coalesced_to_trace_id = 4;
+  // The delta which arrived to compositor.
+  // This is the sum of all the inputs coalesced together
+  // with the resampler applied to them.
+  // This delta is used to calculate a |visual_offset|.
+  optional float provided_to_compositor_delta_x = 5;
+  optional float provided_to_compositor_delta_y = 6;
+  // The offset which compositor set.
+  optional int64 visual_offset_x = 7;
+  optional int64 visual_offset_y = 8;
+
+  // Data which GPU returns.
+  // Number of inputs which were shown together in one GPU frame.
+  optional int32 event_count_in_gpu_frame = 9;
+  // The trace_ids of inputs which were shown together in one GPU frame.
+  repeated int64 trace_ids_in_gpu_frame = 10;
+  // The sum of original deltas of inputs which were shown together in one GPU
+  // frame.
+  optional float original_delta_in_gpu_frame_y = 11;
+  // The sum of predicted deltas of inputs which were shown together in one GPU
+  // frame.
+  optional float predicted_delta_in_gpu_frame_y = 12;
+  // The array of original deltas of inputs which were shown together in one GPU
+  // frame.
+  repeated float segregated_original_deltas_in_gpu_frame_y = 13;
+  // The array of predicted deltas of inputs which were shown together in one
+  // GPU frame.
+  repeated float segregated_predicted_deltas_in_gpu_frame_y = 14;
+}
+
+// Debug information for system layer of audio rendering on Windows.
+message WinRenderAudioFromSource {
+  // Buffer size used by the platform.
+  optional uint32 iaudioclient_buffer_size_frames = 1;
+  // Number of available frames in the platform buffer.
+  optional uint32 iaudioclient_buffer_unfilled_frames = 2;
+  // Number of frames requested from the audio stream client.
+  optional uint32 packet_size_frames = 3;
+  // Total number of frames requested from the client and written to the
+  // platform buffer during the stream lifetime.
+  optional uint64 num_written_frames = 4;
+  // Total number of frames played by the platform during the stream lifetime.
+  optional uint64 num_played_out_frames = 5;
+  // Device frequency reported by the platform; used to convert the stream
+  // position to frames.
+  optional uint64 iaudioclock_device_frequency = 6;
+  // Stream position reported by the platform.
+  optional uint64 iaudioclock_stream_position = 7;
+  // Performance counter position reported by the platform.
+  optional uint64 iaudioclock_qpc_position = 8;
+  // Stream position increase since the last call, converted to milliseconds.
+  optional int64 iaudioclock_stream_position_increase_ms = 9;
+  // Performance counter position since the last call, converted to
+  // milliseconds.
+  optional int64 iaudioclock_qpc_position_increase_ms = 10;
+  // Estimated playout delay, milliseconds.
+  optional int64 playout_delay_ms = 11;
+};
+
+// Debug information for system layer of audio rendering on Mac.
+message MacAUHALStream {
+  // The number of frames that the stream requests from the audio source.
+  optional int32 input_buffer_size = 1;
+  // The number of frames that the OS requests for playout.
+  optional uint32 output_buffer_size = 2;
+  // Sample rate of the stream.
+  optional int32 sample_rate = 3;
+  // The time that the audio requested by the OS is expected to play out.
+  optional int64 os_request_playout_timeticks_us = 4;
+  // Total number of frames requested from the audio source.
+  optional int32 source_request_frames = 5;
+  // The delay between the request for audio from the source and when the audio
+  // is expected to be played out.
+  optional int64 source_request_playout_delay_us = 6;
+  // The time when the audio that is requested from the source is expected to
+  // play out.
+  optional int64 source_request_playout_timeticks_us = 7;
+  // The time when audio audio is requested from the source.
+  optional int64 source_request_current_timeticks_us = 8;
+  // The audio playout latency that comes from hardware, in milliseconds.
+  optional int64 hardware_latency_us = 9;
+  // Whether the kAudioTimeStampHostTimeValid is set on the output
+  // AudioTimeStamp.
+  optional bool audiotimestamp_host_time_valid = 10;
+  // The playout time based on the machine time from AudioTimeStamp.
+  optional int64 audiotimestamp_mach_timeticks_us = 11;
+  // The time that the audio requested by the os is expected to be consumed by
+  // the hardware. Measured in frames since the start of playout.
+  optional double audiotimestamp_sample_time_frames = 12;
+  // The time that the previous audio requested by the os was expected to be
+  // consumed by the hardware. Measured in frames since the start of playout.
+  optional double audiotimestamp_last_sample_time_frames = 13;
+  // The duration of audio that was estimated to be lost in the case of a
+  // glitch.
+  optional int64 lost_audio_duration_us = 14;
+};
+
+// Debug information for system layer of audio rendering using ALSA on Linux.
+message LinuxAlsaOutput {
+  // The delay between the request for audio from the source and when the audio
+  // is expected to be played out.
+  optional int64 source_request_playout_delay_us = 1;
+  // The number of bytes that are already present in the buffer on a call to
+  // BufferPacket.
+  optional int32 forward_bytes = 2;
+  // Sample rate of the stream.
+  optional int32 sample_rate = 3;
+  // Delay obtained by the OS in frames.
+  optional int32 getcurrentdelay_pcm_delay_frames = 4;
+  // The number of frames in ALSA's buffer.
+  optional int32 getcurrentdelay_alsa_buffer_frames = 5;
+  // The number of frames that can be written to in ALSA's buffer.
+  optional int32 getcurrentdelay_available_frames = 6;
+  // The final delay that GetCurrentDelay arrives on, in frames.
+  optional int32 getcurrentdelay_final_delay_frames = 7;
+};
+
+// Debug information for system layer of audio rendering using Pulse on Linux.
+message LinuxPulseOutput {
+  // The delay between the request for audio from the source and when the audio
+  // is expected to be played out.
+  optional int64 source_request_playout_delay_us = 1;
+  // Sample rate of the stream.
+  optional int32 sample_rate = 2;
+  // The number of frames that the stream requests from the audio source.
+  optional int32 input_buffer_size_frames = 3;
+  // The number of bytes that the OS requests.
+  optional uint32 stream_request_bytes = 4;
+  // The number of bytes in a single frame.
+  optional uint32 frame_size_bytes = 5;
+};
+
+// Debug information for system layer of audio rendering on ChromeOS.
+message CrasUnified {
+  // The total duration of silence due to missing samples during the stream.
+  optional int64 underrun_duration_us = 1;
+  // Previous underrun duration, used for calculating the length of silence
+  // since the last callback.
+  optional int64 last_underrun_duration_us = 2;
+  // Difference in total underrun duration since the last callback. Logged only
+  // when positive, which is when a glitch occurs.
+  optional int64 underrun_glitch_duration_us = 3;
+  // OS playout latency reported by cras.
+  optional int64 latency_us = 4;
+  // The number of frames that the stream requests from the audio source.
+  optional int32 requested_frames = 5;
+  // The number of frames that the source provided.
+  optional uint32 filled_frames = 6;
+  // Sample rate of the stream.
+  optional int32 sample_rate = 7;
+};
+
+message ChromeUnguessableToken {
+  optional uint64 low_token = 1;
+  optional uint64 high_token = 2;
+}
+
+message FrameSinkId {
+  optional uint32 frame_sink_client_id = 1;
+  optional uint32 frame_sink_id = 2;
+}
+
+message LocalSurfaceId {
+  optional uint32 parent_sequence_number = 1;
+  optional uint32 child_sequence_number = 2;
+  optional ChromeUnguessableToken unguessable_token = 3;
+}
+
+message ChromeGraphicsPipeline {
+  enum StepName {
+    STEP_UNKNOWN = 0;
+    STEP_DID_NOT_PRODUCE_FRAME = 1;
+    STEP_GENERATE_COMPOSITOR_FRAME = 2;
+    STEP_GENERATE_RENDER_PASS = 3;
+    STEP_ISSUE_BEGIN_FRAME = 4;
+    STEP_RECEIVE_COMPOSITOR_FRAME = 5;
+    STEP_RECEIVE_BEGIN_FRAME = 6;
+    STEP_RECEIVE_BEGIN_FRAME_DISCARD = 7;
+    STEP_SEND_BEGIN_MAIN_FRAME = 8;
+    STEP_SUBMIT_COMPOSITOR_FRAME = 9;
+    STEP_SURFACE_AGGREGATION = 10;
+    STEP_SEND_BUFFER_SWAP = 11;
+    STEP_BUFFER_SWAP_POST_SUBMIT = 12;
+    STEP_FINISH_BUFFER_SWAP = 13;
+    STEP_SWAP_BUFFERS_ACK = 14;
+
+    // While the above steps are part of the cc/viz/gpu pipeline, the STEP_EXO*
+    // and STEP_BACKEND* are somehow special.
+    //
+    // STEP_BACKEND* is platform independent and it can be used to trace any of
+    // the backends. For example, it perfectly fits in ozone/drm, ozone/wayland
+    // or x11 and can be set before and after buffer swap or overlay submission
+    // that helps to understand the flow better.
+    //
+    // The STEP_EXO* is used only by EXO (see below). It relies on a trace id
+    // from a Wayland client, which can use the "augmented_surface" protocol's
+    // "augmented_surface.set_frame_trace_id" to pass that value. As a result,
+    // any of the Wayland clients that use EXO will be able to have a nice trace
+    // connection and see their buffer submissions' flows.
+    //
+    // Speaking about the example, Lacros combines both STEP_BACKEND* and
+    // STEP_EXO* so that developers are able to trace the frame submission from
+    // Lacros (cc/viz/gpu) to Ozone/Wayland backend, then to EXO and to Ash
+    // (viz/gpu).
+
+    // Frame submission stages when Exo (Wayland server implementation in Ash
+    // browser process) is involved. Wayland clients (such as Lacros or ARC++)
+    // submit visual contents via Wayland surface commits, with which Exo
+    // constructs compositor frames and forwards to Ash Viz.
+    STEP_EXO_CONSTRUCT_COMPOSITOR_FRAME = 15;
+    STEP_EXO_SUBMIT_COMPOSITOR_FRAME = 16;
+    STEP_EXO_DISCARD_COMPOSITOR_FRAME = 17;
+
+    // Frame submission stages in backends that viz uses to submit frames to
+    // the gpu or to the system compositor. See the explanation above how these
+    // stages can be used.
+    STEP_BACKEND_SEND_BUFFER_SWAP = 18;
+    STEP_BACKEND_SEND_BUFFER_POST_SUBMIT = 19;
+    STEP_BACKEND_FINISH_BUFFER_SWAP = 20;
+  }
+  enum FrameSkippedReason {
+    SKIPPED_REASON_UNKNOWN = 0;
+    SKIPPED_REASON_RECOVER_LATENCY = 1;
+    SKIPPED_REASON_NO_DAMAGE = 2;
+    SKIPPED_REASON_WAITING_ON_MAIN = 3;
+    SKIPPED_REASON_DRAW_THROTTLED = 4;
+  }
+  optional StepName step = 1;
+  optional FrameSinkId frame_sink_id = 2;
+  optional int64 display_trace_id = 3;
+  optional LocalSurfaceId local_surface_id = 4;
+  optional int64 frame_sequence = 5;
+  optional FrameSkippedReason frame_skipped_reason = 6;
+
+  // Optional variable that can be set together with STEP_BACKEND*.
+  optional int64 backend_frame_id = 7;
+};
+
+message LibunwindstackUnwinder {
+  // The enum is a copy of ErrorCode enum inside third_party/libunwindstack,
+  // ideally this should be in sync with that.
+  enum ErrorCode {
+    ERROR_NONE = 0;            // No error.
+    ERROR_MEMORY_INVALID = 1;  // Memory read failed.
+    ERROR_UNWIND_INFO = 2;     // Unable to use unwind information to unwind.
+    ERROR_UNSUPPORTED = 3;     // Encountered unsupported feature.
+    ERROR_INVALID_MAP = 4;     // Unwind in an invalid map.
+    ERROR_MAX_FRAMES_EXCEEDED = 5;  // The number of frames exceed the total
+                                    // allowed.
+    ERROR_REPEATED_FRAME = 6;  // The last frame has the same pc/sp as the next.
+    ERROR_INVALID_ELF = 7;     // Unwind in an invalid elf.
+    ERROR_THREAD_DOES_NOT_EXIST = 8;  // Attempt to unwind a local thread that
+                                      // does not exist.
+    ERROR_THREAD_TIMEOUT = 9;  // Timeout trying to unwind a local thread.
+    ERROR_SYSTEM_CALL = 10;    // System call failed while unwinding.
+    ERROR_BAD_ARCH = 11;       // Arch invalid (none, or mismatched).
+    ERROR_MAPS_PARSE = 12;     // Failed to parse maps data.
+    ERROR_INVALID_PARAMETER_LIBUNWINDSTACK =
+        13;                  // Invalid parameter passed to function.
+    ERROR_PTRACE_CALL = 14;  // Ptrace call failed while unwinding.
+  }
+  optional ErrorCode error_code = 1;
+  optional int32 num_frames = 2;
+};
+
+message ScrollPredictorMetrics {
+  message EventFrameValue {
+    optional int64 event_trace_id = 1;
+    // The fractional pixels (can be fractional after the predictor adjusts in
+    // resampling of input) that the page was scrolled by this frame.
+    optional float delta_value_pixels = 2;
+  };
+  // Data from the previous, current, and next frame used to determine the
+  // values below as according to the metric doc:
+  // http://doc/1Y0u0Tq5eUZff75nYUzQVw6JxmbZAW9m64pJidmnGWsY.
+  optional EventFrameValue prev_event_frame_value = 1;
+  optional EventFrameValue cur_event_frame_value = 2;
+  optional EventFrameValue next_event_frame_value = 3;
+  // This is the amount of delta processed in this frame that was above the
+  // janky threshold (as defined by
+  // http://doc/1Y0u0Tq5eUZff75nYUzQVw6JxmbZAW9m64pJidmnGWsY)
+  optional float janky_value_pixels = 4;
+  // True if we are also missing frames (so multiple frames are being presented
+  // at once).
+  optional bool has_missed_vsyncs = 5;
+  // True if we're moving less than the slow scroll threshold as defined by the
+  // doc above.
+  optional bool is_slow_scroll = 6;
+};
+
+//
+// Critical User Interaction metrics
+//
+
+message PageLoad {
+  optional int64 navigation_id = 1;
+  optional string url = 2;
+}
+
+message StartUp {
+  // This enum must be kept up to date with LaunchCauseMetrics.LaunchCause.
+  enum LaunchCauseType {
+    OTHER = 0;
+    CUSTOM_TAB = 1;
+    TWA = 2;
+    RECENTS = 3;
+    RECENTS_OR_BACK = 4;
+    FOREGROUND_WHEN_LOCKED = 5;
+    MAIN_LAUNCHER_ICON = 6;
+    MAIN_LAUNCHER_ICON_SHORTCUT = 7;
+    HOME_SCREEN_WIDGET = 8;
+    OPEN_IN_BROWSER_FROM_MENU = 9;
+    EXTERNAL_SEARCH_ACTION_INTENT = 10;
+    NOTIFICATION = 11;
+    EXTERNAL_VIEW_INTENT = 12;
+    OTHER_CHROME = 13;
+    WEBAPK_CHROME_DISTRIBUTOR = 14;
+    WEBAPK_OTHER_DISTRIBUTOR = 15;
+    HOME_SCREEN_SHORTCUT = 16;
+    SHARE_INTENT = 17;
+    NFC = 18;
+  }
+
+  optional int64 activity_id = 1;
+  // deprecated field 2.
+  optional LaunchCauseType launch_cause = 3;
+}
+
+message WebContentInteraction {
+  enum Type {
+    INTERACTION_UNSPECIFIED = 0;
+    INTERACTION_KEYBOARD = 1;
+    INTERACTION_CLICK_TAP = 2;
+    INTERACTION_DRAG = 3;
+  }
+
+  optional Type type = 1;
+  optional int64 total_duration_ms = 2;
+}
+
+// The EventForwarder is a subsystem in android that forwards events from Java
+// code to Chromium's native implementation. In this case we register how many
+// events there was, what time this event occurred and the current x & y on the
+// device screen (pixels).
+//
+// All data comes from MotionEvent getters so read these for more context:
+// https://developer.android.com/reference/android/view/MotionEvent
+message EventForwarder {
+  // The events getHistorySize().
+  optional int32 history_size = 1;
+  // The time of the oldest event (getHistoricalEventTimeNanos(0)).
+  optional int64 oldest_time_ns = 2;
+  // The time of the newest event (getEventTimeNanos(0)).
+  optional int64 latest_time_ns = 5;
+  // The X coordinate of the event as reported by MotionEvent.getX().
+  optional float x_pixel = 3;
+  // The Y coordinate of the event as reported by MotionEvent.getY().
+  optional float y_pixel = 4;
+  // Determine if the previous forwarded event changed x coordinate.
+  optional bool has_x_movement = 6;
+  // Determine if the previous forwarded event changed y coordinate.
+  optional bool has_y_movement = 7;
+}
+
+// TouchDispositionGestureFilter is a class on android that detects and forwards
+// along gesture events based on touch acks and other information.
+message TouchDispositionGestureFilter {
+  // The number of gesture's inside of a GestureEventDataPacket.
+  optional int32 gesture_count = 1;
+}
+
+message ViewClassName {
+  // The name associated with a View class in browser UI. The class name is set
+  // by the view class itself through metadata macros and contains no data that
+  // can be modified by a user.
+  optional string name = 1;
+}
+
+// Describes Chrome's Compositor scheduler's current state and associated
+// variables.
+//
+// These protos and enums were adapted from the corresponding original JSON
+// trace event for the scheduler state. In contrast to the JSON, we use strongly
+// typed enum values instead of strings for many fields, and
+// microsecond-granularity timestamps.
+//
+// The original format was generated in JSON by the code at
+// https://cs.chromium.org/chromium/src/cc/scheduler/scheduler.cc?l=870&rcl=5e15eabc9c0eec8daf94fdf78e93f13b6e3b63dd
+//
+// And is now generated as protozero:
+// https://cs.chromium.org/chromium/src/cc/scheduler/scheduler.cc?q=Scheduler::AsPro
+//
+// All non-delta-timestamps are absolute CLOCK_MONOTONIC timestamps.
+
+// Next id: 15
+enum ChromeCompositorSchedulerActionV2 {
+  CC_SCHEDULER_ACTION_V2_UNSPECIFIED = 0;
+  CC_SCHEDULER_ACTION_V2_NONE = 1;
+  CC_SCHEDULER_ACTION_V2_SEND_BEGIN_MAIN_FRAME = 2;
+  CC_SCHEDULER_ACTION_V2_COMMIT = 3;
+  CC_SCHEDULER_ACTION_V2_POST_COMMIT = 14;
+  CC_SCHEDULER_ACTION_V2_ACTIVATE_SYNC_TREE = 4;
+  CC_SCHEDULER_ACTION_V2_DRAW_IF_POSSIBLE = 5;
+  CC_SCHEDULER_ACTION_V2_DRAW_FORCED = 6;
+  CC_SCHEDULER_ACTION_V2_DRAW_ABORT = 7;
+  CC_SCHEDULER_ACTION_V2_BEGIN_LAYER_TREE_FRAME_SINK_CREATION = 8;
+  CC_SCHEDULER_ACTION_V2_PREPARE_TILES = 9;
+  CC_SCHEDULER_ACTION_V2_INVALIDATE_LAYER_TREE_FRAME_SINK = 10;
+  CC_SCHEDULER_ACTION_V2_PERFORM_IMPL_SIDE_INVALIDATION = 11;
+  CC_SCHEDULER_ACTION_V2_NOTIFY_BEGIN_MAIN_FRAME_NOT_EXPECTED_UNTIL = 12;
+  CC_SCHEDULER_ACTION_V2_NOTIFY_BEGIN_MAIN_FRAME_NOT_EXPECTED_SOON = 13;
+}
+
+// Next id: 18
+message ChromeCompositorSchedulerStateV2 {
+  enum BeginImplFrameDeadlineMode {
+    DEADLINE_MODE_UNSPECIFIED = 0;
+    DEADLINE_MODE_NONE = 1;
+    DEADLINE_MODE_IMMEDIATE = 2;
+    DEADLINE_MODE_REGULAR = 3;
+    DEADLINE_MODE_LATE = 4;
+    DEADLINE_MODE_BLOCKED = 5;
+  }
+  optional ChromeCompositorStateMachineV2 state_machine = 1;
+  optional bool observing_begin_frame_source = 2;
+  optional bool begin_impl_frame_deadline_task = 3;
+  optional bool pending_begin_frame_task = 4;
+  optional bool skipped_last_frame_missed_exceeded_deadline = 5;
+  optional ChromeCompositorSchedulerActionV2 inside_action = 7;
+  optional BeginImplFrameDeadlineMode deadline_mode = 8;
+  optional int64 deadline_us = 9;
+  optional int64 deadline_scheduled_at_us = 10;
+  optional int64 now_us = 11;
+  optional int64 now_to_deadline_delta_us = 12;
+  optional int64 now_to_deadline_scheduled_at_delta_us = 13;
+  optional BeginImplFrameArgsV2 begin_impl_frame_args = 14;
+  optional BeginFrameObserverStateV2 begin_frame_observer_state = 15;
+  optional BeginFrameSourceStateV2 begin_frame_source_state = 16;
+  optional CompositorTimingHistoryV2 compositor_timing_history = 17;
+
+  reserved 6;
+}
+
+// Describes the current values stored in the Chrome Compositor state machine.
+// Next id: 3
+message ChromeCompositorStateMachineV2 {
+  // Next id: 6
+  message MajorStateV2 {
+    enum BeginImplFrameState {
+      BEGIN_IMPL_FRAME_UNSPECIFIED = 0;
+      BEGIN_IMPL_FRAME_IDLE = 1;
+      BEGIN_IMPL_FRAME_INSIDE_BEGIN_FRAME = 2;
+      BEGIN_IMPL_FRAME_INSIDE_DEADLINE = 3;
+    }
+    enum BeginMainFrameState {
+      BEGIN_MAIN_FRAME_UNSPECIFIED = 0;
+      BEGIN_MAIN_FRAME_IDLE = 1;
+      BEGIN_MAIN_FRAME_SENT = 2;
+      BEGIN_MAIN_FRAME_READY_TO_COMMIT = 3;
+    }
+    enum LayerTreeFrameSinkState {
+      LAYER_TREE_FRAME_UNSPECIFIED = 0;
+      LAYER_TREE_FRAME_NONE = 1;
+      LAYER_TREE_FRAME_ACTIVE = 2;
+      LAYER_TREE_FRAME_CREATING = 3;
+      LAYER_TREE_FRAME_WAITING_FOR_FIRST_COMMIT = 4;
+      LAYER_TREE_FRAME_WAITING_FOR_FIRST_ACTIVATION = 5;
+    }
+    enum ForcedRedrawOnTimeoutState {
+      FORCED_REDRAW_UNSPECIFIED = 0;
+      FORCED_REDRAW_IDLE = 1;
+      FORCED_REDRAW_WAITING_FOR_COMMIT = 2;
+      FORCED_REDRAW_WAITING_FOR_ACTIVATION = 3;
+      FORCED_REDRAW_WAITING_FOR_DRAW = 4;
+    }
+    optional ChromeCompositorSchedulerActionV2 next_action = 1;
+    optional BeginImplFrameState begin_impl_frame_state = 2;
+    optional BeginMainFrameState begin_main_frame_state = 3;
+    optional LayerTreeFrameSinkState layer_tree_frame_sink_state = 4;
+    optional ForcedRedrawOnTimeoutState forced_redraw_state = 5;
+  }
+  optional MajorStateV2 major_state = 1;
+
+  // Next id: 47
+  message MinorStateV2 {
+    enum TreePriority {
+      TREE_PRIORITY_UNSPECIFIED = 0;
+      TREE_PRIORITY_SAME_PRIORITY_FOR_BOTH_TREES = 1;
+      TREE_PRIORITY_SMOOTHNESS_TAKES_PRIORITY = 2;
+      TREE_PRIORITY_NEW_CONTENT_TAKES_PRIORITY = 3;
+    }
+    enum ScrollHandlerState {
+      SCROLL_HANDLER_UNSPECIFIED = 0;
+      SCROLL_AFFECTS_SCROLL_HANDLER = 1;
+      SCROLL_DOES_NOT_AFFECT_SCROLL_HANDLER = 2;
+    }
+    optional int32 commit_count = 1;
+    optional int32 current_frame_number = 2;
+    optional int32 last_frame_number_submit_performed = 3;
+    optional int32 last_frame_number_draw_performed = 4;
+    optional int32 last_frame_number_begin_main_frame_sent = 5;
+    optional bool did_draw = 6;
+    optional bool did_send_begin_main_frame_for_current_frame = 7;
+    optional bool did_notify_begin_main_frame_not_expected_until = 8;
+    optional bool did_notify_begin_main_frame_not_expected_soon = 9;
+    optional bool wants_begin_main_frame_not_expected = 10;
+    optional bool did_commit_during_frame = 11;
+    optional bool did_invalidate_layer_tree_frame_sink = 12;
+    optional bool did_perform_impl_side_invalidaion = 13;
+    optional bool did_prepare_tiles = 14;
+    optional int32 consecutive_checkerboard_animations = 15;
+    optional int32 pending_submit_frames = 16;
+    optional int32 submit_frames_with_current_layer_tree_frame_sink = 17;
+    optional bool needs_redraw = 18;
+    optional bool needs_prepare_tiles = 19;
+    optional bool needs_begin_main_frame = 20;
+    optional bool needs_one_begin_impl_frame = 21;
+    optional bool visible = 22;
+    optional bool begin_frame_source_paused = 23;
+    optional bool can_draw = 24;
+    optional bool resourceless_draw = 25;
+    optional bool has_pending_tree = 26;
+    optional bool pending_tree_is_ready_for_activation = 27;
+    optional bool active_tree_needs_first_draw = 28;
+    optional bool active_tree_is_ready_to_draw = 29;
+    optional bool did_create_and_initialize_first_layer_tree_frame_sink = 30;
+    optional TreePriority tree_priority = 31;
+    optional ScrollHandlerState scroll_handler_state = 32;
+    optional bool critical_begin_main_frame_to_activate_is_fast = 33;
+    optional bool main_thread_missed_last_deadline = 34;
+    optional bool video_needs_begin_frames = 36;
+    optional bool defer_begin_main_frame = 37;
+    optional bool last_commit_had_no_updates = 38;
+    optional bool did_draw_in_last_frame = 39;
+    optional bool did_submit_in_last_frame = 40;
+    optional bool needs_impl_side_invalidation = 41;
+    optional bool current_pending_tree_is_impl_side = 42;
+    optional bool previous_pending_tree_was_impl_side = 43;
+    optional bool processing_animation_worklets_for_active_tree = 44;
+    optional bool processing_animation_worklets_for_pending_tree = 45;
+    optional bool processing_paint_worklets_for_pending_tree = 46;
+
+    reserved 35;
+  }
+  optional MinorStateV2 minor_state = 2;
+}
+
+// Next id: 12
+message BeginFrameArgsV2 {
+  // JSON format has a "type" field that was always just "BeginFrameArgs" we
+  // drop this in the proto representation, and instead make the JSON format
+  // "subtype" field become the type field.
+  enum BeginFrameArgsType {
+    BEGIN_FRAME_ARGS_TYPE_UNSPECIFIED = 0;
+    BEGIN_FRAME_ARGS_TYPE_INVALID = 1;
+    BEGIN_FRAME_ARGS_TYPE_NORMAL = 2;
+    BEGIN_FRAME_ARGS_TYPE_MISSED = 3;
+  }
+  optional BeginFrameArgsType type = 1;
+  optional uint64 source_id = 2;
+  optional uint64 sequence_number = 3;
+  optional int64 frame_time_us = 4;
+  optional int64 deadline_us = 5;
+  optional int64 interval_delta_us = 6;
+  optional bool on_critical_path = 7;
+  optional bool animate_only = 8;
+  oneof created_from {
+    // The interned SourceLocation.
+    uint64 source_location_iid = 9;
+    // The SourceLocation that this args was created from.
+    // TODO(nuskos): Eventually we will support interning inside of
+    // TypedArgument TraceEvents and then we shouldn't need this SourceLocation
+    // since we can emit it as part of the InternedData message. When we can
+    // remove this |source_location|.
+    SourceLocation source_location = 10;
+  }
+  optional int64 frames_throttled_since_last = 11;
+}
+
+// Next id: 7
+message BeginImplFrameArgsV2 {
+  optional int64 updated_at_us = 1;
+  optional int64 finished_at_us = 2;
+  enum State {
+    BEGIN_FRAME_FINISHED = 0;
+    BEGIN_FRAME_USING = 1;
+  }
+  optional State state = 3;
+  oneof args {
+    // Only set if |state| is BEGIN_FRAME_FINISHED.
+    BeginFrameArgsV2 current_args = 4;
+    // Only set if |state| is BEGIN_FRAME_USING.
+    BeginFrameArgsV2 last_args = 5;
+  }
+  message TimestampsInUs {
+    optional int64 interval_delta = 1;
+    optional int64 now_to_deadline_delta = 2;
+    optional int64 frame_time_to_now_delta = 3;
+    optional int64 frame_time_to_deadline_delta = 4;
+    optional int64 now = 5;
+    optional int64 frame_time = 6;
+    optional int64 deadline = 7;
+  }
+  optional TimestampsInUs timestamps_in_us = 6;
+}
+
+message BeginFrameObserverStateV2 {
+  optional int64 dropped_begin_frame_args = 1;
+  optional BeginFrameArgsV2 last_begin_frame_args = 2;
+}
+
+message BeginFrameSourceStateV2 {
+  optional uint32 source_id = 1;
+  optional bool paused = 2;
+  optional uint32 num_observers = 3;
+  optional BeginFrameArgsV2 last_begin_frame_args = 4;
+}
+
+message CompositorTimingHistoryV2 {
+  optional int64 begin_main_frame_queue_critical_estimate_delta_us = 1;
+  optional int64 begin_main_frame_queue_not_critical_estimate_delta_us = 2;
+  optional int64 begin_main_frame_start_to_ready_to_commit_estimate_delta_us =
+      3;
+  optional int64 commit_to_ready_to_activate_estimate_delta_us = 4;
+  optional int64 prepare_tiles_estimate_delta_us = 5;
+  optional int64 activate_estimate_delta_us = 6;
+  optional int64 draw_estimate_delta_us = 7;
+}
+
+message ChromeTrackEvent {
+  // Extension range for Chrome: 1000-1999
+  // Next ID: 1063
+  extend TrackEvent {
+    optional ChromeAppState chrome_app_state = 1000;
+
+    optional ChromeMemoryPressureNotification
+        chrome_memory_pressure_notification = 1001;
+
+    optional ChromeTaskAnnotator chrome_task_annotator = 1002;
+
+    optional ChromeBrowserContext chrome_browser_context = 1003;
+
+    optional ChromeProfileDestroyer chrome_profile_destroyer = 1004;
+
+    optional ChromeTaskPostedToDisabledQueue
+        chrome_task_posted_to_disabled_queue = 1005;
+
+    optional ChromeRasterTask chrome_raster_task = 1006;
+
+    optional ChromeMessagePumpForUI chrome_message_pump_for_ui = 1007;
+
+    optional RenderFrameImplDeletion render_frame_impl_deletion = 1008;
+
+    optional ShouldSwapBrowsingInstancesResult
+        should_swap_browsing_instances_result = 1009;
+
+    optional FrameTreeNodeInfo frame_tree_node_info = 1010;
+
+    optional ChromeHashedPerformanceMark chrome_hashed_performance_mark = 1011;
+
+    optional RenderProcessHost render_process_host = 1012;
+    optional RenderProcessHostCleanup render_process_host_cleanup = 1013;
+    optional RenderProcessHostListener render_process_host_listener_changed =
+        1014;
+    optional ChildProcessLauncherPriority child_process_launcher_priority =
+        1015;
+
+    optional ResourceBundle resource_bundle = 1016;
+
+    optional ChromeWebAppBadNavigate chrome_web_app_bad_navigate = 1017;
+
+    optional ChromeExtensionId chrome_extension_id = 1018;
+
+    optional SiteInstance site_instance = 1019;
+
+    optional RenderViewHost render_view_host = 1020;
+
+    optional RenderFrameProxyHost render_frame_proxy_host = 1021;
+
+    optional AndroidViewDump android_view_dump = 1022;
+
+    optional ParkableStringCompressInBackground
+        parkable_string_compress_in_background = 1023;
+    optional ParkableStringUnpark parkable_string_unpark = 1024;
+
+    optional ChromeSamplingProfilerSampleCollected
+        chrome_sampling_profiler_sample_completed = 1025;
+    optional SendBeginMainFrameToCommitBreakdown
+        send_begin_mainframe_to_commit_breakdown = 1026;
+
+    optional GlobalRenderFrameHostId global_render_frame_host_id = 1027;
+
+    optional RenderFrameHost render_frame_host = 1028;
+
+    optional ChromeThreadPoolTask thread_pool_task = 1029;
+
+    optional BackForwardCacheCanStoreDocumentResult
+        back_forward_cache_can_store_document_result = 1030;
+
+    optional RendererMainThreadTaskExecution
+        renderer_main_thread_task_execution = 1031;
+
+    optional EventLatency event_latency = 1032;
+
+    optional ProcessSingleton process_singleton = 1033;
+
+    optional SiteInstanceGroup site_instance_group = 1034;
+
+    optional BrowsingContextState browsing_context_state = 1035;
+
+    optional DeviceThermalState device_thermal_state = 1036;
+
+    optional NavigationHandle navigation = 1037;
+
+    optional AndroidIPC android_ipc = 1038;
+
+    optional ChromeSqlDiagnostics sql_diagnostics = 1039;
+
+    optional SequenceManagerTask sequence_manager_task = 1040;
+
+    optional AndroidToolbar android_toolbar = 1041;
+
+    optional ActiveProcesses active_processes = 1042;
+
+    optional BlinkTaskScope blink_task_scope = 1043;
+
+    optional UkmPageLoadTimingUpdate ukm_page_load_timing_update = 1044;
+
+    optional BlinkHighEntropyAPI high_entropy_api = 1045;
+
+    optional TabSwitchMeasurement tab_switch_measurement = 1046;
+
+    optional ScrollDeltas scroll_deltas = 1047;
+
+    optional WinRenderAudioFromSource win_render_audio_from_source = 1048;
+
+    optional MacAUHALStream mac_auhal_stream = 1049;
+
+    optional LinuxAlsaOutput linux_alsa_output = 1050;
+
+    optional LinuxPulseOutput linux_pulse_output = 1051;
+
+    optional ChromeGraphicsPipeline chrome_graphics_pipeline = 1052;
+
+    optional CrasUnified chromeos_cras_unified = 1053;
+
+    optional LibunwindstackUnwinder libunwindstack_unwinder = 1054;
+
+    optional ScrollPredictorMetrics scroll_predictor_metrics = 1055;
+
+    optional PageLoad page_load = 1056;
+
+    optional StartUp startup = 1057;
+
+    optional WebContentInteraction web_content_interaction = 1058;
+
+    optional EventForwarder event_forwarder = 1059;
+
+    optional TouchDispositionGestureFilter touch_disposition_gesture_filter =
+        1060;
+
+    optional ViewClassName view_class_name = 1061;
+
+    optional ChromeCompositorSchedulerStateV2 cc_scheduler_state = 1062;
+  }
+}
diff --git a/src/libtracing/protos/third_party/chromium/sources.gni b/src/libtracing/protos/third_party/chromium/sources.gni
new file mode 100644
index 000000000..115ec4ba6
--- /dev/null
+++ b/src/libtracing/protos/third_party/chromium/sources.gni
@@ -0,0 +1,11 @@
+# Copyright 2020 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# List of .proto files used when defining Chromium extensions for typed events.
+# New files should be added to this list.
+#
+# DO NOT EDIT THIS AT THE MOMENT. This file has to be supported in Perfetto
+# first in order to be useful.
+# TODO(b/181318121): Implement the support in Perfetto and remove the warning.
+chrome_track_event_sources = [ "chrome_track_event.proto" ]
diff --git a/src/libtracing/protos/third_party/pprof/profile.proto b/src/libtracing/protos/third_party/pprof/profile.proto
new file mode 100644
index 000000000..21282c545
--- /dev/null
+++ b/src/libtracing/protos/third_party/pprof/profile.proto
@@ -0,0 +1,230 @@
+// Copyright (C) 2018 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Profile is a common stacktrace profile format.
+//
+// Measurements represented with this format should follow the
+// following conventions:
+//
+// - Consumers should treat unset optional fields as if they had been
+//   set with their default value.
+//
+// - When possible, measurements should be stored in "unsampled" form
+//   that is most useful to humans.  There should be enough
+//   information present to determine the original sampled values.
+//
+// - On-disk, the serialized proto must be gzip-compressed.
+//
+// - The profile is represented as a set of samples, where each sample
+//   references a sequence of locations, and where each location belongs
+//   to a mapping.
+// - There is a N->1 relationship from sample.location_id entries to
+//   locations. For every sample.location_id entry there must be a
+//   unique Location with that id.
+// - There is an optional N->1 relationship from locations to
+//   mappings. For every nonzero Location.mapping_id there must be a
+//   unique Mapping with that id.
+
+syntax = "proto3";
+
+// This is in perfetto.third_party to avoid clashing with potential other
+// copies of this proto.
+package perfetto.third_party.perftools.profiles;
+
+option java_package = "com.google.perftools.profiles";
+option java_outer_classname = "ProfileProto";
+
+message Profile {
+  // A description of the samples associated with each Sample.value.
+  // For a cpu profile this might be:
+  //   [["cpu","nanoseconds"]] or [["wall","seconds"]] or [["syscall","count"]]
+  // For a heap profile, this might be:
+  //   [["allocations","count"], ["space","bytes"]],
+  // If one of the values represents the number of events represented
+  // by the sample, by convention it should be at index 0 and use
+  // sample_type.unit == "count".
+  repeated ValueType sample_type = 1;
+  // The set of samples recorded in this profile.
+  repeated Sample sample = 2;
+  // Mapping from address ranges to the image/binary/library mapped
+  // into that address range.  mapping[0] will be the main binary.
+  repeated Mapping mapping = 3;
+  // Useful program location
+  repeated Location location = 4;
+  // Functions referenced by locations
+  repeated Function function = 5;
+  // A common table for strings referenced by various messages.
+  // string_table[0] must always be "".
+  repeated string string_table = 6;
+  // frames with Function.function_name fully matching the following
+  // regexp will be dropped from the samples, along with their successors.
+  // Index into string table.
+  int64 drop_frames = 7;
+  // frames with Function.function_name fully matching the following
+  // regexp will be kept, even if it matches drop_functions.
+  // Index into string table.
+  int64 keep_frames = 8;
+
+  // The following fields are informational, do not affect
+  // interpretation of results.
+
+  // Time of collection (UTC) represented as nanoseconds past the epoch.
+  int64 time_nanos = 9;
+  // Duration of the profile, if a duration makes sense.
+  int64 duration_nanos = 10;
+  // The kind of events between sampled ocurrences.
+  // e.g [ "cpu","cycles" ] or [ "heap","bytes" ]
+  ValueType period_type = 11;
+  // The number of events between sampled occurrences.
+  int64 period = 12;
+  // Freeform text associated to the profile.
+  // Indices into string table.
+  repeated int64 comment = 13;
+  // Index into the string table of the type of the preferred sample
+  // value. If unset, clients should default to the last sample value.
+  int64 default_sample_type = 14;
+}
+
+// ValueType describes the semantics and measurement units of a value.
+message ValueType {
+  // Index into string table.
+  int64 type = 1;
+  // Index into string table.
+  int64 unit = 2;
+}
+
+// Each Sample records values encountered in some program
+// context. The program context is typically a stack trace, perhaps
+// augmented with auxiliary information like the thread-id, some
+// indicator of a higher level request being handled etc.
+message Sample {
+  // The ids recorded here correspond to a Profile.location.id.
+  // The leaf is at location_id[0].
+  repeated uint64 location_id = 1;
+  // The type and unit of each value is defined by the corresponding
+  // entry in Profile.sample_type. All samples must have the same
+  // number of values, the same as the length of Profile.sample_type.
+  // When aggregating multiple samples into a single sample, the
+  // result has a list of values that is the elemntwise sum of the
+  // lists of the originals.
+  repeated int64 value = 2;
+  // label includes additional context for this sample. It can include
+  // things like a thread id, allocation size, etc
+  repeated Label label = 3;
+}
+
+message Label {
+  // Index into string table
+  int64 key = 1;
+
+  // At most one of the following must be present
+
+  // Index into string table
+  int64 str = 2;
+
+  int64 num = 3;
+
+  // Should only be present when num is present.
+  // Specifies the units of num.
+  // Use arbitrary string (for example, "requests") as a custom count unit.
+  // If no unit is specified, consumer may apply heuristic to deduce the unit.
+  // Consumers may also  interpret units like "bytes" and "kilobytes" as memory
+  // units and units like "seconds" and "nanoseconds" as time units,
+  // and apply appropriate unit conversions to these.
+
+  // Index into string table
+  int64 num_unit = 4;
+}
+
+message Mapping {
+  // Unique nonzero id for the mapping.
+  uint64 id = 1;
+  // Address at which the binary (or DLL) is loaded into memory.
+  uint64 memory_start = 2;
+  // The limit of the address range occupied by this mapping.
+  uint64 memory_limit = 3;
+  // Offset in the binary that corresponds to the first mapped address.
+  uint64 file_offset = 4;
+  // The object this entry is loaded from.  This can be a filename on
+  // disk for the main binary and shared libraries, or virtual
+  // abstractions like "[vdso]".
+  // Index into string table
+  int64 filename = 5;
+  // A string that uniquely identifies a particular program version
+  // with high probability. E.g., for binaries generated by GNU tools,
+  // it could be the contents of the .note.gnu.build-id field.
+  // Index into string table
+  int64 build_id = 6;
+
+  // The following fields indicate the resolution of symbolic info.
+  bool has_functions = 7;
+  bool has_filenames = 8;
+  bool has_line_numbers = 9;
+  bool has_inline_frames = 10;
+}
+
+// Describes function and line table debug information.
+message Location {
+  // Unique nonzero id for the location.  A profile could use
+  // instruction addresses or any integer sequence as ids.
+  uint64 id = 1;
+  // The id of the corresponding profile.Mapping for this location.
+  // It can be unset if the mapping is unknown or not applicable for
+  // this profile type.
+  uint64 mapping_id = 2;
+  // The instruction address for this location, if available.  It
+  // should be within [Mapping.memory_start...Mapping.memory_limit]
+  // for the corresponding mapping. A non-leaf address may be in the
+  // middle of a call instruction. It is up to display tools to find
+  // the beginning of the instruction if necessary.
+  uint64 address = 3;
+  // Multiple line indicates this location has inlined functions,
+  // where the last entry represents the caller into which the
+  // preceding entries were inlined.
+  //
+  // E.g., if memcpy() is inlined into printf:
+  //    line[0].function_name == "memcpy"
+  //    line[1].function_name == "printf"
+  repeated Line line = 4;
+  // Provides an indication that multiple symbols map to this location's
+  // address, for example due to identical code folding by the linker. In that
+  // case the line information above represents one of the multiple
+  // symbols. This field must be recomputed when the symbolization state of the
+  // profile changes.
+  bool is_folded = 5;
+}
+
+message Line {
+  // The id of the corresponding profile.Function for this line.
+  uint64 function_id = 1;
+  // Line number in source code.
+  int64 line = 2;
+}
+
+message Function {
+  // Unique nonzero id for the function.
+  uint64 id = 1;
+  // Name of the function, in human-readable form if available.
+  // Index into string table
+  int64 name = 2;
+  // Name of the function, as identified by the system.
+  // For instance, it can be a C++ mangled name.
+  // Index into string table
+  int64 system_name = 3;
+  // Source file containing the function.
+  // Index into string table
+  int64 filename = 4;
+  // Line number in source file.
+  int64 start_line = 5;
+}
diff --git a/src/libtracing/protos/third_party/statsd/shell_config.proto b/src/libtracing/protos/third_party/statsd/shell_config.proto
new file mode 100644
index 000000000..49ec14275
--- /dev/null
+++ b/src/libtracing/protos/third_party/statsd/shell_config.proto
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.protos;
+
+// This is a manual import of ShellSubscription:
+// https://cs.android.com/android/platform/superproject/main/+/main:packages/modules/StatsD/statsd/src/shell/shell_config.proto?q=f:statsD%2Fstatsd%20f:shell_config.proto
+// and its transitive dependencies.
+
+message StatsdShellSubscription {
+  repeated StatsdSimpleAtomMatcher pushed = 1;
+  repeated StatsdPulledAtomSubscription pulled = 2;
+}
+
+message StatsdPulledAtomSubscription {
+  optional StatsdSimpleAtomMatcher matcher = 1;
+  optional int32 freq_millis = 2;
+  repeated string packages = 3;
+}
+
+message StatsdSimpleAtomMatcher {
+  optional int32 atom_id = 1;
+}
diff --git a/src/libtracing/protos/third_party/statsd/shell_data.proto b/src/libtracing/protos/third_party/statsd/shell_data.proto
new file mode 100644
index 000000000..3896a3665
--- /dev/null
+++ b/src/libtracing/protos/third_party/statsd/shell_data.proto
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package perfetto.proto;
+
+// This is a manual import of ShellData:
+// https://cs.android.com/android/platform/superproject/main/+/main:packages/modules/StatsD/statsd/src/shell/shell_data.proto;l=27;drc=d2e51ecdf08753688fb889b657dcba60adb994f3
+// This must exactly match perfetto.protos.StatsdAtom.
+message ShellData {
+  repeated bytes atom = 1;
+  repeated int64 timestamp_nanos = 2;
+}
diff --git a/src/libtracing/protozero_src/copyable_ptr_unittest.cc b/src/libtracing/protozero_src/copyable_ptr_unittest.cc
new file mode 100644
index 000000000..d9be950ee
--- /dev/null
+++ b/src/libtracing/protozero_src/copyable_ptr_unittest.cc
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/copyable_ptr.h"
+
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+namespace {
+
+struct X {
+  X() = default;
+  X(const X&) = default;
+  X& operator=(const X&) = default;
+  ~X() { val = -1; }
+
+  friend bool operator==(const X& lhs, const X& rhs) {
+    return lhs.val == rhs.val;
+  }
+
+  // Deliberately unusual implementation.
+  friend bool operator!=(const X& lhs, const X& rhs) {
+    return lhs.val == rhs.val * -1;
+  }
+
+  int val = 0;
+};
+
+TEST(CopyablePtrTest, CopyOperators) {
+  CopyablePtr<X> p1;
+  p1->val = 1;
+  ASSERT_NE(p1.get(), nullptr);
+  ASSERT_EQ(&*p1, p1.get());
+
+  CopyablePtr<X> p2(p1);
+  EXPECT_NE(p1.get(), nullptr);
+  EXPECT_NE(p2.get(), nullptr);
+  EXPECT_NE(p1.get(), p2.get());
+
+  p2->val = 2;
+  EXPECT_EQ(p1->val, 1);
+  EXPECT_EQ(p2->val, 2);
+
+  {
+    CopyablePtr<X> p3;
+    p3 = p1;
+    EXPECT_EQ(p3->val, 1);
+
+    p3 = p2;
+    EXPECT_EQ(p3->val, 2);
+
+    p3->val = 3;
+    EXPECT_EQ(p3->val, 3);
+  }
+
+  EXPECT_EQ(p1->val, 1);
+  EXPECT_EQ(p2->val, 2);
+}
+
+TEST(CopyablePtrTest, MoveOperators) {
+  CopyablePtr<X> p1;
+  p1->val = 1;
+
+  CopyablePtr<X> p2(std::move(p1));
+  EXPECT_EQ(p2->val, 1);
+
+  // The moved-from object needs to stay valid and non-null.
+  EXPECT_EQ(p1->val, 0);
+  {
+    CopyablePtr<X> p3;
+    p3->val = 3;
+    p1 = std::move(p3);
+    EXPECT_EQ(p1->val, 3);
+    EXPECT_EQ(p3->val, 0);
+  }
+  EXPECT_EQ(p1->val, 3);
+}
+
+TEST(CopyablePtrTest, DeepCompare) {
+  CopyablePtr<X> p1;
+  p1->val = 1;
+
+  CopyablePtr<X> p2;
+  p2->val = 2;
+
+  CopyablePtr<X> p3;
+  p3->val = -2;
+
+  EXPECT_NE(p1.get(), p2.get());
+  EXPECT_NE(p1.get(), p3.get());
+
+  EXPECT_FALSE(p1 == p2);
+  EXPECT_FALSE(p1 == p3);
+  EXPECT_FALSE(p2 == p3);
+
+  EXPECT_FALSE(p1 != p2);  // The operator!= is special, see above.
+  EXPECT_TRUE(p2 != p3);
+
+  p1->val = -2;
+  EXPECT_TRUE(p1 != p2);
+  EXPECT_FALSE(p1 == p2);
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/field.cc b/src/libtracing/protozero_src/field.cc
new file mode 100644
index 000000000..8f9418219
--- /dev/null
+++ b/src/libtracing/protozero_src/field.cc
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/field.h"
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+
+#if !PERFETTO_IS_LITTLE_ENDIAN()
+// The memcpy() for fixed32/64 below needs to be adjusted if we want to
+// support big endian CPUs. There doesn't seem to be a compelling need today.
+#error Unimplemented for big endian archs.
+#endif
+
+namespace protozero {
+
+template <typename Container>
+void Field::SerializeAndAppendToInternal(Container* dst) const {
+  namespace pu = proto_utils;
+  size_t initial_size = dst->size();
+  dst->resize(initial_size + pu::kMaxSimpleFieldEncodedSize + size_);
+  uint8_t* start = reinterpret_cast<uint8_t*>(&(*dst)[initial_size]);
+  uint8_t* wptr = start;
+  switch (type_) {
+    case static_cast<int>(pu::ProtoWireType::kVarInt): {
+      wptr = pu::WriteVarInt(pu::MakeTagVarInt(id_), wptr);
+      wptr = pu::WriteVarInt(int_value_, wptr);
+      break;
+    }
+    case static_cast<int>(pu::ProtoWireType::kFixed32): {
+      wptr = pu::WriteVarInt(pu::MakeTagFixed<uint32_t>(id_), wptr);
+      uint32_t value32 = static_cast<uint32_t>(int_value_);
+      memcpy(wptr, &value32, sizeof(value32));
+      wptr += sizeof(uint32_t);
+      break;
+    }
+    case static_cast<int>(pu::ProtoWireType::kFixed64): {
+      wptr = pu::WriteVarInt(pu::MakeTagFixed<uint64_t>(id_), wptr);
+      memcpy(wptr, &int_value_, sizeof(int_value_));
+      wptr += sizeof(uint64_t);
+      break;
+    }
+    case static_cast<int>(pu::ProtoWireType::kLengthDelimited): {
+      ConstBytes payload = as_bytes();
+      wptr = pu::WriteVarInt(pu::MakeTagLengthDelimited(id_), wptr);
+      wptr = pu::WriteVarInt(payload.size, wptr);
+      memcpy(wptr, payload.data, payload.size);
+      wptr += payload.size;
+      break;
+    }
+    default:
+      PERFETTO_FATAL("Unknown field type %u", type_);
+  }
+  size_t written_size = static_cast<size_t>(wptr - start);
+  PERFETTO_DCHECK(written_size > 0 && written_size < pu::kMaxMessageLength);
+  PERFETTO_DCHECK(initial_size + written_size <= dst->size());
+  dst->resize(initial_size + written_size);
+}
+
+void Field::SerializeAndAppendTo(std::string* dst) const {
+  SerializeAndAppendToInternal(dst);
+}
+
+void Field::SerializeAndAppendTo(std::vector<uint8_t>* dst) const {
+  SerializeAndAppendToInternal(dst);
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_common.h b/src/libtracing/protozero_src/filtering/filter_bytecode_common.h
new file mode 100644
index 000000000..02a6cd02c
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_common.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_COMMON_H_
+#define SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_COMMON_H_
+
+#include <stdint.h>
+
+namespace protozero {
+
+enum FilterOpcode : uint32_t {
+  // The immediate value is 0 in this case.
+  kFilterOpcode_EndOfMessage = 0,
+
+  // The immediate value is the id of the allowed field.
+  kFilterOpcode_SimpleField = 1,
+
+  // The immediate value is the start of the range. The next word (without
+  // any shifting) is the length of the range.
+  kFilterOpcode_SimpleFieldRange = 2,
+
+  // The immediate value is the id of the allowed field. The next word
+  // (without any shifting) is the index of the filter that should be used to
+  // recurse into the nested message.
+  kFilterOpcode_NestedField = 3,
+
+  // The imediate value is the id of the allowed field. The behaviour of this
+  // opcode is the same as kFilterOpcode_SimpleField, with the further semantic
+  // that the field is a string and needs to be processed using the string
+  // filtering fules.
+  kFilterOpcode_FilterString = 4,
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_COMMON_H_
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_generator.cc b/src/libtracing/protozero_src/filtering/filter_bytecode_generator.cc
new file mode 100644
index 000000000..487534b84
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_generator.cc
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/protozero/filtering/filter_bytecode_generator.h"
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/hash.h"
+#include "perfetto/protozero/packed_repeated_fields.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "src/protozero/filtering/filter_bytecode_common.h"
+
+namespace protozero {
+
+FilterBytecodeGenerator::FilterBytecodeGenerator() = default;
+FilterBytecodeGenerator::~FilterBytecodeGenerator() = default;
+
+void FilterBytecodeGenerator::EndMessage() {
+  endmessage_called_ = true;
+  bytecode_.push_back(kFilterOpcode_EndOfMessage);
+  last_field_id_ = 0;
+  ++num_messages_;
+}
+
+// Allows a simple field (varint, fixed32/64, string or bytes).
+void FilterBytecodeGenerator::AddSimpleField(uint32_t field_id) {
+  PERFETTO_CHECK(field_id > last_field_id_);
+  bytecode_.push_back(field_id << 3 | kFilterOpcode_SimpleField);
+  last_field_id_ = field_id;
+  endmessage_called_ = false;
+}
+
+// Allows a string field which needs to be rewritten using the given chain.
+void FilterBytecodeGenerator::AddFilterStringField(uint32_t field_id) {
+  PERFETTO_CHECK(field_id > last_field_id_);
+  bytecode_.push_back(field_id << 3 | kFilterOpcode_FilterString);
+  last_field_id_ = field_id;
+  endmessage_called_ = false;
+}
+
+// Allows a range of simple fields. |range_start| is the id of the first field
+// in range, |range_len| the number of fields in the range.
+// AddSimpleFieldRange(N,1) is semantically equivalent to AddSimpleField(N).
+void FilterBytecodeGenerator::AddSimpleFieldRange(uint32_t range_start,
+                                                  uint32_t range_len) {
+  PERFETTO_CHECK(range_start > last_field_id_);
+  PERFETTO_CHECK(range_len > 0);
+  bytecode_.push_back(range_start << 3 | kFilterOpcode_SimpleFieldRange);
+  bytecode_.push_back(range_len);
+  last_field_id_ = range_start + range_len - 1;
+  endmessage_called_ = false;
+}
+
+// Adds a nested field. |message_index| is the index of the message that the
+// parser must recurse into. This implies that at least |message_index| + 1
+// calls to EndMessage() will be made.
+// The Serialize() method will fail if any field points to an out of range
+// index.
+void FilterBytecodeGenerator::AddNestedField(uint32_t field_id,
+                                             uint32_t message_index) {
+  PERFETTO_CHECK(field_id > last_field_id_);
+  bytecode_.push_back(field_id << 3 | kFilterOpcode_NestedField);
+  bytecode_.push_back(message_index);
+  last_field_id_ = field_id;
+  max_msg_index_ = std::max(max_msg_index_, message_index);
+  endmessage_called_ = false;
+}
+
+// Returns the bytes that can be used into TraceConfig.trace_filter.bytecode.
+// The returned bytecode is a binary buffer which consists of a sequence of
+// varints (the opcodes) and a checksum.
+// The returned string can be passed as-is to FilterBytecodeParser.Load().
+std::string FilterBytecodeGenerator::Serialize() {
+  PERFETTO_CHECK(endmessage_called_);
+  PERFETTO_CHECK(max_msg_index_ < num_messages_);
+  protozero::PackedVarInt words;
+  perfetto::base::Hasher hasher;
+  for (uint32_t word : bytecode_) {
+    words.Append(word);
+    hasher.Update(word);
+  }
+  words.Append(static_cast<uint32_t>(hasher.digest()));
+  return std::string(reinterpret_cast<const char*>(words.data()), words.size());
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_generator.h b/src/libtracing/protozero_src/filtering/filter_bytecode_generator.h
new file mode 100644
index 000000000..ecff87e11
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_generator.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_GENERATOR_H_
+#define SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_GENERATOR_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <string>
+#include <vector>
+
+namespace protozero {
+
+// Creates a filter bytecode that can be passed to the FilterBytecodeParser.
+// This class is typically only used by offline tools (e.g. the proto_filter
+// cmdline tool). See go/trace-filtering for the full filtering design.
+class FilterBytecodeGenerator {
+ public:
+  FilterBytecodeGenerator();
+  ~FilterBytecodeGenerator();
+
+  // Call at the end of every message. It implicitly starts a new message, there
+  // is no corresponding BeginMessage().
+  void EndMessage();
+
+  // All the methods below must be called in monotonic field_id order or the
+  // generator will CHECK() and crash.
+
+  // Allows a simple field (varint, fixed32/64, string or bytes).
+  void AddSimpleField(uint32_t field_id);
+
+  // Allows a string field which needs to be filtered.
+  void AddFilterStringField(uint32_t field_id);
+
+  // Allows a range of simple fields. |range_start| is the id of the first field
+  // in range, |range_len| the number of fields in the range.
+  // AddSimpleFieldRange(N,1) is semantically equivalent to AddSimpleField(N)
+  // (but it takes 2 words to encode, rather than just one).
+  void AddSimpleFieldRange(uint32_t range_start, uint32_t range_len);
+
+  // Adds a nested field. |message_index| is the index of the message that the
+  // parser must recurse into. This implies that at least |message_index| calls
+  // to Begin/EndMessage will be made.
+  // The Serialize() method will fail if any field points to an index that is
+  // out of range (e.g., if message_index = 5 but only 3 EndMessage() calls were
+  // made).
+  void AddNestedField(uint32_t field_id, uint32_t message_index);
+
+  // Returns the filter bytecode, which is a buffer containing a sequence of
+  // varints and a checksum. The returned string can be passed to
+  // FilterBytecodeParser.Load().
+  std::string Serialize();
+
+ private:
+  uint32_t num_messages_ = 0;
+  uint32_t last_field_id_ = 0;
+  uint32_t max_msg_index_ = 0;
+  bool endmessage_called_ = false;
+
+  std::vector<uint32_t> bytecode_;
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_GENERATOR_H_
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_generator_unittest.cc b/src/libtracing/protozero_src/filtering/filter_bytecode_generator_unittest.cc
new file mode 100644
index 000000000..650120b84
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_generator_unittest.cc
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "test/gtest_and_gmock.h"
+
+#include "perfetto/protozero/packed_repeated_fields.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "src/protozero/filtering/filter_bytecode_generator.h"
+#include "src/protozero/filtering/filter_bytecode_parser.h"
+
+// This file tests the generator, assuming the parser is good.
+// The parser is tested separately (without the generator) in
+// filter_bytecode_parser_unittest.cc
+
+namespace protozero {
+
+namespace {
+
+TEST(FilterBytecodeGeneratorTest, SimpleFields) {
+  FilterBytecodeGenerator gen;
+  gen.AddSimpleField(1u);
+  gen.AddSimpleField(127u);
+  gen.AddSimpleField(128u);
+  gen.AddSimpleField(1000u);
+  gen.EndMessage();
+
+  FilterBytecodeParser parser;
+  std::string bytecode = gen.Serialize();
+  ASSERT_TRUE(parser.Load(reinterpret_cast<const uint8_t*>(bytecode.data()),
+                          bytecode.size()));
+  EXPECT_FALSE(parser.Query(0, 0).allowed);
+  EXPECT_TRUE(parser.Query(0, 1).allowed);
+  EXPECT_FALSE(parser.Query(0, 126).allowed);
+  EXPECT_TRUE(parser.Query(0, 127).allowed);
+  EXPECT_TRUE(parser.Query(0, 128).allowed);
+  EXPECT_FALSE(parser.Query(0, 129).allowed);
+  EXPECT_TRUE(parser.Query(0, 1000).allowed);
+  EXPECT_FALSE(parser.Query(0, 1001).allowed);
+}
+
+TEST(FilterBytecodeGeneratorTest, SimpleAndRanges) {
+  FilterBytecodeGenerator gen;
+  gen.AddSimpleField(1u);
+  gen.AddSimpleFieldRange(10, 10);
+  gen.AddSimpleField(30u);
+  gen.AddSimpleFieldRange(120, 20);
+  gen.AddSimpleField(1000u);
+  gen.EndMessage();
+
+  FilterBytecodeParser parser;
+  std::string bytecode = gen.Serialize();
+  ASSERT_TRUE(parser.Load(reinterpret_cast<const uint8_t*>(bytecode.data()),
+                          bytecode.size()));
+  EXPECT_FALSE(parser.Query(0, 0).allowed);
+  EXPECT_TRUE(parser.Query(0, 1).allowed);
+  EXPECT_FALSE(parser.Query(0, 9).allowed);
+  for (uint32_t i = 10; i <= 19; ++i)
+    EXPECT_TRUE(parser.Query(0, i).allowed);
+  EXPECT_TRUE(parser.Query(0, 30).allowed);
+  for (uint32_t i = 120; i <= 139; ++i)
+    EXPECT_TRUE(parser.Query(0, i).allowed);
+  EXPECT_FALSE(parser.Query(0, 140).allowed);
+  EXPECT_FALSE(parser.Query(0, 999).allowed);
+  EXPECT_TRUE(parser.Query(0, 1000).allowed);
+  EXPECT_FALSE(parser.Query(0, 1001).allowed);
+}
+
+TEST(FilterBytecodeGeneratorTest, Nested) {
+  FilterBytecodeGenerator gen;
+  // Message 0.
+  gen.AddSimpleField(1u);
+  gen.AddSimpleFieldRange(10, 1);
+  gen.AddNestedField(11, 3);
+  gen.AddNestedField(12, 1);
+  gen.EndMessage();
+
+  // Message 1.
+  gen.AddNestedField(11, 1);  // Recursive
+  gen.AddNestedField(12, 2);  // Recursive
+  gen.AddNestedField(13, 3);  // Recursive
+  gen.EndMessage();
+
+  // Message 2.
+  gen.AddSimpleField(21);
+  gen.EndMessage();
+
+  // Message 3.
+  gen.AddNestedField(1, 0);  // Recurse in the root message (sneaky).
+  gen.AddSimpleField(31);
+  gen.EndMessage();
+
+  FilterBytecodeParser parser;
+  std::string bytecode = gen.Serialize();
+  ASSERT_TRUE(parser.Load(reinterpret_cast<const uint8_t*>(bytecode.data()),
+                          bytecode.size()));
+
+  // Check root message.
+  EXPECT_TRUE(parser.Query(0, 1).allowed);
+  EXPECT_TRUE(parser.Query(0, 1).simple_field());
+  EXPECT_TRUE(parser.Query(0, 10).allowed);
+  EXPECT_TRUE(parser.Query(0, 10).simple_field());
+  EXPECT_TRUE(parser.Query(0, 11).allowed);
+  EXPECT_EQ(parser.Query(0, 11).nested_msg_index, 3u);
+  EXPECT_TRUE(parser.Query(0, 12).allowed);
+  EXPECT_EQ(parser.Query(0, 12).nested_msg_index, 1u);
+  EXPECT_FALSE(parser.Query(0, 13).allowed);
+
+  // Check message 1.
+  EXPECT_FALSE(parser.Query(1, 10).allowed);
+  EXPECT_TRUE(parser.Query(1, 11).allowed);
+  EXPECT_EQ(parser.Query(1, 11).nested_msg_index, 1u);
+  EXPECT_TRUE(parser.Query(1, 12).allowed);
+  EXPECT_EQ(parser.Query(1, 12).nested_msg_index, 2u);
+  EXPECT_TRUE(parser.Query(1, 13).allowed);
+  EXPECT_EQ(parser.Query(1, 13).nested_msg_index, 3u);
+
+  // Check message 2.
+  EXPECT_FALSE(parser.Query(2, 11).allowed);
+  EXPECT_TRUE(parser.Query(2, 21).allowed);
+  EXPECT_TRUE(parser.Query(2, 21).simple_field());
+
+  // Check message 3.
+  EXPECT_TRUE(parser.Query(3, 1).allowed);
+  EXPECT_EQ(parser.Query(3, 1).nested_msg_index, 0u);
+  EXPECT_TRUE(parser.Query(3, 31).allowed);
+  EXPECT_TRUE(parser.Query(3, 31).simple_field());
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_parser.cc b/src/libtracing/protozero_src/filtering/filter_bytecode_parser.cc
new file mode 100644
index 000000000..e00b71ce5
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_parser.cc
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/protozero/filtering/filter_bytecode_parser.h"
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/hash.h"
+#include "perfetto/protozero/packed_repeated_fields.h"
+#include "perfetto/protozero/proto_decoder.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "src/protozero/filtering/filter_bytecode_common.h"
+
+namespace protozero {
+
+void FilterBytecodeParser::Reset() {
+  bool suppress = suppress_logs_for_fuzzer_;
+  *this = FilterBytecodeParser();
+  suppress_logs_for_fuzzer_ = suppress;
+}
+
+bool FilterBytecodeParser::Load(const void* filter_data, size_t len) {
+  Reset();
+  bool res = LoadInternal(static_cast<const uint8_t*>(filter_data), len);
+  // If load fails, don't leave the parser in a half broken state.
+  if (!res)
+    Reset();
+  return res;
+}
+
+bool FilterBytecodeParser::LoadInternal(const uint8_t* bytecode_data,
+                                        size_t len) {
+  // First unpack the varints into a plain uint32 vector, so it's easy to
+  // iterate through them and look ahead.
+  std::vector<uint32_t> words;
+  bool packed_parse_err = false;
+  words.reserve(len);  // An overestimation, but avoids reallocations.
+  using BytecodeDecoder =
+      PackedRepeatedFieldIterator<proto_utils::ProtoWireType::kVarInt,
+                                  uint32_t>;
+  for (BytecodeDecoder it(bytecode_data, len, &packed_parse_err); it; ++it)
+    words.emplace_back(*it);
+
+  if (packed_parse_err || words.empty())
+    return false;
+
+  perfetto::base::Hasher hasher;
+  for (size_t i = 0; i < words.size() - 1; ++i)
+    hasher.Update(words[i]);
+
+  uint32_t expected_csum = static_cast<uint32_t>(hasher.digest());
+  if (expected_csum != words.back()) {
+    if (!suppress_logs_for_fuzzer_) {
+      PERFETTO_ELOG("Filter bytecode checksum failed. Expected: %x, actual: %x",
+                    expected_csum, words.back());
+    }
+    return false;
+  }
+
+  words.pop_back();  // Pop the checksum.
+
+  // Temporay storage for each message. Cleared on every END_OF_MESSAGE.
+  std::vector<uint32_t> direct_indexed_fields;
+  std::vector<uint32_t> ranges;
+  uint32_t max_msg_index = 0;
+
+  auto add_directly_indexed_field = [&](uint32_t field_id, uint32_t msg_id) {
+    PERFETTO_DCHECK(field_id > 0 && field_id < kDirectlyIndexLimit);
+    direct_indexed_fields.resize(std::max(direct_indexed_fields.size(),
+                                          static_cast<size_t>(field_id) + 1));
+    direct_indexed_fields[field_id] = kAllowed | msg_id;
+  };
+
+  auto add_range = [&](uint32_t id_start, uint32_t id_end, uint32_t msg_id) {
+    PERFETTO_DCHECK(id_end > id_start);
+    PERFETTO_DCHECK(id_start >= kDirectlyIndexLimit);
+    ranges.emplace_back(id_start);
+    ranges.emplace_back(id_end);
+    ranges.emplace_back(kAllowed | msg_id);
+  };
+
+  bool is_eom = true;
+  for (size_t i = 0; i < words.size(); ++i) {
+    const uint32_t word = words[i];
+    const bool has_next_word = i < words.size() - 1;
+    const uint32_t opcode = word & 0x7u;
+    const uint32_t field_id = word >> 3;
+
+    is_eom = opcode == kFilterOpcode_EndOfMessage;
+    if (field_id == 0 && opcode != kFilterOpcode_EndOfMessage) {
+      PERFETTO_DLOG("bytecode error @ word %zu, invalid field id (0)", i);
+      return false;
+    }
+
+    if (opcode == kFilterOpcode_SimpleField ||
+        opcode == kFilterOpcode_NestedField ||
+        opcode == kFilterOpcode_FilterString) {
+      // Field words are organized as follow:
+      // MSB: 1 if allowed, 0 if not allowed.
+      // Remaining bits:
+      //   Message index in the case of nested (non-simple) messages.
+      //   0x7f..e in the case of string fields which need filtering.
+      //   0x7f..f in the case of simple fields.
+      uint32_t msg_id;
+      if (opcode == kFilterOpcode_SimpleField) {
+        msg_id = kSimpleField;
+      } else if (opcode == kFilterOpcode_FilterString) {
+        msg_id = kFilterStringField;
+      } else {  // FILTER_OPCODE_NESTED_FIELD
+        // The next word in the bytecode contains the message index.
+        if (!has_next_word) {
+          PERFETTO_DLOG("bytecode error @ word %zu: unterminated nested field",
+                        i);
+          return false;
+        }
+        msg_id = words[++i];
+        max_msg_index = std::max(max_msg_index, msg_id);
+      }
+
+      if (field_id < kDirectlyIndexLimit) {
+        add_directly_indexed_field(field_id, msg_id);
+      } else {
+        // In the case of a large field id (rare) we waste an extra word and
+        // represent it as a range. Doesn't make sense to introduce extra
+        // complexity to deal with rare cases like this.
+        add_range(field_id, field_id + 1, msg_id);
+      }
+    } else if (opcode == kFilterOpcode_SimpleFieldRange) {
+      if (!has_next_word) {
+        PERFETTO_DLOG("bytecode error @ word %zu: unterminated range", i);
+        return false;
+      }
+      const uint32_t range_len = words[++i];
+      const uint32_t range_end = field_id + range_len;  // STL-style, excl.
+      uint32_t id = field_id;
+
+      // Here's the subtle complexity: at the bytecode level, we don't know
+      // anything about the kDirectlyIndexLimit. It is legit to define a range
+      // that spans across the direct-indexing threshold (e.g. 126-132). In that
+      // case we want to add all the elements < the indexing to the O(1) bucket
+      // and add only the remaining range as a non-indexed range.
+      for (; id < range_end && id < kDirectlyIndexLimit; ++id)
+        add_directly_indexed_field(id, kAllowed | kSimpleField);
+      PERFETTO_DCHECK(id >= kDirectlyIndexLimit || id == range_end);
+      if (id < range_end)
+        add_range(id, range_end, kSimpleField);
+    } else if (opcode == kFilterOpcode_EndOfMessage) {
+      // For each message append:
+      // 1. The "header" word telling how many directly indexed fields there
+      //    are.
+      // 2. The words for the directly indexed fields (id < 128).
+      // 3. The rest of the fields, encoded as ranges.
+      // Also update the |message_offset_| index to remember the word offset for
+      // the current message.
+      message_offset_.emplace_back(static_cast<uint32_t>(words_.size()));
+      words_.emplace_back(static_cast<uint32_t>(direct_indexed_fields.size()));
+      words_.insert(words_.end(), direct_indexed_fields.begin(),
+                    direct_indexed_fields.end());
+      words_.insert(words_.end(), ranges.begin(), ranges.end());
+      direct_indexed_fields.clear();
+      ranges.clear();
+    } else {
+      PERFETTO_DLOG("bytecode error @ word %zu: invalid opcode (%x)", i, word);
+      return false;
+    }
+  }  // (for word in bytecode).
+
+  if (!is_eom) {
+    PERFETTO_DLOG(
+        "bytecode error: end of message not the last word in the bytecode");
+    return false;
+  }
+
+  if (max_msg_index > 0 && max_msg_index >= message_offset_.size()) {
+    PERFETTO_DLOG(
+        "bytecode error: a message index (%u) is out of range "
+        "(num_messages=%zu)",
+        max_msg_index, message_offset_.size());
+    return false;
+  }
+
+  // Add a final entry to |message_offset_| so we can tell where the last
+  // message ends without an extra branch in the Query() hotpath.
+  message_offset_.emplace_back(static_cast<uint32_t>(words_.size()));
+
+  return true;
+}
+
+FilterBytecodeParser::QueryResult FilterBytecodeParser::Query(
+    uint32_t msg_index,
+    uint32_t field_id) const {
+  FilterBytecodeParser::QueryResult res{false, 0u};
+  if (static_cast<uint64_t>(msg_index) + 1 >=
+      static_cast<uint64_t>(message_offset_.size())) {
+    return res;
+  }
+  const uint32_t start_offset = message_offset_[msg_index];
+  // These are DCHECKs and not just CHECKS because the |words_| is populated
+  // by the LoadInternal call above. These cannot be violated with a malformed
+  // bytecode.
+  PERFETTO_DCHECK(start_offset < words_.size());
+  const uint32_t* word = &words_[start_offset];
+  const uint32_t end_off = message_offset_[msg_index + 1];
+  const uint32_t* const end = words_.data() + end_off;
+  PERFETTO_DCHECK(end > word && end <= words_.data() + words_.size());
+  const uint32_t num_directly_indexed = *(word++);
+  PERFETTO_DCHECK(num_directly_indexed <= kDirectlyIndexLimit);
+  PERFETTO_DCHECK(word + num_directly_indexed <= end);
+  uint32_t field_state = 0;
+  if (PERFETTO_LIKELY(field_id < num_directly_indexed)) {
+    PERFETTO_DCHECK(&word[field_id] < end);
+    field_state = word[field_id];
+  } else {
+    for (word = word + num_directly_indexed; word + 2 < end;) {
+      const uint32_t range_start = *(word++);
+      const uint32_t range_end = *(word++);
+      const uint32_t range_state = *(word++);
+      if (field_id >= range_start && field_id < range_end) {
+        field_state = range_state;
+        break;
+      }
+    }  // for (word in ranges)
+  }    // if (field_id >= num_directly_indexed)
+
+  res.allowed = (field_state & kAllowed) != 0;
+  res.nested_msg_index = field_state & ~kAllowed;
+  PERFETTO_DCHECK(!res.nested_msg_field() ||
+                  res.nested_msg_index < message_offset_.size() - 1);
+  return res;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_parser.h b/src/libtracing/protozero_src/filtering/filter_bytecode_parser.h
new file mode 100644
index 000000000..1ed4fa65f
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_parser.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_PARSER_H_
+#define SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_PARSER_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <optional>
+#include <vector>
+
+namespace protozero {
+
+// Loads the proto-encoded bytecode in memory and allows fast lookups for tuples
+// (msg_index, field_id) to tell if a given field should be allowed or not and,
+// in the case of nested fields, what is the next message index to recurse into.
+// This class does two things:
+// 1. Expands the array of varint from the proto into a vector<uint32_t>. This
+//    is to avoid performing varint decoding on every lookup, at the cost of
+//    some extra memory (2KB-4KB). Note that the expanded vector is not just a
+//    1:1 copy of the proto one (more below). This is to avoid O(Fields) linear
+//    lookup complexity.
+// 2. Creates an index of offsets to remember the start word for each message.
+//    This is so we can jump to O(1) to the N-th message when recursing into a
+//    nested fields, without having to scan and find the (N-1)-th END_OF_MESSAGE
+//    marker.
+// Overall lookups are O(1) for field ids < 128 (kDirectlyIndexLimit) and O(N),
+// with N being the number of allowed field ranges for other fields.
+// See comments around |word_| below for the structure of the word vector.
+class FilterBytecodeParser {
+ public:
+  // Result of a Query() operation
+  struct QueryResult {
+    bool allowed;  // Whether the field is allowed at all or no.
+
+    // If |allowed|==true && nested_msg_field() == true, this tells the message
+    // index of the nested field that should be used when recursing in the
+    // parser.
+    uint32_t nested_msg_index;
+
+    // If |allowed|==true, specifies if the field is of a simple type (varint,
+    // fixed32/64, string or byte).
+    bool simple_field() const { return nested_msg_index == kSimpleField; }
+
+    // If |allowed|==true, specifies if this field is a string field that needs
+    // to be filtered.
+    bool filter_string_field() const {
+      return nested_msg_index == kFilterStringField;
+    }
+
+    // If |allowed|==true, specifies if the field is a nested field that needs
+    // recursion. The caller is expected to use |nested_msg_index| for the next
+    // Query() calls.
+    bool nested_msg_field() const {
+      static_assert(kFilterStringField < kSimpleField,
+                    "kFilterStringField < kSimpleField");
+      return nested_msg_index < kFilterStringField;
+    }
+  };
+
+  // Loads a filter. The filter data consists of a sequence of varints which
+  // contains the filter opcodes and a final checksum.
+  bool Load(const void* filter_data, size_t len);
+
+  // Checks wheter a given field is allowed or not.
+  // msg_index = 0 is the index of the root message, where all queries should
+  // start from (typically perfetto.protos.Trace).
+  QueryResult Query(uint32_t msg_index, uint32_t field_id) const;
+
+  void Reset();
+  void set_suppress_logs_for_fuzzer(bool x) { suppress_logs_for_fuzzer_ = x; }
+
+ private:
+  static constexpr uint32_t kDirectlyIndexLimit = 128;
+  static constexpr uint32_t kAllowed = 1u << 31u;
+  static constexpr uint32_t kSimpleField = 0x7fffffff;
+  static constexpr uint32_t kFilterStringField = 0x7ffffffe;
+
+  bool LoadInternal(const uint8_t* filter_data, size_t len);
+
+  // The state of all fields for all messages is stored in one contiguous array.
+  // This is to avoid memory fragmentation and allocator overhead.
+  // We expect a high number of messages (hundreds), but each message is small.
+  // For each message we store two sets of uint32:
+  // 1. A set of "directly indexed" fields, for field ids < 128.
+  // 2. The remainder is a set of ranges.
+  // So each message descriptor consists of a sequence of words as follows:
+  //
+  // [0] -> how many directly indexed fields are stored next (up to 128)
+  //
+  // [1..N] -> One word per field id (See "field state" below).
+  //
+  // [N + 1] -> Start of field id range 1
+  // [N + 2] -> End of field id range 1 (exclusive, STL-style).
+  // [N + 3] -> Field state for fields in range 1 (below)
+  //
+  // [N + 4] -> Start of field id range 2
+  // [N + 5] -> End of field id range 2 (exclusive, STL-style).
+  // [N + 6] -> Field state for fields in range 2 (below)
+
+  // The "field state" word is as follows:
+  // Bit 31: 1 if the field is allowed, 0 if disallowed.
+  //         Only directly indexed fields can be 0 (it doesn't make sense to add
+  //         a range and then say "btw it's NOT allowed".. don't add it then.
+  //         0 is only used for filling gaps in the directly indexed bucket.
+  // Bits [30..0] (only when MSB == allowed):
+  //  0x7fffffff: The field is "simple" (varint, fixed32/64, string, bytes) and
+  //      can be directly passed through in output. No recursion is needed.
+  //  0x7ffffffe: The field is string field which needs to be filtered.
+  //  [0, 7ffffffd]: The field is a nested submessage. The value is the index
+  //     that must be passed as first argument to the next Query() calls.
+  //     Note that the message index is purely a monotonic counter in the
+  std::vector<uint32_t> words_;
+
+  // One entry for each message index stored in the filter plus a sentinel at
+  // the end. Maps each message index to the offset in |words_| where the
+  // Nth message start.
+  // message_offset_.size() - 2 == the max message id that can be parsed.
+  std::vector<uint32_t> message_offset_;
+
+  bool suppress_logs_for_fuzzer_ = false;
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_FILTERING_FILTER_BYTECODE_PARSER_H_
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_parser_fuzzer.cc b/src/libtracing/protozero_src/filtering/filter_bytecode_parser_fuzzer.cc
new file mode 100644
index 000000000..f14f10173
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_parser_fuzzer.cc
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "perfetto/ext/base/hash.h"
+
+#include "perfetto/protozero/packed_repeated_fields.h"
+#include "src/protozero/filtering/filter_bytecode_parser.h"
+
+namespace protozero {
+namespace {
+
+// This function gives a little help to the fuzzer. The bytecode is really a
+// sequence of varint-encoded uint32 words, with a FNV1a checksum at the end.
+// It's very unlikely that the fuzzer on its own can work out the checksum, so
+// most fuzzer inputs are doomed to fail the checksum verification.
+// This takes the fuzzer input and builds a more plausible bytecode.
+void LoadBytecodeWithChecksum(FilterBytecodeParser* parser,
+                              const uint8_t* data,
+                              size_t size) {
+  protozero::PackedVarInt words;
+  perfetto::base::Hasher hasher;
+  for (size_t i = 0; i < size; i += sizeof(uint32_t)) {
+    uint32_t word = 0;
+    memcpy(&word, data, sizeof(uint32_t));
+    words.Append(word);
+    hasher.Update(word);
+  }
+  words.Append(static_cast<uint32_t>(hasher.digest()));
+  parser->Load(words.data(), words.size());
+}
+
+int FuzzBytecodeParser(const uint8_t* data, size_t size) {
+  FilterBytecodeParser parser;
+  parser.set_suppress_logs_for_fuzzer(true);
+
+  if (size > 4 && data[0] < 192) {
+    // 75% of the times use the LoadBytecodeWithChecksum() which helps the
+    // fuzzer passing the checksum verification.
+    LoadBytecodeWithChecksum(&parser, data + 1, size - 1);
+  } else {
+    // In the remaining 25%, pass completely arbitrary inputs.
+    parser.Load(data, size);
+  }
+
+  // Smoke testing with known problematic values
+  for (uint32_t msg_index = 0; msg_index < 3; ++msg_index) {
+    parser.Query(msg_index, 0);
+    parser.Query(msg_index, 1);
+    parser.Query(msg_index, 127);
+    parser.Query(msg_index, 128);
+    parser.Query(msg_index, 129);
+    parser.Query(msg_index, 65536);
+    parser.Query(msg_index, 65536);
+    parser.Query(msg_index, 1u << 28);
+    parser.Query(msg_index, 1u << 31);
+  }
+
+  // Query using the random data at the end of the random buffer.
+  if (size > 8) {
+    uint32_t msg_index = 0;
+    uint32_t field_id = 0;
+    memcpy(&msg_index, &data[size - 8], 4);
+    memcpy(&field_id, &data[size - 4], 4);
+    parser.Query(msg_index, field_id);
+  }
+
+  return 0;
+}
+
+}  // namespace
+}  // namespace protozero
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  return protozero::FuzzBytecodeParser(data, size);
+}
diff --git a/src/libtracing/protozero_src/filtering/filter_bytecode_parser_unittest.cc b/src/libtracing/protozero_src/filtering/filter_bytecode_parser_unittest.cc
new file mode 100644
index 000000000..3b24b0063
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_bytecode_parser_unittest.cc
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "test/gtest_and_gmock.h"
+
+#include "perfetto/ext/base/hash.h"
+#include "perfetto/protozero/packed_repeated_fields.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "src/protozero/filtering/filter_bytecode_common.h"
+#include "src/protozero/filtering/filter_bytecode_parser.h"
+
+namespace protozero {
+
+namespace {
+
+bool LoadBytecode(FilterBytecodeParser* parser,
+                  std::initializer_list<uint32_t> bytecode) {
+  perfetto::base::Hasher hasher;
+  protozero::PackedVarInt words;
+  for (uint32_t w : bytecode) {
+    words.Append(w);
+    hasher.Update(w);
+  }
+  words.Append(static_cast<uint32_t>(hasher.digest()));
+  return parser->Load(words.data(), words.size());
+}
+
+TEST(FilterBytecodeParserTest, EomHandling) {
+  FilterBytecodeParser parser;
+
+  // EOM not being correctly at the end should cause a parse failure.
+  EXPECT_FALSE(LoadBytecode(&parser, {kFilterOpcode_SimpleField | 1}));
+  EXPECT_FALSE(LoadBytecode(&parser, {kFilterOpcode_SimpleFieldRange | 1,
+                                      kFilterOpcode_EndOfMessage}));
+  EXPECT_FALSE(LoadBytecode(&parser, {kFilterOpcode_NestedField | (4u << 3),
+                                      kFilterOpcode_EndOfMessage}));
+}
+
+TEST(FilterBytecodeParserTest, ParserSimpleFields) {
+  FilterBytecodeParser parser;
+  EXPECT_FALSE(parser.Load(nullptr, 0));
+  EXPECT_FALSE(parser.Query(42, 42).allowed);
+
+  EXPECT_TRUE(LoadBytecode(&parser, {}));
+  EXPECT_FALSE(parser.Query(0, 0).allowed);
+  EXPECT_FALSE(parser.Query(0, 0xffffffff).allowed);
+  EXPECT_FALSE(parser.Query(1, 0).allowed);
+  EXPECT_FALSE(parser.Query(0, 1).allowed);
+  EXPECT_FALSE(parser.Query(1, 1).allowed);
+  EXPECT_FALSE(parser.Query(42, 42).allowed);
+
+  // An invalid field_id (0) in bytecode should cause a parse failure.
+  EXPECT_FALSE(LoadBytecode(
+      &parser, {kFilterOpcode_SimpleField | 0, kFilterOpcode_EndOfMessage}));
+
+  // A valid bytecode that has only one field.
+  EXPECT_TRUE(LoadBytecode(&parser, {kFilterOpcode_SimpleField | (2u << 3),
+                                     kFilterOpcode_EndOfMessage}));
+  EXPECT_FALSE(parser.Query(0, 0).allowed);
+  EXPECT_FALSE(parser.Query(0, 1).allowed);
+  EXPECT_TRUE(parser.Query(0, 2).allowed);
+  EXPECT_TRUE(parser.Query(0, 2).simple_field());
+  EXPECT_TRUE(parser.Query(0, 2).allowed);
+  EXPECT_FALSE(parser.Query(0, 3).allowed);
+  EXPECT_FALSE(parser.Query(1, 1).allowed);
+  EXPECT_FALSE(parser.Query(1, 2).allowed);
+  EXPECT_FALSE(parser.Query(1, 3).allowed);
+
+  // A valid bytecode that has few sparse fields < 128.
+  EXPECT_TRUE(LoadBytecode(&parser, {kFilterOpcode_SimpleField | (1u << 3),
+                                     kFilterOpcode_SimpleField | (7u << 3),
+                                     kFilterOpcode_SimpleField | (8u << 3),
+                                     kFilterOpcode_SimpleField | (127u << 3),
+                                     kFilterOpcode_EndOfMessage}));
+  EXPECT_FALSE(parser.Query(0, 0).allowed);
+  EXPECT_TRUE(parser.Query(0, 1).allowed);
+  EXPECT_FALSE(parser.Query(0, 2).allowed);
+  EXPECT_FALSE(parser.Query(0, 3).allowed);
+  EXPECT_FALSE(parser.Query(0, 6).allowed);
+  EXPECT_TRUE(parser.Query(0, 7).allowed);
+  EXPECT_TRUE(parser.Query(0, 8).allowed);
+  EXPECT_FALSE(parser.Query(0, 9).allowed);
+  EXPECT_FALSE(parser.Query(0, 126).allowed);
+  EXPECT_TRUE(parser.Query(0, 127).allowed);
+  EXPECT_FALSE(parser.Query(0, 128).allowed);
+
+  // A valid bytecode that has only fields > 128.
+  EXPECT_TRUE(LoadBytecode(&parser, {kFilterOpcode_SimpleField | (1000u << 3),
+                                     kFilterOpcode_SimpleField | (1001u << 3),
+                                     kFilterOpcode_SimpleField | (2000u << 3),
+                                     kFilterOpcode_EndOfMessage}));
+  for (uint32_t i = 0; i < 1000; ++i)
+    EXPECT_FALSE(parser.Query(0, i).allowed);
+  EXPECT_TRUE(parser.Query(0, 1000).allowed);
+  EXPECT_TRUE(parser.Query(0, 1001).allowed);
+  EXPECT_FALSE(parser.Query(0, 1002).allowed);
+  EXPECT_FALSE(parser.Query(0, 1999).allowed);
+  EXPECT_TRUE(parser.Query(0, 2000).allowed);
+  EXPECT_FALSE(parser.Query(0, 2001).allowed);
+}
+
+TEST(FilterBytecodeParserTest, ParserSimpleRanges) {
+  FilterBytecodeParser parser;
+
+  // Invalid, range length missing.
+  EXPECT_FALSE(
+      LoadBytecode(&parser, {
+                                kFilterOpcode_SimpleFieldRange | (2u << 3),
+                            }));
+
+  // Borderline valid: range length = 0.
+  EXPECT_TRUE(
+      LoadBytecode(&parser, {kFilterOpcode_SimpleFieldRange | (2u << 3), 0u,
+                             kFilterOpcode_SimpleFieldRange | (127u << 3), 0u,
+                             kFilterOpcode_SimpleFieldRange | (128u << 3), 0u,
+                             kFilterOpcode_SimpleFieldRange | (128u << 3), 0u,
+                             kFilterOpcode_EndOfMessage}));
+  for (uint32_t i = 0; i < 130; ++i)
+    EXPECT_FALSE(parser.Query(0, i).allowed) << i;
+
+  // A valid bytecode with two ranges [2,2], [10, 14].
+  EXPECT_TRUE(
+      LoadBytecode(&parser, {kFilterOpcode_SimpleFieldRange | (2u << 3),
+                             1u,  // length of the range,
+                             kFilterOpcode_SimpleFieldRange | (10u << 3),
+                             5u,  // length of the range,
+                             kFilterOpcode_EndOfMessage}));
+  EXPECT_FALSE(parser.Query(0, 0).allowed);
+  EXPECT_FALSE(parser.Query(0, 1).allowed);
+  EXPECT_TRUE(parser.Query(0, 2).allowed);
+  EXPECT_TRUE(parser.Query(0, 2).simple_field());
+  EXPECT_FALSE(parser.Query(0, 3).allowed);
+  EXPECT_FALSE(parser.Query(0, 9).allowed);
+  for (uint32_t i = 10; i <= 14; ++i)
+    EXPECT_TRUE(parser.Query(0, i).allowed);
+  EXPECT_FALSE(parser.Query(0, 15).allowed);
+}
+
+TEST(FilterBytecodeParserTest, ParserSimpleFieldsAndRanges) {
+  FilterBytecodeParser parser;
+
+  // Borderline valid: range length = 0.
+  EXPECT_TRUE(
+      LoadBytecode(&parser, {kFilterOpcode_SimpleFieldRange | (1u << 3),
+                             2u,  // [1,2]
+
+                             kFilterOpcode_SimpleField | (4u << 3),
+
+                             kFilterOpcode_SimpleFieldRange | (126u << 3),
+                             4u,  // [126, 129]
+
+                             kFilterOpcode_SimpleField | (150u << 3),
+
+                             kFilterOpcode_EndOfMessage}));
+  EXPECT_TRUE(parser.Query(0, 1).allowed);
+  EXPECT_TRUE(parser.Query(0, 2).allowed);
+  EXPECT_FALSE(parser.Query(0, 3).allowed);
+  EXPECT_TRUE(parser.Query(0, 4).allowed);
+  EXPECT_FALSE(parser.Query(0, 5).allowed);
+  EXPECT_FALSE(parser.Query(0, 125).allowed);
+  for (uint32_t i = 126; i <= 129; ++i)
+    EXPECT_TRUE(parser.Query(0, i).allowed) << i;
+  EXPECT_FALSE(parser.Query(0, 130).allowed);
+  EXPECT_TRUE(parser.Query(0, 150).allowed);
+}
+
+TEST(FilterBytecodeParserTest, ParserNestedMessages) {
+  FilterBytecodeParser parser;
+
+  // Invalid because there are 1 messages in total, and message index 1 is
+  // out of range.
+  EXPECT_FALSE(LoadBytecode(&parser, {kFilterOpcode_NestedField | (4u << 3),
+                                      1u,  // message index
+                                      kFilterOpcode_EndOfMessage}));
+
+  // A valid bytecode consisting of 4 message, with recursive / cylical
+  // dependencies between them.
+  EXPECT_TRUE(LoadBytecode(
+      &parser, {
+                   // Message 0 (root).
+                   kFilterOpcode_SimpleFieldRange | (1u << 3),
+                   2u,  // [1,2]
+                   kFilterOpcode_NestedField | (4u << 3),
+                   3u,  // message index
+                   kFilterOpcode_SimpleField | (10u << 3),
+                   kFilterOpcode_NestedField | (127u << 3),
+                   1u,  // message index
+                   kFilterOpcode_NestedField | (128u << 3),
+                   2u,  // message index
+                   kFilterOpcode_EndOfMessage,
+
+                   // Message 1.
+                   kFilterOpcode_NestedField | (2u << 3),
+                   1u,  // message index (recurse onto itself),
+                   kFilterOpcode_SimpleField | (11u << 3),
+                   kFilterOpcode_EndOfMessage,
+
+                   // Message 2.
+                   kFilterOpcode_NestedField | (2u << 3),
+                   3u,  // message index.
+                   kFilterOpcode_EndOfMessage,
+
+                   // Message 3.
+                   kFilterOpcode_NestedField | (2u << 3),
+                   2u,  // message index (create a cycle, 2->3, 3->2).
+                   kFilterOpcode_EndOfMessage,
+               }));
+
+  // Query message 0 fields.
+  EXPECT_TRUE(parser.Query(0, 1).allowed);
+  EXPECT_TRUE(parser.Query(0, 2).allowed);
+  EXPECT_TRUE(parser.Query(0, 2).simple_field());
+  EXPECT_TRUE(parser.Query(0, 4).allowed);
+  EXPECT_FALSE(parser.Query(0, 4).simple_field());
+  EXPECT_EQ(parser.Query(0, 4).nested_msg_index, 3u);
+  EXPECT_TRUE(parser.Query(0, 10).allowed);
+  EXPECT_TRUE(parser.Query(0, 10).simple_field());
+  EXPECT_TRUE(parser.Query(0, 127).allowed);
+  EXPECT_EQ(parser.Query(0, 127).nested_msg_index, 1u);
+  EXPECT_TRUE(parser.Query(0, 128).allowed);
+  EXPECT_EQ(parser.Query(0, 128).nested_msg_index, 2u);
+  EXPECT_FALSE(parser.Query(0, 129).allowed);
+
+  // Query message 1 fields.
+  EXPECT_FALSE(parser.Query(1, 1).allowed);
+  EXPECT_TRUE(parser.Query(1, 2).allowed);
+  EXPECT_EQ(parser.Query(1, 2).nested_msg_index, 1u);
+  EXPECT_FALSE(parser.Query(1, 3).allowed);
+  EXPECT_TRUE(parser.Query(1, 11).allowed);
+  EXPECT_TRUE(parser.Query(1, 11).simple_field());
+
+  // Query message 2 fields.
+  EXPECT_FALSE(parser.Query(2, 0).allowed);
+  EXPECT_FALSE(parser.Query(2, 1).allowed);
+  EXPECT_TRUE(parser.Query(2, 2).allowed);
+  EXPECT_EQ(parser.Query(2, 2).nested_msg_index, 3u);
+  EXPECT_FALSE(parser.Query(2, 4).allowed);
+
+  // Query message 3 fields.
+  EXPECT_FALSE(parser.Query(3, 0).allowed);
+  EXPECT_FALSE(parser.Query(3, 1).allowed);
+  EXPECT_TRUE(parser.Query(3, 2).allowed);
+  EXPECT_EQ(parser.Query(3, 2).nested_msg_index, 2u);
+  EXPECT_FALSE(parser.Query(3, 4).allowed);
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/filter_util.cc b/src/libtracing/protozero_src/filtering/filter_util.cc
new file mode 100644
index 000000000..e7ee9bc4f
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_util.cc
@@ -0,0 +1,426 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/protozero/filtering/filter_util.h"
+
+#include <algorithm>
+#include <deque>
+#include <map>
+#include <memory>
+#include <set>
+
+#include <google/protobuf/compiler/importer.h>
+
+#include "perfetto/base/build_config.h"
+#include "perfetto/ext/base/file_utils.h"
+#include "perfetto/ext/base/getopt.h"
+#include "perfetto/ext/base/string_utils.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "src/protozero/filtering/filter_bytecode_generator.h"
+#include "src/protozero/filtering/filter_bytecode_parser.h"
+
+namespace protozero {
+
+namespace {
+
+class MultiFileErrorCollectorImpl
+    : public google::protobuf::compiler::MultiFileErrorCollector {
+ public:
+  ~MultiFileErrorCollectorImpl() override;
+  void AddError(const std::string&, int, int, const std::string&) override;
+  void AddWarning(const std::string&, int, int, const std::string&) override;
+};
+
+MultiFileErrorCollectorImpl::~MultiFileErrorCollectorImpl() = default;
+
+void MultiFileErrorCollectorImpl::AddError(const std::string& filename,
+                                           int line,
+                                           int column,
+                                           const std::string& message) {
+  PERFETTO_ELOG("Error %s %d:%d: %s", filename.c_str(), line, column,
+                message.c_str());
+}
+
+void MultiFileErrorCollectorImpl::AddWarning(const std::string& filename,
+                                             int line,
+                                             int column,
+                                             const std::string& message) {
+  PERFETTO_ELOG("Warning %s %d:%d: %s", filename.c_str(), line, column,
+                message.c_str());
+}
+
+}  // namespace
+
+FilterUtil::FilterUtil() = default;
+FilterUtil::~FilterUtil() = default;
+
+bool FilterUtil::LoadMessageDefinition(
+    const std::string& proto_file,
+    const std::string& root_message,
+    const std::string& proto_dir_path,
+    const std::set<std::string>& passthrough_fields,
+    const std::set<std::string>& string_filter_fields) {
+  passthrough_fields_ = passthrough_fields;
+  passthrough_fields_seen_.clear();
+  filter_string_fields_ = string_filter_fields;
+  filter_string_fields_seen_.clear();
+
+  // The protobuf compiler doesn't like backslashes and prints an error like:
+  // Error C:\it7mjanpw3\perfetto-a16500 -1:0: Backslashes, consecutive slashes,
+  // ".", or ".." are not allowed in the virtual path.
+  // Given that C:\foo\bar is a legit path on windows, fix it at this level
+  // because the problem is really the protobuf compiler being too picky.
+  static auto normalize_for_win = [](const std::string& path) {
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    return perfetto::base::ReplaceAll(path, "\\", "/");
+#else
+    return path;
+#endif
+  };
+
+  google::protobuf::compiler::DiskSourceTree dst;
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  // If the path is absolute, maps "C:/" -> "C:/" (without hardcoding 'C').
+  if (proto_file.size() > 3 && proto_file[1] == ':') {
+    char win_drive[4]{proto_file[0], ':', '/', '\0'};
+    dst.MapPath(win_drive, win_drive);
+  }
+#endif
+  dst.MapPath("/", "/");  // We might still need this on Win under cygwin.
+  dst.MapPath("", normalize_for_win(proto_dir_path));
+  MultiFileErrorCollectorImpl mfe;
+  google::protobuf::compiler::Importer importer(&dst, &mfe);
+  const google::protobuf::FileDescriptor* root_file =
+      importer.Import(normalize_for_win(proto_file));
+  const google::protobuf::Descriptor* root_msg = nullptr;
+  if (!root_message.empty()) {
+    root_msg = importer.pool()->FindMessageTypeByName(root_message);
+  } else if (root_file->message_type_count() > 0) {
+    // The user didn't specfy the root type. Pick the first type in the file,
+    // most times it's the right guess.
+    root_msg = root_file->message_type(0);
+    if (root_msg)
+      PERFETTO_LOG(
+          "The guessed root message name is \"%s\". Pass -r com.MyName to "
+          "override",
+          root_msg->full_name().c_str());
+  }
+
+  if (!root_msg) {
+    PERFETTO_ELOG("Could not find the root message \"%s\" in %s",
+                  root_message.c_str(), proto_file.c_str());
+    return false;
+  }
+
+  // |descriptors_by_full_name| is passed by argument rather than being a member
+  // field so that we don't risk leaving it out of sync (and depending on it in
+  // future without realizing) when performing the Dedupe() pass.
+  DescriptorsByNameMap descriptors_by_full_name;
+  ParseProtoDescriptor(root_msg, &descriptors_by_full_name);
+
+  // If the user specified a set of fields to pass through, print an error and
+  // fail if any of the passed fields have not been seen while recursing in the
+  // schema. This is to avoid typos or naming changes to be silently ignored.
+  std::vector<std::string> unused;
+  std::set_difference(passthrough_fields_.begin(), passthrough_fields_.end(),
+                      passthrough_fields_seen_.begin(),
+                      passthrough_fields_seen_.end(),
+                      std::back_inserter(unused));
+  for (const std::string& message_and_field : unused) {
+    PERFETTO_ELOG("Field not found %s", message_and_field.c_str());
+  }
+  if (!unused.empty()) {
+    PERFETTO_ELOG("Passthrough syntax: perfetto.protos.MessageName:field_name");
+    return false;
+  }
+  std::set_difference(
+      filter_string_fields_.begin(), filter_string_fields_.end(),
+      filter_string_fields_seen_.begin(), filter_string_fields_seen_.end(),
+      std::back_inserter(unused));
+  for (const std::string& message_and_field : unused) {
+    PERFETTO_ELOG("Field not found %s", message_and_field.c_str());
+  }
+  if (!unused.empty()) {
+    PERFETTO_ELOG(
+        "Filter string syntax: perfetto.protos.MessageName:field_name");
+    return false;
+  }
+  return true;
+}
+
+// Generates a Message object for the given libprotobuf message descriptor.
+// Recurses as needed into nested fields.
+FilterUtil::Message* FilterUtil::ParseProtoDescriptor(
+    const google::protobuf::Descriptor* proto,
+    DescriptorsByNameMap* descriptors_by_full_name) {
+  auto descr_it = descriptors_by_full_name->find(proto->full_name());
+  if (descr_it != descriptors_by_full_name->end())
+    return descr_it->second;
+
+  descriptors_.emplace_back();
+  Message* msg = &descriptors_.back();
+  msg->full_name = proto->full_name();
+  (*descriptors_by_full_name)[msg->full_name] = msg;
+  for (int i = 0; i < proto->field_count(); ++i) {
+    const auto* proto_field = proto->field(i);
+    const uint32_t field_id = static_cast<uint32_t>(proto_field->number());
+    PERFETTO_CHECK(msg->fields.count(field_id) == 0);
+    auto& field = msg->fields[field_id];
+    field.name = proto_field->name();
+    field.type = proto_field->type_name();
+
+    std::string message_and_field = msg->full_name + ":" + field.name;
+    bool passthrough = false;
+    if (passthrough_fields_.count(message_and_field)) {
+      field.type = "bytes";
+      passthrough = true;
+      passthrough_fields_seen_.insert(message_and_field);
+    }
+    if (filter_string_fields_.count(message_and_field)) {
+      PERFETTO_CHECK(field.type == "string");
+      field.filter_string = true;
+      msg->has_filter_string_fields = true;
+      filter_string_fields_seen_.insert(message_and_field);
+    }
+    if (proto_field->message_type() && !passthrough) {
+      msg->has_nested_fields = true;
+      // Recurse.
+      field.nested_type = ParseProtoDescriptor(proto_field->message_type(),
+                                               descriptors_by_full_name);
+    }
+  }
+  return msg;
+}
+
+void FilterUtil::Dedupe() {
+  std::map<std::string /*identity*/, Message*> index;
+
+  std::map<Message*, Message*> dupe_graph;  // K,V: K shall be duped against V.
+
+  // As a first pass, generate an |identity| string for each leaf message. The
+  // identity is simply the comma-separated stringification of its field ids.
+  // If another message with the same identity exists, add an edge to the graph.
+  const size_t initial_count = descriptors_.size();
+  size_t field_count = 0;
+  for (auto& descr : descriptors_) {
+    // Dedupe only leaf messages without nested or string filter fields.
+    if (descr.has_nested_fields || descr.has_filter_string_fields)
+      continue;
+    std::string identity;
+    for (const auto& id_and_field : descr.fields)
+      identity.append(std::to_string(id_and_field.first) + ",");
+    auto it_and_inserted = index.emplace(identity, &descr);
+    if (!it_and_inserted.second) {
+      // insertion failed, a dupe exists already.
+      Message* dupe_against = it_and_inserted.first->second;
+      dupe_graph.emplace(&descr, dupe_against);
+    }
+  }
+
+  // Now apply de-duplications by re-directing the nested_type pointer to the
+  // equivalent descriptors that have the same set of allowed field ids.
+  std::set<Message*> referenced_descriptors;
+  referenced_descriptors.emplace(&descriptors_.front());  // The root.
+  for (auto& descr : descriptors_) {
+    for (auto& id_and_field : descr.fields) {
+      Message* target = id_and_field.second.nested_type;
+      if (!target)
+        continue;  // Only try to dedupe nested types.
+      auto it = dupe_graph.find(target);
+      if (it == dupe_graph.end()) {
+        referenced_descriptors.emplace(target);
+        continue;
+      }
+      ++field_count;
+      // Replace with the dupe.
+      id_and_field.second.nested_type = it->second;
+    }  // for (nested_fields).
+  }    // for (descriptors_).
+
+  // Remove unreferenced descriptors. We should much rather crash in the case of
+  // a logic bug rathern than trying to use them but don't emit them.
+  size_t removed_count = 0;
+  for (auto it = descriptors_.begin(); it != descriptors_.end();) {
+    if (referenced_descriptors.count(&*it)) {
+      ++it;
+    } else {
+      ++removed_count;
+      it = descriptors_.erase(it);
+    }
+  }
+  PERFETTO_LOG(
+      "Deduplication removed %zu duped descriptors out of %zu descriptors from "
+      "%zu fields",
+      removed_count, initial_count, field_count);
+}
+
+// Prints the list of messages and fields in a diff-friendly text format.
+void FilterUtil::PrintAsText(std::optional<std::string> filter_bytecode) {
+  using perfetto::base::StripPrefix;
+  const std::string& root_name = descriptors_.front().full_name;
+  std::string root_prefix = root_name.substr(0, root_name.rfind('.'));
+  if (!root_prefix.empty())
+    root_prefix.append(".");
+
+  FilterBytecodeParser parser;
+  if (filter_bytecode) {
+    PERFETTO_CHECK(
+        parser.Load(filter_bytecode->data(), filter_bytecode->size()));
+  }
+
+  // <Filter msg_index, Message>
+  std::deque<std::pair<uint32_t, const Message*>> queue;
+  std::set<const Message*> seen_msgs{&descriptors_.front()};
+  queue.emplace_back(0u, &descriptors_.front());
+
+  while (!queue.empty()) {
+    auto index_and_descr = queue.front();
+    queue.pop_front();
+    uint32_t msg_index = index_and_descr.first;
+    const auto& descr = *index_and_descr.second;
+
+    for (const auto& id_and_field : descr.fields) {
+      const uint32_t field_id = id_and_field.first;
+      const auto& field = id_and_field.second;
+
+      FilterBytecodeParser::QueryResult result{0, false};
+      if (filter_bytecode) {
+        result = parser.Query(msg_index, field_id);
+        if (!result.allowed) {
+          continue;
+        }
+      }
+
+      const Message* nested_type = id_and_field.second.nested_type;
+      bool passthrough = false;
+      if (nested_type) {
+        // result.simple_field might be true if the generated bytecode is
+        // passing through a whole submessage without recursing.
+        passthrough = result.allowed && result.simple_field();
+        if (seen_msgs.find(nested_type) == seen_msgs.end()) {
+          seen_msgs.insert(nested_type);
+          queue.emplace_back(result.nested_msg_index, nested_type);
+        }
+      } else {  // simple field
+        PERFETTO_CHECK(result.simple_field() || result.filter_string_field() ||
+                       !filter_bytecode);
+        PERFETTO_CHECK(result.filter_string_field() == field.filter_string ||
+                       !filter_bytecode);
+      }
+
+      auto stripped_name = StripPrefix(descr.full_name, root_prefix);
+      std::string stripped_nested =
+          nested_type ? " " + StripPrefix(nested_type->full_name, root_prefix)
+                      : "";
+      if (passthrough)
+        stripped_nested += "  # PASSTHROUGH";
+      if (field.filter_string)
+        stripped_nested += "  # FILTER STRING";
+      fprintf(print_stream_, "%-60s %3u %-8s %-32s%s\n", stripped_name.c_str(),
+              field_id, field.type.c_str(), field.name.c_str(),
+              stripped_nested.c_str());
+    }
+  }
+}
+
+std::string FilterUtil::GenerateFilterBytecode() {
+  protozero::FilterBytecodeGenerator bytecode_gen;
+
+  // Assign indexes to descriptors, simply by counting them in order;
+  std::map<Message*, uint32_t> descr_to_idx;
+  for (auto& descr : descriptors_)
+    descr_to_idx[&descr] = static_cast<uint32_t>(descr_to_idx.size());
+
+  for (auto& descr : descriptors_) {
+    for (auto it = descr.fields.begin(); it != descr.fields.end();) {
+      uint32_t field_id = it->first;
+      const Message::Field& field = it->second;
+      if (field.nested_type) {
+        // Append the index of the target submessage.
+        PERFETTO_CHECK(descr_to_idx.count(field.nested_type));
+        uint32_t nested_msg_index = descr_to_idx[field.nested_type];
+        bytecode_gen.AddNestedField(field_id, nested_msg_index);
+        ++it;
+        continue;
+      }
+      if (field.filter_string) {
+        bytecode_gen.AddFilterStringField(field_id);
+        ++it;
+        continue;
+      }
+      // Simple field. Lookahead to see if we have a range of contiguous simple
+      // fields.
+      for (uint32_t range_len = 1;; ++range_len) {
+        ++it;
+        if (it != descr.fields.end() && it->first == field_id + range_len &&
+            it->second.is_simple()) {
+          continue;
+        }
+        // At this point it points to either the end() of the vector or a
+        // non-contiguous or non-simple field (which will be picked up by the
+        // next iteration).
+        if (range_len == 1) {
+          bytecode_gen.AddSimpleField(field_id);
+        } else {
+          bytecode_gen.AddSimpleFieldRange(field_id, range_len);
+        }
+        break;
+      }  // for (range_len)
+    }    // for (descr.fields)
+    bytecode_gen.EndMessage();
+  }  // for (descriptors)
+  return bytecode_gen.Serialize();
+}
+
+std::string FilterUtil::LookupField(const std::string& varint_encoded_path) {
+  const uint8_t* ptr =
+      reinterpret_cast<const uint8_t*>(varint_encoded_path.data());
+  const uint8_t* const end = ptr + varint_encoded_path.size();
+
+  std::vector<uint32_t> fields;
+  while (ptr < end) {
+    uint64_t varint;
+    const uint8_t* next = proto_utils::ParseVarInt(ptr, end, &varint);
+    PERFETTO_CHECK(next != ptr);
+    fields.emplace_back(static_cast<uint32_t>(varint));
+    ptr = next;
+  }
+  return LookupField(fields.data(), fields.size());
+}
+
+std::string FilterUtil::LookupField(const uint32_t* field_ids,
+                                    size_t num_fields) {
+  const Message* msg = descriptors_.empty() ? nullptr : &descriptors_.front();
+  std::string res;
+  for (size_t i = 0; i < num_fields; ++i) {
+    const uint32_t field_id = field_ids[i];
+    const Message::Field* field = nullptr;
+    if (msg) {
+      auto it = msg->fields.find(field_id);
+      field = it == msg->fields.end() ? nullptr : &it->second;
+    }
+    res.append(".");
+    if (field) {
+      res.append(field->name);
+      msg = field->nested_type;
+    } else {
+      res.append(std::to_string(field_id));
+    }
+  }
+  return res;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/filter_util.h b/src/libtracing/protozero_src/filtering/filter_util.h
new file mode 100644
index 000000000..a8936dfca
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_util.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_FILTERING_FILTER_UTIL_H_
+#define SRC_PROTOZERO_FILTERING_FILTER_UTIL_H_
+
+#include <stdint.h>
+
+#include <list>
+#include <map>
+#include <optional>
+#include <set>
+#include <string>
+
+// We include this intentionally instead of forward declaring to allow
+// for an easy find/replace transformation when moving to Google3.
+#include <google/protobuf/descriptor.h>
+
+namespace protozero {
+
+// Parses a .proto message definition, recursing into its sub-messages, and
+// builds up a set of Messages and Field definitions.
+// Depends on libprotobuf-full and should be used only in host tools.
+// See the //tools/proto_filter for an executable that wraps this class with
+// a cmdline interface.
+class FilterUtil {
+ public:
+  FilterUtil();
+  ~FilterUtil();
+
+  // Loads a message schema from a .proto file, recursing into nested types.
+  // Args:
+  // proto_file: path to the .proto file.
+  // root_message: fully qualified message name (e.g., perfetto.protos.Trace).
+  //     If empty, the first message in the file will be used.
+  // proto_dir_path: the root for .proto includes. If empty uses CWD.
+  // passthrough: an optional set of fields that should be transparently passed
+  //     through without recursing further.
+  //     Syntax: "perfetto.protos.TracePacket:trace_config"
+  // filter_string_fields: an optional set of fields that should be treated as
+  //     string fields which need to be filtered.
+  //     Syntax: same as passthrough
+  bool LoadMessageDefinition(
+      const std::string& proto_file,
+      const std::string& root_message,
+      const std::string& proto_dir_path,
+      const std::set<std::string>& passthrough_fields = {},
+      const std::set<std::string>& filter_string_fields = {});
+
+  // Deduplicates leaf messages having the same sets of field ids.
+  // It changes the internal state and affects the behavior of next calls to
+  // GenerateFilterBytecode() and PrintAsText().
+  void Dedupe();
+
+  // Generates the filter bytecode for the root message previously loaded by
+  // LoadMessageDefinition() using FilterBytecodeGenerator.
+  // The returned string is a binary-encoded proto message of type
+  // perfetto.protos.ProtoFilter (see proto_filter.proto).
+  std::string GenerateFilterBytecode();
+
+  // Prints the list of messages and fields onto stdout in a diff-friendly text
+  // format. Example:
+  // PowerRails                 2 message  energy_data     PowerRails.EnergyData
+  // PowerRails.RailDescriptor  1 uint32   index
+  // If the optional bytecode filter is given, only the fields allowed by the
+  // bytecode are printed.
+  void PrintAsText(std::optional<std::string> filter_bytecode = {});
+
+  // Resolves an array of field ids into a dot-concatenated field names.
+  // E.g., [2,5,1] -> ".trace.packet.timestamp".
+  std::string LookupField(const uint32_t* field_ids, size_t num_fields);
+
+  // Like the above but the array of field is passed as a buffer containing
+  // varints, e.g. "\x02\x05\0x01".
+  std::string LookupField(const std::string& varint_encoded_path);
+
+  void set_print_stream_for_testing(FILE* stream) { print_stream_ = stream; }
+
+ private:
+  struct Message {
+    struct Field {
+      std::string name;
+      std::string type;  // "uint32", "string", "message"
+      bool filter_string;
+      // Only when type == "message". Note that when using Dedupe() this can
+      // be aliased against a different submessage which happens to have the
+      // same set of field ids.
+      Message* nested_type = nullptr;
+
+      bool is_simple() const {
+        return nested_type == nullptr && !filter_string;
+      }
+    };
+    std::string full_name;  // e.g., "perfetto.protos.Foo.Bar";
+    std::map<uint32_t /*field_id*/, Field> fields;
+
+    // True if at least one field has a non-null |nestd_type|.
+    bool has_nested_fields = false;
+
+    // True if at least one field has |filter_string|==true.
+    bool has_filter_string_fields = false;
+  };
+
+  using DescriptorsByNameMap = std::map<std::string, Message*>;
+  Message* ParseProtoDescriptor(const google::protobuf::Descriptor*,
+                                DescriptorsByNameMap*);
+
+  // list<> because pointers need to be stable.
+  std::list<Message> descriptors_;
+  std::set<std::string> passthrough_fields_;
+  std::set<std::string> filter_string_fields_;
+
+  // Used only for debugging aid, to print out an error message when the user
+  // specifies a field to pass through but it doesn't exist.
+  std::set<std::string> passthrough_fields_seen_;
+  std::set<std::string> filter_string_fields_seen_;
+
+  FILE* print_stream_ = stdout;
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_FILTERING_FILTER_UTIL_H_
diff --git a/src/libtracing/protozero_src/filtering/filter_util_unittest.cc b/src/libtracing/protozero_src/filtering/filter_util_unittest.cc
new file mode 100644
index 000000000..831e4f456
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/filter_util_unittest.cc
@@ -0,0 +1,381 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "test/gtest_and_gmock.h"
+
+#include "perfetto/ext/base/file_utils.h"
+#include "perfetto/ext/base/temp_file.h"
+#include "src/protozero/filtering/filter_bytecode_parser.h"
+#include "src/protozero/filtering/filter_util.h"
+
+#include <regex>
+
+namespace protozero {
+
+namespace {
+
+perfetto::base::TempFile MkTemp(const char* str) {
+  auto tmp = perfetto::base::TempFile::Create();
+  perfetto::base::WriteAll(*tmp, str, strlen(str));
+  perfetto::base::FlushFile(*tmp);
+  return tmp;
+}
+
+std::string FilterToText(FilterUtil& filter,
+                         std::optional<std::string> bytecode = {}) {
+  std::string tmp_path = perfetto::base::TempFile::Create().path();
+  {
+    perfetto::base::ScopedFstream tmp_stream(fopen(tmp_path.c_str(), "wb"));
+    PERFETTO_CHECK(!!tmp_stream);
+    filter.set_print_stream_for_testing(*tmp_stream);
+    filter.PrintAsText(bytecode);
+    filter.set_print_stream_for_testing(stdout);
+  }
+  std::string output;
+  PERFETTO_CHECK(perfetto::base::ReadFile(tmp_path, &output));
+  // Make the output a bit more compact.
+  output = std::regex_replace(output, std::regex(" +"), " ");
+  return std::regex_replace(output, std::regex(" +\\n"), "\n");
+}
+
+TEST(SchemaParserTest, SchemaToBytecode_Simple) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    optional int32 i32 = 13;
+    optional fixed64 f64 = 5;
+    optional string str = 71;
+  }
+  )");
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "Root", ""));
+  std::string bytecode = filter.GenerateFilterBytecode();
+  FilterBytecodeParser fbp;
+  ASSERT_TRUE(fbp.Load(bytecode.data(), bytecode.size()));
+  EXPECT_TRUE(fbp.Query(0, 13).allowed);
+  EXPECT_TRUE(fbp.Query(0, 13).simple_field());
+  EXPECT_TRUE(fbp.Query(0, 5).allowed);
+  EXPECT_TRUE(fbp.Query(0, 5).simple_field());
+  EXPECT_TRUE(fbp.Query(0, 71).allowed);
+  EXPECT_TRUE(fbp.Query(0, 71).simple_field());
+  EXPECT_FALSE(fbp.Query(0, 1).allowed);
+  EXPECT_FALSE(fbp.Query(0, 12).allowed);
+  EXPECT_FALSE(fbp.Query(0, 70).allowed);
+}
+
+TEST(SchemaParserTest, SchemaToBytecode_Nested) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    message Child {
+      repeated fixed64 f64 = 3;
+      optional Child recurse = 4;
+    }
+    oneof xxx { int32 i32 = 1; }
+    optional Child chld = 2;
+  }
+  )");
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "", ""));
+  std::string bytecode = filter.GenerateFilterBytecode();
+  FilterBytecodeParser fbp;
+  ASSERT_TRUE(fbp.Load(bytecode.data(), bytecode.size()));
+  EXPECT_TRUE(fbp.Query(0, 1).allowed);
+  EXPECT_TRUE(fbp.Query(0, 1).simple_field());
+  EXPECT_TRUE(fbp.Query(0, 2).allowed);
+  EXPECT_FALSE(fbp.Query(0, 2).simple_field());
+  // False as those fields exist only in Child, not in the root (0).
+  EXPECT_FALSE(fbp.Query(0, 3).allowed);
+  EXPECT_FALSE(fbp.Query(0, 4).allowed);
+
+  EXPECT_TRUE(fbp.Query(1, 3).allowed);
+  EXPECT_TRUE(fbp.Query(1, 3).simple_field());
+  EXPECT_TRUE(fbp.Query(1, 4).allowed);
+  EXPECT_FALSE(fbp.Query(1, 4).simple_field());
+  EXPECT_EQ(fbp.Query(1, 4).nested_msg_index, 1u);  // Self
+}
+
+TEST(SchemaParserTest, SchemaToBytecode_Dedupe) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    message Nested {
+      message Child1 {
+        optional int32 f1 = 3;
+        optional int64 f2 = 4;
+      }
+      message Child2 {
+        optional string f1 = 3;
+        optional bytes f2 = 4;
+      }
+      message ChildNonDedupe {
+        optional string f1 = 3;
+        optional bytes f2 = 4;
+        optional int32 extra = 1;
+      }
+      optional Child1 chld1 = 1;
+      optional Child2 chld2 = 2;
+      optional ChildNonDedupe chld3 = 3;
+    }
+    repeated Nested nested = 1;
+  }
+  )");
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "Root", ""));
+  filter.Dedupe();
+  std::string bytecode = filter.GenerateFilterBytecode();
+  FilterBytecodeParser fbp;
+  ASSERT_TRUE(fbp.Load(bytecode.data(), bytecode.size()));
+
+  // 0: Root
+  EXPECT_TRUE(fbp.Query(0, 1).allowed);
+  EXPECT_FALSE(fbp.Query(0, 1).simple_field());
+
+  // 1: Nested
+  EXPECT_TRUE(fbp.Query(1, 1).allowed);
+  EXPECT_FALSE(fbp.Query(1, 1).simple_field());
+  EXPECT_TRUE(fbp.Query(1, 2).allowed);
+  EXPECT_FALSE(fbp.Query(1, 2).simple_field());
+  EXPECT_TRUE(fbp.Query(1, 3).allowed);
+  EXPECT_FALSE(fbp.Query(1, 3).simple_field());
+
+  // Check deduping.
+  // Fields chld1 and chld2 should point to the same sub-filter because they
+  // have the same field ids.
+  EXPECT_EQ(fbp.Query(1, 1).nested_msg_index, fbp.Query(1, 2).nested_msg_index);
+
+  // Field chld3 should point to a different one because it has an extra field.
+  EXPECT_NE(fbp.Query(1, 1).nested_msg_index, fbp.Query(1, 3).nested_msg_index);
+}
+
+TEST(SchemaParserTest, FieldLookup) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    message Nested {
+      message Child1 {
+        optional int32 f1 = 3;
+        optional int64 f2 = 4;
+        repeated Child2 c2 = 5;
+      }
+      message Child2 {
+        optional string f3 = 6;
+        optional bytes f4 = 7;
+        repeated Child1 c1 = 8;
+      }
+      optional Child1 x1 = 1;
+      optional Child2 x2 = 2;
+    }
+    repeated Nested n = 1;
+  }
+  )");
+
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "Root", ""));
+  std::vector<uint32_t> fld;
+
+  fld = {1, 1, 3};
+  ASSERT_EQ(filter.LookupField(fld.data(), fld.size()), ".n.x1.f1");
+
+  fld = {1, 2, 7};
+  ASSERT_EQ(filter.LookupField(fld.data(), fld.size()), ".n.x2.f4");
+
+  fld = {1, 2, 8, 5, 8, 5, 7};
+  ASSERT_EQ(filter.LookupField(fld.data(), fld.size()), ".n.x2.c1.c2.c1.c2.f4");
+}
+
+TEST(SchemaParserTest, PrintAsText) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    optional int32 i32 = 13;
+    optional Child1 c1 = 2;
+    optional Child2 c2 = 7;
+  }
+  message Child1 {
+    optional int32 f1 = 3;
+    optional int64 f2 = 4;
+  }
+  message Child2 {
+    optional int32 f1 = 3;
+    optional int64 f2 = 4;
+    repeated Root c1 = 5;
+    repeated Nested n1 = 6;
+    message Nested {
+      optional int64 f1 = 1;
+    }
+  }
+  )");
+
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "Root", ""));
+
+  EXPECT_EQ(R"(Root 2 message c1 Child1
+Root 7 message c2 Child2
+Root 13 int32 i32
+Child1 3 int32 f1
+Child1 4 int64 f2
+Child2 3 int32 f1
+Child2 4 int64 f2
+Child2 5 message c1 Root
+Child2 6 message n1 Child2.Nested
+Child2.Nested 1 int64 f1
+)",
+            FilterToText(filter));
+
+  // If we generate bytecode from the schema itself, all fields are allowed and
+  // the result is identical to the unfiltered output.
+  EXPECT_EQ(FilterToText(filter),
+            FilterToText(filter, filter.GenerateFilterBytecode()));
+}
+
+TEST(SchemaParserTest, PrintAsTextWithBytecodeFiltering) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    optional int32 i32 = 13;
+    optional Child1 c1 = 2;
+    optional Child2 c2 = 7;
+  }
+  message Child1 {
+    optional int32 f1 = 3;
+    optional int64 f2 = 4;
+  }
+  message Child2 {
+    optional int32 f1 = 3;
+    optional int64 f2 = 4;
+    repeated Root c1 = 5;
+    repeated Nested n1 = 6;
+    message Nested {
+      optional int64 f1 = 1;
+    }
+  }
+  )");
+
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "Root", ""));
+
+  auto schema_subset = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    optional Child2 c2 = 7;
+  }
+  message Child1 {
+    optional int32 f1 = 3;
+    optional int64 f2 = 4;
+  }
+  message Child2 {
+    optional int64 f2 = 4;
+    repeated Root c1 = 5;
+    repeated Nested n1 = 6;
+    message Nested {
+      optional int64 f1 = 1;
+    }
+  }
+  )");
+
+  FilterUtil filter_subset;
+  ASSERT_TRUE(
+      filter_subset.LoadMessageDefinition(schema_subset.path(), "Root", ""));
+  std::string bytecode = filter_subset.GenerateFilterBytecode();
+
+  // Note: Child1 isn't listed even though the filter allows it, because it
+  // isn't reachable from the root message.
+  EXPECT_EQ(R"(Root 7 message c2 Child2
+Child2 4 int64 f2
+Child2 5 message c1 Root
+Child2 6 message n1 Child2.Nested
+Child2.Nested 1 int64 f1
+)",
+            FilterToText(filter, bytecode));
+}
+
+TEST(SchemaParserTest, Passthrough) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    optional int32 i32 = 13;
+    optional TracePacket packet = 7;
+  }
+  message TraceConfig {
+    optional int32 f3 = 3;
+    optional int64 f4 = 4;
+  }
+  message TracePacket {
+    optional int32 f1 = 3;
+    optional int64 f2 = 4;
+    optional TraceConfig cfg = 5;
+  }
+  )");
+
+  FilterUtil filter;
+  std::set<std::string> passthrough{"TracePacket:cfg"};
+  ASSERT_TRUE(
+      filter.LoadMessageDefinition(schema.path(), "Root", "", passthrough));
+
+  EXPECT_EQ(R"(Root 7 message packet TracePacket
+Root 13 int32 i32
+TracePacket 3 int32 f1
+TracePacket 4 int64 f2
+TracePacket 5 bytes cfg
+)",
+            FilterToText(filter));
+
+  std::string bytecode = filter.GenerateFilterBytecode();
+  // If we generate bytecode from the schema itself, all fields are allowed and
+  // the result is identical to the unfiltered output.
+  EXPECT_EQ(FilterToText(filter), FilterToText(filter, bytecode));
+}
+
+TEST(SchemaParserTest, FilterString) {
+  auto schema = MkTemp(R"(
+  syntax = "proto2";
+  message Root {
+    optional int32 i32 = 13;
+    optional TracePacket packet = 7;
+  }
+  message TraceConfig {
+    optional string f1 = 1;
+  }
+  message TracePacket {
+    optional int32 f1 = 3;
+    optional int64 f2 = 4;
+    optional TraceConfig cfg = 5;
+  }
+  )");
+
+  FilterUtil filter;
+  std::set<std::string> filter_string{"TraceConfig:f1"};
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "Root", "", {},
+                                           filter_string));
+
+  EXPECT_EQ(R"(Root 7 message packet TracePacket
+Root 13 int32 i32
+TracePacket 3 int32 f1
+TracePacket 4 int64 f2
+TracePacket 5 message cfg TraceConfig
+TraceConfig 1 string f1 # FILTER STRING
+)",
+            FilterToText(filter));
+
+  std::string bytecode = filter.GenerateFilterBytecode();
+  // If we generate bytecode from the schema itself, all fields are allowed and
+  // the result is identical to the unfiltered output.
+  EXPECT_EQ(FilterToText(filter), FilterToText(filter, bytecode));
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/message_filter.cc b/src/libtracing/protozero_src/filtering/message_filter.cc
new file mode 100644
index 000000000..44df200c4
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/message_filter.cc
@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/protozero/filtering/message_filter.h"
+
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "src/protozero/filtering/string_filter.h"
+
+namespace protozero {
+
+namespace {
+
+// Inline helpers to append proto fields in output. They are the equivalent of
+// the protozero::Message::AppendXXX() fields but don't require building and
+// maintaining a full protozero::Message object or dealing with scattered
+// output slices.
+// All these functions assume there is enough space in the output buffer, which
+// should be always the case assuming that we don't end up generating more
+// output than input.
+
+inline void AppendVarInt(uint32_t field_id, uint64_t value, uint8_t** out) {
+  *out = proto_utils::WriteVarInt(proto_utils::MakeTagVarInt(field_id), *out);
+  *out = proto_utils::WriteVarInt(value, *out);
+}
+
+// For fixed32 / fixed64.
+template <typename INT_T /* uint32_t | uint64_t*/>
+inline void AppendFixed(uint32_t field_id, INT_T value, uint8_t** out) {
+  *out = proto_utils::WriteVarInt(proto_utils::MakeTagFixed<INT_T>(field_id),
+                                  *out);
+  memcpy(*out, &value, sizeof(value));
+  *out += sizeof(value);
+}
+
+// For length-delimited (string, bytes) fields. Note: this function appends only
+// the proto preamble and the varint field that states the length of the payload
+// not the payload itself.
+// In the case of submessages, the caller needs to re-write the length at the
+// end in the in the returned memory area.
+// The problem here is that, because of filtering, the length of a submessage
+// might be < original length (the original length is still an upper-bound).
+// Returns a pair with: (1) the pointer where the final length should be written
+// into, (2) the length of the size field.
+// The caller must write a redundant varint to match the original size (i.e.
+// needs to use WriteRedundantVarInt()).
+inline std::pair<uint8_t*, uint32_t> AppendLenDelim(uint32_t field_id,
+                                                    uint32_t len,
+                                                    uint8_t** out) {
+  *out = proto_utils::WriteVarInt(proto_utils::MakeTagLengthDelimited(field_id),
+                                  *out);
+  uint8_t* size_field_start = *out;
+  *out = proto_utils::WriteVarInt(len, *out);
+  const size_t size_field_len = static_cast<size_t>(*out - size_field_start);
+  return std::make_pair(size_field_start, size_field_len);
+}
+}  // namespace
+
+MessageFilter::MessageFilter(Config config) : config_(std::move(config)) {
+  // Push a state on the stack for the implicit root message.
+  stack_.emplace_back();
+}
+
+MessageFilter::MessageFilter() : MessageFilter(Config()) {}
+
+MessageFilter::~MessageFilter() = default;
+
+bool MessageFilter::Config::LoadFilterBytecode(const void* filter_data,
+                                               size_t len) {
+  return filter_.Load(filter_data, len);
+}
+
+bool MessageFilter::Config::SetFilterRoot(
+    std::initializer_list<uint32_t> field_ids) {
+  uint32_t root_msg_idx = 0;
+  for (uint32_t field_id : field_ids) {
+    auto res = filter_.Query(root_msg_idx, field_id);
+    if (!res.allowed || !res.nested_msg_field())
+      return false;
+    root_msg_idx = res.nested_msg_index;
+  }
+  root_msg_index_ = root_msg_idx;
+  return true;
+}
+
+MessageFilter::FilteredMessage MessageFilter::FilterMessageFragments(
+    const InputSlice* slices,
+    size_t num_slices) {
+  // First compute the upper bound for the output. The filtered message cannot
+  // be > the original message.
+  uint32_t total_len = 0;
+  for (size_t i = 0; i < num_slices; ++i)
+    total_len += slices[i].len;
+  out_buf_.reset(new uint8_t[total_len]);
+  out_ = out_buf_.get();
+  out_end_ = out_ + total_len;
+
+  // Reset the parser state.
+  tokenizer_ = MessageTokenizer();
+  error_ = false;
+  stack_.clear();
+  stack_.resize(2);
+  // stack_[0] is a sentinel and should never be hit in nominal cases. If we
+  // end up there we will just keep consuming the input stream and detecting
+  // at the end, without hurting the fastpath.
+  stack_[0].in_bytes_limit = UINT32_MAX;
+  stack_[0].eat_next_bytes = UINT32_MAX;
+  // stack_[1] is the actual root message.
+  stack_[1].in_bytes_limit = total_len;
+  stack_[1].msg_index = config_.root_msg_index();
+
+  // Process the input data and write the output.
+  for (size_t slice_idx = 0; slice_idx < num_slices; ++slice_idx) {
+    const InputSlice& slice = slices[slice_idx];
+    const uint8_t* data = static_cast<const uint8_t*>(slice.data);
+    for (size_t i = 0; i < slice.len; ++i)
+      FilterOneByte(data[i]);
+  }
+
+  // Construct the output object.
+  PERFETTO_CHECK(out_ >= out_buf_.get() && out_ <= out_end_);
+  auto used_size = static_cast<size_t>(out_ - out_buf_.get());
+  FilteredMessage res{std::move(out_buf_), used_size};
+  res.error = error_;
+  if (stack_.size() != 1 || !tokenizer_.idle() ||
+      stack_[0].in_bytes != total_len) {
+    res.error = true;
+  }
+  return res;
+}
+
+void MessageFilter::FilterOneByte(uint8_t octet) {
+  PERFETTO_DCHECK(!stack_.empty());
+
+  auto* state = &stack_.back();
+  StackState next_state{};
+  bool push_next_state = false;
+
+  if (state->eat_next_bytes > 0) {
+    // This is the case where the previous tokenizer_.Push() call returned a
+    // length delimited message which is NOT a submessage (a string or a bytes
+    // field). We just want to consume it, and pass it through/filter strings
+    // if the field was allowed.
+    --state->eat_next_bytes;
+    if (state->action == StackState::kPassthrough) {
+      *(out_++) = octet;
+    } else if (state->action == StackState::kFilterString) {
+      *(out_++) = octet;
+      if (state->eat_next_bytes == 0) {
+        config_.string_filter().MaybeFilter(
+            reinterpret_cast<char*>(state->filter_string_ptr),
+            static_cast<size_t>(out_ - state->filter_string_ptr));
+      }
+    }
+  } else {
+    MessageTokenizer::Token token = tokenizer_.Push(octet);
+    // |token| will not be valid() in most cases and this is WAI. When pushing
+    // a varint field, only the last byte yields a token, all the other bytes
+    // return an invalid token, they just update the internal tokenizer state.
+    if (token.valid()) {
+      auto filter = config_.filter().Query(state->msg_index, token.field_id);
+      switch (token.type) {
+        case proto_utils::ProtoWireType::kVarInt:
+          if (filter.allowed && filter.simple_field())
+            AppendVarInt(token.field_id, token.value, &out_);
+          break;
+        case proto_utils::ProtoWireType::kFixed32:
+          if (filter.allowed && filter.simple_field())
+            AppendFixed(token.field_id, static_cast<uint32_t>(token.value),
+                        &out_);
+          break;
+        case proto_utils::ProtoWireType::kFixed64:
+          if (filter.allowed && filter.simple_field())
+            AppendFixed(token.field_id, static_cast<uint64_t>(token.value),
+                        &out_);
+          break;
+        case proto_utils::ProtoWireType::kLengthDelimited:
+          // Here we have two cases:
+          // A. A simple string/bytes field: we just want to consume the next
+          //    bytes (the string payload), optionally passing them through in
+          //    output if the field is allowed.
+          // B. This is a nested submessage. In this case we want to recurse and
+          //    push a new state on the stack.
+          // Note that we can't tell the difference between a
+          // "non-allowed string" and a "non-allowed submessage". But it doesn't
+          // matter because in both cases we just want to skip the next N bytes.
+          const auto submessage_len = static_cast<uint32_t>(token.value);
+          auto in_bytes_left = state->in_bytes_limit - state->in_bytes - 1;
+          if (PERFETTO_UNLIKELY(submessage_len > in_bytes_left)) {
+            // This is a malicious / malformed string/bytes/submessage that
+            // claims to be larger than the outer message that contains it.
+            return SetUnrecoverableErrorState();
+          }
+
+          if (filter.allowed && filter.nested_msg_field() &&
+              submessage_len > 0) {
+            // submessage_len == 0 is the edge case of a message with a 0-len
+            // (but present) submessage. In this case, if allowed, we don't want
+            // to push any further state (doing so would desync the FSM) but we
+            // still want to emit it.
+            // At this point |submessage_len| is only an upper bound. The
+            // final message written in output can be <= the one in input,
+            // only some of its fields might be allowed (also remember that
+            // this class implicitly removes redundancy varint encoding of
+            // len-delimited field lengths). The final length varint (the
+            // return value of AppendLenDelim()) will be filled when popping
+            // from |stack_|.
+            auto size_field =
+                AppendLenDelim(token.field_id, submessage_len, &out_);
+            push_next_state = true;
+            next_state.field_id = token.field_id;
+            next_state.msg_index = filter.nested_msg_index;
+            next_state.in_bytes_limit = submessage_len;
+            next_state.size_field = size_field.first;
+            next_state.size_field_len = size_field.second;
+            next_state.out_bytes_written_at_start = out_written();
+          } else {
+            // A string or bytes field, or a 0 length submessage.
+            state->eat_next_bytes = submessage_len;
+            if (filter.allowed && filter.filter_string_field()) {
+              state->action = StackState::kFilterString;
+              AppendLenDelim(token.field_id, submessage_len, &out_);
+              state->filter_string_ptr = out_;
+            } else if (filter.allowed) {
+              state->action = StackState::kPassthrough;
+              AppendLenDelim(token.field_id, submessage_len, &out_);
+            } else {
+              state->action = StackState::kDrop;
+            }
+          }
+          break;
+      }  // switch(type)
+
+      if (PERFETTO_UNLIKELY(track_field_usage_)) {
+        IncrementCurrentFieldUsage(token.field_id, filter.allowed);
+      }
+    }  // if (token.valid)
+  }    // if (eat_next_bytes == 0)
+
+  ++state->in_bytes;
+  while (state->in_bytes >= state->in_bytes_limit) {
+    PERFETTO_DCHECK(state->in_bytes == state->in_bytes_limit);
+    push_next_state = false;
+
+    // We can't possibly write more than we read.
+    const uint32_t msg_bytes_written = static_cast<uint32_t>(
+        out_written() - state->out_bytes_written_at_start);
+    PERFETTO_DCHECK(msg_bytes_written <= state->in_bytes_limit);
+
+    // Backfill the length field of the
+    proto_utils::WriteRedundantVarInt(msg_bytes_written, state->size_field,
+                                      state->size_field_len);
+
+    const uint32_t in_bytes_processes_for_last_msg = state->in_bytes;
+    stack_.pop_back();
+    PERFETTO_CHECK(!stack_.empty());
+    state = &stack_.back();
+    state->in_bytes += in_bytes_processes_for_last_msg;
+    if (PERFETTO_UNLIKELY(!tokenizer_.idle())) {
+      // If we hit this case, it means that we got to the end of a submessage
+      // while decoding a field. We can't recover from this and we don't want to
+      // propagate a broken sub-message.
+      return SetUnrecoverableErrorState();
+    }
+  }
+
+  if (push_next_state) {
+    PERFETTO_DCHECK(tokenizer_.idle());
+    stack_.emplace_back(std::move(next_state));
+    state = &stack_.back();
+  }
+}
+
+void MessageFilter::SetUnrecoverableErrorState() {
+  error_ = true;
+  stack_.clear();
+  stack_.resize(1);
+  auto& state = stack_[0];
+  state.eat_next_bytes = UINT32_MAX;
+  state.in_bytes_limit = UINT32_MAX;
+  state.action = StackState::kDrop;
+  out_ = out_buf_.get();  // Reset the write pointer.
+}
+
+void MessageFilter::IncrementCurrentFieldUsage(uint32_t field_id,
+                                               bool allowed) {
+  // Slowpath. Used mainly in offline tools and tests to workout used fields in
+  // a proto.
+  PERFETTO_DCHECK(track_field_usage_);
+
+  // Field path contains a concatenation of varints, one for each nesting level.
+  // e.g. y in message Root { Sub x = 2; }; message Sub { SubSub y = 7; }
+  // is encoded as [varint(2) + varint(7)].
+  // We use varint to take the most out of SSO (small string opt). In most cases
+  // the path will fit in the on-stack 22 bytes, requiring no heap.
+  std::string field_path;
+
+  auto append_field_id = [&field_path](uint32_t id) {
+    uint8_t buf[10];
+    uint8_t* end = proto_utils::WriteVarInt(id, buf);
+    field_path.append(reinterpret_cast<char*>(buf),
+                      static_cast<size_t>(end - buf));
+  };
+
+  // Append all the ancestors IDs from the state stack.
+  // The first entry of the stack has always ID 0 and we skip it (we don't know
+  // the ID of the root message itself).
+  PERFETTO_DCHECK(stack_.size() >= 2 && stack_[1].field_id == 0);
+  for (size_t i = 2; i < stack_.size(); ++i)
+    append_field_id(stack_[i].field_id);
+  // Append the id of the field in the current message.
+  append_field_id(field_id);
+  field_usage_[field_path] += allowed ? 1 : -1;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/message_filter.h b/src/libtracing/protozero_src/filtering/message_filter.h
new file mode 100644
index 000000000..0344e973b
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/message_filter.h
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_FILTERING_MESSAGE_FILTER_H_
+#define SRC_PROTOZERO_FILTERING_MESSAGE_FILTER_H_
+
+#include <stdint.h>
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include "src/protozero/filtering/filter_bytecode_parser.h"
+#include "src/protozero/filtering/message_tokenizer.h"
+#include "src/protozero/filtering/string_filter.h"
+
+namespace protozero {
+
+// A class to filter binary-encoded proto messages using an allow-list of field
+// ids, also known as "filter bytecode". The filter determines which fields are
+// allowed to be passed through in output and strips all the other fields.
+// See go/trace-filtering for full design.
+// This class takes in input:
+// 1) The filter bytecode, loaded once via the LoadFilterBytecode() method.
+// 2) A proto-encoded binary message. The message doesn't have to be contiguous,
+//    it can be passed as an array of arbitrarily chunked fragments.
+// The FilterMessage*() method returns in output a proto message, stripping out
+// all unknown fields. If the input is malformed (e.g., unknown proto field wire
+// types, lengths out of bound) the whole filtering failed and the |error| flag
+// of the FilteredMessage object is set to true.
+// The filtering operation is based on rewriting a copy of the message into a
+// self-allocated buffer, which is then returned in the output. The input buffer
+// is NOT altered.
+// Note also that the process of rewriting the protos gets rid of most redundant
+// varint encoding (if present). So even if all fields are allow-listed, the
+// output might NOT be bitwise identical to the input (but it will be
+// semantically equivalent).
+// Furthermore the enable_field_usage_tracking() method allows to keep track of
+// a histogram of allowed / denied fields. It slows down filtering and is
+// intended only on host tools.
+class MessageFilter {
+ public:
+  class Config {
+   public:
+    bool LoadFilterBytecode(const void* filter_data, size_t len);
+    bool SetFilterRoot(std::initializer_list<uint32_t> field_ids);
+
+    const FilterBytecodeParser& filter() const { return filter_; }
+    const StringFilter& string_filter() const { return string_filter_; }
+    StringFilter& string_filter() { return string_filter_; }
+    uint32_t root_msg_index() const { return root_msg_index_; }
+
+   private:
+    FilterBytecodeParser filter_;
+    StringFilter string_filter_;
+    uint32_t root_msg_index_ = 0;
+  };
+
+  MessageFilter();
+  explicit MessageFilter(Config);
+  ~MessageFilter();
+
+  struct InputSlice {
+    const void* data;
+    size_t len;
+  };
+
+  struct FilteredMessage {
+    FilteredMessage(std::unique_ptr<uint8_t[]> d, size_t s)
+        : data(std::move(d)), size(s) {}
+    std::unique_ptr<uint8_t[]> data;
+    size_t size;  // The used bytes in |data|. This is <= sizeof(data).
+    bool error = false;
+  };
+
+  // Loads the filter bytecode that will be used to filter any subsequent
+  // message. Must be called before the first call to FilterMessage*().
+  // |filter_data| must point to a byte buffer for a proto-encoded ProtoFilter
+  // message (see proto_filter.proto).
+  bool LoadFilterBytecode(const void* filter_data, size_t len) {
+    return config_.LoadFilterBytecode(filter_data, len);
+  }
+
+  // This affects the filter starting point of the subsequent FilterMessage*()
+  // calls. By default the filtering process starts from the message @ index 0,
+  // the root message passed to proto_filter when generating the bytecode
+  // (in typical tracing use-cases, this is perfetto.protos.Trace). However, the
+  // caller (TracingServiceImpl) might want to filter packets from the 2nd level
+  // (perfetto.protos.TracePacket) because the root level is pre-pended after
+  // the fact. This call allows to change the root message for the filter.
+  // The argument |field_ids| is an array of proto field ids and determines the
+  // path to the new root. For instance, in the case of [1,2,3] SetFilterRoot
+  // will identify the sub-message for the field "root.1.2.3" and use that.
+  // In order for this to succeed all the fields in the path must be allowed
+  // in the filter and must be a nested message type.
+  bool SetFilterRoot(std::initializer_list<uint32_t> field_ids) {
+    return config_.SetFilterRoot(field_ids);
+  }
+
+  // Takes an input message, fragmented in arbitrary slices, and returns a
+  // filtered message in output.
+  FilteredMessage FilterMessageFragments(const InputSlice*, size_t num_slices);
+
+  // Helper for tests, where the input is a contiguous buffer.
+  FilteredMessage FilterMessage(const void* data, size_t len) {
+    InputSlice slice{data, len};
+    return FilterMessageFragments(&slice, 1);
+  }
+
+  // When enabled returns a map of "field path" to "usage counter".
+  // The key (std::string) is a binary buffer (i.e. NOT an ASCII/UTF-8 string)
+  // which contains a varint for each field. Consider the following:
+  // message Root { Sub1 f1 = 1; };
+  // message Sub1 { Sub2 f2 = 7;}
+  // message Sub2 { string f3 = 5; }
+  // The field .f1.f2.f3 will be encoded as \x01\0x07\x05.
+  // The value is the number of times that field has been encountered. If the
+  // field is not allow-listed in the bytecode (the field is stripped in output)
+  // the count will be negative.
+  void enable_field_usage_tracking(bool x) { track_field_usage_ = x; }
+  const std::unordered_map<std::string, int32_t>& field_usage() const {
+    return field_usage_;
+  }
+
+  const Config& config() const { return config_; }
+
+  // Retuns the helper class used to perform string filtering.
+  StringFilter& string_filter() { return config_.string_filter(); }
+
+ private:
+  // This is called by FilterMessageFragments().
+  // Inlining allows the compiler turn the per-byte call/return into a for loop,
+  // while, at the same time, keeping the code easy to read and reason about.
+  // It gives a 20-25% speedup (265ms vs 215ms for a 25MB trace).
+  void FilterOneByte(uint8_t octet) PERFETTO_ALWAYS_INLINE;
+
+  // No-inline because this is a slowpath (only when usage tracking is enabled).
+  void IncrementCurrentFieldUsage(uint32_t field_id,
+                                  bool allowed) PERFETTO_NO_INLINE;
+
+  // Gets into an error state which swallows all the input and emits no output.
+  void SetUnrecoverableErrorState();
+
+  // We keep track of the nest of messages in a stack. Each StackState
+  // object corresponds to a level of nesting in the proto message structure.
+  // Every time a new field of type len-delimited that has a corresponding
+  // sub-message in the bytecode is encountered, a new StackState is pushed in
+  // |stack_|. stack_[0] is a sentinel to prevent over-popping without adding
+  // extra branches in the fastpath.
+  // |stack_|. stack_[1] is the state of the root message.
+  struct StackState {
+    uint32_t in_bytes = 0;  // Number of input bytes processed.
+
+    // When |in_bytes| reaches this value, the current state should be popped.
+    // This is set when recursing into nested submessages. This is 0 only for
+    // stack_[0] (we don't know the size of the root message upfront).
+    uint32_t in_bytes_limit = 0;
+
+    // This is set when a len-delimited message is encountered, either a string
+    // or a nested submessage that is NOT allow-listed in the bytecode.
+    // This causes input bytes to be consumed without being parsed from the
+    // input stream. If |passthrough_eaten_bytes| == true, they will be copied
+    // as-is in output (e.g. in the case of an allowed string/bytes field).
+    uint32_t eat_next_bytes = 0;
+
+    // Keeps tracks of the stream_writer output counter (out_.written()) then
+    // the StackState is pushed. This is used to work out, when popping, how
+    // many bytes have been written for the current submessage.
+    uint32_t out_bytes_written_at_start = 0;
+
+    uint32_t field_id = 0;   // The proto field id for the current message.
+    uint32_t msg_index = 0;  // The index of the message filter in the bytecode.
+
+    // This is a pointer to the proto preamble for the current submessage
+    // (it's nullptr for stack_[0] and non-null elsewhere). This will be filled
+    // with the actual size of the message (out_.written() -
+    // |out_bytes_written_at_start|) when finishing (popping) the message.
+    // This must be filled using WriteRedundantVarint(). Note that the
+    // |size_field_len| is variable and depends on the actual length of the
+    // input message. If the output message has roughly the same size of the
+    // input message, the length will not be redundant.
+    // In other words: the length of the field is reserved when the submessage
+    // starts. At that point we know the upper-bound for the output message
+    // (a filtered submessage can be <= the original one, but not >). So we
+    // reserve as many bytes it takes to write the input length in varint.
+    // Then, when the message is finalized and we know the actual output size
+    // we backfill the field.
+    // Consider the example of a submessage where the input size = 130 (>127,
+    // 2 varint bytes) and the output is 120 bytes. The length will be 2 bytes
+    // wide even though could have been encoded with just one byte.
+    uint8_t* size_field = nullptr;
+    uint32_t size_field_len = 0;
+
+    // The pointer to the start of the string to update the string if it is
+    // filtered.
+    uint8_t* filter_string_ptr = nullptr;
+
+    // How |eat_next_bytes| should be handled. It seems that keeping this field
+    // at the end rather than next to |eat_next_bytes| makes the filter a little
+    // (but measurably) faster. (likely something related with struct layout vs
+    // cache sizes).
+    enum FilterAction {
+      kDrop,
+      kPassthrough,
+      kFilterString,
+    };
+    FilterAction action = FilterAction::kDrop;
+  };
+
+  uint32_t out_written() { return static_cast<uint32_t>(out_ - &out_buf_[0]); }
+
+  Config config_;
+
+  std::unique_ptr<uint8_t[]> out_buf_;
+  uint8_t* out_ = nullptr;
+  uint8_t* out_end_ = nullptr;
+
+  MessageTokenizer tokenizer_;
+  std::vector<StackState> stack_;
+
+  bool error_ = false;
+  bool track_field_usage_ = false;
+  std::unordered_map<std::string, int32_t> field_usage_;
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_FILTERING_MESSAGE_FILTER_H_
diff --git a/src/libtracing/protozero_src/filtering/message_filter_benchmark.cc b/src/libtracing/protozero_src/filtering/message_filter_benchmark.cc
new file mode 100644
index 000000000..c800c8234
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/message_filter_benchmark.cc
@@ -0,0 +1,48 @@
+// Copyright (C) 2021 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.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <benchmark/benchmark.h>
+
+#include <algorithm>
+#include <string>
+
+#include "perfetto/ext/base/file_utils.h"
+#include "src/base/test/utils.h"
+#include "src/protozero/filtering/message_filter.h"
+
+static void BM_ProtozeroMessageFilter(benchmark::State& state) {
+  std::string trace_data;
+  static const char kTestTrace[] = "test/data/example_android_trace_30s.pb";
+  perfetto::base::ReadFile(perfetto::base::GetTestDataPath(kTestTrace),
+                           &trace_data);
+  PERFETTO_CHECK(!trace_data.empty());
+
+  std::string filter;
+  static const char kFullTraceFilter[] = "test/data/full_trace_filter.bytecode";
+  perfetto::base::ReadFile(kFullTraceFilter, &filter);
+  PERFETTO_CHECK(!filter.empty());
+
+  protozero::MessageFilter filt;
+  filt.LoadFilterBytecode(filter.data(), filter.size());
+
+  for (auto _ : state) {
+    auto res = filt.FilterMessage(trace_data.data(), trace_data.size());
+    benchmark::DoNotOptimize(res);
+    benchmark::ClobberMemory();
+  }
+  state.SetBytesProcessed(
+      static_cast<int64_t>(state.iterations() * trace_data.size()));
+}
+
+BENCHMARK(BM_ProtozeroMessageFilter);
diff --git a/src/libtracing/protozero_src/filtering/message_filter_fuzzer.cc b/src/libtracing/protozero_src/filtering/message_filter_fuzzer.cc
new file mode 100644
index 000000000..60cfe5c84
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/message_filter_fuzzer.cc
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "perfetto/base/logging.h"
+#include "src/protozero/filtering/message_filter.h"
+
+namespace protozero {
+namespace {
+
+// A valid filter bytecode obtained from a perfetto.protos.Trace message.
+uint8_t kValidFilter[] = {
+    0x0b, 0x01, 0x12, 0x04, 0x00, 0x0b, 0x02, 0x13, 0x0f, 0x19, 0x23, 0x13,
+    0x33, 0x14, 0x3b, 0x15, 0x41, 0x4b, 0x11, 0x51, 0x5b, 0x16, 0x63, 0x3b,
+    0x69, 0x8b, 0x02, 0x21, 0x93, 0x02, 0x2a, 0x9b, 0x02, 0x2c, 0xab, 0x02,
+    0x2e, 0xb3, 0x02, 0x09, 0xc3, 0x02, 0x30, 0xca, 0x02, 0x02, 0xdb, 0x02,
+    0x31, 0xe3, 0x02, 0x26, 0xeb, 0x02, 0x32, 0xf3, 0x02, 0x07, 0xfb, 0x02,
+    0x33, 0x8b, 0x03, 0x0a, 0x9b, 0x03, 0x34, 0xb3, 0x03, 0x06, 0xc3, 0x03,
+    0x37, 0xd1, 0x03, 0xdb, 0x03, 0x3c, 0xe3, 0x03, 0x39, 0x93, 0x04, 0x38,
+    0x9b, 0x04, 0x3a, 0x00, 0x09, 0x13, 0x03, 0x19, 0x00, 0x0a, 0x02, 0x1b,
+    0x04, 0x23, 0x05, 0x5b, 0x06, 0x6b, 0x06, 0x83, 0x01, 0x07, 0x8b, 0x01,
+    0x08, 0x93, 0x01, 0x07, 0x9b, 0x01, 0x07, 0xa3, 0x01, 0x08, 0x9b, 0x02,
+    0x08, 0xcb, 0x02, 0x08, 0xd3, 0x02, 0x08, 0xdb, 0x02, 0x09, 0xe3, 0x02,
+    0x07, 0xeb, 0x02, 0x0a, 0xf3, 0x02, 0x07, 0xfb, 0x02, 0x0b, 0x83, 0x03,
+    0x06, 0x8b, 0x03, 0x0b, 0x93, 0x03, 0x05, 0x9b, 0x03, 0x0b, 0xab, 0x03,
+    0x0c, 0xb3, 0x03, 0x0c, 0xbb, 0x03, 0x0c, 0x9b, 0x04, 0x0d, 0xa3, 0x04,
+    0x07, 0xab, 0x04, 0x06, 0xb3, 0x04, 0x07, 0xc3, 0x04, 0x06, 0xcb, 0x04,
+    0x07, 0xd3, 0x04, 0x07, 0xdb, 0x04, 0x06, 0x93, 0x07, 0x08, 0xeb, 0x07,
+    0x08, 0xcb, 0x09, 0x07, 0xd3, 0x09, 0x05, 0xf3, 0x0b, 0x06, 0xdb, 0x0e,
+    0x09, 0xe3, 0x0e, 0x09, 0xeb, 0x0e, 0x07, 0xf3, 0x0e, 0x09, 0xfb, 0x0e,
+    0x09, 0x83, 0x0f, 0x07, 0x8b, 0x0f, 0x06, 0x93, 0x0f, 0x07, 0xb3, 0x0f,
+    0x0a, 0xc3, 0x0f, 0x0e, 0xfb, 0x0f, 0x0e, 0x83, 0x10, 0x08, 0xfb, 0x10,
+    0x08, 0x8b, 0x11, 0x08, 0xcb, 0x13, 0x06, 0xd3, 0x13, 0x07, 0xdb, 0x13,
+    0x07, 0xb3, 0x14, 0x07, 0x00, 0x11, 0x00, 0x0a, 0x07, 0x00, 0x0a, 0x02,
+    0x00, 0x0a, 0x03, 0x00, 0x0a, 0x05, 0x00, 0x0a, 0x04, 0x00, 0x0a, 0x06,
+    0x00, 0x09, 0x00, 0x00, 0x0a, 0x03, 0x29, 0x00, 0x0a, 0x08, 0x00, 0x0b,
+    0x10, 0x13, 0x07, 0x19, 0x00, 0x0a, 0x03, 0x23, 0x07, 0x29, 0x00, 0x0b,
+    0x12, 0x11, 0x00, 0x0a, 0x0a, 0x5b, 0x07, 0x00, 0x0a, 0x02, 0x1b, 0x07,
+    0x00, 0x0b, 0x09, 0x11, 0x00, 0x0b, 0x06, 0x13, 0x06, 0x1b, 0x0e, 0x22,
+    0x02, 0x33, 0x06, 0x39, 0x43, 0x06, 0x49, 0x00, 0x0a, 0x03, 0x2b, 0x0b,
+    0x33, 0x20, 0x42, 0x05, 0x82, 0x01, 0x02, 0xa1, 0x01, 0xc3, 0x01, 0x17,
+    0xcb, 0x01, 0x04, 0xd3, 0x01, 0x0b, 0xdb, 0x01, 0x06, 0xe3, 0x01, 0x1e,
+    0xeb, 0x01, 0x1f, 0xf2, 0x01, 0x02, 0x00, 0x0b, 0x18, 0x12, 0x0c, 0x73,
+    0x1a, 0x7b, 0x1c, 0x83, 0x01, 0x1d, 0x8b, 0x01, 0x05, 0x00, 0x0b, 0x08,
+    0x13, 0x19, 0x00, 0x0a, 0x2e, 0x00, 0x0a, 0x03, 0x23, 0x1b, 0x2b, 0x1b,
+    0x33, 0x05, 0x00, 0x0a, 0x09, 0x53, 0x09, 0x00, 0x09, 0x13, 0x1b, 0x00,
+    0x0a, 0x03, 0x23, 0x1b, 0x00, 0x09, 0x19, 0x00, 0x0a, 0x03, 0x23, 0x06,
+    0x2a, 0x02, 0x00, 0x0a, 0x04, 0x31, 0x42, 0x08, 0x92, 0x01, 0x02, 0x00,
+    0x0b, 0x22, 0x13, 0x23, 0x1a, 0x03, 0x33, 0x07, 0x3b, 0x09, 0x42, 0x03,
+    0x5b, 0x0b, 0x62, 0x03, 0x81, 0x01, 0x8b, 0x01, 0x29, 0x92, 0x01, 0x02,
+    0xa3, 0x01, 0x07, 0xab, 0x01, 0x0b, 0xb2, 0x01, 0x03, 0xcb, 0x01, 0x09,
+    0xda, 0x01, 0x02, 0x00, 0x09, 0x21, 0x00, 0x0b, 0x24, 0x11, 0x00, 0x0a,
+    0x04, 0x31, 0xa3, 0x06, 0x25, 0xbb, 0x06, 0x26, 0xc3, 0x06, 0x0a, 0xcb,
+    0x06, 0x27, 0xd3, 0x06, 0x06, 0xeb, 0x06, 0x0b, 0x00, 0x0a, 0x03, 0x52,
+    0x02, 0x00, 0x0a, 0x04, 0x32, 0x03, 0x00, 0x0a, 0x02, 0x22, 0x02, 0x33,
+    0x28, 0x3a, 0x02, 0x00, 0x2a, 0x02, 0x00, 0x09, 0x13, 0x07, 0x19, 0x00,
+    0x09, 0x13, 0x2b, 0x00, 0x0a, 0x09, 0x00, 0x0b, 0x2d, 0x12, 0x08, 0x00,
+    0x0a, 0x12, 0x00, 0x0b, 0x06, 0x13, 0x09, 0x1b, 0x06, 0x23, 0x05, 0x2b,
+    0x2f, 0x32, 0x02, 0x00, 0x09, 0x13, 0x0a, 0x00, 0x0b, 0x09, 0x13, 0x07,
+    0x00, 0x09, 0x1a, 0x03, 0x00, 0x0b, 0x09, 0x12, 0x02, 0x00, 0x0b, 0x08,
+    0x12, 0x02, 0x00, 0x0b, 0x35, 0x11, 0x00, 0x0b, 0x36, 0x13, 0x36, 0x00,
+    0x09, 0x13, 0x07, 0x1b, 0x0b, 0x00, 0x09, 0x13, 0x08, 0x1b, 0x06, 0x23,
+    0x06, 0x2a, 0x02, 0x3b, 0x06, 0x00, 0x0a, 0x05, 0x82, 0x01, 0x03, 0x00,
+    0x09, 0x1b, 0x31, 0x23, 0x26, 0x29, 0x33, 0x09, 0x3b, 0x06, 0x43, 0x31,
+    0x00, 0x0b, 0x06, 0x00, 0x0b, 0x06, 0x13, 0x06, 0x23, 0x09, 0x2b, 0x06,
+    0x33, 0x09, 0x3b, 0x06, 0x83, 0x01, 0x06, 0x8b, 0x01, 0x06, 0x93, 0x01,
+    0x06, 0x9b, 0x01, 0x05, 0x00, 0x5b, 0x3d, 0xd1, 0x03, 0x00, 0x59, 0xf9,
+    0x01, 0x00, 0x8f, 0xf8, 0xf5, 0xcb, 0x06};
+
+int FuzzMessageFilter(const uint8_t* data, size_t size) {
+  MessageFilter filter;
+  PERFETTO_CHECK(filter.LoadFilterBytecode(kValidFilter, sizeof(kValidFilter)));
+
+  auto res = filter.FilterMessage(data, size);
+
+  // Either parsing fails or if it succeeds, the output data must be <= input.
+  PERFETTO_CHECK(res.error || res.size <= size);
+  return 0;
+}
+
+}  // namespace
+}  // namespace protozero
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  return protozero::FuzzMessageFilter(data, size);
+}
diff --git a/src/libtracing/protozero_src/filtering/message_filter_unittest.cc b/src/libtracing/protozero_src/filtering/message_filter_unittest.cc
new file mode 100644
index 000000000..fb4a854bb
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/message_filter_unittest.cc
@@ -0,0 +1,934 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/ext/base/base64.h"
+#include "test/gtest_and_gmock.h"
+
+#include <random>
+
+#include "perfetto/ext/base/file_utils.h"
+#include "perfetto/ext/base/string_utils.h"
+#include "perfetto/ext/base/temp_file.h"
+#include "perfetto/protozero/proto_decoder.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "protos/perfetto/trace/trace.pb.h"
+#include "src/protozero/filtering/filter_util.h"
+#include "src/protozero/filtering/message_filter.h"
+
+namespace protozero {
+
+namespace {
+
+TEST(MessageFilterTest, EndToEnd) {
+  auto schema = perfetto::base::TempFile::Create();
+  static const char kSchema[] = R"(
+  syntax = "proto2";
+  message FilterSchema {
+    message Nested {
+      optional fixed32 f32 = 2;
+      repeated string ss = 5;
+    }
+    optional int32 i32 = 1;
+    optional string str = 3;
+    repeated Nested nest = 6;
+    repeated int32 f11 = 11;
+    repeated int64 f12 = 12;
+    repeated sint32 f13 = 13;
+    repeated sint64 f14 = 14;
+    repeated fixed32 f15 = 15;
+    repeated fixed32 f16 = 16;
+    repeated fixed64 f17 = 17;
+    repeated fixed64 f18 = 18;
+    repeated float f19 = 19;
+    repeated double f20 = 20;
+  };
+  )";
+
+  perfetto::base::WriteAll(*schema, kSchema, strlen(kSchema));
+  perfetto::base::FlushFile(*schema);
+
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "", ""));
+  std::string bytecode = filter.GenerateFilterBytecode();
+  ASSERT_GT(bytecode.size(), 0u);
+
+  HeapBuffered<Message> msg;
+  msg->AppendVarInt(/*field_id=*/1, -1000000000ll);
+  msg->AppendVarInt(/*field_id=*/2, 42);
+  msg->AppendString(/*field_id=*/3, "foobar");
+  msg->AppendFixed(/*field_id=*/4, 10);
+  msg->AppendVarInt(/*field_id=*/11, INT32_MIN);
+  msg->AppendVarInt(/*field_id=*/12, INT64_MIN);
+  msg->AppendSignedVarInt(/*field_id=*/13, INT32_MIN);
+  msg->AppendSignedVarInt(/*field_id=*/14, INT64_MIN);
+  msg->AppendFixed(/*field_id=*/15, static_cast<int32_t>(INT32_MIN));
+  msg->AppendFixed(/*field_id=*/16, static_cast<int32_t>(INT32_MAX));
+  msg->AppendFixed(/*field_id=*/17, static_cast<int64_t>(INT64_MIN));
+  msg->AppendFixed(/*field_id=*/18, static_cast<int64_t>(INT64_MAX));
+  msg->AppendFixed(/*field_id=*/19, FLT_EPSILON);
+  msg->AppendFixed(/*field_id=*/20, DBL_EPSILON);
+
+  auto* nest = msg->BeginNestedMessage<Message>(/*field_id=*/6);
+  nest->AppendFixed(/*field_id=*/1, 10);
+  nest->AppendFixed(/*field_id=*/2, static_cast<int32_t>(-2000000000ll));
+  nest->AppendString(/*field_id=*/4, "stripped");
+  nest->AppendString(/*field_id=*/5, "");
+  nest->Finalize();
+
+  MessageFilter flt;
+  ASSERT_TRUE(flt.LoadFilterBytecode(bytecode.data(), bytecode.size()));
+
+  std::vector<uint8_t> encoded = msg.SerializeAsArray();
+
+  for (int repetitions = 0; repetitions < 3; ++repetitions) {
+    auto filtered = flt.FilterMessage(encoded.data(), encoded.size());
+    ASSERT_LT(filtered.size, encoded.size());
+
+    ProtoDecoder dec(filtered.data.get(), filtered.size);
+    EXPECT_TRUE(dec.FindField(1).valid());
+    EXPECT_EQ(dec.FindField(1).as_int64(), -1000000000ll);
+    EXPECT_FALSE(dec.FindField(2).valid());
+    EXPECT_TRUE(dec.FindField(3).valid());
+    EXPECT_EQ(dec.FindField(3).as_std_string(), "foobar");
+    EXPECT_FALSE(dec.FindField(4).valid());
+    EXPECT_TRUE(dec.FindField(6).valid());
+    for (uint32_t i = 11; i <= 20; ++i)
+      EXPECT_TRUE(dec.FindField(i).valid());
+
+    EXPECT_EQ(dec.FindField(11).as_int32(), INT32_MIN);
+    EXPECT_EQ(dec.FindField(12).as_int64(), INT64_MIN);
+    EXPECT_EQ(dec.FindField(13).as_sint32(), INT32_MIN);
+    EXPECT_EQ(dec.FindField(14).as_sint64(), INT64_MIN);
+    EXPECT_EQ(dec.FindField(15).as_int32(), INT32_MIN);
+    EXPECT_EQ(dec.FindField(16).as_int32(), INT32_MAX);
+    EXPECT_EQ(dec.FindField(17).as_int64(), INT64_MIN);
+    EXPECT_EQ(dec.FindField(18).as_int64(), INT64_MAX);
+    EXPECT_EQ(dec.FindField(19).as_float(), FLT_EPSILON);
+    EXPECT_EQ(dec.FindField(20).as_double(), DBL_EPSILON);
+
+    ProtoDecoder nest_dec(dec.FindField(6).as_bytes());
+    EXPECT_FALSE(nest_dec.FindField(1).valid());
+    EXPECT_TRUE(nest_dec.FindField(2).valid());
+    EXPECT_EQ(nest_dec.FindField(2).as_int32(), -2000000000ll);
+    EXPECT_TRUE(nest_dec.FindField(5).valid());
+    EXPECT_EQ(nest_dec.FindField(5).as_bytes().size, 0u);
+  }
+}
+
+TEST(MessageFilterTest, Passthrough) {
+  auto schema = perfetto::base::TempFile::Create();
+  static const char kSchema[] = R"(
+  syntax = "proto2";
+  message TracePacket {
+    optional int64 timestamp = 1;
+    optional TraceConfig cfg = 2;
+    optional TraceConfig cfg_filtered = 3;
+    optional string other = 4;
+  };
+  message SubConfig {
+    optional string f4 = 6;
+  }
+  message TraceConfig {
+    optional int64 f1 = 3;
+    optional string f2 = 4;
+    optional SubConfig f3 = 5;
+  }
+  )";
+
+  perfetto::base::WriteAll(*schema, kSchema, strlen(kSchema));
+  perfetto::base::FlushFile(*schema);
+
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(
+      schema.path(), "", "", {"TracePacket:other", "TracePacket:cfg"}));
+  std::string bytecode = filter.GenerateFilterBytecode();
+  ASSERT_GT(bytecode.size(), 0u);
+
+  HeapBuffered<Message> msg;
+  msg->AppendVarInt(/*field_id=*/1, 10);
+  msg->AppendString(/*field_id=*/4, "other_string");
+
+  // Fill `cfg`.
+  auto* nest = msg->BeginNestedMessage<Message>(/*field_id=*/2);
+  nest->AppendVarInt(/*field_id=*/3, 100);
+  nest->AppendString(/*field_id=*/4, "f2.payload");
+  nest->AppendString(/*field_id=*/99, "not_in_original_schema");
+  auto* nest2 = nest->BeginNestedMessage<Message>(/*field_id=*/5);
+  nest2->AppendString(/*field_id=*/6, "subconfig.f4");
+  nest2->Finalize();
+  nest->Finalize();
+
+  // Fill `cfg_filtered`.
+  nest = msg->BeginNestedMessage<Message>(/*field_id=*/3);
+  nest->AppendVarInt(/*field_id=*/3, 200);  // This should be propagated.
+  nest->AppendVarInt(/*field_id=*/6, 300);  // This shoudl be filtered out.
+  nest->Finalize();
+
+  MessageFilter flt;
+  ASSERT_TRUE(flt.LoadFilterBytecode(bytecode.data(), bytecode.size()));
+
+  std::vector<uint8_t> encoded = msg.SerializeAsArray();
+
+  auto filtered = flt.FilterMessage(encoded.data(), encoded.size());
+  ASSERT_FALSE(filtered.error);
+  ASSERT_LT(filtered.size, encoded.size());
+
+  ProtoDecoder dec(filtered.data.get(), filtered.size);
+  EXPECT_EQ(dec.FindField(1).as_int64(), 10);
+  EXPECT_EQ(dec.FindField(4).as_std_string(), "other_string");
+
+  EXPECT_TRUE(dec.FindField(2).valid());
+  ProtoDecoder nest_dec(dec.FindField(2).as_bytes());
+  EXPECT_EQ(nest_dec.FindField(3).as_int32(), 100);
+  EXPECT_EQ(nest_dec.FindField(4).as_std_string(), "f2.payload");
+  EXPECT_TRUE(nest_dec.FindField(5).valid());
+  ProtoDecoder nest_dec2(nest_dec.FindField(5).as_bytes());
+  EXPECT_EQ(nest_dec2.FindField(6).as_std_string(), "subconfig.f4");
+
+  // Field 99 should be preserved anyways even if it wasn't in the original
+  // schema because the whole TracePacket submessage was passed through.
+  EXPECT_TRUE(nest_dec.FindField(99).valid());
+  EXPECT_EQ(nest_dec.FindField(99).as_std_string(), "not_in_original_schema");
+
+  // Check that the field `cfg_filtered` contains only `f1`,`f2`,`f3`.
+  EXPECT_TRUE(dec.FindField(3).valid());
+  ProtoDecoder nest_dec3(dec.FindField(3).as_bytes());
+  EXPECT_EQ(nest_dec3.FindField(3).as_int32(), 200);
+  EXPECT_FALSE(nest_dec3.FindField(6).valid());
+}
+
+TEST(MessageFilterTest, ChangeRoot) {
+  auto schema = perfetto::base::TempFile::Create();
+  static const char kSchema[] = R"(
+  syntax = "proto2";
+  message FilterSchema {
+    message Nested {
+      message Nested2 {
+        optional int32 e = 5;
+      }
+      optional int32 c = 3;
+      repeated Nested2 d = 4;
+    }
+    optional int32 a = 1;
+    optional Nested b = 2;
+  };
+  )";
+
+  perfetto::base::WriteAll(*schema, kSchema, strlen(kSchema));
+  perfetto::base::FlushFile(*schema);
+
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "", ""));
+  std::string bytecode = filter.GenerateFilterBytecode();
+  ASSERT_GT(bytecode.size(), 0u);
+
+  HeapBuffered<Message> msg;
+  msg->AppendVarInt(/*field_id=*/1, 101);
+  msg->AppendVarInt(/*field_id=*/3, 103);
+  msg->AppendVarInt(/*field_id=*/5, 105);
+  auto* nest = msg->BeginNestedMessage<Message>(/*field_id=*/4);  // Nested b.
+  nest->AppendVarInt(/*field_id=*/5, 205);
+  nest->Finalize();
+  std::vector<uint8_t> encoded = msg.SerializeAsArray();
+
+  MessageFilter flt;
+  ASSERT_TRUE(flt.LoadFilterBytecode(bytecode.data(), bytecode.size()));
+
+  // First set the root to field id ".2" (.b). The fliter should happen treating
+  // |Nested| as rot, so allowing only field 3 and 4 (Nested2) through.
+  {
+    flt.SetFilterRoot({2});
+    auto filtered = flt.FilterMessage(encoded.data(), encoded.size());
+    ASSERT_LT(filtered.size, encoded.size());
+    ProtoDecoder dec(filtered.data.get(), filtered.size);
+    EXPECT_FALSE(dec.FindField(1).valid());
+    EXPECT_TRUE(dec.FindField(3).valid());
+    EXPECT_EQ(dec.FindField(3).as_int32(), 103);
+    EXPECT_FALSE(dec.FindField(5).valid());
+    EXPECT_TRUE(dec.FindField(4).valid());
+    EXPECT_EQ(dec.FindField(4).as_std_string(), "(\xCD\x01");
+  }
+
+  // Now set the root to ".2.4" (.b.d). This should allow only the field "e"
+  // to pass through.
+  {
+    flt.SetFilterRoot({2, 4});
+    auto filtered = flt.FilterMessage(encoded.data(), encoded.size());
+    ASSERT_LT(filtered.size, encoded.size());
+    ProtoDecoder dec(filtered.data.get(), filtered.size);
+    EXPECT_FALSE(dec.FindField(1).valid());
+    EXPECT_FALSE(dec.FindField(3).valid());
+    EXPECT_FALSE(dec.FindField(4).valid());
+    EXPECT_TRUE(dec.FindField(5).valid());
+    EXPECT_EQ(dec.FindField(5).as_int32(), 105);
+  }
+}
+
+TEST(MessageFilterTest, StringFilter) {
+  auto schema = perfetto::base::TempFile::Create();
+  static const char kSchema[] = R"(
+  syntax = "proto2";
+  message TracePacket {
+    optional TraceConfig cfg = 1;
+  };
+  message TraceConfig {
+    optional string f2 = 1;
+  }
+  )";
+
+  perfetto::base::WriteAll(*schema, kSchema, strlen(kSchema));
+  perfetto::base::FlushFile(*schema);
+
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "", "", {},
+                                           {"TraceConfig:f2"}));
+  std::string bytecode = filter.GenerateFilterBytecode();
+  ASSERT_GT(bytecode.size(), 0u);
+  PERFETTO_LOG(
+      "%s", perfetto::base::Base64Encode(perfetto::base::StringView(bytecode))
+                .c_str());
+
+  HeapBuffered<Message> msg;
+  msg->AppendVarInt(/*field_id=*/1, 10);
+
+  // Fill `cfg`.
+  auto* nest = msg->BeginNestedMessage<Message>(/*field_id=*/1);
+  nest->AppendString(/*field_id=*/1, "f2.payload");
+  nest->Finalize();
+
+  MessageFilter flt;
+  ASSERT_TRUE(flt.LoadFilterBytecode(bytecode.data(), bytecode.size()));
+
+  std::vector<uint8_t> encoded = msg.SerializeAsArray();
+
+  auto filtered = flt.FilterMessage(encoded.data(), encoded.size());
+  ASSERT_FALSE(filtered.error);
+  ASSERT_LT(filtered.size, encoded.size());
+}
+
+TEST(MessageFilterTest, MalformedInput) {
+  // Create and load a simple filter.
+  auto schema = perfetto::base::TempFile::Create();
+  static const char kSchema[] = R"(
+  syntax = "proto2";
+  message FilterSchema {
+    message Nested {
+      optional fixed32 f32 = 4;
+      repeated string ss = 5;
+    }
+    optional int32 i32 = 1;
+    optional string str = 2;
+    repeated Nested nest = 3;
+  };
+  )";
+  perfetto::base::WriteAll(*schema, kSchema, strlen(kSchema));
+  perfetto::base::FlushFile(*schema);
+  FilterUtil filter;
+  ASSERT_TRUE(filter.LoadMessageDefinition(schema.path(), "", ""));
+  std::string bytecode = filter.GenerateFilterBytecode();
+  ASSERT_GT(bytecode.size(), 0u);
+  MessageFilter flt;
+  ASSERT_TRUE(flt.LoadFilterBytecode(bytecode.data(), bytecode.size()));
+
+  {
+    // A malformed message found by the fuzzer.
+    static const uint8_t kData[]{
+        0x52, 0x21,  // ID=10, type=len-delimited, len=33.
+        0xa0, 0xa4,  // Early terminating payload.
+    };
+    auto res = flt.FilterMessage(kData, sizeof(kData));
+    EXPECT_TRUE(res.error);
+  }
+
+  {
+    // A malformed message which contains a non-terminated varint.
+    static const uint8_t kData[]{
+        0x08, 0x2A,  // A valid varint field id=1 value=42 (0x2A).
+        0x08, 0xFF,  // An unterminated varint.
+    };
+    auto res = flt.FilterMessage(kData, sizeof(kData));
+    EXPECT_TRUE(res.error);
+  }
+
+  {
+    // A malformed message which contains a sub-message with a field that brings
+    // it out of the outer size.
+    static const uint8_t kData[]{
+        0x08, 0x2A,  // A valid varint field id=1 value=42 (0x2A).
+        0x1A, 0x04,  // A len-delim field, id=3, length=4.
+        // The nested message |nest| starts here.
+        0x25, 0x0, 0x0, 0x0, 0x01,  // A fixed32 field, id=4.
+        // Note that the fixed32 field has an expected length of 4 but that
+        // overflows the size of the |nest| method, because with its 0x25
+        // preamble it becomes 5 bytes. At this point this should cause a
+        // persistent failure.
+    };
+    auto res = flt.FilterMessage(kData, sizeof(kData));
+    EXPECT_TRUE(res.error);
+  }
+
+  // A parsing failure shoulnd't affect the ability to filter the following
+  // message. Try again but this time with a valid message.
+  {
+    static const uint8_t kData[]{
+        0x08, 0x2A,  // A valid varint field id=1 value=42 (0x2A).
+        0x1A, 0x05,  // A len-delim field, id=3, length=5.
+        0x25, 0x0,  0x0, 0x0, 0x01,  // A fixed32 field, id=4.
+        0x38, 0x42,  // A valid but not allowed varint field id=7.
+    };
+    auto res = flt.FilterMessage(kData, sizeof(kData));
+    EXPECT_FALSE(res.error);
+    EXPECT_EQ(res.size, sizeof(kData) - 2);  // last 2 bytes should be skipped.
+    EXPECT_EQ(memcmp(kData, res.data.get(), res.size), 0);
+  }
+}
+
+// It processes a real test trace with a real filter. The filter has been
+// obtained from the full upstream perfetto proto (+ re-adding the for_testing
+// field which got removed after adding most test traces). This covers the most
+// complex case of filtering a real trace with a filter that allows all possible
+// fields, hence re-entering deeply in most nested fields.
+TEST(MessageFilterTest, RealTracePassthrough) {
+  // This is test/data/android_log_ring_buffer_mode.pb. It's re-encoded as a
+  // constant because unittests cannot depend on test/data/, only integration
+  // tests can.
+  static const uint8_t kTraceData[]{
+      0x0a, 0x16, 0x18, 0x8f, 0x4e, 0xa2, 0x02, 0x10, 0x82, 0x47, 0x7a, 0x76,
+      0xb2, 0x8d, 0x42, 0xba, 0x81, 0xdc, 0x33, 0x32, 0x6d, 0x57, 0xa0, 0x79,
+      0x0a, 0x5f, 0x18, 0x8f, 0x4e, 0x32, 0x5a, 0x0a, 0x09, 0x08, 0x06, 0x10,
+      0xf4, 0xd3, 0xea, 0xbb, 0xba, 0x55, 0x0a, 0x0c, 0x08, 0x02, 0x10, 0xf9,
+      0xcc, 0xb4, 0xd1, 0xe8, 0xdc, 0xa5, 0xbc, 0x15, 0x0a, 0x09, 0x08, 0x04,
+      0x10, 0x86, 0xb9, 0x9c, 0xba, 0xba, 0x55, 0x0a, 0x0c, 0x08, 0x01, 0x10,
+      0xeb, 0xe9, 0x82, 0xd3, 0xe8, 0xdc, 0xa5, 0xbc, 0x15, 0x0a, 0x09, 0x08,
+      0x03, 0x10, 0xac, 0xd6, 0xea, 0xbb, 0xba, 0x55, 0x0a, 0x09, 0x08, 0x05,
+      0x10, 0x9b, 0xe1, 0xd8, 0xbb, 0xba, 0x55, 0x0a, 0x07, 0x08, 0x07, 0x10,
+      0xf5, 0xe6, 0xd9, 0x55, 0x0a, 0x07, 0x08, 0x08, 0x10, 0xc1, 0xcc, 0xa7,
+      0x41, 0x0a, 0x27, 0x18, 0x8f, 0x4e, 0x9a, 0x02, 0x21, 0x0a, 0x13, 0x08,
+      0xf0, 0x1f, 0x10, 0x01, 0x18, 0x00, 0x20, 0x00, 0x28, 0x00, 0x30, 0x00,
+      0x38, 0x00, 0x40, 0x00, 0x48, 0x00, 0x10, 0x01, 0x18, 0x07, 0x20, 0x06,
+      0x28, 0x0b, 0x30, 0x01, 0x38, 0x01, 0x0a, 0xd5, 0x01, 0x18, 0x8f, 0x4e,
+      0x8a, 0x02, 0xce, 0x01, 0x0a, 0x06, 0x08, 0x80, 0x80, 0x02, 0x20, 0x00,
+      0x12, 0xa5, 0x01, 0x0a, 0xa2, 0x01, 0x0a, 0x0b, 0x61, 0x6e, 0x64, 0x72,
+      0x6f, 0x69, 0x64, 0x2e, 0x6c, 0x6f, 0x67, 0x10, 0x00, 0x18, 0x00, 0x20,
+      0x00, 0xa2, 0x06, 0x04, 0x50, 0x00, 0x58, 0x00, 0xaa, 0x06, 0x02, 0x0a,
+      0x00, 0xb2, 0x06, 0x08, 0x08, 0x00, 0x10, 0x00, 0x18, 0x00, 0x20, 0x00,
+      0xba, 0x06, 0x06, 0x10, 0x00, 0x18, 0x00, 0x20, 0x00, 0xc2, 0x06, 0x06,
+      0x08, 0x00, 0x18, 0x00, 0x28, 0x00, 0xca, 0x06, 0x0a, 0x08, 0x00, 0x28,
+      0x00, 0x32, 0x04, 0x28, 0x00, 0x30, 0x00, 0xd2, 0x06, 0x02, 0x08, 0x00,
+      0xda, 0x06, 0x02, 0x18, 0x00, 0xc2, 0x3e, 0x00, 0xfa, 0xff, 0xff, 0xff,
+      0x07, 0x46, 0x08, 0x00, 0x10, 0x00, 0x18, 0x00, 0x20, 0x00, 0x28, 0x00,
+      0x32, 0x3a, 0x08, 0x00, 0x10, 0x00, 0x18, 0x00, 0x20, 0x00, 0x29, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00,
+      0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
+      0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x60, 0x00, 0x6a, 0x00, 0x72, 0x00,
+      0x18, 0xe0, 0xd4, 0x03, 0x20, 0x00, 0x28, 0x00, 0x3a, 0x06, 0x08, 0x00,
+      0x10, 0x00, 0x18, 0x00, 0x40, 0x00, 0x48, 0x00, 0x50, 0x00, 0x5a, 0x02,
+      0x08, 0x00, 0x60, 0x00, 0x68, 0x00, 0x0a, 0x94, 0x01, 0x40, 0xd9, 0xf4,
+      0x98, 0x96, 0xbe, 0x54, 0xba, 0x02, 0x84, 0x81, 0x80, 0x00, 0x0a, 0xff,
+      0x80, 0x80, 0x00, 0x38, 0x04, 0x32, 0x08, 0x70, 0x65, 0x72, 0x66, 0x65,
+      0x74, 0x74, 0x6f, 0x42, 0x5d, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64,
+      0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f,
+      0x75, 0x72, 0x63, 0x65, 0x2e, 0x63, 0x63, 0x3a, 0x31, 0x35, 0x35, 0x20,
+      0x53, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x41, 0x6e, 0x64,
+      0x72, 0x6f, 0x69, 0x64, 0x20, 0x6c, 0x6f, 0x67, 0x20, 0x64, 0x61, 0x74,
+      0x61, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x20, 0x73, 0x74,
+      0x72, 0x65, 0x61, 0x6d, 0x20, 0x74, 0x61, 0x69, 0x6c, 0x3d, 0x31, 0x20,
+      0x6c, 0x69, 0x64, 0x73, 0x3d, 0x30, 0x2c, 0x32, 0x2c, 0x33, 0x2c, 0x34,
+      0x2c, 0x37, 0x28, 0xdb, 0xe6, 0x9b, 0xfb, 0xeb, 0xdb, 0xa5, 0xbc, 0x15,
+      0x08, 0x00, 0x10, 0xb5, 0x58, 0x18, 0xb5, 0x58, 0x20, 0x00, 0x18, 0x8f,
+      0x4e, 0x0a, 0xf4, 0x0a, 0x40, 0xb2, 0x84, 0xde, 0xdd, 0x8f, 0x55, 0xba,
+      0x02, 0xe4, 0x8a, 0x80, 0x00, 0x0a, 0xe4, 0x80, 0x80, 0x00, 0x38, 0x04,
+      0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74,
+      0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x38, 0x72, 0x6d,
+      0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f,
+      0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x3a, 0x20, 0x63, 0x6c,
+      0x6e, 0x74, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x31, 0x34, 0x20, 0x63, 0x6f,
+      0x6e, 0x6e, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x37, 0x32, 0x31, 0x64, 0x61,
+      0x30, 0x37, 0x31, 0x30, 0x30, 0x0a, 0x28, 0x92, 0xad, 0xf6, 0xf0, 0xbd,
+      0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18, 0xe9, 0x06,
+      0x20, 0x00, 0x0a, 0xf3, 0x80, 0x80, 0x00, 0x38, 0x06, 0x32, 0x0b, 0x72,
+      0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x4e,
+      0x49, 0x4e, 0x46, 0x4f, 0x3a, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f,
+      0x72, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x77, 0x5f, 0x69, 0x6f, 0x76, 0x65,
+      0x63, 0x5f, 0x63, 0x62, 0x3a, 0x20, 0x57, 0x72, 0x69, 0x74, 0x65, 0x20,
+      0x69, 0x6f, 0x76, 0x65, 0x63, 0x20, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+      0x74, 0x20, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x20, 0x66,
+      0x6f, 0x72, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64,
+      0x65, 0x6d, 0x5f, 0x66, 0x73, 0x63, 0x28, 0x9e, 0xa1, 0xea, 0xf0, 0xbd,
+      0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x07, 0x10, 0xe9, 0x06, 0x18, 0xe9, 0x06,
+      0x20, 0x00, 0x0a, 0xfd, 0x80, 0x80, 0x00, 0x38, 0x06, 0x32, 0x0b, 0x72,
+      0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x58,
+      0x49, 0x4e, 0x46, 0x4f, 0x3a, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f,
+      0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f,
+      0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x3a, 0x20, 0x43, 0x61, 0x6c, 0x6c,
+      0x69, 0x6e, 0x67, 0x20, 0x57, 0x72, 0x69, 0x74, 0x65, 0x20, 0x5b, 0x6f,
+      0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x30, 0x2c, 0x20, 0x73, 0x69, 0x7a,
+      0x65, 0x3d, 0x36, 0x35, 0x35, 0x33, 0x36, 0x5d, 0x66, 0x6f, 0x72, 0x20,
+      0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f,
+      0x66, 0x73, 0x63, 0x21, 0x28, 0xe6, 0xc4, 0x80, 0xf1, 0xbd, 0xdc, 0xa5,
+      0xbc, 0x15, 0x08, 0x07, 0x10, 0xf6, 0x0b, 0x18, 0xf6, 0x0b, 0x20, 0x00,
+      0x0a, 0x80, 0x81, 0x80, 0x00, 0x38, 0x04, 0x32, 0x12, 0x76, 0x65, 0x6e,
+      0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72,
+      0x61, 0x67, 0x65, 0x42, 0x54, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f,
+      0x72, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x77, 0x5f, 0x69, 0x6f, 0x76, 0x65,
+      0x63, 0x5f, 0x63, 0x62, 0x3a, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f,
+      0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x63, 0x3a, 0x20, 0x72,
+      0x65, 0x71, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x31, 0x34, 0x20, 0x6d, 0x73,
+      0x67, 0x5f, 0x69, 0x64, 0x3d, 0x33, 0x3a, 0x20, 0x52, 0x2f, 0x57, 0x20,
+      0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x20, 0x72, 0x65, 0x63, 0x65,
+      0x69, 0x76, 0x65, 0x64, 0x0a, 0x28, 0xc3, 0xe0, 0xf9, 0xf0, 0xbd, 0xdc,
+      0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18, 0xe9, 0x06, 0x20,
+      0x00, 0x0a, 0xc1, 0x80, 0x80, 0x00, 0x38, 0x04, 0x32, 0x12, 0x76, 0x65,
+      0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f,
+      0x72, 0x61, 0x67, 0x65, 0x42, 0x15, 0x77, 0x61, 0x6b, 0x65, 0x6c, 0x6f,
+      0x63, 0x6b, 0x20, 0x61, 0x63, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x3a,
+      0x20, 0x31, 0x0a, 0x28, 0xb4, 0xc7, 0x8a, 0xf1, 0xbd, 0xdc, 0xa5, 0xbc,
+      0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18, 0xe9, 0x06, 0x20, 0x00, 0x0a,
+      0x84, 0x81, 0x80, 0x00, 0x38, 0x04, 0x32, 0x12, 0x76, 0x65, 0x6e, 0x64,
+      0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61,
+      0x67, 0x65, 0x42, 0x58, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72,
+      0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74,
+      0x68, 0x72, 0x65, 0x61, 0x64, 0x3a, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74,
+      0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x63, 0x3a, 0x20,
+      0x55, 0x6e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x77, 0x6f, 0x72, 0x6b,
+      0x65, 0x72, 0x20, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20, 0x28, 0x74,
+      0x68, 0x5f, 0x69, 0x64, 0x3a, 0x20, 0x34, 0x39, 0x30, 0x31, 0x31, 0x34,
+      0x39, 0x35, 0x34, 0x34, 0x36, 0x34, 0x29, 0x0a, 0x28, 0x8e, 0xe0, 0x8e,
+      0xf1, 0xbd, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18,
+      0xf6, 0x0b, 0x20, 0x00, 0x0a, 0x83, 0x81, 0x80, 0x00, 0x38, 0x04, 0x32,
+      0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f,
+      0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x57, 0x72, 0x6d, 0x74,
+      0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69,
+      0x65, 0x6e, 0x74, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x3a, 0x20,
+      0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f,
+      0x66, 0x73, 0x63, 0x3a, 0x20, 0x72, 0x65, 0x71, 0x5f, 0x68, 0x3d, 0x30,
+      0x78, 0x31, 0x34, 0x20, 0x6d, 0x73, 0x67, 0x5f, 0x69, 0x64, 0x3d, 0x33,
+      0x3a, 0x20, 0x42, 0x79, 0x74, 0x65, 0x73, 0x20, 0x77, 0x72, 0x69, 0x74,
+      0x74, 0x65, 0x6e, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x36, 0x0a,
+      0x28, 0x8a, 0xe1, 0xa0, 0xf2, 0xbd, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00,
+      0x10, 0xe9, 0x06, 0x18, 0xf6, 0x0b, 0x20, 0x00, 0x0a, 0x88, 0x81, 0x80,
+      0x00, 0x38, 0x04, 0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e,
+      0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42,
+      0x5c, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
+      0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x68, 0x72, 0x65,
+      0x61, 0x64, 0x3a, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f,
+      0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x63, 0x3a, 0x20, 0x72, 0x65, 0x71,
+      0x5f, 0x68, 0x3d, 0x30, 0x78, 0x31, 0x34, 0x20, 0x6d, 0x73, 0x67, 0x5f,
+      0x69, 0x64, 0x3d, 0x33, 0x3a, 0x20, 0x53, 0x65, 0x6e, 0x64, 0x20, 0x72,
+      0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3a, 0x20, 0x72, 0x65, 0x73,
+      0x3d, 0x30, 0x20, 0x65, 0x72, 0x72, 0x3d, 0x30, 0x0a, 0x28, 0xf8, 0x89,
+      0xa2, 0xf2, 0xbd, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06,
+      0x18, 0xf6, 0x0b, 0x20, 0x00, 0x0a, 0xae, 0x81, 0x80, 0x00, 0x38, 0x04,
+      0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74,
+      0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x81, 0x01, 0x72,
+      0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63,
+      0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64,
+      0x3a, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65,
+      0x6d, 0x5f, 0x66, 0x73, 0x63, 0x3a, 0x20, 0x41, 0x62, 0x6f, 0x75, 0x74,
+      0x20, 0x74, 0x6f, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x72, 0x6d,
+      0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, 0x63, 0x6c,
+      0x69, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20,
+      0x28, 0x74, 0x68, 0x5f, 0x69, 0x64, 0x3a, 0x20, 0x34, 0x39, 0x30, 0x31,
+      0x31, 0x34, 0x39, 0x35, 0x34, 0x34, 0x36, 0x34, 0x29, 0x20, 0x77, 0x61,
+      0x6b, 0x65, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x72, 0x65, 0x6c, 0x65, 0x61,
+      0x73, 0x65, 0x64, 0x3a, 0x20, 0x31, 0x0a, 0x0a, 0x28, 0xb9, 0xcb, 0xa9,
+      0xf2, 0xbd, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18,
+      0xf6, 0x0b, 0x20, 0x00, 0x0a, 0xf4, 0x80, 0x80, 0x00, 0x38, 0x06, 0x32,
+      0x0b, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
+      0x42, 0x4f, 0x49, 0x4e, 0x46, 0x4f, 0x3a, 0x72, 0x6d, 0x74, 0x5f, 0x73,
+      0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+      0x74, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x3a, 0x20, 0x44, 0x6f,
+      0x6e, 0x65, 0x20, 0x57, 0x72, 0x69, 0x74, 0x65, 0x20, 0x28, 0x62, 0x79,
+      0x74, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x36, 0x29,
+      0x20, 0x66, 0x6f, 0x72, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d,
+      0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x63, 0x21, 0x28, 0xd6, 0xbd,
+      0x8f, 0xf2, 0xbd, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x07, 0x10, 0xf6, 0x0b,
+      0x18, 0xf6, 0x0b, 0x20, 0x00, 0x0a, 0xe7, 0x80, 0x80, 0x00, 0x38, 0x04,
+      0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74,
+      0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x3b, 0x72, 0x6d,
+      0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x64, 0x69,
+      0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x3a,
+      0x20, 0x63, 0x6c, 0x6e, 0x74, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x31, 0x34,
+      0x20, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x37, 0x32,
+      0x31, 0x64, 0x61, 0x30, 0x37, 0x31, 0x30, 0x30, 0x0a, 0x28, 0x92, 0xd5,
+      0xc7, 0xf2, 0xbd, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06,
+      0x18, 0xe9, 0x06, 0x20, 0x00, 0x18, 0x8f, 0x4e, 0x0a, 0x70, 0x40, 0x92,
+      0xaf, 0xd5, 0x8d, 0x90, 0x55, 0xba, 0x02, 0xe0, 0x80, 0x80, 0x00, 0x0a,
+      0xdb, 0x80, 0x80, 0x00, 0x38, 0x04, 0x32, 0x08, 0x70, 0x65, 0x72, 0x66,
+      0x65, 0x74, 0x74, 0x6f, 0x42, 0x39, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69,
+      0x64, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73,
+      0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x63, 0x63, 0x3a, 0x32, 0x39, 0x31,
+      0x20, 0x53, 0x65, 0x65, 0x6e, 0x20, 0x31, 0x31, 0x20, 0x41, 0x6e, 0x64,
+      0x72, 0x6f, 0x69, 0x64, 0x20, 0x6c, 0x6f, 0x67, 0x20, 0x65, 0x76, 0x65,
+      0x6e, 0x74, 0x73, 0x28, 0xd0, 0x8f, 0xfa, 0xf4, 0xbd, 0xdc, 0xa5, 0xbc,
+      0x15, 0x08, 0x00, 0x10, 0xb5, 0x58, 0x18, 0xb5, 0x58, 0x20, 0x00, 0x18,
+      0x8f, 0x4e, 0x0a, 0xfa, 0x0a, 0x40, 0x9c, 0xc7, 0xf8, 0xbc, 0x90, 0x55,
+      0xba, 0x02, 0xea, 0x8a, 0x80, 0x00, 0x0a, 0xe4, 0x80, 0x80, 0x00, 0x38,
+      0x04, 0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d,
+      0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x38, 0x72,
+      0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63,
+      0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x3a, 0x20, 0x63,
+      0x6c, 0x6e, 0x74, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x31, 0x35, 0x20, 0x63,
+      0x6f, 0x6e, 0x6e, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x37, 0x32, 0x31, 0x64,
+      0x61, 0x30, 0x37, 0x31, 0x30, 0x30, 0x0a, 0x28, 0xb4, 0xa2, 0x8b, 0xa5,
+      0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18, 0xe9,
+      0x06, 0x20, 0x00, 0x0a, 0x80, 0x81, 0x80, 0x00, 0x38, 0x04, 0x32, 0x12,
+      0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73,
+      0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x54, 0x72, 0x6d, 0x74, 0x5f,
+      0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x77, 0x5f, 0x69,
+      0x6f, 0x76, 0x65, 0x63, 0x5f, 0x63, 0x62, 0x3a, 0x20, 0x2f, 0x62, 0x6f,
+      0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x31,
+      0x3a, 0x20, 0x72, 0x65, 0x71, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x31, 0x35,
+      0x20, 0x6d, 0x73, 0x67, 0x5f, 0x69, 0x64, 0x3d, 0x33, 0x3a, 0x20, 0x52,
+      0x2f, 0x57, 0x20, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x20, 0x72,
+      0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x0a, 0x28, 0x87, 0xf1, 0x8e,
+      0xa5, 0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18,
+      0xe9, 0x06, 0x20, 0x00, 0x0a, 0xc1, 0x80, 0x80, 0x00, 0x38, 0x04, 0x32,
+      0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f,
+      0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x15, 0x77, 0x61, 0x6b,
+      0x65, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x61, 0x63, 0x71, 0x75, 0x69, 0x72,
+      0x65, 0x64, 0x3a, 0x20, 0x31, 0x0a, 0x28, 0x8e, 0x8e, 0x9e, 0xa5, 0xbe,
+      0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18, 0xe9, 0x06,
+      0x20, 0x00, 0x0a, 0x84, 0x81, 0x80, 0x00, 0x38, 0x04, 0x32, 0x12, 0x76,
+      0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74,
+      0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x58, 0x72, 0x6d, 0x74, 0x5f, 0x73,
+      0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+      0x74, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x3a, 0x20, 0x2f, 0x62,
+      0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73,
+      0x31, 0x3a, 0x20, 0x55, 0x6e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x77,
+      0x6f, 0x72, 0x6b, 0x65, 0x72, 0x20, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64,
+      0x20, 0x28, 0x74, 0x68, 0x5f, 0x69, 0x64, 0x3a, 0x20, 0x34, 0x39, 0x30,
+      0x31, 0x32, 0x38, 0x37, 0x30, 0x30, 0x36, 0x34, 0x30, 0x29, 0x0a, 0x28,
+      0x9a, 0xa4, 0xa1, 0xa5, 0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10,
+      0xe9, 0x06, 0x18, 0xf1, 0x0b, 0x20, 0x00, 0x0a, 0xf3, 0x80, 0x80, 0x00,
+      0x38, 0x06, 0x32, 0x0b, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72,
+      0x61, 0x67, 0x65, 0x42, 0x4e, 0x49, 0x4e, 0x46, 0x4f, 0x3a, 0x72, 0x6d,
+      0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x77,
+      0x5f, 0x69, 0x6f, 0x76, 0x65, 0x63, 0x5f, 0x63, 0x62, 0x3a, 0x20, 0x57,
+      0x72, 0x69, 0x74, 0x65, 0x20, 0x69, 0x6f, 0x76, 0x65, 0x63, 0x20, 0x72,
+      0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x20, 0x72, 0x65, 0x63, 0x65, 0x69,
+      0x76, 0x65, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x2f, 0x62, 0x6f, 0x6f,
+      0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x31, 0x28,
+      0x8e, 0xb1, 0xff, 0xa4, 0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x07, 0x10,
+      0xe9, 0x06, 0x18, 0xe9, 0x06, 0x20, 0x00, 0x0a, 0xff, 0x80, 0x80, 0x00,
+      0x38, 0x06, 0x32, 0x0b, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72,
+      0x61, 0x67, 0x65, 0x42, 0x5a, 0x49, 0x4e, 0x46, 0x4f, 0x3a, 0x72, 0x6d,
+      0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c,
+      0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x3a,
+      0x20, 0x43, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x57, 0x72, 0x69,
+      0x74, 0x65, 0x20, 0x5b, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x30,
+      0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x32, 0x30, 0x39, 0x37, 0x31,
+      0x35, 0x32, 0x5d, 0x66, 0x6f, 0x72, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74,
+      0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x31, 0x21, 0x28,
+      0xe6, 0xae, 0x92, 0xa5, 0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x07, 0x10,
+      0xf1, 0x0b, 0x18, 0xf1, 0x0b, 0x20, 0x00, 0x0a, 0x85, 0x81, 0x80, 0x00,
+      0x38, 0x04, 0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72,
+      0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x59,
+      0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f,
+      0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61,
+      0x64, 0x3a, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64,
+      0x65, 0x6d, 0x5f, 0x66, 0x73, 0x31, 0x3a, 0x20, 0x72, 0x65, 0x71, 0x5f,
+      0x68, 0x3d, 0x30, 0x78, 0x31, 0x35, 0x20, 0x6d, 0x73, 0x67, 0x5f, 0x69,
+      0x64, 0x3d, 0x33, 0x3a, 0x20, 0x42, 0x79, 0x74, 0x65, 0x73, 0x20, 0x77,
+      0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x20, 0x3d, 0x20, 0x32, 0x30, 0x39,
+      0x37, 0x31, 0x35, 0x32, 0x0a, 0x28, 0x96, 0x87, 0xd7, 0xb3, 0xbe, 0xdc,
+      0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xe9, 0x06, 0x18, 0xf1, 0x0b, 0x20,
+      0x00, 0x0a, 0x88, 0x81, 0x80, 0x00, 0x38, 0x04, 0x32, 0x12, 0x76, 0x65,
+      0x6e, 0x64, 0x6f, 0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f,
+      0x72, 0x61, 0x67, 0x65, 0x42, 0x5c, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74,
+      0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+      0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x3a, 0x20, 0x2f, 0x62, 0x6f,
+      0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x31,
+      0x3a, 0x20, 0x72, 0x65, 0x71, 0x5f, 0x68, 0x3d, 0x30, 0x78, 0x31, 0x35,
+      0x20, 0x6d, 0x73, 0x67, 0x5f, 0x69, 0x64, 0x3d, 0x33, 0x3a, 0x20, 0x53,
+      0x65, 0x6e, 0x64, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+      0x3a, 0x20, 0x72, 0x65, 0x73, 0x3d, 0x30, 0x20, 0x65, 0x72, 0x72, 0x3d,
+      0x30, 0x0a, 0x28, 0xda, 0xb3, 0xd8, 0xb3, 0xbe, 0xdc, 0xa5, 0xbc, 0x15,
+      0x08, 0x00, 0x10, 0xe9, 0x06, 0x18, 0xf1, 0x0b, 0x20, 0x00, 0x0a, 0xae,
+      0x81, 0x80, 0x00, 0x38, 0x04, 0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f,
+      0x72, 0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67,
+      0x65, 0x42, 0x81, 0x01, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72,
+      0x61, 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74,
+      0x68, 0x72, 0x65, 0x61, 0x64, 0x3a, 0x20, 0x2f, 0x62, 0x6f, 0x6f, 0x74,
+      0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f, 0x66, 0x73, 0x31, 0x3a, 0x20,
+      0x41, 0x62, 0x6f, 0x75, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x6c, 0x6f,
+      0x63, 0x6b, 0x20, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61,
+      0x67, 0x65, 0x20, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x68,
+      0x72, 0x65, 0x61, 0x64, 0x20, 0x28, 0x74, 0x68, 0x5f, 0x69, 0x64, 0x3a,
+      0x20, 0x34, 0x39, 0x30, 0x31, 0x32, 0x38, 0x37, 0x30, 0x30, 0x36, 0x34,
+      0x30, 0x29, 0x20, 0x77, 0x61, 0x6b, 0x65, 0x6c, 0x6f, 0x63, 0x6b, 0x20,
+      0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x64, 0x3a, 0x20, 0x31, 0x0a,
+      0x0a, 0x28, 0xe4, 0xa2, 0xe0, 0xb3, 0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08,
+      0x00, 0x10, 0xe9, 0x06, 0x18, 0xf1, 0x0b, 0x20, 0x00, 0x0a, 0xe7, 0x80,
+      0x80, 0x00, 0x38, 0x04, 0x32, 0x12, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72,
+      0x2e, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
+      0x42, 0x3b, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67,
+      0x65, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+      0x5f, 0x63, 0x62, 0x3a, 0x20, 0x63, 0x6c, 0x6e, 0x74, 0x5f, 0x68, 0x3d,
+      0x30, 0x78, 0x31, 0x35, 0x20, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x68, 0x3d,
+      0x30, 0x78, 0x37, 0x32, 0x31, 0x64, 0x61, 0x30, 0x37, 0x31, 0x30, 0x30,
+      0x0a, 0x28, 0xeb, 0xea, 0x8f, 0xb4, 0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08,
+      0x00, 0x10, 0xe9, 0x06, 0x18, 0xe9, 0x06, 0x20, 0x00, 0x0a, 0xf6, 0x80,
+      0x80, 0x00, 0x38, 0x06, 0x32, 0x0b, 0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74,
+      0x6f, 0x72, 0x61, 0x67, 0x65, 0x42, 0x51, 0x49, 0x4e, 0x46, 0x4f, 0x3a,
+      0x72, 0x6d, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f,
+      0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61,
+      0x64, 0x3a, 0x20, 0x44, 0x6f, 0x6e, 0x65, 0x20, 0x57, 0x72, 0x69, 0x74,
+      0x65, 0x20, 0x28, 0x62, 0x79, 0x74, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x32,
+      0x30, 0x39, 0x37, 0x31, 0x35, 0x32, 0x29, 0x20, 0x66, 0x6f, 0x72, 0x20,
+      0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x5f,
+      0x66, 0x73, 0x31, 0x21, 0x28, 0x9e, 0xa9, 0xc5, 0xb3, 0xbe, 0xdc, 0xa5,
+      0xbc, 0x15, 0x08, 0x07, 0x10, 0xf1, 0x0b, 0x18, 0xf1, 0x0b, 0x20, 0x00,
+      0x18, 0x8f, 0x4e, 0x0a, 0x70, 0x40, 0xd2, 0x9f, 0x8f, 0xed, 0x90, 0x55,
+      0xba, 0x02, 0xe0, 0x80, 0x80, 0x00, 0x0a, 0xdb, 0x80, 0x80, 0x00, 0x38,
+      0x04, 0x32, 0x08, 0x70, 0x65, 0x72, 0x66, 0x65, 0x74, 0x74, 0x6f, 0x42,
+      0x39, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x5f, 0x6c, 0x6f, 0x67,
+      0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+      0x2e, 0x63, 0x63, 0x3a, 0x32, 0x39, 0x31, 0x20, 0x53, 0x65, 0x65, 0x6e,
+      0x20, 0x31, 0x31, 0x20, 0x41, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x20,
+      0x6c, 0x6f, 0x67, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x28, 0xf4,
+      0x9d, 0x96, 0xd4, 0xbe, 0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xb5,
+      0x58, 0x18, 0xb5, 0x58, 0x20, 0x00, 0x18, 0x8f, 0x4e, 0x0a, 0x4e, 0x40,
+      0xfe, 0xf3, 0x83, 0xd1, 0x9e, 0x55, 0xba, 0x02, 0xbe, 0x80, 0x80, 0x00,
+      0x0a, 0xb9, 0x80, 0x80, 0x00, 0x38, 0x06, 0x32, 0x00, 0x42, 0x1f, 0x74,
+      0x75, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x3a, 0x73, 0x75, 0x69, 0x73,
+      0x76, 0x63, 0x20, 0x20, 0x65, 0x78, 0x69, 0x73, 0x20, 0x61, 0x6c, 0x72,
+      0x65, 0x61, 0x64, 0x79, 0x20, 0x30, 0x28, 0x9f, 0x92, 0xdf, 0xdf, 0xcc,
+      0xdc, 0xa5, 0xbc, 0x15, 0x08, 0x00, 0x10, 0xd9, 0x06, 0x18, 0xd9, 0x06,
+      0x20, 0x00, 0x18, 0x8f, 0x4e, 0x0a, 0x1b, 0x40, 0x9b, 0x83, 0xa7, 0xba,
+      0xba, 0x55, 0xba, 0x02, 0x8b, 0x80, 0x80, 0x00, 0x12, 0x86, 0x80, 0x80,
+      0x00, 0x08, 0x1a, 0x18, 0x00, 0x10, 0x00, 0x18, 0x8f, 0x4e};
+
+  static const uint8_t kFilterBytecode[]{
+      0x0b, 0x01, 0x00, 0x0b, 0x60, 0x13, 0x02, 0x19, 0x23, 0x08, 0x2b, 0x09,
+      0x33, 0x0f, 0x3b, 0x10, 0x41, 0x4b, 0x05, 0x51, 0x5b, 0x12, 0x63, 0x72,
+      0x69, 0x8b, 0x02, 0x21, 0x93, 0x02, 0x33, 0x9b, 0x02, 0x35, 0xa1, 0x02,
+      0xab, 0x02, 0x37, 0xb3, 0x02, 0x07, 0xbb, 0x02, 0x3e, 0xc3, 0x02, 0x3d,
+      0xca, 0x02, 0x02, 0xdb, 0x02, 0x1b, 0xe3, 0x02, 0x11, 0xeb, 0x02, 0x40,
+      0xf3, 0x02, 0x04, 0xfb, 0x02, 0x41, 0x83, 0x03, 0x34, 0x8b, 0x03, 0x42,
+      0x91, 0x03, 0x9b, 0x03, 0x43, 0xa3, 0x03, 0x46, 0xab, 0x03, 0x49, 0xb3,
+      0x03, 0x04, 0xbb, 0x03, 0x07, 0xc3, 0x03, 0x4b, 0xcb, 0x03, 0x4c, 0xd1,
+      0x03, 0xdb, 0x03, 0x73, 0xe3, 0x03, 0x5f, 0xeb, 0x03, 0x5b, 0xf3, 0x03,
+      0x4d, 0xfb, 0x03, 0x04, 0x83, 0x04, 0x5d, 0x8b, 0x04, 0x4e, 0x93, 0x04,
+      0x4f, 0x9b, 0x04, 0x50, 0xa3, 0x04, 0x51, 0xab, 0x04, 0x3c, 0xb3, 0x04,
+      0x0e, 0xbb, 0x04, 0x04, 0xc3, 0x04, 0x69, 0xcb, 0x04, 0x53, 0xd3, 0x04,
+      0x3c, 0xdb, 0x04, 0x04, 0xe3, 0x04, 0x56, 0xeb, 0x04, 0x58, 0xf3, 0x04,
+      0x5a, 0xa3, 0x38, 0x70, 0x00, 0x0b, 0x03, 0x13, 0x04, 0x19, 0x00, 0x0a,
+      0x03, 0x23, 0x04, 0x29, 0x00, 0x0a, 0x03, 0x00, 0x0b, 0x06, 0x11, 0x00,
+      0x0a, 0x0a, 0x5b, 0x07, 0x62, 0x03, 0x00, 0x0a, 0x04, 0x00, 0x0a, 0x02,
+      0x1b, 0x04, 0x00, 0x0b, 0x0a, 0x13, 0x0d, 0x1b, 0x0e, 0x21, 0x2b, 0x0e,
+      0x00, 0x0a, 0x0d, 0x73, 0x0b, 0x7a, 0x02, 0x00, 0x0a, 0x09, 0x53, 0x0c,
+      0x00, 0x0a, 0x02, 0x1b, 0x0c, 0x23, 0x0c, 0x2a, 0x04, 0x00, 0x0a, 0x05,
+      0x00, 0x0a, 0x02, 0x00, 0x0b, 0x07, 0x11, 0x00, 0x0b, 0x0e, 0x13, 0x0e,
+      0x1b, 0x11, 0x22, 0x02, 0x33, 0x0e, 0x39, 0x43, 0x0e, 0x49, 0x53, 0x0e,
+      0x00, 0x0a, 0x08, 0x00, 0x0a, 0x03, 0x23, 0x13, 0x2b, 0x15, 0x33, 0x20,
+      0x42, 0x05, 0x82, 0x01, 0x02, 0xa1, 0x01, 0xab, 0x01, 0x0e, 0xb2, 0x01,
+      0x02, 0xc3, 0x01, 0x16, 0xcb, 0x01, 0x0e, 0xd3, 0x01, 0x15, 0xdb, 0x01,
+      0x0e, 0xe3, 0x01, 0x07, 0xeb, 0x01, 0x1e, 0xf2, 0x01, 0x02, 0x83, 0x02,
+      0x1f, 0x8b, 0x02, 0x07, 0x91, 0x02, 0x9b, 0x02, 0x0e, 0xa1, 0x02, 0xb3,
+      0x02, 0x04, 0xbb, 0x02, 0x15, 0xc3, 0x02, 0x15, 0xcb, 0x02, 0x04, 0xd1,
+      0x02, 0xdb, 0x02, 0x15, 0xe2, 0x02, 0x03, 0x00, 0x0a, 0x07, 0x43, 0x14,
+      0x4a, 0x02, 0x5b, 0x13, 0x63, 0x13, 0x00, 0x0a, 0x02, 0x1b, 0x14, 0x23,
+      0x14, 0x2a, 0x04, 0x00, 0x09, 0x00, 0x0b, 0x17, 0x12, 0x0c, 0x73, 0x19,
+      0x7b, 0x1c, 0x83, 0x01, 0x1d, 0x8b, 0x01, 0x1b, 0x00, 0x0b, 0x0d, 0x13,
+      0x18, 0x00, 0x0a, 0x2e, 0x00, 0x0a, 0x03, 0x23, 0x1a, 0x2b, 0x1a, 0x33,
+      0x1b, 0x00, 0x0a, 0x09, 0x53, 0x07, 0x00, 0x0a, 0x07, 0x00, 0x09, 0x13,
+      0x1a, 0x00, 0x0a, 0x03, 0x23, 0x1a, 0x00, 0x0a, 0x03, 0x23, 0x0e, 0x2a,
+      0x02, 0x00, 0x0a, 0x0a, 0x00, 0x0a, 0x04, 0x32, 0x0a, 0x92, 0x01, 0x02,
+      0x00, 0x0b, 0x22, 0x13, 0x23, 0x1a, 0x03, 0x33, 0x04, 0x3b, 0x07, 0x42,
+      0x03, 0x5b, 0x15, 0x62, 0x03, 0x81, 0x01, 0x8b, 0x01, 0x32, 0x92, 0x01,
+      0x02, 0xa3, 0x01, 0x1b, 0xab, 0x01, 0x15, 0xb2, 0x01, 0x03, 0xcb, 0x01,
+      0x0d, 0xda, 0x01, 0x05, 0x83, 0x02, 0x15, 0x00, 0x09, 0x21, 0x00, 0x0b,
+      0x24, 0x12, 0x02, 0x00, 0x0a, 0x04, 0x32, 0x03, 0xa3, 0x06, 0x25, 0xab,
+      0x06, 0x0d, 0xb3, 0x06, 0x26, 0xbb, 0x06, 0x27, 0xc3, 0x06, 0x1b, 0xcb,
+      0x06, 0x28, 0xd3, 0x06, 0x07, 0xdb, 0x06, 0x2b, 0xe3, 0x06, 0x07, 0xeb,
+      0x06, 0x15, 0xf3, 0x06, 0x2a, 0xfb, 0x06, 0x2c, 0x83, 0x07, 0x0e, 0x8b,
+      0x07, 0x07, 0x93, 0x07, 0x15, 0x9b, 0x07, 0x2f, 0xc1, 0x3e, 0xcb, 0x3e,
+      0x30, 0xf9, 0xff, 0xff, 0xff, 0x07, 0x00, 0x0a, 0x03, 0x52, 0x02, 0x63,
+      0x15, 0x6a, 0x02, 0x00, 0x0a, 0x05, 0x33, 0x0e, 0x00, 0x0a, 0x04, 0x32,
+      0x03, 0x00, 0x0a, 0x02, 0x22, 0x02, 0x33, 0x29, 0x3a, 0x05, 0x6a, 0x0e,
+      0x00, 0x2a, 0x02, 0x00, 0x0a, 0x02, 0x1b, 0x0e, 0x22, 0x04, 0x00, 0x09,
+      0x1a, 0x02, 0x00, 0x0a, 0x0d, 0x7b, 0x2d, 0x83, 0x01, 0x2e, 0x8a, 0x01,
+      0x02, 0x00, 0x0a, 0x02, 0x1b, 0x0e, 0x21, 0x00, 0x0b, 0x0d, 0x11, 0x00,
+      0x09, 0xa3, 0x06, 0x0e, 0x00, 0x0a, 0x05, 0x33, 0x31, 0x00, 0x0a, 0x0e,
+      0x00, 0x09, 0x13, 0x0d, 0x19, 0x00, 0x09, 0x13, 0x34, 0x1a, 0x02, 0x00,
+      0x0a, 0x09, 0x00, 0x0b, 0x36, 0x12, 0x09, 0x5b, 0x0d, 0x00, 0x0a, 0x13,
+      0x00, 0x0b, 0x0e, 0x13, 0x07, 0x1b, 0x0e, 0x23, 0x11, 0x2b, 0x38, 0x32,
+      0x02, 0x00, 0x09, 0x13, 0x3b, 0x1a, 0x02, 0x2b, 0x39, 0x32, 0x09, 0x00,
+      0x0a, 0x03, 0x23, 0x3a, 0x2a, 0x02, 0x00, 0x0b, 0x04, 0x00, 0x0a, 0x06,
+      0x42, 0x02, 0x00, 0x0a, 0x06, 0x00, 0x0b, 0x07, 0x13, 0x04, 0x00, 0x0b,
+      0x3f, 0x13, 0x04, 0x00, 0x0a, 0x08, 0x4b, 0x07, 0x00, 0x0b, 0x07, 0x12,
+      0x02, 0x00, 0x0b, 0x0d, 0x12, 0x02, 0x00, 0x0a, 0x06, 0x3b, 0x0e, 0x42,
+      0x02, 0x00, 0x0b, 0x44, 0x12, 0x02, 0x00, 0x0b, 0x45, 0x13, 0x45, 0x00,
+      0x09, 0x13, 0x04, 0x1b, 0x0e, 0x00, 0x0b, 0x47, 0x13, 0x04, 0x19, 0x00,
+      0x0b, 0x48, 0x13, 0x0d, 0x1a, 0x03, 0x00, 0x0a, 0x03, 0x2a, 0x06, 0x00,
+      0x0a, 0x05, 0x33, 0x0e, 0x3b, 0x4a, 0x42, 0x08, 0x00, 0x0b, 0x0e, 0x13,
+      0x0e, 0x1b, 0x0e, 0x00, 0x09, 0x13, 0x1b, 0x23, 0x0e, 0x2a, 0x02, 0x3b,
+      0x0e, 0x43, 0x0e, 0x4b, 0x11, 0x00, 0x0b, 0x0d, 0x00, 0x0a, 0x08, 0x4b,
+      0x07, 0x82, 0x01, 0x05, 0x00, 0x0b, 0x0d, 0x13, 0x3c, 0x00, 0x0a, 0x06,
+      0x82, 0x01, 0x03, 0x9b, 0x01, 0x15, 0x00, 0x0b, 0x0e, 0x00, 0x09, 0x13,
+      0x52, 0x00, 0x0a, 0x0f, 0x00, 0x0a, 0x02, 0x1b, 0x54, 0x00, 0x09, 0x13,
+      0x55, 0x1b, 0x07, 0x00, 0x0a, 0x04, 0x2b, 0x07, 0x00, 0x0b, 0x04, 0x13,
+      0x11, 0x1b, 0x0d, 0x23, 0x57, 0x2b, 0x15, 0x00, 0x0a, 0x0b, 0x00, 0x0b,
+      0x59, 0x12, 0x02, 0x23, 0x0e, 0x00, 0x0b, 0x07, 0x00, 0x0a, 0x02, 0x1b,
+      0x0e, 0x00, 0x0a, 0x02, 0x1b, 0x5c, 0x00, 0x09, 0x13, 0x04, 0x00, 0x0a,
+      0x02, 0x1b, 0x5e, 0x00, 0x0a, 0x02, 0x1b, 0x0e, 0x23, 0x0e, 0x00, 0x0a,
+      0x02, 0x1b, 0x1b, 0x23, 0x11, 0x29, 0x33, 0x0d, 0x3b, 0x0e, 0x43, 0x3c,
+      0x00, 0x09, 0x13, 0x61, 0x19, 0x23, 0x57, 0x00, 0x0a, 0x02, 0x1b, 0x0e,
+      0x23, 0x1b, 0x5b, 0x0e, 0x63, 0x04, 0x6b, 0x0e, 0x73, 0x04, 0x7b, 0x04,
+      0x83, 0x01, 0x04, 0x8b, 0x01, 0x0d, 0x93, 0x01, 0x04, 0x9b, 0x01, 0x04,
+      0xa3, 0x01, 0x0d, 0xab, 0x01, 0x15, 0xb3, 0x01, 0x15, 0xbb, 0x01, 0x0e,
+      0xc3, 0x01, 0x15, 0xcb, 0x01, 0x15, 0xd3, 0x01, 0x15, 0xdb, 0x01, 0x0d,
+      0xe3, 0x01, 0x3c, 0xeb, 0x01, 0x04, 0xf3, 0x01, 0x3c, 0xfb, 0x01, 0x0d,
+      0x83, 0x02, 0x3c, 0x8b, 0x02, 0x1b, 0x93, 0x02, 0x3c, 0x9b, 0x02, 0x0d,
+      0xa3, 0x02, 0x04, 0xab, 0x02, 0x0e, 0xb3, 0x02, 0x0e, 0xbb, 0x02, 0x0e,
+      0xc3, 0x02, 0x04, 0xcb, 0x02, 0x0d, 0xd3, 0x02, 0x0d, 0xdb, 0x02, 0x07,
+      0xe3, 0x02, 0x04, 0xeb, 0x02, 0x1b, 0xf3, 0x02, 0x04, 0xfb, 0x02, 0x15,
+      0x83, 0x03, 0x0e, 0x8b, 0x03, 0x15, 0x93, 0x03, 0x1b, 0x9b, 0x03, 0x15,
+      0xa3, 0x03, 0x0d, 0xab, 0x03, 0x15, 0xb3, 0x03, 0x15, 0xbb, 0x03, 0x15,
+      0xc3, 0x03, 0x15, 0xcb, 0x03, 0x15, 0xd3, 0x03, 0x0e, 0xdb, 0x03, 0x0d,
+      0xe3, 0x03, 0x15, 0xeb, 0x03, 0x15, 0xf3, 0x03, 0x15, 0xfb, 0x03, 0x15,
+      0x83, 0x04, 0x15, 0x8b, 0x04, 0x04, 0x93, 0x04, 0x0e, 0x9b, 0x04, 0x0d,
+      0xa3, 0x04, 0x04, 0xab, 0x04, 0x04, 0xb3, 0x04, 0x04, 0xbb, 0x04, 0x0d,
+      0xc3, 0x04, 0x04, 0xcb, 0x04, 0x04, 0xd3, 0x04, 0x04, 0xdb, 0x04, 0x04,
+      0xe3, 0x04, 0x0e, 0xeb, 0x04, 0x07, 0xf3, 0x04, 0x07, 0xfb, 0x04, 0x62,
+      0x83, 0x05, 0x04, 0x8b, 0x05, 0x07, 0x93, 0x05, 0x11, 0x9b, 0x05, 0x0d,
+      0xa3, 0x05, 0x62, 0xab, 0x05, 0x0e, 0xb3, 0x05, 0x04, 0xbb, 0x05, 0x1b,
+      0xc3, 0x05, 0x04, 0xcb, 0x05, 0x15, 0xd3, 0x05, 0x15, 0xdb, 0x05, 0x11,
+      0xe3, 0x05, 0x0e, 0xeb, 0x05, 0x0e, 0xf3, 0x05, 0x1f, 0xfb, 0x05, 0x04,
+      0x83, 0x06, 0x15, 0x8b, 0x06, 0x0d, 0x93, 0x06, 0x0d, 0x9b, 0x06, 0x0d,
+      0xa3, 0x06, 0x3c, 0xab, 0x06, 0x3c, 0xb3, 0x06, 0x3c, 0xbb, 0x06, 0x3c,
+      0xc3, 0x06, 0x07, 0xcb, 0x06, 0x07, 0xd3, 0x06, 0x07, 0xdb, 0x06, 0x15,
+      0xe3, 0x06, 0x04, 0xeb, 0x06, 0x0e, 0xf3, 0x06, 0x07, 0xfb, 0x06, 0x04,
+      0x83, 0x07, 0x04, 0x8b, 0x07, 0x04, 0x93, 0x07, 0x0d, 0x9b, 0x07, 0x0d,
+      0xa3, 0x07, 0x0d, 0xab, 0x07, 0x0d, 0xb3, 0x07, 0x0d, 0xbb, 0x07, 0x0d,
+      0xc3, 0x07, 0x3c, 0xcb, 0x07, 0x04, 0xd3, 0x07, 0x0d, 0xdb, 0x07, 0x15,
+      0xe3, 0x07, 0x3c, 0xeb, 0x07, 0x3c, 0xf3, 0x07, 0x1b, 0x83, 0x08, 0x1b,
+      0x8b, 0x08, 0x3c, 0x93, 0x08, 0x0d, 0x9b, 0x08, 0x0d, 0xa3, 0x08, 0x04,
+      0xab, 0x08, 0x0e, 0xb3, 0x08, 0x07, 0xbb, 0x08, 0x57, 0xc3, 0x08, 0x07,
+      0xcb, 0x08, 0x04, 0xd3, 0x08, 0x07, 0xdb, 0x08, 0x11, 0xe3, 0x08, 0x1b,
+      0xeb, 0x08, 0x34, 0xf3, 0x08, 0x1f, 0xfb, 0x08, 0x0d, 0x83, 0x09, 0x0d,
+      0x8b, 0x09, 0x3c, 0x93, 0x09, 0x04, 0x9b, 0x09, 0x0e, 0xa3, 0x09, 0x04,
+      0xab, 0x09, 0x3c, 0xb3, 0x09, 0x04, 0xbb, 0x09, 0x3c, 0xc3, 0x09, 0x3c,
+      0xcb, 0x09, 0x04, 0xd3, 0x09, 0x1b, 0xdb, 0x09, 0x07, 0xe3, 0x09, 0x0d,
+      0xeb, 0x09, 0x04, 0xf3, 0x09, 0x04, 0xfb, 0x09, 0x04, 0x83, 0x0a, 0x04,
+      0x8b, 0x0a, 0x1b, 0x93, 0x0a, 0x1f, 0x9b, 0x0a, 0x11, 0xa3, 0x0a, 0x07,
+      0xab, 0x0a, 0x07, 0xb3, 0x0a, 0x0d, 0xbb, 0x0a, 0x11, 0xc3, 0x0a, 0x0d,
+      0xcb, 0x0a, 0x0d, 0xd3, 0x0a, 0x1b, 0xdb, 0x0a, 0x04, 0xe3, 0x0a, 0x1b,
+      0xeb, 0x0a, 0x0d, 0xf3, 0x0a, 0x3c, 0xfb, 0x0a, 0x0d, 0x83, 0x0b, 0x1b,
+      0x8b, 0x0b, 0x0d, 0x93, 0x0b, 0x3c, 0x9b, 0x0b, 0x3c, 0xa3, 0x0b, 0x3c,
+      0xab, 0x0b, 0x07, 0xb3, 0x0b, 0x0d, 0xbb, 0x0b, 0x11, 0xc3, 0x0b, 0x07,
+      0xcb, 0x0b, 0x0d, 0xd3, 0x0b, 0x0d, 0xdb, 0x0b, 0x04, 0xe3, 0x0b, 0x0d,
+      0xeb, 0x0b, 0x0d, 0xf3, 0x0b, 0x0e, 0xfb, 0x0b, 0x0e, 0x83, 0x0c, 0x04,
+      0x8b, 0x0c, 0x0e, 0x93, 0x0c, 0x0e, 0x9b, 0x0c, 0x0e, 0xa3, 0x0c, 0x0d,
+      0xab, 0x0c, 0x0d, 0xb3, 0x0c, 0x04, 0xbb, 0x0c, 0x07, 0xc3, 0x0c, 0x63,
+      0xcb, 0x0c, 0x0d, 0xd3, 0x0c, 0x0d, 0xdb, 0x0c, 0x1f, 0xe3, 0x0c, 0x3c,
+      0xeb, 0x0c, 0x0d, 0xf3, 0x0c, 0x0e, 0xfb, 0x0c, 0x04, 0x83, 0x0d, 0x04,
+      0x8b, 0x0d, 0x11, 0x93, 0x0d, 0x1f, 0x9b, 0x0d, 0x04, 0xa3, 0x0d, 0x0e,
+      0xab, 0x0d, 0x0d, 0xb3, 0x0d, 0x0d, 0xbb, 0x0d, 0x04, 0xc3, 0x0d, 0x04,
+      0xcb, 0x0d, 0x07, 0xd3, 0x0d, 0x04, 0xdb, 0x0d, 0x0d, 0xb3, 0x0e, 0x0d,
+      0xbb, 0x0e, 0x04, 0xc3, 0x0e, 0x1f, 0xcb, 0x0e, 0x1b, 0xd3, 0x0e, 0x0d,
+      0xdb, 0x0e, 0x07, 0xe3, 0x0e, 0x07, 0xeb, 0x0e, 0x04, 0xf3, 0x0e, 0x07,
+      0xfb, 0x0e, 0x07, 0x83, 0x0f, 0x04, 0x8b, 0x0f, 0x0e, 0x93, 0x0f, 0x04,
+      0x9b, 0x0f, 0x0d, 0xa3, 0x0f, 0x11, 0xab, 0x0f, 0x11, 0xb3, 0x0f, 0x3c,
+      0xbb, 0x0f, 0x1f, 0xc3, 0x0f, 0x11, 0xcb, 0x0f, 0x04, 0xd3, 0x0f, 0x04,
+      0xdb, 0x0f, 0x0d, 0xe3, 0x0f, 0x04, 0xeb, 0x0f, 0x3c, 0xf3, 0x0f, 0x0d,
+      0xfb, 0x0f, 0x11, 0x83, 0x10, 0x0d, 0x8b, 0x10, 0x04, 0x93, 0x10, 0x11,
+      0x9b, 0x10, 0x0d, 0xa3, 0x10, 0x04, 0xab, 0x10, 0x0d, 0xb3, 0x10, 0x0d,
+      0xbb, 0x10, 0x04, 0xc3, 0x10, 0x07, 0xcb, 0x10, 0x07, 0xd3, 0x10, 0x04,
+      0xdb, 0x10, 0x0d, 0xe3, 0x10, 0x0d, 0xeb, 0x10, 0x04, 0xf3, 0x10, 0x3c,
+      0xfb, 0x10, 0x0d, 0x83, 0x11, 0x04, 0x8b, 0x11, 0x0d, 0x93, 0x11, 0x0e,
+      0x9b, 0x11, 0x0e, 0xa3, 0x11, 0x0e, 0xab, 0x11, 0x0e, 0xb3, 0x11, 0x0e,
+      0xbb, 0x11, 0x0e, 0xc3, 0x11, 0x15, 0xcb, 0x11, 0x07, 0xd3, 0x11, 0x0d,
+      0xdb, 0x11, 0x0d, 0xe3, 0x11, 0x0d, 0xeb, 0x11, 0x3c, 0xf3, 0x11, 0x3c,
+      0xfb, 0x11, 0x0d, 0x83, 0x12, 0x15, 0x8b, 0x12, 0x07, 0x93, 0x12, 0x07,
+      0x9b, 0x12, 0x15, 0xa3, 0x12, 0x04, 0xab, 0x12, 0x04, 0xb3, 0x12, 0x07,
+      0xbb, 0x12, 0x07, 0xc3, 0x12, 0x0e, 0xcb, 0x12, 0x0e, 0xd3, 0x12, 0x0e,
+      0xdb, 0x12, 0x0d, 0xe3, 0x12, 0x3c, 0xeb, 0x12, 0x0d, 0xf3, 0x12, 0x3c,
+      0xfb, 0x12, 0x0e, 0x83, 0x13, 0x15, 0x8b, 0x13, 0x15, 0x93, 0x13, 0x15,
+      0x9b, 0x13, 0x0d, 0xa3, 0x13, 0x1b, 0xab, 0x13, 0x07, 0xb3, 0x13, 0x04,
+      0xbb, 0x13, 0x04, 0xc3, 0x13, 0x07, 0xcb, 0x13, 0x07, 0xd3, 0x13, 0x04,
+      0xdb, 0x13, 0x04, 0xe3, 0x13, 0x07, 0xeb, 0x13, 0x07, 0xf3, 0x13, 0x07,
+      0xfb, 0x13, 0x07, 0x83, 0x14, 0x15, 0x8b, 0x14, 0x15, 0x93, 0x14, 0x0e,
+      0x9b, 0x14, 0x04, 0xa3, 0x14, 0x04, 0xab, 0x14, 0x3c, 0xb3, 0x14, 0x04,
+      0xbb, 0x14, 0x64, 0xc3, 0x14, 0x07, 0xcb, 0x14, 0x15, 0xd3, 0x14, 0x0e,
+      0xdb, 0x14, 0x07, 0xe3, 0x14, 0x0e, 0xeb, 0x14, 0x0d, 0xf3, 0x14, 0x15,
+      0xfb, 0x14, 0x04, 0x83, 0x15, 0x0e, 0x8b, 0x15, 0x0e, 0x93, 0x15, 0x04,
+      0x9b, 0x15, 0x66, 0xa3, 0x15, 0x04, 0xab, 0x15, 0x07, 0xb3, 0x15, 0x0e,
+      0xbb, 0x15, 0x07, 0xc3, 0x15, 0x07, 0xcb, 0x15, 0x07, 0xd3, 0x15, 0x07,
+      0xdb, 0x15, 0x04, 0xe3, 0x15, 0x3c, 0xeb, 0x15, 0x67, 0xf3, 0x15, 0x07,
+      0xfb, 0x15, 0x04, 0x83, 0x16, 0x07, 0x8b, 0x16, 0x07, 0x93, 0x16, 0x04,
+      0x9b, 0x16, 0x11, 0xa3, 0x16, 0x68, 0xab, 0x16, 0x3c, 0xb3, 0x16, 0x07,
+      0x00, 0x0a, 0x10, 0x00, 0x0a, 0x14, 0x00, 0x09, 0x13, 0x65, 0x00, 0x09,
+      0x1a, 0x03, 0x00, 0x00, 0x09, 0x22, 0x03, 0x00, 0x0a, 0x0c, 0x00, 0x0b,
+      0x6a, 0x00, 0x0b, 0x6b, 0x00, 0x0a, 0x03, 0x23, 0x6c, 0x2b, 0x6e, 0x3b,
+      0x6d, 0x52, 0x02, 0x00, 0x09, 0x13, 0x6d, 0x1b, 0x6c, 0x23, 0x6e, 0x33,
+      0x6d, 0x43, 0x6f, 0x4b, 0x0e, 0x51, 0x00, 0x0a, 0x07, 0x49, 0x00, 0x09,
+      0x13, 0x0e, 0x29, 0x00, 0x09, 0x13, 0x66, 0x00, 0x0a, 0x04, 0x2b, 0x71,
+      0x00, 0x09, 0x13, 0x71, 0x1a, 0x04, 0x00, 0x0b, 0x0e, 0x13, 0x0e, 0x1b,
+      0x0e, 0x23, 0x07, 0x2b, 0x0e, 0x33, 0x07, 0x3b, 0x0e, 0x83, 0x01, 0x0e,
+      0x8b, 0x01, 0x0e, 0x93, 0x01, 0x0e, 0x9b, 0x01, 0x11, 0xa3, 0x01, 0x0e,
+      0xab, 0x01, 0x07, 0xb3, 0x01, 0x0e, 0xbb, 0x01, 0x04, 0xc3, 0x01, 0x07,
+      0xcb, 0x01, 0x0e, 0xd3, 0x01, 0x0e, 0x00, 0x5b, 0x74, 0x63, 0x75, 0xd1,
+      0x03, 0x00, 0x59, 0xf9, 0x01, 0xe9, 0x02, 0x00, 0x0b, 0x2d, 0x00, 0x89,
+      0x8c, 0xb0, 0x80, 0x08};
+
+  MessageFilter filt;
+  ASSERT_TRUE(
+      filt.LoadFilterBytecode(kFilterBytecode, sizeof(kFilterBytecode)));
+
+  // Pass the trace in input splitting it in slices of arbitrary size.
+  std::vector<MessageFilter::InputSlice> input_slices;
+  for (size_t i = 0; i < sizeof(kTraceData);) {
+    std::minstd_rand0 rnd_engine(0);
+    size_t slice_size = rnd_engine() % 4096;
+    slice_size = std::min(slice_size, sizeof(kTraceData) - i);
+    input_slices.emplace_back(
+        MessageFilter::InputSlice{kTraceData + i, slice_size});
+    i += slice_size;
+  }
+
+  auto filtered_data =
+      filt.FilterMessageFragments(input_slices.data(), input_slices.size());
+
+  EXPECT_GT(filtered_data.size, 0u);
+  EXPECT_LE(filtered_data.size, sizeof(kTraceData));
+
+  perfetto::protos::Trace original_trace;
+  ASSERT_TRUE(original_trace.ParseFromArray(kTraceData, sizeof(kTraceData)));
+
+  perfetto::protos::Trace filtered_trace;
+  ASSERT_TRUE(filtered_trace.ParseFromArray(
+      filtered_data.data.get(), static_cast<int>(filtered_data.size)));
+
+  // Check that the re-serialized traces are identical.
+  std::string original_ser = original_trace.SerializeAsString();
+  std::string filter_ser = filtered_trace.SerializeAsString();
+
+  EXPECT_EQ(filtered_trace.packet_size(), original_trace.packet_size());
+
+  // Don't use EXPECT_EQ, the string is too big. If this check fails, the gtest
+  // diffing algorithm will take several minutes to compute the diff.
+  // That would mistakenly look like a CI or timing-related issue as the gtest
+  // would fail due to timeout.
+  // If this check fails, use base::HexDump() to investigate.
+  EXPECT_TRUE(original_ser == filter_ser);
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/message_tokenizer.h b/src/libtracing/protozero_src/filtering/message_tokenizer.h
new file mode 100644
index 000000000..124b461ab
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/message_tokenizer.h
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_FILTERING_MESSAGE_TOKENIZER_H_
+#define SRC_PROTOZERO_FILTERING_MESSAGE_TOKENIZER_H_
+
+#include <stdint.h>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/proto_utils.h"
+
+namespace protozero {
+
+// A helper class for schema-less tokenizing of protobuf messages.
+// This class takes a stream of proto-encoded bytes, pushed one by one in input
+// via Push(octet), and returns a stream of tokens (each Push() call can return
+// 0 or 1 token).
+// A "token" contains metadata about a field, specifically: its ID, its wire
+// type and:
+//  - For varint and fixed32/64 fields: its payload.
+//  - For string and bytes fields: the length of its payload.
+//    In this case the caller is supposed to "eat" those N bytes before calling
+//    Push() again.
+// Note that this class cannot differentiate between a string/bytes field or
+// a submessage, because they are encoded in the same way. The caller is
+// supposed to know whether a field can be recursed into by just keep calling
+// Push() or is a string that should be skipped.
+// This is inline to allow the compiler to see through the Push method and
+// avoid a function call for each byte.
+class MessageTokenizer {
+ public:
+  struct Token {
+    uint32_t field_id;  // 0 == not valid.
+    proto_utils::ProtoWireType type;
+
+    // For kLengthDelimited, |value| represent the length of the payload.
+    uint64_t value;
+
+    inline bool valid() const { return field_id != 0; }
+    bool operator==(const Token& o) const {
+      return field_id == o.field_id && type == o.type && value == o.value;
+    }
+  };
+
+  // Pushes a byte in input and returns a token, only when getting to the last
+  // byte of each field. Specifically:
+  // - For varint and fixed32 fields, the Token is returned after the last byte
+  //   of the numeric payload is pushed.
+  // - For length-delimited fields, this returns after the last byte of the
+  //   length is pushed (i.e. right before the payload starts). The caller is
+  //   expected to either skip the next |value| bytes (in the case of a string
+  //   or bytes fields) or keep calling Push, in the case of a submessage.
+  inline Token Push(uint8_t octet) {
+    using protozero::proto_utils::ProtoWireType;
+
+    // Parsing a fixed32/64 field is the only case where we don't have to do
+    // any varint decoding. This is why this block is before the remaining
+    // switch statement below (all the rest is a varint).
+    if (PERFETTO_UNLIKELY(state_ == kFixedIntValue)) {
+      PERFETTO_DCHECK(fixed_int_bits_ == 32 || fixed_int_bits_ == 64);
+      fixed_int_value_ |= static_cast<uint64_t>(octet) << fixed_int_shift_;
+      fixed_int_shift_ += 8;
+      if (fixed_int_shift_ < fixed_int_bits_)
+        return Token{};  // Intermediate byte of a fixed32/64.
+      auto wire_type = fixed_int_bits_ == 32 ? ProtoWireType::kFixed32
+                                             : ProtoWireType::kFixed64;
+      uint64_t fixed_int_value = fixed_int_value_;
+      fixed_int_value_ = fixed_int_shift_ = fixed_int_bits_ = 0;
+      state_ = kFieldPreamble;
+      return Token{field_id_, wire_type, fixed_int_value};
+    }
+
+    // At this point either we are: (i) parsing a field preamble; (ii) parsing a
+    // varint field paylod; (iii) parsing the length of a length-delimited
+    // field. In all cases, we need to decode a varint before proceeding.
+    varint_ |= static_cast<uint64_t>(octet & 0x7F) << varint_shift_;
+    if (octet & 0x80) {
+      varint_shift_ += 7;
+      if (PERFETTO_UNLIKELY(varint_shift_ >= 64)) {
+        varint_shift_ = 0;
+        state_ = kInvalidVarInt;
+      }
+      return Token{};  // Still parsing a varint.
+    }
+
+    uint64_t varint = varint_;
+    varint_ = 0;
+    varint_shift_ = 0;
+
+    switch (state_) {
+      case kFieldPreamble: {
+        auto field_type = static_cast<uint32_t>(varint & 7u);  // 7 = 0..0111
+        field_id_ = static_cast<uint32_t>(varint >> 3);
+
+        // The field type is legit, now check it's well formed and within
+        // boundaries.
+        if (field_type == static_cast<uint32_t>(ProtoWireType::kVarInt)) {
+          state_ = kVarIntValue;
+        } else if (field_type ==
+                       static_cast<uint32_t>(ProtoWireType::kFixed32) ||
+                   field_type ==
+                       static_cast<uint32_t>(ProtoWireType::kFixed64)) {
+          state_ = kFixedIntValue;
+          fixed_int_shift_ = 0;
+          fixed_int_value_ = 0;
+          fixed_int_bits_ =
+              field_type == static_cast<uint32_t>(ProtoWireType::kFixed32) ? 32
+                                                                           : 64;
+        } else if (field_type ==
+                   static_cast<uint32_t>(ProtoWireType::kLengthDelimited)) {
+          state_ = kLenDelimited;
+        } else {
+          state_ = kInvalidFieldType;
+        }
+        return Token{};
+      }
+
+      case kVarIntValue: {
+        // Return the varint field payload and go back to the next field.
+        state_ = kFieldPreamble;
+        return Token{field_id_, ProtoWireType::kVarInt, varint};
+      }
+
+      case kLenDelimited: {
+        const auto payload_len = varint;
+        if (payload_len > protozero::proto_utils::kMaxMessageLength) {
+          state_ = kMessageTooBig;
+          return Token{};
+        }
+        state_ = kFieldPreamble;
+        // At this point the caller is expected to consume the next
+        // |payload_len| bytes.
+        return Token{field_id_, ProtoWireType::kLengthDelimited, payload_len};
+      }
+
+      case kFixedIntValue:
+        // Unreacheable because of the if before the switch.
+        PERFETTO_DCHECK(false);
+        break;
+
+      // Unrecoverable error states.
+      case kInvalidFieldType:
+      case kMessageTooBig:
+      case kInvalidVarInt:
+        break;
+    }  // switch(state_)
+
+    return Token{};  // Keep GCC happy.
+  }
+
+  // Returns true if the tokenizer FSM has reached quiescence (i.e. if we are
+  // NOT in the middle of parsing a field).
+  bool idle() const {
+    return state_ == kFieldPreamble && varint_shift_ == 0 &&
+           fixed_int_shift_ == 0;
+  }
+
+  // Only for reporting parser errors in the trace.
+  uint32_t state() const { return static_cast<uint32_t>(state_); }
+
+ private:
+  enum State {
+    kFieldPreamble = 0,  // Parsing the varint for the field preamble.
+    kVarIntValue = 1,    // Parsing the payload of a varint field.
+    kFixedIntValue = 2,  // Parsing the payload of a fixed32/64 field.
+    kLenDelimited = 3,   // Parsing the length of a length-delimited field.
+
+    // Unrecoverable error states:
+    kInvalidFieldType = 4,  // Encountered an invalid field type.
+    kMessageTooBig = 5,     // Size of the length delimited message was too big.
+    kInvalidVarInt = 6,     // Varint larger than 64 bits.
+  };
+
+  State state_ = kFieldPreamble;
+  uint32_t field_id_ = 0;
+  uint64_t varint_ = 0;
+  uint32_t varint_shift_ = 0;
+  uint32_t fixed_int_shift_ = 0;
+  uint32_t fixed_int_bits_ = 0;
+  uint64_t fixed_int_value_ = 0;
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_FILTERING_MESSAGE_TOKENIZER_H_
diff --git a/src/libtracing/protozero_src/filtering/message_tokenizer_unittest.cc b/src/libtracing/protozero_src/filtering/message_tokenizer_unittest.cc
new file mode 100644
index 000000000..68086943b
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/message_tokenizer_unittest.cc
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "test/gtest_and_gmock.h"
+
+#include "perfetto/protozero/message.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "src/protozero/filtering/message_tokenizer.h"
+
+namespace protozero {
+
+using proto_utils::ProtoWireType;
+using ::testing::ElementsAre;
+using Token = MessageTokenizer::Token;
+
+// For ASSERT_THAT(ElementsAre(...))
+inline std::ostream& operator<<(std::ostream& stream, const Token& t) {
+  stream << "{" << t.field_id << ", ";
+  switch (t.type) {
+    case ProtoWireType::kVarInt:
+      stream << "varint, ";
+      break;
+    case ProtoWireType::kFixed32:
+      stream << "fixed32, ";
+      break;
+    case ProtoWireType::kFixed64:
+      stream << "fixed64, ";
+      break;
+    case ProtoWireType::kLengthDelimited:
+      stream << "lendelim, ";
+      break;
+    default:
+      stream << "???, ";
+      break;
+  }
+  stream << t.value << "}";
+  return stream;
+}
+
+namespace {
+
+TEST(MessageTokenizerTest, FlatMessage) {
+  HeapBuffered<Message> msg;
+  msg->AppendVarInt(/*field_id*/ 1, 42u);
+  msg->AppendVarInt(/*field_id*/ 1, 1000u);
+  msg->AppendVarInt(/*field_id*/ 2, 1000000000ull);
+  msg->AppendVarInt(/*field_id*/ 3, 0xFF001234DEADBEEFull);
+  msg->AppendString(/*field_id*/ 4, "foo");
+  msg->AppendFixed(/*field_id*/ 5, 0xFFAAFFFFu);
+  msg->AppendString(/*field_id*/ 4, "foobar");
+  msg->AppendFixed(/*field_id*/ 6, uint64_t(1ull << 63));
+  msg->AppendVarInt(/*field_id*/ 1000, 1001ull);
+  msg->AppendVarInt(/*field_id*/ 1000000, 1000001ull);
+  msg->AppendVarInt(/*field_id*/ 1 << 28, uint64_t(1ull << 63));
+
+  // Treat all len-delimited fields as strings/bytes and just eat their payload.
+  MessageTokenizer tokenizer;
+  std::vector<Token> tokens;
+  size_t eat_bytes = 0;
+  for (uint8_t octet : msg.SerializeAsArray()) {
+    if (eat_bytes > 0) {
+      --eat_bytes;
+      continue;
+    }
+    auto token = tokenizer.Push(octet);
+    if (token.valid())
+      tokens.emplace_back(token);
+    if (token.type == ProtoWireType::kLengthDelimited) {
+      ASSERT_EQ(eat_bytes, 0u);
+      eat_bytes = static_cast<size_t>(token.value);
+    }
+  }
+  EXPECT_TRUE(tokenizer.idle());
+  EXPECT_THAT(
+      tokens,
+      ElementsAre(
+          Token{1, ProtoWireType::kVarInt, 42u},
+          Token{1, ProtoWireType::kVarInt, 1000u},
+          Token{2, ProtoWireType::kVarInt, 1000000000ull},
+          Token{3, ProtoWireType::kVarInt, 0xFF001234DEADBEEFull},
+          Token{4, ProtoWireType::kLengthDelimited, 3},
+          Token{5, ProtoWireType::kFixed32, 0xFFAAFFFFu},
+          Token{4, ProtoWireType::kLengthDelimited, 6},
+          Token{6, ProtoWireType::kFixed64, uint64_t(1ull << 63)},
+          Token{1000, ProtoWireType::kVarInt, 1001ull},
+          Token{1000000, ProtoWireType::kVarInt, 1000001ull},
+          Token{1 << 28, ProtoWireType::kVarInt, uint64_t(1ull << 63)}));
+}
+
+TEST(MessageTokenizerTest, NestedMessage) {
+  HeapBuffered<Message> msg;
+  msg->AppendVarInt(/*field_id*/ 1, 101u);
+  {
+    auto* nested = msg->BeginNestedMessage<Message>(2);
+    nested->AppendVarInt(/*field_id*/ 3, 103u);
+    nested->AppendFixed(/*field_id*/ 4, 104u);
+    {
+      auto* nested2 = nested->BeginNestedMessage<Message>(5);
+      nested2->AppendVarInt(/*field_id*/ 6, 106u);
+      nested2->AppendFixed(/*field_id*/ 7, 107u);
+      nested2->Finalize();
+    }
+    nested->AppendFixed(/*field_id*/ 8, 0x42420000u);
+    nested->Finalize();
+  }
+  msg->AppendFixed(/*field_id*/ 9, uint64_t(1ull << 63));
+
+  // Tokenize the message. This treat all len delimited fields as submessage
+  // and test the recursion logic.
+  MessageTokenizer tokenizer;
+  std::vector<Token> tokens;
+  for (uint8_t octet : msg.SerializeAsArray()) {
+    auto token = tokenizer.Push(octet);
+    if (token.valid())
+      tokens.emplace_back(token);
+  }
+  EXPECT_TRUE(tokenizer.idle());
+  EXPECT_THAT(
+      tokens,
+      ElementsAre(Token{1, ProtoWireType::kVarInt, 101u},
+                  Token{2, ProtoWireType::kLengthDelimited, 21u},
+                  Token{3, ProtoWireType::kVarInt, 103u},
+                  Token{4, ProtoWireType::kFixed32, 104u},
+                  Token{5, ProtoWireType::kLengthDelimited, 7},
+                  Token{6, ProtoWireType::kVarInt, 106u},
+                  Token{7, ProtoWireType::kFixed32, 107u},
+                  Token{8, ProtoWireType::kFixed32, 0x42420000u},
+                  Token{9, ProtoWireType::kFixed64, uint64_t(1ull << 63)}));
+}
+
+TEST(MessageTokenizerTest, InvlidCases) {
+  {
+    // A very large varint.
+    MessageTokenizer tokenizer;
+    EXPECT_FALSE(tokenizer.Push(0x08).valid());
+    for (int i = 0; i < 14; ++i)
+      EXPECT_FALSE(tokenizer.Push(0xff).valid());
+    EXPECT_FALSE(tokenizer.Push(0x0).valid());
+    EXPECT_FALSE(tokenizer.idle());
+    EXPECT_EQ(tokenizer.state(), 6u);
+  }
+  {
+    // A very large string.
+    MessageTokenizer tokenizer;
+    EXPECT_FALSE(tokenizer.Push(0x0A).valid());
+    EXPECT_FALSE(tokenizer.Push(0xFF).valid());
+    EXPECT_FALSE(tokenizer.Push(0xFF).valid());
+    EXPECT_FALSE(tokenizer.Push(0xFF).valid());
+    EXPECT_FALSE(tokenizer.Push(0xFF).valid());
+    EXPECT_FALSE(tokenizer.Push(0x20).valid());
+    EXPECT_FALSE(tokenizer.idle());
+    EXPECT_EQ(tokenizer.state(), 5u);
+  }
+  {
+    // A field of unknown type (wire type = 0x3).
+    MessageTokenizer tokenizer;
+    EXPECT_FALSE(tokenizer.Push(0x0B).valid());
+    EXPECT_FALSE(tokenizer.Push(0).valid());
+    EXPECT_FALSE(tokenizer.Push(0).valid());
+    EXPECT_FALSE(tokenizer.idle());
+    EXPECT_EQ(tokenizer.state(), 4u);
+  }
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/string_filter.cc b/src/libtracing/protozero_src/filtering/string_filter.cc
new file mode 100644
index 000000000..90fa40ba5
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/string_filter.cc
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/protozero/filtering/string_filter.h"
+
+#include <cstring>
+#include <regex>
+#include <string_view>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/string_view.h"
+#include "perfetto/public/compiler.h"
+
+namespace protozero {
+namespace {
+
+using Matches = std::match_results<char*>;
+
+static constexpr std::string_view kRedacted = "P60REDACTED";
+static constexpr char kRedactedDash = '-';
+
+// Returns a pointer to the first character after the tgid pipe character in
+// the atrace string given by [ptr, end). Returns null if no such character
+// exists.
+//
+// Examples:
+// E|1024 -> nullptr
+// foobarbaz -> nullptr
+// B|1024|x -> pointer to x
+const char* FindAtracePayloadPtr(const char* ptr, const char* end) {
+  // Don't even bother checking any strings which are so short that they could
+  // not contain a post-tgid section. This filters out strings like "E|" which
+  // emitted by Bionic.
+  //
+  // Also filter out any other strings starting with "E" as they never contain
+  // anything past the tgid: this removes >half of the strings for ~zero cost.
+  static constexpr size_t kEarliestSecondPipeIndex = 2;
+  const char* search_start = ptr + kEarliestSecondPipeIndex;
+  if (search_start >= end || *ptr == 'E') {
+    return nullptr;
+  }
+
+  // We skipped past the first '|' character by starting at the character at
+  // index 2. Just find the next pipe character (i.e. the one after tgid) using
+  // memchr.
+  const char* pipe = static_cast<const char*>(
+      memchr(search_start, '|', size_t(end - search_start)));
+  return pipe ? pipe + 1 : nullptr;
+}
+
+bool StartsWith(const char* ptr,
+                const char* end,
+                const std::string& starts_with) {
+  // Verify that the atrace string has enough characters to match against all
+  // the characters in the "starts with" string. If it does, memcmp to check if
+  // all the characters match and return true if they do.
+  return ptr + starts_with.size() <= end &&
+         memcmp(ptr, starts_with.data(), starts_with.size()) == 0;
+}
+
+void RedactMatches(const Matches& matches) {
+  // Go through every group in the matches.
+  for (size_t i = 1; i < matches.size(); ++i) {
+    const auto& match = matches[i];
+    PERFETTO_CHECK(match.second >= match.first);
+
+    // Overwrite the match with characters from |kRedacted|. If match is
+    // smaller, we will not use all of |kRedacted| but that's fine (i.e. we
+    // will overwrite with a truncated |kRedacted|).
+    size_t match_len = static_cast<size_t>(match.second - match.first);
+    size_t redacted_len = std::min(match_len, kRedacted.size());
+    memcpy(match.first, kRedacted.data(), redacted_len);
+
+    // Overwrite any characters after |kRedacted| with |kRedactedDash|.
+    memset(match.first + redacted_len, kRedactedDash, match_len - redacted_len);
+  }
+}
+
+}  // namespace
+
+void StringFilter::AddRule(Policy policy,
+                           std::string_view pattern_str,
+                           std::string atrace_payload_starts_with) {
+  rules_.emplace_back(StringFilter::Rule{
+      policy,
+      std::regex(pattern_str.begin(), pattern_str.end(),
+                 std::regex::ECMAScript | std::regex_constants::optimize),
+      std::move(atrace_payload_starts_with)});
+}
+
+bool StringFilter::MaybeFilterInternal(char* ptr, size_t len) const {
+  std::match_results<char*> matches;
+  bool atrace_find_tried = false;
+  const char* atrace_payload_ptr = nullptr;
+  for (const Rule& rule : rules_) {
+    switch (rule.policy) {
+      case Policy::kMatchRedactGroups:
+      case Policy::kMatchBreak:
+        if (std::regex_match(ptr, ptr + len, matches, rule.pattern)) {
+          if (rule.policy == Policy::kMatchBreak) {
+            return false;
+          }
+          RedactMatches(matches);
+          return true;
+        }
+        break;
+      case Policy::kAtraceMatchRedactGroups:
+      case Policy::kAtraceMatchBreak:
+        atrace_payload_ptr = atrace_find_tried
+                                 ? atrace_payload_ptr
+                                 : FindAtracePayloadPtr(ptr, ptr + len);
+        atrace_find_tried = true;
+        if (atrace_payload_ptr &&
+            StartsWith(atrace_payload_ptr, ptr + len,
+                       rule.atrace_payload_starts_with) &&
+            std::regex_match(ptr, ptr + len, matches, rule.pattern)) {
+          if (rule.policy == Policy::kAtraceMatchBreak) {
+            return false;
+          }
+          RedactMatches(matches);
+          return true;
+        }
+        break;
+      case Policy::kAtraceRepeatedSearchRedactGroups:
+        atrace_payload_ptr = atrace_find_tried
+                                 ? atrace_payload_ptr
+                                 : FindAtracePayloadPtr(ptr, ptr + len);
+        atrace_find_tried = true;
+        if (atrace_payload_ptr && StartsWith(atrace_payload_ptr, ptr + len,
+                                             rule.atrace_payload_starts_with)) {
+          auto beg = std::regex_iterator<char*>(ptr, ptr + len, rule.pattern);
+          auto end = std::regex_iterator<char*>();
+          bool has_any_matches = beg != end;
+          for (auto it = std::move(beg); it != end; ++it) {
+            RedactMatches(*it);
+          }
+          if (has_any_matches) {
+            return true;
+          }
+        }
+        break;
+    }
+  }
+  return false;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/filtering/string_filter.h b/src/libtracing/protozero_src/filtering/string_filter.h
new file mode 100644
index 000000000..e7ed33113
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/string_filter.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_FILTERING_STRING_FILTER_H_
+#define SRC_PROTOZERO_FILTERING_STRING_FILTER_H_
+
+#include <regex>
+#include <string>
+#include <string_view>
+
+namespace protozero {
+
+// Performs filtering of strings in an "iptables" style. See the comments in
+// |TraceConfig.TraceFilter| for information on how this class works.
+class StringFilter {
+ public:
+  enum class Policy {
+    kMatchRedactGroups = 1,
+    kAtraceMatchRedactGroups = 2,
+    kMatchBreak = 3,
+    kAtraceMatchBreak = 4,
+    kAtraceRepeatedSearchRedactGroups = 5,
+  };
+
+  // Adds a new rule for filtering strings.
+  void AddRule(Policy policy,
+               std::string_view pattern,
+               std::string atrace_payload_starts_with);
+
+  // Tries to filter the given string. Returns true if the string was modified
+  // in any way, false otherwise.
+  bool MaybeFilter(char* ptr, size_t len) const {
+    if (len == 0 || rules_.empty()) {
+      return false;
+    }
+    return MaybeFilterInternal(ptr, len);
+  }
+
+ private:
+  struct Rule {
+    Policy policy;
+    std::regex pattern;
+    std::string atrace_payload_starts_with;
+  };
+
+  bool MaybeFilterInternal(char* ptr, size_t len) const;
+
+  std::vector<Rule> rules_;
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_FILTERING_STRING_FILTER_H_
diff --git a/src/libtracing/protozero_src/filtering/string_filter_benchmark.cc b/src/libtracing/protozero_src/filtering/string_filter_benchmark.cc
new file mode 100644
index 000000000..2b976c679
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/string_filter_benchmark.cc
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <benchmark/benchmark.h>
+#include <cstdint>
+#include <vector>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/hash.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "src/base/test/utils.h"
+#include "src/protozero/filtering/string_filter.h"
+
+namespace {
+
+using Policy = protozero::StringFilter::Policy;
+
+std::vector<std::pair<size_t, size_t>> LoadTraceStrings(
+    benchmark::State& state,
+    std::vector<char>& storage) {
+  storage.clear();
+
+  std::vector<std::pair<size_t, size_t>> strs;
+  std::string path = perfetto::base::GetTestDataPath(
+      "test/data/example_android_trace_30s_atrace_strings.txt");
+  perfetto::base::ScopedFstream f(fopen(path.c_str(), "re"));
+  if (!f) {
+    state.SkipWithError("Strings does not exist");
+    return {};
+  }
+  char line[4096];
+  while (fgets(line, sizeof(line), *f)) {
+    size_t len = strlen(line);
+    size_t pos = storage.size();
+    storage.insert(storage.end(), line, line + len);
+    strs.push_back(std::make_pair(pos, len));
+  }
+  return strs;
+}
+
+void Benchmark(benchmark::State& state,
+               Policy policy,
+               const char* regex,
+               const char* atrace) {
+  protozero::StringFilter rewriter;
+  for (int64_t i = 0; i < state.range(0); ++i) {
+    rewriter.AddRule(policy, regex, atrace);
+  }
+
+  std::vector<char> storage;
+  auto strs = LoadTraceStrings(state, storage);
+  uint32_t match = 0;
+  for (auto _ : state) {
+    match = 0;
+    std::vector<char> local = storage;
+    for (auto& str : strs) {
+      match += rewriter.MaybeFilter(local.data() + str.first, str.second);
+    }
+    benchmark::DoNotOptimize(match);
+  }
+  state.counters["time/string"] =
+      benchmark::Counter(static_cast<double>(strs.size()),
+                         benchmark::Counter::kIsIterationInvariantRate |
+                             benchmark::Counter::kInvert);
+  state.counters["time/redaction"] =
+      benchmark::Counter(static_cast<double>(match),
+                         benchmark::Counter::kIsIterationInvariantRate |
+                             benchmark::Counter::kInvert);
+  state.counters["redactions"] = benchmark::Counter(
+      static_cast<double>(match), benchmark::Counter::kDefaults);
+}
+
+}  // namespace
+
+static void BM_ProtozeroStringRewriterRedactMissing(benchmark::State& state) {
+  Benchmark(state, Policy::kMatchRedactGroups,
+            R"(S\|[^|]+\|\*job\*\/.*\/.*\/(.*)\n)", "");
+}
+BENCHMARK(BM_ProtozeroStringRewriterRedactMissing)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterAtraceRedactMissing(
+    benchmark::State& state) {
+  Benchmark(state, Policy::kAtraceMatchRedactGroups,
+            R"(S\|[^|]+\|\*job\*\/.*\/.*\/(.*)\n)", "*job*");
+}
+BENCHMARK(BM_ProtozeroStringRewriterAtraceRedactMissing)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterRedactRare(benchmark::State& state) {
+  Benchmark(state, Policy::kMatchRedactGroups,
+            R"(B\|[^|]+\|VerifyClass (.*)\n)", "");
+}
+BENCHMARK(BM_ProtozeroStringRewriterRedactRare)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterAtraceRedactRare(
+    benchmark::State& state) {
+  Benchmark(state, Policy::kAtraceMatchRedactGroups,
+            R"(B\|[^|]+\|VerifyClass (.*)\n)", "VerifyClass");
+}
+BENCHMARK(BM_ProtozeroStringRewriterAtraceRedactRare)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterAtraceSearchSingleRedactRare(
+    benchmark::State& state) {
+  Benchmark(state, Policy::kAtraceRepeatedSearchRedactGroups,
+            R"(VerifyClass (.*)\n)", "VerifyClass");
+}
+BENCHMARK(BM_ProtozeroStringRewriterAtraceSearchSingleRedactRare)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterRedactCommon(benchmark::State& state) {
+  Benchmark(state, Policy::kMatchRedactGroups,
+            R"(B\|[^|]+\|Lock contention on a monitor lock (.*)\n)", "");
+}
+BENCHMARK(BM_ProtozeroStringRewriterRedactCommon)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterAtraceRedactCommon(
+    benchmark::State& state) {
+  Benchmark(state, Policy::kAtraceMatchRedactGroups,
+            R"(B\|[^|]+\|Lock contention on a monitor lock (.*)\n)",
+            "Lock contention on a monitor lock");
+}
+BENCHMARK(BM_ProtozeroStringRewriterAtraceRedactCommon)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterAtraceRedactSpammy(
+    benchmark::State& state) {
+  Benchmark(state, Policy::kAtraceMatchRedactGroups,
+            R"(C\|[^|]+\|Heap size \(KB\)\|(\d+)\n)", "Heap size (KB)");
+}
+BENCHMARK(BM_ProtozeroStringRewriterAtraceRedactSpammy)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
+
+static void BM_ProtozeroStringRewriterAtraceSearchSingleRedactSpammy(
+    benchmark::State& state) {
+  Benchmark(state, Policy::kAtraceRepeatedSearchRedactGroups,
+            R"(Heap size \(KB\)\|(\d+))", "Heap size (KB)");
+}
+BENCHMARK(BM_ProtozeroStringRewriterAtraceSearchSingleRedactSpammy)
+    ->Unit(benchmark::kMillisecond)
+    ->Arg(10);
diff --git a/src/libtracing/protozero_src/filtering/string_filter_unittest.cc b/src/libtracing/protozero_src/filtering/string_filter_unittest.cc
new file mode 100644
index 000000000..06000fda0
--- /dev/null
+++ b/src/libtracing/protozero_src/filtering/string_filter_unittest.cc
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/protozero/filtering/string_filter.h"
+
+#include "protos/perfetto/trace/trace_packet.pb.h"
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+namespace {
+
+TEST(StringFilterTest, RegexRedaction) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "");
+
+  std::string res = "B|1234|foo 1234 bar baz";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo P60REDACTED-");
+}
+
+TEST(StringFilterTest, RegexRedactionShort) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "");
+
+  std::string res = "B|1234|foo 1234";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo P60R");
+}
+
+TEST(StringFilterTest, RegexRedactionMismatch) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "");
+
+  std::string res = "B|1234|fooo";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|fooo");
+}
+
+TEST(StringFilterTest, AtraceRegexRedaction) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "foo");
+
+  std::string res = "B|1234|foo 1234 bar baz";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo P60REDACTED-");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionZero) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|(.*))", "");
+
+  std::string res = "B|1234|";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionExact) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "foo 1234 bar baz");
+
+  std::string res = "B|1234|foo 1234 bar baz";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo P60REDACTED-");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionEmpty) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "");
+
+  std::string res = "B|1234|foo 1234";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo P60R");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionTooLong) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "foo 1234 bar baz ");
+
+  std::string res = "B|1234|foo 1234 bar baz";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo 1234 bar baz");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionMismatch) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "foo 2");
+
+  std::string res = "B|1234|foo 1234 bar baz";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo 1234 bar baz");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionEnd) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups, R"(E\|\d+)",
+                 "");
+
+  std::string res = "E|1234";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "E|1234");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionNotAtrace) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups, R"(B\|\d+)",
+                 "");
+
+  std::string res = "B|1";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1");
+}
+
+TEST(StringFilterTest, AtraceRegexRedactionMultiple) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "foo");
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|(.*))", "bar");
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|R(.*))", "R");
+
+  std::string res = "B|1|bar 1234567";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1|P60REDACTED");
+}
+
+TEST(StringFilterTest, Mixed) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "foo");
+  filter.AddRule(StringFilter::Policy::kMatchRedactGroups, R"(B\|\d+\|(.*))",
+                 "");
+
+  std::string res = "B|1234|foo";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|P60");
+}
+
+TEST(StringFilterTest, Break) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kMatchBreak, R"(B\|\d+)", "");
+  filter.AddRule(StringFilter::Policy::kMatchRedactGroups, R"(B\|(\d+))", "");
+
+  std::string res = "B|1234";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234");
+}
+
+TEST(StringFilterTest, AtraceBreak) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchBreak, R"(B\|\d+|foo .*)",
+                 "foo");
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|(\d+)|foo (.*))", "foo");
+
+  std::string res = "B|1234|foo 1234";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo 1234");
+}
+
+TEST(StringFilterTest, AtraceSearch) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceRepeatedSearchRedactGroups,
+                 R"(x:(\d+))", "foo");
+
+  std::string res = "B|1234|foo x:1234 x:494 y:4904 x:dfja x:239039";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo x:P60R x:P60 y:4904 x:dfja x:P60RED");
+}
+
+TEST(StringFilterTest, AtraceSearchBreaks) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceRepeatedSearchRedactGroups,
+                 R"(x:(\d+))", "foo");
+  filter.AddRule(StringFilter::Policy::kAtraceRepeatedSearchRedactGroups,
+                 R"(y:(\d+))", "foo");
+
+  std::string res = "B|1234|foo x:1234 x:494 y:4904 x:dfja x:239039";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo x:P60R x:P60 y:4904 x:dfja x:P60RED");
+}
+
+TEST(StringFilterTest, AtraceSearchReturnsFalseOnNoMatch) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceRepeatedSearchRedactGroups,
+                 R"(x:(\d+))", "foo");
+
+  std::string res = "B|1234|foo x:dfja";
+  ASSERT_FALSE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo x:dfja");
+}
+
+TEST(StringFilterTest, AtraceSearchMultipleGroups) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceRepeatedSearchRedactGroups,
+                 R"(x:(\d+)|y:(\d+))", "foo");
+
+  std::string res = "B|1234|foo x:1234 x:494 y:4904 x:dfja x:239039";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo x:P60R x:P60 y:P60R x:dfja x:P60RED");
+}
+
+TEST(StringFilterTest, AtraceSearchRecursive) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceRepeatedSearchRedactGroups,
+                 R"(x:([^\s-]*))", "foo");
+
+  std::string res = "B|1234|foo x:1234 x:494 y:4904 x:dfja x:239039";
+  ASSERT_TRUE(filter.MaybeFilter(res.data(), res.size()));
+  ASSERT_EQ(res, "B|1234|foo x:P60R x:P60 y:4904 x:P60R x:P60RED");
+}
+
+TEST(StringFilterTest, RegexRedactionNonUtf) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "");
+
+  std::string bad = std::string(1, char(0xff));
+  std::string bad_copy = bad;
+
+  ASSERT_FALSE(filter.MaybeFilter(bad.data(), bad.size()));
+  ASSERT_EQ(bad, bad_copy);
+
+  perfetto::protos::TracePacket packet;
+  packet.mutable_perfetto_metatrace()->set_counter_id(0);
+  *packet.mutable_perfetto_metatrace()->mutable_counter_name() = "foo";
+  packet.mutable_perfetto_metatrace()->set_counter_value(100);
+
+  std::string metatrace = packet.SerializeAsString();
+  std::string metatrace_copy = metatrace;
+
+  ASSERT_FALSE(filter.MaybeFilter(metatrace.data(), metatrace.size()));
+  ASSERT_EQ(metatrace, metatrace_copy);
+}
+
+TEST(StringFilterTest, AtraceRedactionNonUtf) {
+  StringFilter filter;
+  filter.AddRule(StringFilter::Policy::kAtraceMatchRedactGroups,
+                 R"(B\|\d+\|foo (.*))", "");
+
+  std::string bad = std::string(1, char(0xff));
+  std::string bad_copy = bad;
+
+  ASSERT_FALSE(filter.MaybeFilter(bad.data(), bad.size()));
+  ASSERT_EQ(bad, bad_copy);
+
+  perfetto::protos::TracePacket packet;
+  packet.mutable_perfetto_metatrace()->set_counter_id(0);
+  *packet.mutable_perfetto_metatrace()->mutable_counter_name() = "foo";
+  packet.mutable_perfetto_metatrace()->set_counter_value(100);
+
+  std::string metatrace = packet.SerializeAsString();
+  std::string metatrace_copy = metatrace;
+
+  ASSERT_FALSE(filter.MaybeFilter(metatrace.data(), metatrace.size()));
+  ASSERT_EQ(metatrace, metatrace_copy);
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/gen_field_helpers.cc b/src/libtracing/protozero_src/gen_field_helpers.cc
new file mode 100644
index 000000000..af5949ea6
--- /dev/null
+++ b/src/libtracing/protozero_src/gen_field_helpers.cc
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/gen_field_helpers.h"
+
+namespace protozero {
+namespace internal {
+namespace gen_helpers {
+
+void DeserializeString(const protozero::Field& field, std::string* dst) {
+  field.get(dst);
+}
+
+template bool DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt,
+                                        uint64_t>(const protozero::Field& field,
+                                                  std::vector<uint64_t>* dst);
+
+template bool DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt,
+                                        int64_t>(const protozero::Field& field,
+                                                 std::vector<int64_t>* dst);
+
+template bool DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt,
+                                        uint32_t>(const protozero::Field& field,
+                                                  std::vector<uint32_t>* dst);
+
+template bool DeserializePackedRepeated<proto_utils::ProtoWireType::kVarInt,
+                                        int32_t>(const protozero::Field& field,
+                                                 std::vector<int32_t>* dst);
+
+void SerializeTinyVarInt(uint32_t field_id, bool value, Message* msg) {
+  msg->AppendTinyVarInt(field_id, value);
+}
+
+template void SerializeExtendedVarInt<uint64_t>(uint32_t field_id,
+                                                uint64_t value,
+                                                Message* msg);
+
+template void SerializeExtendedVarInt<uint32_t>(uint32_t field_id,
+                                                uint32_t value,
+                                                Message* msg);
+
+template void SerializeFixed<double>(uint32_t field_id,
+                                     double value,
+                                     Message* msg);
+
+template void SerializeFixed<float>(uint32_t field_id,
+                                    float value,
+                                    Message* msg);
+
+template void SerializeFixed<uint64_t>(uint32_t field_id,
+                                       uint64_t value,
+                                       Message* msg);
+
+template void SerializeFixed<int64_t>(uint32_t field_id,
+                                      int64_t value,
+                                      Message* msg);
+
+template void SerializeFixed<uint32_t>(uint32_t field_id,
+                                       uint32_t value,
+                                       Message* msg);
+
+template void SerializeFixed<int32_t>(uint32_t field_id,
+                                      int32_t value,
+                                      Message* msg);
+
+void SerializeString(uint32_t field_id,
+                     const std::string& value,
+                     Message* msg) {
+  msg->AppendString(field_id, value);
+}
+
+void SerializeUnknownFields(const std::string& unknown_fields, Message* msg) {
+  msg->AppendRawProtoBytes(unknown_fields.data(), unknown_fields.size());
+}
+
+MessageSerializer::MessageSerializer() = default;
+
+MessageSerializer::~MessageSerializer() = default;
+
+std::vector<uint8_t> MessageSerializer::SerializeAsArray() {
+  return msg_.SerializeAsArray();
+}
+
+std::string MessageSerializer::SerializeAsString() {
+  return msg_.SerializeAsString();
+}
+
+template bool EqualsField<std::string>(const std::string&, const std::string&);
+
+}  // namespace gen_helpers
+}  // namespace internal
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/message.cc b/src/libtracing/protozero_src/message.cc
new file mode 100644
index 000000000..562438b0f
--- /dev/null
+++ b/src/libtracing/protozero_src/message.cc
@@ -0,0 +1,220 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/message.h"
+
+#include <atomic>
+#include <type_traits>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/message_arena.h"
+#include "perfetto/protozero/message_handle.h"
+
+#if !PERFETTO_IS_LITTLE_ENDIAN()
+// The memcpy() for float and double below needs to be adjusted if we want to
+// support big endian CPUs. There doesn't seem to be a compelling need today.
+#error Unimplemented for big endian archs.
+#endif
+
+namespace protozero {
+
+namespace {
+
+constexpr int kBytesToCompact = proto_utils::kMessageLengthFieldSize - 1u;
+
+#if PERFETTO_DCHECK_IS_ON()
+std::atomic<uint32_t> g_generation;
+#endif
+
+}  // namespace
+
+// Do NOT put any code in the constructor or use default initialization.
+// Use the Reset() method below instead.
+
+// This method is called to initialize both root and nested messages.
+void Message::Reset(ScatteredStreamWriter* stream_writer, MessageArena* arena) {
+// Older versions of libstdcxx don't have is_trivially_constructible.
+#if !defined(__GLIBCXX__) || __GLIBCXX__ >= 20170516
+  static_assert(std::is_trivially_constructible<Message>::value,
+                "Message must be trivially constructible");
+#endif
+
+  static_assert(std::is_trivially_destructible<Message>::value,
+                "Message must be trivially destructible");
+  stream_writer_ = stream_writer;
+  arena_ = arena;
+  size_ = 0;
+  size_field_ = nullptr;
+  nested_message_ = nullptr;
+  message_state_ = MessageState::kNotFinalized;
+#if PERFETTO_DCHECK_IS_ON()
+  handle_ = nullptr;
+  generation_ = g_generation.fetch_add(1, std::memory_order_relaxed);
+#endif
+}
+
+void Message::AppendString(uint32_t field_id, const char* str) {
+  AppendBytes(field_id, str, strlen(str));
+}
+
+void Message::AppendBytes(uint32_t field_id, const void* src, size_t size) {
+  PERFETTO_DCHECK(field_id);
+  if (nested_message_)
+    EndNestedMessage();
+
+  PERFETTO_DCHECK(size < proto_utils::kMaxMessageLength);
+  // Write the proto preamble (field id, type and length of the field).
+  uint8_t buffer[proto_utils::kMaxSimpleFieldEncodedSize];
+  uint8_t* pos = buffer;
+  pos = proto_utils::WriteVarInt(proto_utils::MakeTagLengthDelimited(field_id),
+                                 pos);
+  pos = proto_utils::WriteVarInt(static_cast<uint32_t>(size), pos);
+  WriteToStream(buffer, pos);
+
+  const uint8_t* src_u8 = reinterpret_cast<const uint8_t*>(src);
+  WriteToStream(src_u8, src_u8 + size);
+}
+
+size_t Message::AppendScatteredBytes(uint32_t field_id,
+                                     ContiguousMemoryRange* ranges,
+                                     size_t num_ranges) {
+  PERFETTO_DCHECK(field_id);
+  if (nested_message_)
+    EndNestedMessage();
+
+  size_t size = 0;
+  for (size_t i = 0; i < num_ranges; ++i) {
+    size += ranges[i].size();
+  }
+
+  PERFETTO_DCHECK(size < proto_utils::kMaxMessageLength);
+
+  uint8_t buffer[proto_utils::kMaxSimpleFieldEncodedSize];
+  uint8_t* pos = buffer;
+  pos = proto_utils::WriteVarInt(proto_utils::MakeTagLengthDelimited(field_id),
+                                 pos);
+  pos = proto_utils::WriteVarInt(static_cast<uint32_t>(size), pos);
+  WriteToStream(buffer, pos);
+
+  for (size_t i = 0; i < num_ranges; ++i) {
+    auto& range = ranges[i];
+    WriteToStream(range.begin, range.end);
+  }
+
+  return size;
+}
+
+uint32_t Message::Finalize() {
+  if (is_finalized())
+    return size_;
+
+  if (nested_message_)
+    EndNestedMessage();
+
+  // Write the length of the nested message a posteriori, using a leading-zero
+  // redundant varint encoding. This can be nullptr for the root message, among
+  // many reasons, because the TraceWriterImpl delegate is keeping track of the
+  // root fragment size independently.
+  if (size_field_) {
+    PERFETTO_DCHECK(!is_finalized());
+    PERFETTO_DCHECK(size_ < proto_utils::kMaxMessageLength);
+    //
+    // Normally the size of a protozero message is written with 4 bytes just
+    // before the contents of the message itself:
+    //
+    //    size          message data
+    //   [aa bb cc dd] [01 23 45 67 ...]
+    //
+    // We always reserve 4 bytes for the size, because the real size of the
+    // message isn't known until the call to Finalize(). This is possible
+    // because we can use leading zero redundant varint coding to expand any
+    // size smaller than 256 MiB to 4 bytes.
+    //
+    // However this is wasteful for short, frequently written messages, so the
+    // code below uses a 1 byte size field when possible. This is done by
+    // shifting the already-written data (which should still be in the cache)
+    // back by 3 bytes, resulting in this layout:
+    //
+    //   size  message data
+    //   [aa] [01 23 45 67 ...]
+    //
+    // We can only do this optimization if the message is contained in a single
+    // chunk (since we can't modify previously committed chunks). We can check
+    // this by verifying that the size field is immediately before the message
+    // in memory and is fully contained by the current chunk.
+    //
+    if (PERFETTO_LIKELY(size_ <= proto_utils::kMaxOneByteMessageLength &&
+                        size_field_ ==
+                            stream_writer_->write_ptr() - size_ -
+                                proto_utils::kMessageLengthFieldSize &&
+                        size_field_ >= stream_writer_->cur_range().begin)) {
+      stream_writer_->Rewind(size_, kBytesToCompact);
+      PERFETTO_DCHECK(size_field_ == stream_writer_->write_ptr() - size_ - 1u);
+      *size_field_ = static_cast<uint8_t>(size_);
+      message_state_ = MessageState::kFinalizedWithCompaction;
+    } else {
+      proto_utils::WriteRedundantVarInt(size_, size_field_);
+      message_state_ = MessageState::kFinalized;
+    }
+    size_field_ = nullptr;
+  } else {
+    message_state_ = MessageState::kFinalized;
+  }
+
+#if PERFETTO_DCHECK_IS_ON()
+  if (handle_)
+    handle_->reset_message();
+#endif
+
+  return size_;
+}
+
+Message* Message::BeginNestedMessageInternal(uint32_t field_id) {
+  PERFETTO_DCHECK(field_id);
+  if (nested_message_)
+    EndNestedMessage();
+
+  // Write the proto preamble for the nested message.
+  uint8_t data[proto_utils::kMaxTagEncodedSize];
+  uint8_t* data_end = proto_utils::WriteVarInt(
+      proto_utils::MakeTagLengthDelimited(field_id), data);
+  WriteToStream(data, data_end);
+
+  Message* message = arena_->NewMessage();
+  message->Reset(stream_writer_, arena_);
+
+  // The length of the nested message cannot be known upfront. So right now
+  // just reserve the bytes to encode the size after the nested message is done.
+  message->set_size_field(
+      stream_writer_->ReserveBytes(proto_utils::kMessageLengthFieldSize));
+  size_ += proto_utils::kMessageLengthFieldSize;
+
+  nested_message_ = message;
+  return message;
+}
+
+void Message::EndNestedMessage() {
+  size_ += nested_message_->Finalize();
+  if (nested_message_->message_state_ ==
+      MessageState::kFinalizedWithCompaction) {
+    size_ -= kBytesToCompact;
+  }
+  arena_->DeleteLastMessage(nested_message_);
+  nested_message_ = nullptr;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/message_arena.cc b/src/libtracing/protozero_src/message_arena.cc
new file mode 100644
index 000000000..698b5fefa
--- /dev/null
+++ b/src/libtracing/protozero_src/message_arena.cc
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/message_arena.h"
+
+#include <atomic>
+#include <type_traits>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/message_handle.h"
+
+namespace protozero {
+
+MessageArena::MessageArena() {
+  // The code below assumes that there is always at least one block.
+  blocks_.emplace_front();
+  static_assert(
+      std::alignment_of<decltype(blocks_.front().storage[0])>::value >=
+          alignof(Message),
+      "MessageArea's storage is not properly aligned");
+}
+
+MessageArena::~MessageArena() = default;
+
+Message* MessageArena::NewMessage() {
+  PERFETTO_DCHECK(!blocks_.empty());  // Should never become empty.
+
+  Block* block = &blocks_.front();
+  if (PERFETTO_UNLIKELY(block->entries >= Block::kCapacity)) {
+    blocks_.emplace_front();
+    block = &blocks_.front();
+  }
+  const auto idx = block->entries++;
+  void* storage = &block->storage[idx];
+  PERFETTO_ASAN_UNPOISON(storage, sizeof(Message));
+  return new (storage) Message();
+}
+
+void MessageArena::DeleteLastMessageInternal() {
+  PERFETTO_DCHECK(!blocks_.empty());  // Should never be empty, see below.
+  Block* block = &blocks_.front();
+  PERFETTO_DCHECK(block->entries > 0);
+
+  // This is the reason why there is no ~Message() call here.
+  // MessageArea::Reset() (see header) also relies on dtor being trivial.
+  static_assert(std::is_trivially_destructible<Message>::value,
+                "Message must be trivially destructible");
+
+  --block->entries;
+  PERFETTO_ASAN_POISON(&block->storage[block->entries], sizeof(Message));
+
+  // Don't remove the first block to avoid malloc/free calls when the root
+  // message is reset. Hitting the allocator all the times is a waste of time.
+  if (block->entries == 0 && std::next(blocks_.cbegin()) != blocks_.cend()) {
+    blocks_.pop_front();
+  }
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/message_arena_unittest.cc b/src/libtracing/protozero_src/message_arena_unittest.cc
new file mode 100644
index 000000000..d3a396846
--- /dev/null
+++ b/src/libtracing/protozero_src/message_arena_unittest.cc
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/message_arena.h"
+
+#include <array>
+
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+namespace {
+
+using ::testing::NotNull;
+
+TEST(MessageArenaTest, Basic) {
+  MessageArena arena;
+
+  Message* msg1 = arena.NewMessage();
+  EXPECT_THAT(msg1, NotNull());
+  Message* msg2 = arena.NewMessage();
+  EXPECT_THAT(msg2, NotNull());
+  EXPECT_NE(msg1, msg2);
+  arena.DeleteLastMessage(msg2);
+  arena.DeleteLastMessage(msg1);
+
+  Message* msg3 = arena.NewMessage();
+  EXPECT_THAT(msg3, NotNull());
+}
+
+TEST(MessageArenaTest, ManyMessages) {
+  MessageArena arena;
+  // Ideally this should be more than MessageArena::Block::kCapacity, but that's
+  // private.
+  constexpr size_t kNumMessages = 32;
+  std::array<Message*, kNumMessages> messages;
+
+  for (size_t i = 0; i < kNumMessages; i++) {
+    Message* msg = arena.NewMessage();
+    EXPECT_THAT(msg, NotNull());
+    messages[i] = msg;
+  }
+
+  for (auto it = messages.crbegin(); it != messages.crend(); it++) {
+    Message* msg = *it;
+    arena.DeleteLastMessage(msg);
+  }
+
+  Message* msg = arena.NewMessage();
+  EXPECT_THAT(msg, NotNull());
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/message_handle_unittest.cc b/src/libtracing/protozero_src/message_handle_unittest.cc
new file mode 100644
index 000000000..96c86003c
--- /dev/null
+++ b/src/libtracing/protozero_src/message_handle_unittest.cc
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/message_handle.h"
+
+#include "perfetto/protozero/root_message.h"
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+
+namespace {
+
+TEST(MessageHandleTest, MoveHandleSharedMessageDoesntFinalize) {
+  RootMessage<Message> message;
+
+  MessageHandle<Message> handle_1(&message);
+  handle_1 = MessageHandle<Message>(&message);
+  ASSERT_FALSE(handle_1->is_finalized());
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/message_unittest.cc b/src/libtracing/protozero_src/message_unittest.cc
new file mode 100644
index 000000000..2a79ea8c4
--- /dev/null
+++ b/src/libtracing/protozero_src/message_unittest.cc
@@ -0,0 +1,474 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/message.h"
+
+#include <limits>
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/message_handle.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "perfetto/protozero/root_message.h"
+#include "src/base/test/utils.h"
+#include "src/protozero/test/fake_scattered_buffer.h"
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+
+namespace {
+
+constexpr size_t kChunkSize = 16;
+constexpr uint8_t kTestBytes[] = {0, 0, 0, 0, 0x42, 1, 0x42, 0xff, 0x42, 0};
+constexpr const char kStartWatermark[] = {'a', 'b', 'c', 'd',
+                                          '1', '2', '3', '\0'};
+constexpr const char kEndWatermark[] = {'9', '8', '7', '6',
+                                        'z', 'w', 'y', '\0'};
+
+class FakeRootMessage : public RootMessage<Message> {};
+class FakeChildMessage : public Message {};
+
+uint32_t SimpleHash(const std::string& str) {
+  uint32_t hash = 5381;
+  for (char c : str)
+    hash = 33 * hash + static_cast<uint32_t>(c);
+  return hash;
+}
+
+class MessageTest : public ::testing::Test {
+ public:
+  void SetUp() override { SetChunkSize(kChunkSize); }
+
+  void TearDown() override {
+    // Check that none of the messages created by the text fixtures below did
+    // under/overflow their heap boundaries.
+    for (std::unique_ptr<uint8_t[]>& mem : messages_) {
+      EXPECT_STREQ(kStartWatermark, reinterpret_cast<char*>(mem.get()));
+      EXPECT_STREQ(kEndWatermark,
+                   reinterpret_cast<char*>(mem.get() + sizeof(kStartWatermark) +
+                                           sizeof(FakeRootMessage)));
+      FakeRootMessage* msg = reinterpret_cast<FakeRootMessage*>(
+          mem.get() + sizeof(kStartWatermark));
+      msg->~FakeRootMessage();
+      mem.reset();
+    }
+    messages_.clear();
+    stream_writer_.reset();
+    buffer_.reset();
+  }
+
+  void ResetMessage(FakeRootMessage* msg) { msg->Reset(stream_writer_.get()); }
+
+  void SetChunkSize(size_t size) {
+    buffer_.reset(new FakeScatteredBuffer(size));
+    stream_writer_.reset(new ScatteredStreamWriter(buffer_.get()));
+    chunk_size_ = size;
+    readback_pos_ = 0;
+  }
+
+  FakeRootMessage* NewMessage() {
+    std::unique_ptr<uint8_t[]> mem(
+        new uint8_t[sizeof(kStartWatermark) + sizeof(FakeRootMessage) +
+                    sizeof(kEndWatermark)]);
+    uint8_t* msg_start = mem.get() + sizeof(kStartWatermark);
+    memcpy(mem.get(), kStartWatermark, sizeof(kStartWatermark));
+    memset(msg_start, 0, sizeof(FakeRootMessage));
+    memcpy(msg_start + sizeof(FakeRootMessage), kEndWatermark,
+           sizeof(kEndWatermark));
+    messages_.push_back(std::move(mem));
+    FakeRootMessage* msg = new (msg_start) FakeRootMessage();
+    msg->Reset(stream_writer_.get());
+    return msg;
+  }
+
+  FakeRootMessage* NewMessageWithSizeField() {
+    FakeRootMessage* msg = NewMessage();
+    uint8_t* size_field =
+        stream_writer_->ReserveBytes(proto_utils::kMessageLengthFieldSize);
+    memset(size_field, 0u, proto_utils::kMessageLengthFieldSize);
+    msg->set_size_field(size_field);
+    return msg;
+  }
+
+  size_t GetNumSerializedBytes() {
+    if (buffer_->chunks().empty())
+      return 0;
+    return buffer_->chunks().size() * chunk_size_ -
+           stream_writer_->bytes_available();
+  }
+
+  std::string GetNextSerializedBytes(size_t num_bytes) {
+    size_t old_readback_pos = readback_pos_;
+    readback_pos_ += num_bytes;
+    return buffer_->GetBytesAsString(old_readback_pos, num_bytes);
+  }
+
+  static void BuildNestedMessages(Message* msg,
+                                  uint32_t max_depth,
+                                  bool empty = false,
+                                  uint32_t depth = 0) {
+    if (!empty) {
+      for (uint32_t i = 1; i <= 128; ++i)
+        msg->AppendBytes(i, kTestBytes, sizeof(kTestBytes));
+    }
+
+    if (depth < max_depth) {
+      auto* nested_msg =
+          msg->BeginNestedMessage<FakeChildMessage>(1 + depth * 10);
+      BuildNestedMessages(nested_msg, max_depth, empty, depth + 1);
+    }
+
+    if (!empty) {
+      for (uint32_t i = 129; i <= 256; ++i)
+        msg->AppendVarInt(i, 42);
+    }
+
+    if ((depth & 2) == 0)
+      msg->Finalize();
+  }
+
+ private:
+  std::unique_ptr<FakeScatteredBuffer> buffer_;
+  std::unique_ptr<ScatteredStreamWriter> stream_writer_;
+  std::vector<std::unique_ptr<uint8_t[]>> messages_;
+  size_t chunk_size_{};
+  size_t readback_pos_{};
+};
+
+TEST_F(MessageTest, ZeroLengthArraysAndStrings) {
+  Message* msg = NewMessage();
+  msg->AppendBytes(1 /* field_id */, nullptr, 0);
+  msg->AppendString(2 /* field_id */, "");
+
+  EXPECT_EQ(4u, msg->Finalize());
+  EXPECT_EQ(4u, GetNumSerializedBytes());
+
+  // These lines match the serialization of the Append* calls above.
+  ASSERT_EQ("0A00", GetNextSerializedBytes(2));
+  ASSERT_EQ("1200", GetNextSerializedBytes(2));
+}
+
+TEST_F(MessageTest, BasicTypesNoNesting) {
+  Message* msg = NewMessage();
+  msg->AppendVarInt(1 /* field_id */, 0);
+  msg->AppendVarInt(2 /* field_id */, std::numeric_limits<uint32_t>::max());
+  msg->AppendVarInt(3 /* field_id */, 42);
+  msg->AppendVarInt(4 /* field_id */, std::numeric_limits<uint64_t>::max());
+  msg->AppendFixed(5 /* field_id */, 3.1415f /* float */);
+  msg->AppendFixed(6 /* field_id */, 3.14159265358979323846 /* double */);
+  msg->AppendBytes(7 /* field_id */, kTestBytes, sizeof(kTestBytes));
+
+  // Field ids > 16 are expected to be varint encoded (preamble > 1 byte)
+  msg->AppendString(257 /* field_id */, "0123456789abcdefABCDEF");
+  msg->AppendSignedVarInt(3 /* field_id */, -21);
+
+  EXPECT_EQ(74u, msg->Finalize());
+  EXPECT_EQ(74u, GetNumSerializedBytes());
+
+  // These lines match the serialization of the Append* calls above.
+  ASSERT_EQ("0800", GetNextSerializedBytes(2));
+  ASSERT_EQ("10FFFFFFFF0F", GetNextSerializedBytes(6));
+  ASSERT_EQ("182A", GetNextSerializedBytes(2));
+  ASSERT_EQ("20FFFFFFFFFFFFFFFFFF01", GetNextSerializedBytes(11));
+  ASSERT_EQ("2D560E4940", GetNextSerializedBytes(5));
+  ASSERT_EQ("31182D4454FB210940", GetNextSerializedBytes(9));
+  ASSERT_EQ("3A0A00000000420142FF4200", GetNextSerializedBytes(12));
+  ASSERT_EQ("8A101630313233343536373839616263646566414243444546",
+            GetNextSerializedBytes(25));
+  ASSERT_EQ("1829", GetNextSerializedBytes(2));
+}
+
+TEST_F(MessageTest, NestedMessagesSimple) {
+  Message* root_msg = NewMessage();
+  root_msg->AppendVarInt(1 /* field_id */, 1);
+
+  FakeChildMessage* nested_msg =
+      root_msg->BeginNestedMessage<FakeChildMessage>(128 /* field_id */);
+  ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(nested_msg) % sizeof(void*));
+  nested_msg->AppendVarInt(2 /* field_id */, 2);
+
+  nested_msg =
+      root_msg->BeginNestedMessage<FakeChildMessage>(129 /* field_id */);
+  nested_msg->AppendVarInt(4 /* field_id */, 2);
+
+  root_msg->AppendVarInt(5 /* field_id */, 3);
+
+  // The expected size of the root message is supposed to be 14 bytes:
+  //   2 bytes for the varint field (id: 1) (1 for preamble and one for payload)
+  //   3 bytes for the preamble of the 1st nested message (2 for id, 1 for size)
+  //   2 bytes for the varint field (id: 2) of the 1st nested message
+  //   3 bytes for the premable of the 2nd nested message
+  //   2 bytes for the varint field (id: 4) of the 2nd nested message.
+  //   2 bytes for the last varint (id : 5) field of the root message.
+  // Test also that finalization is idempontent and Finalize() can be safely
+  // called more than once without side effects.
+  for (int i = 0; i < 3; ++i) {
+    EXPECT_EQ(14u, root_msg->Finalize());
+    EXPECT_EQ(14u, GetNumSerializedBytes());
+  }
+
+  ASSERT_EQ("0801", GetNextSerializedBytes(2));
+
+  ASSERT_EQ("820802", GetNextSerializedBytes(3));
+  ASSERT_EQ("1002", GetNextSerializedBytes(2));
+
+  ASSERT_EQ("8A0802", GetNextSerializedBytes(3));
+  ASSERT_EQ("2002", GetNextSerializedBytes(2));
+
+  ASSERT_EQ("2803", GetNextSerializedBytes(2));
+}
+
+// Tests using a AppendScatteredBytes to append raw bytes to
+// a message using multiple individual buffers.
+TEST_F(MessageTest, AppendScatteredBytes) {
+  Message* root_msg = NewMessage();
+
+  uint8_t buffer[42];
+  memset(buffer, 0x42, sizeof(buffer));
+
+  ContiguousMemoryRange ranges[] = {{buffer, buffer + sizeof(buffer)},
+                                    {buffer, buffer + sizeof(buffer)}};
+  root_msg->AppendScatteredBytes(1 /* field_id */, ranges, 2);
+  EXPECT_EQ(86u, root_msg->Finalize());
+  EXPECT_EQ(86u, GetNumSerializedBytes());
+
+  // field_id
+  EXPECT_EQ("0A", GetNextSerializedBytes(1));
+  // field length
+  EXPECT_EQ("54", GetNextSerializedBytes(1));
+  // start of contents
+  EXPECT_EQ("42424242", GetNextSerializedBytes(4));
+}
+
+TEST_F(MessageTest, AppendRawProtoBytesFinalizesNestedMessage) {
+  Message* root_msg = NewMessage();
+
+  uint8_t buffer[42];
+  memset(buffer, 0x42, sizeof(buffer));
+
+  FakeChildMessage* nested_msg =
+      root_msg->BeginNestedMessage<FakeChildMessage>(9001 /* field_id */);
+  nested_msg->AppendVarInt(4 /* field_id */, 2);
+  uint8_t* nested_msg_size_field = nested_msg->size_field();
+
+  EXPECT_FALSE(nested_msg->is_finalized());
+  EXPECT_EQ(0u, *nested_msg_size_field);
+
+  root_msg->AppendRawProtoBytes(buffer, sizeof(buffer));
+
+  // Nested message should have been finalized as a side effect of appending
+  // raw bytes.
+  EXPECT_EQ(0x2u, *nested_msg_size_field);
+}
+
+TEST_F(MessageTest, AppendScatteredBytesFinalizesNestedMessage) {
+  Message* root_msg = NewMessage();
+
+  uint8_t buffer[42];
+  memset(buffer, 0x42, sizeof(buffer));
+
+  FakeChildMessage* nested_msg =
+      root_msg->BeginNestedMessage<FakeChildMessage>(9001 /* field_id */);
+  nested_msg->AppendVarInt(4 /* field_id */, 2);
+  uint8_t* nested_msg_size_field = nested_msg->size_field();
+
+  EXPECT_FALSE(nested_msg->is_finalized());
+  EXPECT_EQ(0u, *nested_msg_size_field);
+
+  ContiguousMemoryRange ranges[] = {{buffer, buffer + sizeof(buffer)}};
+  root_msg->AppendScatteredBytes(1 /* field_id */, ranges, 1);
+
+  // Nested message should have been finalized as a side effect of appending
+  // scattered bytes.
+  EXPECT_EQ(0x2u, *nested_msg_size_field);
+}
+
+TEST_F(MessageTest, StressTest) {
+  std::vector<Message*> nested_msgs;
+
+  Message* root_msg = NewMessage();
+  BuildNestedMessages(root_msg, /*max_depth=*/10);
+  root_msg->Finalize();
+
+  // The main point of this test is to stress the code paths and test for
+  // unexpected crashes of the production code. The actual serialization is
+  // already covered in the other text fixtures. Keeping just a final smoke test
+  // here on the full buffer hash.
+  std::string full_buf = GetNextSerializedBytes(GetNumSerializedBytes());
+  size_t buf_hash = SimpleHash(full_buf);
+  EXPECT_EQ(0xf9e32b65, buf_hash);
+}
+
+TEST_F(MessageTest, DeeplyNested) {
+  Message* root_msg = NewMessage();
+  BuildNestedMessages(root_msg, /*max_depth=*/1000);
+  root_msg->Finalize();
+
+  std::string full_buf = GetNextSerializedBytes(GetNumSerializedBytes());
+  size_t buf_hash = SimpleHash(full_buf);
+  EXPECT_EQ(0xc0fde419, buf_hash);
+}
+
+TEST_F(MessageTest, DeeplyNestedEmptyMessages) {
+  // Stress test writing deeply nested empty messages, many of which will be
+  // packed into the protobuf length field.
+
+  // Use a larger chunk size for this test so there is more opportunity to pack
+  // messages.
+  SetChunkSize(4096u);
+
+  Message* root_msg = NewMessage();
+  BuildNestedMessages(root_msg, /*max_depth=*/1000, /*empty=*/true);
+  root_msg->Finalize();
+
+  std::string full_buf = GetNextSerializedBytes(GetNumSerializedBytes());
+  size_t buf_hash = SimpleHash(full_buf);
+  EXPECT_EQ(0x9371fe8eu, buf_hash);
+}
+
+TEST_F(MessageTest, DestructInvalidMessageHandle) {
+  FakeRootMessage* msg = NewMessage();
+  EXPECT_DCHECK_DEATH({
+    MessageHandle<FakeRootMessage> handle(msg);
+    ResetMessage(msg);
+  });
+}
+
+TEST_F(MessageTest, MessageHandle) {
+  FakeRootMessage* msg3 = NewMessageWithSizeField();
+  FakeRootMessage* msg2 = NewMessageWithSizeField();
+  FakeRootMessage* msg1 = NewMessageWithSizeField();
+  FakeRootMessage* ignored_msg = NewMessage();
+  uint8_t* msg1_size = msg1->size_field();
+  uint8_t* msg2_size = msg2->size_field();
+  uint8_t* msg3_size = msg3->size_field();
+
+  // Test that the handle going out of scope causes the finalization of the
+  // target message and triggers the optional callback.
+  {
+    MessageHandle<FakeRootMessage> handle1(msg1);
+    handle1->AppendBytes(1 /* field_id */, kTestBytes, 1 /* size */);
+    ASSERT_EQ(0u, msg1_size[0]);
+  }
+  ASSERT_EQ(0x3u, msg1_size[0]);
+
+  // Test that the handle can be late initialized.
+  MessageHandle<FakeRootMessage> handle2(ignored_msg);
+  handle2 = MessageHandle<FakeRootMessage>(msg2);
+  handle2->AppendBytes(1 /* field_id */, kTestBytes, 2 /* size */);
+  ASSERT_EQ(0u, msg2_size[0]);  // |msg2| should not be finalized yet.
+
+  // Test that std::move works and does NOT cause finalization of the moved
+  // message.
+  MessageHandle<FakeRootMessage> handle_swp(ignored_msg);
+  handle_swp = std::move(handle2);
+  ASSERT_EQ(0u, msg2_size[0]);  // msg2 should be NOT finalized yet.
+  handle_swp->AppendBytes(2 /* field_id */, kTestBytes, 3 /* size */);
+
+  MessageHandle<FakeRootMessage> handle3(msg3);
+  handle3->AppendBytes(1 /* field_id */, kTestBytes, 4 /* size */);
+  ASSERT_EQ(0u, msg3_size[0]);  // msg2 should be NOT finalized yet.
+
+  // Both |handle3| and |handle_swp| point to a valid message (respectively,
+  // |msg3| and |msg2|). Now move |handle3| into |handle_swp|.
+  handle_swp = std::move(handle3);
+  ASSERT_EQ(0x89u, msg2_size[0]);  // |msg2| should be finalized at this point.
+
+  // At this point writing into handle_swp should actually write into |msg3|.
+  ASSERT_EQ(msg3, &*handle_swp);
+  handle_swp->AppendBytes(2 /* field_id */, kTestBytes, 8 /* size */);
+  MessageHandle<FakeRootMessage> another_handle(ignored_msg);
+  handle_swp = std::move(another_handle);
+  ASSERT_EQ(0x90u, msg3_size[0]);  // |msg3| should be finalized at this point.
+
+#if PERFETTO_DCHECK_IS_ON()
+  // In developer builds w/ PERFETTO_DCHECK on a finalized message should
+  // invalidate the handle, in order to early catch bugs in the client code.
+  FakeRootMessage* msg4 = NewMessage();
+  MessageHandle<FakeRootMessage> handle4(msg4);
+  ASSERT_EQ(msg4, &*handle4);
+  msg4->Finalize();
+  ASSERT_EQ(nullptr, &*handle4);
+#endif
+
+  // Test also the behavior of handle with non-root (nested) messages.
+
+  uint8_t* size_msg_2;
+  {
+    auto* nested_msg_1 = NewMessage()->BeginNestedMessage<FakeChildMessage>(3);
+    MessageHandle<FakeChildMessage> child_handle_1(nested_msg_1);
+    uint8_t* size_msg_1 = nested_msg_1->size_field();
+    memset(size_msg_1, 0, proto_utils::kMessageLengthFieldSize);
+    child_handle_1->AppendVarInt(1, 0x11);
+
+    auto* nested_msg_2 = NewMessage()->BeginNestedMessage<FakeChildMessage>(2);
+    size_msg_2 = nested_msg_2->size_field();
+    memset(size_msg_2, 0, proto_utils::kMessageLengthFieldSize);
+    MessageHandle<FakeChildMessage> child_handle_2(nested_msg_2);
+    child_handle_2->AppendVarInt(2, 0xFF);
+
+    // |nested_msg_1| should not be finalized yet.
+    ASSERT_EQ(0u, size_msg_1[0]);
+
+    // This move should cause |nested_msg_1| to be finalized, but not
+    // |nested_msg_2|, which will be finalized only after the current scope.
+    child_handle_1 = std::move(child_handle_2);
+    ASSERT_EQ(0x82u, size_msg_1[0]);
+    ASSERT_EQ(0u, size_msg_2[0]);
+  }
+  ASSERT_EQ(0x3u, size_msg_2[0]);
+}
+
+TEST_F(MessageTest, MoveMessageHandle) {
+  FakeRootMessage* msg = NewMessageWithSizeField();
+  uint8_t* msg_size = msg->size_field();
+
+  // Test that the handle going out of scope causes the finalization of the
+  // target message.
+  {
+    MessageHandle<FakeRootMessage> handle1(msg);
+    MessageHandle<FakeRootMessage> handle2{};
+    handle1->AppendBytes(1 /* field_id */, kTestBytes, 1 /* size */);
+    handle2 = std::move(handle1);
+    ASSERT_EQ(0u, msg_size[0]);
+  }
+  ASSERT_EQ(0x3u, msg_size[0]);
+}
+
+TEST_F(MessageTest, FinalizeWithCompaction) {
+  FakeRootMessage* msg = NewMessageWithSizeField();
+
+  msg->AppendBytes(1 /* field_id */, kTestBytes, 5 /* size */);
+  uint32_t size = msg->Finalize();
+  EXPECT_EQ(7u, size);
+  EXPECT_EQ(8u, GetNumSerializedBytes());
+}
+
+TEST_F(MessageTest, FinalizeWithoutCompaction) {
+  FakeRootMessage* msg = NewMessageWithSizeField();
+
+  // This message doesn't fit into a single chunk, so it won't be compacted.
+  msg->AppendBytes(1 /* field_id */, kTestBytes, sizeof(kTestBytes) /* size */);
+  msg->AppendBytes(1 /* field_id */, kTestBytes, sizeof(kTestBytes) /* size */);
+  uint32_t size = msg->Finalize();
+  EXPECT_EQ(24u, size);
+  EXPECT_EQ(28u, GetNumSerializedBytes());
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/packed_repeated_fields.cc b/src/libtracing/protozero_src/packed_repeated_fields.cc
new file mode 100644
index 000000000..a884b73ca
--- /dev/null
+++ b/src/libtracing/protozero_src/packed_repeated_fields.cc
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/packed_repeated_fields.h"
+
+#include "perfetto/ext/base/utils.h"
+
+namespace protozero {
+
+void PackedBufferBase::GrowSlowpath() {
+  size_t write_off = static_cast<size_t>(write_ptr_ - storage_begin_);
+  size_t old_size = static_cast<size_t>(storage_end_ - storage_begin_);
+  size_t new_size = old_size < 65536 ? (old_size * 2) : (old_size * 3 / 2);
+  new_size = perfetto::base::AlignUp<4096>(new_size);
+  std::unique_ptr<uint8_t[]> new_buf(new uint8_t[new_size]);
+  memcpy(new_buf.get(), storage_begin_, old_size);
+  heap_buf_ = std::move(new_buf);
+  storage_begin_ = heap_buf_.get();
+  storage_end_ = storage_begin_ + new_size;
+  write_ptr_ = storage_begin_ + write_off;
+}
+
+void PackedBufferBase::Reset() {
+  heap_buf_.reset();
+  storage_begin_ = reinterpret_cast<uint8_t*>(&stack_buf_[0]);
+  storage_end_ = reinterpret_cast<uint8_t*>(&stack_buf_[kOnStackStorageSize]);
+  write_ptr_ = storage_begin_;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/proto_decoder.cc b/src/libtracing/protozero_src/proto_decoder.cc
new file mode 100644
index 000000000..3d12c70f0
--- /dev/null
+++ b/src/libtracing/protozero_src/proto_decoder.cc
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/proto_decoder.h"
+
+#include <string.h>
+
+#include <cinttypes>
+#include <limits>
+#include <memory>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/utils.h"
+#include "perfetto/protozero/proto_utils.h"
+
+namespace protozero {
+
+using namespace proto_utils;
+
+#if !PERFETTO_IS_LITTLE_ENDIAN()
+#error Unimplemented for big endian archs.
+#endif
+
+namespace {
+
+struct ParseFieldResult {
+  enum ParseResult { kAbort, kSkip, kOk };
+  ParseResult parse_res;
+  const uint8_t* next;
+  Field field;
+};
+
+// Parses one field and returns the field itself and a pointer to the next
+// field to parse. If parsing fails, the returned |next| == |buffer|.
+ParseFieldResult ParseOneField(const uint8_t* const buffer,
+                               const uint8_t* const end) {
+  ParseFieldResult res{ParseFieldResult::kAbort, buffer, Field{}};
+
+  // The first byte of a proto field is structured as follows:
+  // The least 3 significant bits determine the field type.
+  // The most 5 significant bits determine the field id. If MSB == 1, the
+  // field id continues on the next bytes following the VarInt encoding.
+  const uint8_t kFieldTypeNumBits = 3;
+  const uint64_t kFieldTypeMask = (1 << kFieldTypeNumBits) - 1;  // 0000 0111;
+  const uint8_t* pos = buffer;
+
+  // If we've already hit the end, just return an invalid field.
+  if (PERFETTO_UNLIKELY(pos >= end))
+    return res;
+
+  uint64_t preamble = 0;
+  if (PERFETTO_LIKELY(*pos < 0x80)) {  // Fastpath for fields with ID < 16.
+    preamble = *(pos++);
+  } else {
+    const uint8_t* next = ParseVarInt(pos, end, &preamble);
+    if (PERFETTO_UNLIKELY(pos == next))
+      return res;
+    pos = next;
+  }
+
+  uint32_t field_id = static_cast<uint32_t>(preamble >> kFieldTypeNumBits);
+  if (field_id == 0 || pos >= end)
+    return res;
+
+  auto field_type = static_cast<uint8_t>(preamble & kFieldTypeMask);
+  const uint8_t* new_pos = pos;
+  uint64_t int_value = 0;
+  uint64_t size = 0;
+
+  switch (field_type) {
+    case static_cast<uint8_t>(ProtoWireType::kVarInt): {
+      new_pos = ParseVarInt(pos, end, &int_value);
+
+      // new_pos not being greater than pos means ParseVarInt could not fully
+      // parse the number. This is because we are out of space in the buffer.
+      // Set the id to zero and return but don't update the offset so a future
+      // read can read this field.
+      if (PERFETTO_UNLIKELY(new_pos == pos))
+        return res;
+
+      break;
+    }
+
+    case static_cast<uint8_t>(ProtoWireType::kLengthDelimited): {
+      uint64_t payload_length;
+      new_pos = ParseVarInt(pos, end, &payload_length);
+      if (PERFETTO_UNLIKELY(new_pos == pos))
+        return res;
+
+      // ParseVarInt guarantees that |new_pos| <= |end| when it succeeds;
+      if (payload_length > static_cast<uint64_t>(end - new_pos))
+        return res;
+
+      const uintptr_t payload_start = reinterpret_cast<uintptr_t>(new_pos);
+      int_value = payload_start;
+      size = payload_length;
+      new_pos += payload_length;
+      break;
+    }
+
+    case static_cast<uint8_t>(ProtoWireType::kFixed64): {
+      new_pos = pos + sizeof(uint64_t);
+      if (PERFETTO_UNLIKELY(new_pos > end))
+        return res;
+      memcpy(&int_value, pos, sizeof(uint64_t));
+      break;
+    }
+
+    case static_cast<uint8_t>(ProtoWireType::kFixed32): {
+      new_pos = pos + sizeof(uint32_t);
+      if (PERFETTO_UNLIKELY(new_pos > end))
+        return res;
+      memcpy(&int_value, pos, sizeof(uint32_t));
+      break;
+    }
+
+    default:
+      PERFETTO_DLOG("Invalid proto field type: %u", field_type);
+      return res;
+  }
+
+  res.next = new_pos;
+
+  if (PERFETTO_UNLIKELY(field_id > Field::kMaxId)) {
+    PERFETTO_DLOG("Skipping field %" PRIu32 " because its id > %" PRIu32,
+                  field_id, Field::kMaxId);
+    res.parse_res = ParseFieldResult::kSkip;
+    return res;
+  }
+
+  if (PERFETTO_UNLIKELY(size > proto_utils::kMaxMessageLength)) {
+    PERFETTO_DLOG("Skipping field %" PRIu32 " because it's too big (%" PRIu64
+                  " KB)",
+                  field_id, size / 1024);
+    res.parse_res = ParseFieldResult::kSkip;
+    return res;
+  }
+
+  res.parse_res = ParseFieldResult::kOk;
+  res.field.initialize(field_id, field_type, int_value,
+                       static_cast<uint32_t>(size));
+  return res;
+}
+
+}  // namespace
+
+Field ProtoDecoder::FindField(uint32_t field_id) {
+  Field res{};
+  auto old_position = read_ptr_;
+  read_ptr_ = begin_;
+  for (auto f = ReadField(); f.valid(); f = ReadField()) {
+    if (f.id() == field_id) {
+      res = f;
+      break;
+    }
+  }
+  read_ptr_ = old_position;
+  return res;
+}
+
+Field ProtoDecoder::ReadField() {
+  ParseFieldResult res;
+  do {
+    res = ParseOneField(read_ptr_, end_);
+    read_ptr_ = res.next;
+  } while (PERFETTO_UNLIKELY(res.parse_res == ParseFieldResult::kSkip));
+  return res.field;
+}
+
+void TypedProtoDecoderBase::ParseAllFields() {
+  const uint8_t* cur = begin_;
+  ParseFieldResult res;
+  for (;;) {
+    res = ParseOneField(cur, end_);
+    PERFETTO_DCHECK(res.parse_res != ParseFieldResult::kOk || res.next != cur);
+    cur = res.next;
+    if (PERFETTO_UNLIKELY(res.parse_res == ParseFieldResult::kSkip))
+      continue;
+    if (PERFETTO_UNLIKELY(res.parse_res == ParseFieldResult::kAbort))
+      break;
+
+    PERFETTO_DCHECK(res.parse_res == ParseFieldResult::kOk);
+    PERFETTO_DCHECK(res.field.valid());
+    auto field_id = res.field.id();
+    if (PERFETTO_UNLIKELY(field_id >= num_fields_))
+      continue;
+
+    // There are two reasons why we might want to expand the heap capacity:
+    // 1. We are writing a non-repeated field, which has an id >
+    //    INITIAL_STACK_CAPACITY. In this case ExpandHeapStorage() ensures to
+    //    allocate at least (num_fields_ + 1) slots.
+    // 2. We are writing a repeated field but ran out of capacity.
+    if (PERFETTO_UNLIKELY(field_id >= size_ || size_ >= capacity_))
+      ExpandHeapStorage();
+
+    PERFETTO_DCHECK(field_id < size_);
+    Field* fld = &fields_[field_id];
+    if (PERFETTO_LIKELY(!fld->valid())) {
+      // This is the first time we see this field.
+      *fld = std::move(res.field);
+    } else {
+      // Repeated field case.
+      // In this case we need to:
+      // 1. Append the last value of the field to end of the repeated field
+      //    storage.
+      // 2. Replace the default instance at offset |field_id| with the current
+      //    value. This is because in case of repeated field a call to Get(X) is
+      //    supposed to return the last value of X, not the first one.
+      // This is so that the RepeatedFieldIterator will iterate in the right
+      // order, see comments on RepeatedFieldIterator.
+      if (num_fields_ > size_) {
+        ExpandHeapStorage();
+        fld = &fields_[field_id];
+      }
+
+      PERFETTO_DCHECK(size_ < capacity_);
+      fields_[size_++] = *fld;
+      *fld = std::move(res.field);
+    }
+  }
+  read_ptr_ = res.next;
+}
+
+void TypedProtoDecoderBase::ExpandHeapStorage() {
+  // When we expand the heap we must ensure that we have at very last capacity
+  // to deal with all known fields plus at least one repeated field. We go +2048
+  // here based on observations on a large 4GB android trace. This is to avoid
+  // trivial re-allocations when dealing with repeated fields of a message that
+  // has > INITIAL_STACK_CAPACITY fields.
+  const uint32_t min_capacity = num_fields_ + 2048;  // Any num >= +1 will do.
+  const uint32_t new_capacity = std::max(capacity_ * 2, min_capacity);
+  PERFETTO_CHECK(new_capacity > size_ && new_capacity > num_fields_);
+  std::unique_ptr<Field[]> new_storage(new Field[new_capacity]);
+
+  static_assert(std::is_trivially_constructible<Field>::value,
+                "Field must be trivially constructible");
+  static_assert(std::is_trivially_copyable<Field>::value,
+                "Field must be trivially copyable");
+
+  // Zero-initialize the slots for known field IDs slots, as they can be
+  // randomly accessed. Instead, there is no need to initialize the repeated
+  // slots, because they are written linearly with no gaps and are always
+  // initialized before incrementing |size_|.
+  const uint32_t new_size = std::max(size_, num_fields_);
+  memset(&new_storage[size_], 0, sizeof(Field) * (new_size - size_));
+
+  memcpy(&new_storage[0], fields_, sizeof(Field) * size_);
+
+  heap_storage_ = std::move(new_storage);
+  fields_ = &heap_storage_[0];
+  capacity_ = new_capacity;
+  size_ = new_size;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/proto_decoder_fuzzer.cc b/src/libtracing/protozero_src/proto_decoder_fuzzer.cc
new file mode 100644
index 000000000..6a6d2169e
--- /dev/null
+++ b/src/libtracing/protozero_src/proto_decoder_fuzzer.cc
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/proto_decoder.h"
+
+namespace protozero {
+namespace {
+
+int FuzzProtoDecoder(const uint8_t* data, size_t size) {
+  volatile uint64_t value = 0;
+  ProtoDecoder dec(data, size);
+  for (auto field = dec.ReadField(); field.valid(); field = dec.ReadField()) {
+    value += field.raw_int_value();
+  }
+  TypedProtoDecoder<1, 0> typed_decoder_1(data, size);
+  TypedProtoDecoder<999, 0> typed_decoder_2(data, size);
+  return 0;
+}
+
+}  // namespace
+}  // namespace protozero
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  return protozero::FuzzProtoDecoder(data, size);
+}
diff --git a/src/libtracing/protozero_src/proto_decoder_unittest.cc b/src/libtracing/protozero_src/proto_decoder_unittest.cc
new file mode 100644
index 000000000..58dc03c5e
--- /dev/null
+++ b/src/libtracing/protozero_src/proto_decoder_unittest.cc
@@ -0,0 +1,651 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/proto_decoder.h"
+
+#include "perfetto/ext/base/utils.h"
+#include "perfetto/protozero/message.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "perfetto/protozero/static_buffer.h"
+#include "test/gtest_and_gmock.h"
+
+#include "src/protozero/test/example_proto/test_messages.pb.h"
+#include "src/protozero/test/example_proto/test_messages.pbzero.h"
+
+// Generated by the protozero plugin.
+namespace pbtest = protozero::test::protos::pbzero;
+
+// Generated by the official protobuf compiler.
+namespace pbgold = protozero::test::protos;
+
+namespace protozero {
+namespace {
+
+using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::InSequence;
+using ::testing::Invoke;
+using namespace proto_utils;
+
+TEST(ProtoDecoderTest, ReadString) {
+  HeapBuffered<Message> message;
+
+  static constexpr char kTestString[] = "test";
+  message->AppendString(1, kTestString);
+  std::vector<uint8_t> proto = message.SerializeAsArray();
+  TypedProtoDecoder<32, false> decoder(proto.data(), proto.size());
+
+  const auto& field = decoder.Get(1);
+  ASSERT_EQ(field.type(), ProtoWireType::kLengthDelimited);
+  ASSERT_EQ(field.size(), sizeof(kTestString) - 1);
+  for (size_t i = 0; i < sizeof(kTestString) - 1; i++) {
+    ASSERT_EQ(field.data()[i], kTestString[i]);
+  }
+}
+
+TEST(ProtoDecoderTest, SkipVeryLargeFields) {
+  const size_t kPayloadSize = 257 * 1024 * 1024;
+  const uint64_t data_size = 4096 + kPayloadSize;
+  std::unique_ptr<uint8_t, perfetto::base::FreeDeleter> data(
+      static_cast<uint8_t*>(malloc(data_size)));
+  StaticBuffered<Message> message(data.get(), data_size);
+
+  // Append a valid field.
+  message->AppendVarInt(/*field_id=*/1, 11);
+
+  // Append a very large field that will be skipped.
+  uint8_t raw[10];
+  uint8_t* wptr = raw;
+  wptr = WriteVarInt(MakeTagLengthDelimited(2), wptr);
+  wptr = WriteVarInt(kPayloadSize, wptr);
+  message->AppendRawProtoBytes(raw, static_cast<size_t>(wptr - raw));
+  const size_t kPaddingSize = 1024 * 128;
+  std::unique_ptr<uint8_t[]> padding(new uint8_t[kPaddingSize]());
+  for (size_t i = 0; i < kPayloadSize / kPaddingSize; i++)
+    message->AppendRawProtoBytes(padding.get(), kPaddingSize);
+
+  // Append another valid field.
+  message->AppendVarInt(/*field_id=*/3, 13);
+
+  ProtoDecoder decoder(data.get(), message.Finalize());
+  Field field = decoder.ReadField();
+  ASSERT_EQ(1u, field.id());
+  ASSERT_EQ(11, field.as_int32());
+
+  field = decoder.ReadField();
+  ASSERT_EQ(3u, field.id());
+  ASSERT_EQ(13, field.as_int32());
+
+  field = decoder.ReadField();
+  ASSERT_FALSE(field.valid());
+}
+
+TEST(ProtoDecoderTest, SingleRepeatedField) {
+  HeapBuffered<Message> message;
+  message->AppendVarInt(/*field_id=*/2, 10);
+  auto data = message.SerializeAsArray();
+  TypedProtoDecoder<2, true> tpd(data.data(), data.size());
+  auto it = tpd.GetRepeated<int32_t>(/*field_id=*/2);
+  EXPECT_TRUE(it);
+  EXPECT_EQ(it.field().as_int32(), 10);
+  EXPECT_EQ(*it, 10);
+  EXPECT_FALSE(++it);
+}
+
+TEST(ProtoDecoderTest, RepeatedVariableLengthField) {
+  HeapBuffered<Message> message;
+
+  static constexpr char kTestString[] = "test";
+  static constexpr char kTestString2[] = "honk honk";
+  message->AppendString(1, kTestString);
+  message->AppendString(1, kTestString2);
+  std::vector<uint8_t> proto = message.SerializeAsArray();
+  TypedProtoDecoder<32, false> decoder(proto.data(), proto.size());
+
+  auto it = decoder.GetRepeated<ConstChars>(1);
+  ASSERT_EQ(it->type(), ProtoWireType::kLengthDelimited);
+  ASSERT_EQ(it->size(), sizeof(kTestString) - 1);
+  ASSERT_EQ(it->as_std_string(), std::string(kTestString));
+  ASSERT_EQ((*it).ToStdString(), std::string(kTestString));
+  ++it;
+  ASSERT_EQ(it->type(), ProtoWireType::kLengthDelimited);
+  ASSERT_EQ(it->size(), sizeof(kTestString2) - 1);
+  ASSERT_EQ(it->as_std_string(), std::string(kTestString2));
+  ASSERT_EQ((*it).ToStdString(), std::string(kTestString2));
+}
+
+TEST(ProtoDecoderTest, SingleRepeatedFieldWithExpansion) {
+  HeapBuffered<Message> message;
+  for (int i = 0; i < 2000; i++) {
+    message->AppendVarInt(/*field_id=*/2, i);
+  }
+  auto data = message.SerializeAsArray();
+  TypedProtoDecoder<2, true> tpd(data.data(), data.size());
+  auto it = tpd.GetRepeated<int32_t>(/*field_id=*/2);
+  for (int i = 0; i < 2000; i++) {
+    EXPECT_TRUE(it);
+    EXPECT_EQ(*it, i);
+    ++it;
+  }
+  EXPECT_FALSE(it);
+}
+
+TEST(ProtoDecoderTest, NoRepeatedField) {
+  uint8_t buf[] = {0x01};
+  TypedProtoDecoder<2, true> tpd(buf, 1);
+  auto it = tpd.GetRepeated<int32_t>(/*field_id=*/1);
+  EXPECT_FALSE(it);
+  EXPECT_FALSE(tpd.Get(2).valid());
+}
+
+TEST(ProtoDecoderTest, RepeatedFields) {
+  HeapBuffered<Message> message;
+
+  message->AppendVarInt(1, 10);
+  message->AppendVarInt(2, 20);
+  message->AppendVarInt(3, 30);
+
+  message->AppendVarInt(1, 11);
+  message->AppendVarInt(2, 21);
+  message->AppendVarInt(2, 22);
+
+  // When iterating with the simple decoder we should just see fields in parsing
+  // order.
+  auto data = message.SerializeAsArray();
+  ProtoDecoder decoder(data.data(), data.size());
+  std::string fields_seen;
+  for (auto fld = decoder.ReadField(); fld.valid(); fld = decoder.ReadField()) {
+    fields_seen +=
+        std::to_string(fld.id()) + ":" + std::to_string(fld.as_int32()) + ";";
+  }
+  EXPECT_EQ(fields_seen, "1:10;2:20;3:30;1:11;2:21;2:22;");
+
+  TypedProtoDecoder<4, true> tpd(data.data(), data.size());
+
+  // When parsing with the one-shot decoder and querying the single field id, we
+  // should see the last value for each of them, not the first one. This is the
+  // current behavior of Google protobuf's parser.
+  EXPECT_EQ(tpd.Get(1).as_int32(), 11);
+  EXPECT_EQ(tpd.Get(2).as_int32(), 22);
+  EXPECT_EQ(tpd.Get(3).as_int32(), 30);
+
+  // But when iterating we should see values in the original order.
+  auto it = tpd.GetRepeated<int32_t>(1);
+  EXPECT_EQ(*it, 10);
+  EXPECT_EQ(*++it, 11);
+  EXPECT_FALSE(++it);
+
+  it = tpd.GetRepeated<int32_t>(2);
+  EXPECT_EQ(*it++, 20);
+  EXPECT_EQ(*it++, 21);
+  EXPECT_EQ(*it++, 22);
+  EXPECT_FALSE(it);
+
+  it = tpd.GetRepeated<int32_t>(3);
+  EXPECT_EQ(*it, 30);
+  EXPECT_FALSE(++it);
+}
+
+TEST(ProtoDecoderTest, FixedData) {
+  struct FieldExpectation {
+    const char* encoded;
+    size_t encoded_size;
+    uint32_t id;
+    ProtoWireType type;
+    uint64_t int_value;
+  };
+
+  const FieldExpectation kFieldExpectations[] = {
+      {"\x08\x00", 2, 1, ProtoWireType::kVarInt, 0},
+      {"\x08\x01", 2, 1, ProtoWireType::kVarInt, 1},
+      {"\x08\x42", 2, 1, ProtoWireType::kVarInt, 0x42},
+      {"\xF8\x07\x42", 3, 127, ProtoWireType::kVarInt, 0x42},
+      {"\xB8\x3E\xFF\xFF\xFF\xFF\x0F", 7, 999, ProtoWireType::kVarInt,
+       0xFFFFFFFF},
+      {"\x7D\x42\x00\x00\x00", 5, 15, ProtoWireType::kFixed32, 0x42},
+      {"\xBD\x3E\x78\x56\x34\x12", 6, 999, ProtoWireType::kFixed32, 0x12345678},
+      {"\x79\x42\x00\x00\x00\x00\x00\x00\x00", 9, 15, ProtoWireType::kFixed64,
+       0x42},
+      {"\xB9\x3E\x08\x07\x06\x05\x04\x03\x02\x01", 10, 999,
+       ProtoWireType::kFixed64, 0x0102030405060708},
+      {"\x0A\x00", 2, 1, ProtoWireType::kLengthDelimited, 0},
+      {"\x0A\x04|abc", 6, 1, ProtoWireType::kLengthDelimited, 4},
+      {"\xBA\x3E\x04|abc", 7, 999, ProtoWireType::kLengthDelimited, 4},
+      {"\xBA\x3E\x83\x01|abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzab"
+       "cdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstu"
+       "vwx",
+       135, 999, ProtoWireType::kLengthDelimited, 131},
+  };
+
+  for (size_t i = 0; i < perfetto::base::ArraySize(kFieldExpectations); ++i) {
+    const FieldExpectation& exp = kFieldExpectations[i];
+    TypedProtoDecoder<999, 0> decoder(
+        reinterpret_cast<const uint8_t*>(exp.encoded), exp.encoded_size);
+
+    auto& field = decoder.Get(exp.id);
+    ASSERT_EQ(exp.type, field.type());
+
+    if (field.type() == ProtoWireType::kLengthDelimited) {
+      ASSERT_EQ(exp.int_value, field.size());
+    } else {
+      ASSERT_EQ(int64_t(exp.int_value), field.as_int64());
+      // Proto encodes booleans as varints of 0 or 1.
+      if (exp.int_value == 0 || exp.int_value == 1) {
+        ASSERT_EQ(int64_t(exp.int_value), field.as_bool());
+      }
+    }
+  }
+
+  // Test float and doubles decoding.
+  const char buf[] = "\x0d\x00\x00\xa0\x3f\x11\x00\x00\x00\x00\x00\x42\x8f\xc0";
+  TypedProtoDecoder<2, false> decoder(reinterpret_cast<const uint8_t*>(buf),
+                                      sizeof(buf));
+  EXPECT_FLOAT_EQ(decoder.Get(1).as_float(), 1.25f);
+  EXPECT_DOUBLE_EQ(decoder.Get(2).as_double(), -1000.25);
+}
+
+TEST(ProtoDecoderTest, FindField) {
+  uint8_t buf[] = {0x08, 0x00};  // field_id 1, varint value 0.
+  ProtoDecoder pd(buf, 2);
+
+  auto field = pd.FindField(1);
+  ASSERT_TRUE(field);
+  EXPECT_EQ(field.as_int64(), 0);
+
+  auto field2 = pd.FindField(2);
+  EXPECT_FALSE(field2);
+}
+
+TEST(ProtoDecoderTest, MoveTypedDecoder) {
+  HeapBuffered<Message> message;
+  message->AppendVarInt(/*field_id=*/1, 10);
+  std::vector<uint8_t> proto = message.SerializeAsArray();
+
+  // Construct a decoder that uses inline storage (i.e., the fields are stored
+  // within the object itself).
+  using Decoder = TypedProtoDecoder<32, false>;
+  std::unique_ptr<Decoder> decoder(new Decoder(proto.data(), proto.size()));
+  ASSERT_GE(reinterpret_cast<uintptr_t>(&decoder->at<1>()),
+            reinterpret_cast<uintptr_t>(decoder.get()));
+  ASSERT_LT(reinterpret_cast<uintptr_t>(&decoder->at<1>()),
+            reinterpret_cast<uintptr_t>(decoder.get()) + sizeof(Decoder));
+
+  // Move the decoder into another object and deallocate the original object.
+  Decoder decoder2(std::move(*decoder));
+  decoder.reset();
+
+  // Check that the contents got moved correctly.
+  EXPECT_EQ(decoder2.Get(1).as_int32(), 10);
+  ASSERT_GE(reinterpret_cast<uintptr_t>(&decoder2.at<1>()),
+            reinterpret_cast<uintptr_t>(&decoder2));
+  ASSERT_LT(reinterpret_cast<uintptr_t>(&decoder2.at<1>()),
+            reinterpret_cast<uintptr_t>(&decoder2) + sizeof(Decoder));
+}
+
+TEST(ProtoDecoderTest, PackedRepeatedVarint) {
+  std::vector<int32_t> values = {42, 255, 0, -1};
+
+  // serialize using protobuf library
+  pbgold::PackedRepeatedFields msg;
+  for (auto v : values)
+    msg.add_field_int32(v);
+  std::string serialized = msg.SerializeAsString();
+
+  // decode using TypedProtoDecoder directly
+  {
+    constexpr int kFieldId =
+        pbtest::PackedRepeatedFields::kFieldInt32FieldNumber;
+    TypedProtoDecoder<kFieldId, false> decoder(
+        reinterpret_cast<const uint8_t*>(serialized.data()), serialized.size());
+    ASSERT_TRUE(decoder.at<kFieldId>().valid());
+    bool parse_error = false;
+    auto packed_it =
+        decoder.GetPackedRepeated<proto_utils::ProtoWireType::kVarInt, int32_t>(
+            kFieldId, &parse_error);
+
+    std::vector<int32_t> decoded_values;
+    for (; packed_it; ++packed_it) {
+      auto v = *packed_it;
+      decoded_values.push_back(v);
+    }
+    ASSERT_EQ(values, decoded_values);
+    ASSERT_FALSE(parse_error);
+  }
+
+  // decode using plugin-generated accessor
+  {
+    auto decoder = pbtest::PackedRepeatedFields::Decoder(serialized);
+    ASSERT_TRUE(decoder.has_field_int32());
+
+    bool parse_error = false;
+    std::vector<int32_t> decoded_values;
+    for (auto packed_it = decoder.field_int32(&parse_error); packed_it;
+         ++packed_it) {
+      auto v = *packed_it;
+      decoded_values.push_back(v);
+    }
+    ASSERT_EQ(values, decoded_values);
+    ASSERT_FALSE(parse_error);
+  }
+
+  // unset field case
+  pbgold::PackedRepeatedFields empty_msg;
+  std::string empty_serialized = empty_msg.SerializeAsString();
+  auto decoder = pbtest::PackedRepeatedFields::Decoder(empty_serialized);
+  ASSERT_FALSE(decoder.has_field_int32());
+  bool parse_error = false;
+  auto packed_it = decoder.field_int32(&parse_error);
+  ASSERT_FALSE(bool(packed_it));
+  ASSERT_FALSE(parse_error);
+}
+
+TEST(ProtoDecoderTest, PackedRepeatedFixed32) {
+  std::vector<uint32_t> values = {42, 255, 0, 1};
+
+  // serialize using protobuf library
+  pbgold::PackedRepeatedFields msg;
+  for (auto v : values)
+    msg.add_field_fixed32(v);
+  std::string serialized = msg.SerializeAsString();
+
+  // decode using TypedProtoDecoder directly
+  {
+    constexpr int kFieldId =
+        pbtest::PackedRepeatedFields::kFieldFixed32FieldNumber;
+    TypedProtoDecoder<kFieldId, false> decoder(
+        reinterpret_cast<const uint8_t*>(serialized.data()), serialized.size());
+    bool parse_error = false;
+    auto packed_it =
+        decoder
+            .GetPackedRepeated<proto_utils::ProtoWireType::kFixed32, uint32_t>(
+                kFieldId, &parse_error);
+
+    std::vector<uint32_t> decoded_values;
+    for (; packed_it; ++packed_it) {
+      auto v = *packed_it;
+      decoded_values.push_back(v);
+    }
+    ASSERT_EQ(values, decoded_values);
+    ASSERT_FALSE(parse_error);
+  }
+
+  // decode using plugin-generated accessor
+  {
+    auto decoder = pbtest::PackedRepeatedFields::Decoder(serialized);
+    ASSERT_TRUE(decoder.has_field_fixed32());
+
+    bool parse_error = false;
+    std::vector<uint32_t> decoded_values;
+    for (auto packed_it = decoder.field_fixed32(&parse_error); packed_it;
+         packed_it++) {
+      auto v = *packed_it;
+      decoded_values.push_back(v);
+    }
+    ASSERT_EQ(values, decoded_values);
+    ASSERT_FALSE(parse_error);
+  }
+
+  // unset field case
+  pbgold::PackedRepeatedFields empty_msg;
+  std::string empty_serialized = empty_msg.SerializeAsString();
+  auto decoder = pbtest::PackedRepeatedFields::Decoder(empty_serialized);
+  ASSERT_FALSE(decoder.has_field_fixed32());
+  bool parse_error = false;
+  auto packed_it = decoder.field_fixed32(&parse_error);
+  ASSERT_FALSE(bool(packed_it));
+  ASSERT_FALSE(parse_error);
+}
+
+TEST(ProtoDecoderTest, PackedRepeatedFixed64) {
+  std::vector<int64_t> values = {42, 255, 0, -1};
+
+  // serialize using protobuf library
+  pbgold::PackedRepeatedFields msg;
+  for (auto v : values)
+    msg.add_field_sfixed64(v);
+  std::string serialized = msg.SerializeAsString();
+
+  // decode using TypedProtoDecoder directly
+  {
+    constexpr int kFieldId =
+        pbtest::PackedRepeatedFields::kFieldSfixed64FieldNumber;
+    TypedProtoDecoder<kFieldId, false> decoder(
+        reinterpret_cast<const uint8_t*>(serialized.data()), serialized.size());
+    bool parse_error = false;
+    auto packed_it =
+        decoder
+            .GetPackedRepeated<proto_utils::ProtoWireType::kFixed64, int64_t>(
+                kFieldId, &parse_error);
+
+    std::vector<int64_t> decoded_values;
+    for (; packed_it; ++packed_it) {
+      auto v = *packed_it;
+      decoded_values.push_back(v);
+    }
+    ASSERT_EQ(values, decoded_values);
+    ASSERT_FALSE(parse_error);
+  }
+
+  // decode using plugin-generated accessor
+  {
+    auto decoder = pbtest::PackedRepeatedFields::Decoder(serialized);
+    ASSERT_TRUE(decoder.has_field_sfixed64());
+
+    bool parse_error = false;
+    std::vector<int64_t> decoded_values;
+    for (auto packed_it = decoder.field_sfixed64(&parse_error); packed_it;
+         packed_it++) {
+      auto v = *packed_it;
+      decoded_values.push_back(v);
+    }
+    ASSERT_EQ(values, decoded_values);
+    ASSERT_FALSE(parse_error);
+  }
+
+  // unset field case
+  pbgold::PackedRepeatedFields empty_msg;
+  std::string empty_serialized = empty_msg.SerializeAsString();
+  auto decoder = pbtest::PackedRepeatedFields::Decoder(empty_serialized);
+  ASSERT_FALSE(decoder.has_field_sfixed64());
+  bool parse_error = false;
+  auto packed_it = decoder.field_sfixed64(&parse_error);
+  ASSERT_FALSE(bool(packed_it));
+  ASSERT_FALSE(parse_error);
+}
+
+TEST(ProtoDecoderTest, ZeroLengthPackedRepeatedField) {
+  HeapBuffered<pbtest::PackedRepeatedFields> msg;
+  PackedVarInt buf;
+  msg->set_field_int32(buf);
+  std::string serialized = msg.SerializeAsString();
+
+  // Encoded as 2 bytes: tag/field, and a length of zero.
+  EXPECT_EQ(2u, serialized.size());
+
+  // Appears empty when decoded.
+  auto decoder = pbtest::PackedRepeatedFields::Decoder(serialized);
+  ASSERT_TRUE(decoder.has_field_int32());
+  bool parse_error = false;
+  auto packed_it = decoder.field_int32(&parse_error);
+  ASSERT_FALSE(bool(packed_it));
+  ASSERT_FALSE(parse_error);
+}
+
+TEST(ProtoDecoderTest, MalformedPackedFixedBuffer) {
+  // Encode a fixed32 field where the length is not a multiple of 4 bytes.
+  HeapBuffered<pbtest::PackedRepeatedFields> msg;
+  PackedFixedSizeInt<uint32_t> buf;
+  buf.Append(1);
+  buf.Append(2);
+  buf.Append(3);
+  const uint8_t* data = buf.data();
+  size_t size = buf.size();
+  size_t invalid_size = size - 2;
+  constexpr int kFieldId =
+      pbtest::PackedRepeatedFields::kFieldFixed32FieldNumber;
+  msg->AppendBytes(kFieldId, data, invalid_size);
+  std::string serialized = msg.SerializeAsString();
+
+  // Iterator indicates parse error.
+  auto decoder = pbtest::PackedRepeatedFields::Decoder(serialized);
+  ASSERT_TRUE(decoder.has_field_fixed32());
+  bool parse_error = false;
+  for (auto packed_it = decoder.field_fixed32(&parse_error); packed_it;
+       packed_it++) {
+  }
+  ASSERT_TRUE(parse_error);
+}
+
+TEST(ProtoDecoderTest, MalformedPackedVarIntBuffer) {
+  // Encode a varint field with the last varint chopped off partway.
+  HeapBuffered<pbtest::PackedRepeatedFields> msg;
+  PackedVarInt buf;
+  buf.Append(1024);
+  buf.Append(2048);
+  buf.Append(4096);
+  const uint8_t* data = buf.data();
+  size_t size = buf.size();
+  size_t invalid_size = size - 1;
+  constexpr int kFieldId = pbtest::PackedRepeatedFields::kFieldInt32FieldNumber;
+  msg->AppendBytes(kFieldId, data, invalid_size);
+  std::string serialized = msg.SerializeAsString();
+
+  // Iterator indicates parse error.
+  auto decoder = pbtest::PackedRepeatedFields::Decoder(serialized);
+  ASSERT_TRUE(decoder.has_field_int32());
+  bool parse_error = false;
+  for (auto packed_it = decoder.field_int32(&parse_error); packed_it;
+       packed_it++) {
+  }
+  ASSERT_TRUE(parse_error);
+}
+
+// Tests that:
+// 1. Very big field ids (>= 2**24) are just skipped but don't fail parsing.
+//    This is a regression test for b/145339282 (DataSourceConfig.for_testing
+//    having a very large ID == 268435455 until Android R).
+// 2. Moderately big" field ids can be parsed correctly. See also
+//    https://github.com/google/perfetto/issues/510 .
+TEST(ProtoDecoderTest, BigFieldIds) {
+  HeapBuffered<Message> message;
+  message->AppendVarInt(/*field_id=*/1, 11);
+  message->AppendVarInt(/*field_id=*/1 << 24, 0);  // Will be skipped
+  message->AppendVarInt(/*field_id=*/65535, 99);
+  message->AppendVarInt(/*field_id=*/(1 << 24) + 1023,
+                        0);  // Will be skipped
+  message->AppendVarInt(/*field_id=*/2, 12);
+  message->AppendVarInt(/*field_id=*/1 << 28, 0);  // Will be skipped
+
+  message->AppendVarInt(/*field_id=*/(1 << 24) - 1, 13);
+  auto data = message.SerializeAsArray();
+
+  // Check the iterator-based ProtoDecoder.
+  {
+    ProtoDecoder decoder(data.data(), data.size());
+    Field field = decoder.ReadField();
+    ASSERT_TRUE(field.valid());
+    ASSERT_EQ(field.id(), 1u);
+    ASSERT_EQ(field.as_int32(), 11);
+
+    field = decoder.ReadField();
+    ASSERT_TRUE(field.valid());
+    ASSERT_EQ(field.id(), 65535u);
+    ASSERT_EQ(field.as_int32(), 99);
+
+    field = decoder.ReadField();
+    ASSERT_TRUE(field.valid());
+    ASSERT_EQ(field.id(), 2u);
+    ASSERT_EQ(field.as_int32(), 12);
+
+    field = decoder.ReadField();
+    ASSERT_TRUE(field.valid());
+    ASSERT_EQ(field.id(), (1u << 24) - 1u);
+    ASSERT_EQ(field.as_int32(), 13);
+
+    field = decoder.ReadField();
+    ASSERT_FALSE(field.valid());
+  }
+
+  // Test the one-shot-read TypedProtoDecoder.
+  // Note: field 65535 will be also skipped because this TypedProtoDecoder has
+  // a cap on MAX_FIELD_ID = 3.
+  {
+    TypedProtoDecoder<3, true> tpd(data.data(), data.size());
+    EXPECT_EQ(tpd.Get(1).as_int32(), 11);
+    EXPECT_EQ(tpd.Get(2).as_int32(), 12);
+  }
+}
+
+// Edge case for SkipBigFieldIds, the message contains only one field with a
+// very big id. Test that we skip it and return an invalid field, instead of
+// geetting stuck in some loop.
+TEST(ProtoDecoderTest, OneBigFieldIdOnly) {
+  HeapBuffered<Message> message;
+  message->AppendVarInt(/*field_id=*/268435455, 0);
+  auto data = message.SerializeAsArray();
+
+  // Check the iterator-based ProtoDecoder.
+  ProtoDecoder decoder(data.data(), data.size());
+  Field field = decoder.ReadField();
+  ASSERT_FALSE(field.valid());
+}
+
+// Check what happens when trying to parse packed repeated field and finding a
+// mismatching wire type instead. A compliant protobuf decoder should accept it,
+// but protozero doesn't handle that. At least it shouldn't crash.
+TEST(ProtoDecoderTest, PacketRepeatedWireTypeMismatch) {
+  protozero::HeapBuffered<pbtest::PackedRepeatedFields> message;
+  // A proper packed encoding should have a length delimited wire type. Use a
+  // var int wire type instead.
+  constexpr int kFieldId = pbtest::PackedRepeatedFields::kFieldInt32FieldNumber;
+  message->AppendTinyVarInt(kFieldId, 5);
+  auto data = message.SerializeAsArray();
+
+  pbtest::PackedRepeatedFields::Decoder decoder(data.data(), data.size());
+  bool parse_error = false;
+  auto it = decoder.field_int32(&parse_error);
+  // The decoder doesn't return a parse error (maybe it should, but that has
+  // been the behavior since the beginning).
+  ASSERT_FALSE(parse_error);
+  // But the iterator returns 0 elements.
+  EXPECT_FALSE(it);
+}
+
+TEST(ProtoDecoderTest, RepeatedMaxFieldIdStack) {
+  HeapBuffered<Message> message;
+  message->AppendVarInt(15, 1);
+  message->AppendVarInt(15, 2);
+  std::vector<uint8_t> proto = message.SerializeAsArray();
+
+  // Make sure that even with a max field id close to the stack capacity,
+  // TypedProtoDecoder behaves correctly w.r.t. repeated fields.
+  const int kMaxFieldId = PROTOZERO_DECODER_INITIAL_STACK_CAPACITY;
+
+  {
+    protozero::TypedProtoDecoder<kMaxFieldId,
+                                 /*HAS_NONPACKED_REPEATED_FIELDS=*/true>
+        decoder(proto.data(), proto.size());
+    std::vector<uint64_t> res;
+    for (auto it = decoder.GetRepeated<uint64_t>(15); it; it++) {
+      res.push_back(*it);
+    }
+    EXPECT_THAT(res, ElementsAre(1, 2));
+  }
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/proto_ring_buffer.cc b/src/libtracing/protozero_src/proto_ring_buffer.cc
new file mode 100644
index 000000000..7b12a1be9
--- /dev/null
+++ b/src/libtracing/protozero_src/proto_ring_buffer.cc
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/ext/protozero/proto_ring_buffer.h"
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/paged_memory.h"
+#include "perfetto/protozero/proto_utils.h"
+
+namespace protozero {
+
+namespace {
+constexpr size_t kGrowBytes = 128 * 1024;
+
+inline ProtoRingBuffer::Message FramingError() {
+  ProtoRingBuffer::Message msg{};
+  msg.fatal_framing_error = true;
+  return msg;
+}
+
+// Tries to decode a length-delimited proto field from |start|.
+// Returns a valid boundary if the preamble is valid and the length is within
+// |end|, or an invalid message otherwise.
+ProtoRingBuffer::Message TryReadProtoMessage(const uint8_t* start,
+                                             const uint8_t* end) {
+  namespace proto_utils = protozero::proto_utils;
+  uint64_t field_tag = 0;
+  auto* start_of_len = proto_utils::ParseVarInt(start, end, &field_tag);
+  if (start_of_len == start)
+    return ProtoRingBuffer::Message{};  // Not enough data.
+
+  const uint32_t tag = field_tag & 0x07;
+  if (tag !=
+      static_cast<uint32_t>(proto_utils::ProtoWireType::kLengthDelimited)) {
+    PERFETTO_ELOG("RPC framing error, unexpected msg tag 0x%xu", tag);
+    return FramingError();
+  }
+
+  uint64_t msg_len = 0;
+  auto* start_of_msg = proto_utils::ParseVarInt(start_of_len, end, &msg_len);
+  if (start_of_msg == start_of_len)
+    return ProtoRingBuffer::Message{};  // Not enough data.
+
+  if (msg_len > ProtoRingBuffer::kMaxMsgSize) {
+    PERFETTO_ELOG("RPC framing error, message too large (%" PRIu64 " > %zu)",
+                  msg_len, ProtoRingBuffer::kMaxMsgSize);
+    return FramingError();
+  }
+
+  if (start_of_msg + msg_len > end)
+    return ProtoRingBuffer::Message{};  // Not enough data.
+
+  ProtoRingBuffer::Message msg{};
+  msg.start = start_of_msg;
+  msg.len = static_cast<uint32_t>(msg_len);
+  msg.field_id = static_cast<uint32_t>(field_tag >> 3);
+  return msg;
+}
+
+}  // namespace
+
+RingBufferMessageReader::RingBufferMessageReader()
+    : buf_(perfetto::base::PagedMemory::Allocate(kGrowBytes)) {}
+RingBufferMessageReader::~RingBufferMessageReader() = default;
+
+void RingBufferMessageReader::Append(const void* data_void, size_t data_len) {
+  if (failed_)
+    return;
+  const uint8_t* data = static_cast<const uint8_t*>(data_void);
+  PERFETTO_DCHECK(wr_ <= buf_.size());
+  PERFETTO_DCHECK(wr_ >= rd_);
+
+  // If the last call to ReadMessage() consumed all the data in the buffer and
+  // there are no incomplete messages pending, restart from the beginning rather
+  // than keep ringing. This is the most common case.
+  if (rd_ == wr_)
+    rd_ = wr_ = 0;
+
+  // The caller is expected to always issue a ReadMessage() after each Append().
+  PERFETTO_CHECK(!fastpath_.valid());
+  if (rd_ == wr_) {
+    auto msg = TryReadMessage(data, data + data_len);
+    if (msg.valid() && msg.end() == (data + data_len)) {
+      // Fastpath: in many cases, the underlying stream will effectively
+      // preserve the atomicity of messages for most small messages.
+      // In this case we can avoid the extra buf_ roundtrip and just pass a
+      // pointer to |data| + (proto preamble len).
+      // The next call to ReadMessage)= will return |fastpath_|.
+      fastpath_ = std::move(msg);
+      return;
+    }
+  }
+
+  size_t avail = buf_.size() - wr_;
+  if (data_len > avail) {
+    // This whole section should be hit extremely rarely.
+
+    // Try first just recompacting the buffer by moving everything to the left.
+    // This can happen if we received "a message and a bit" on each Append call
+    // so we ended pup in a situation like:
+    // buf_: [unused space] [msg1 incomplete]
+    //                      ^rd_             ^wr_
+    //
+    // After recompaction:
+    // buf_: [msg1 incomplete]
+    //       ^rd_             ^wr_
+    uint8_t* buf = static_cast<uint8_t*>(buf_.Get());
+    memmove(&buf[0], &buf[rd_], wr_ - rd_);
+    avail += rd_;
+    wr_ -= rd_;
+    rd_ = 0;
+    if (data_len > avail) {
+      // The compaction didn't free up enough space and we need to expand the
+      // ring buffer. Yes, we could have detected this earlier and split the
+      // code paths, rather than first compacting and then realizing it wasn't
+      // sufficient. However, that would make the code harder to reason about,
+      // creating code paths that are nearly never hit, hence making it more
+      // likely to accumulate bugs in future. All this is very rare.
+      size_t new_size = buf_.size();
+      while (data_len > new_size - wr_)
+        new_size += kGrowBytes;
+      if (new_size > kMaxMsgSize * 2) {
+        failed_ = true;
+        return;
+      }
+      auto new_buf = perfetto::base::PagedMemory::Allocate(new_size);
+      memcpy(new_buf.Get(), buf_.Get(), buf_.size());
+      buf_ = std::move(new_buf);
+      avail = new_size - wr_;
+      // No need to touch rd_ / wr_ cursors.
+    }
+  }
+
+  // Append the received data at the end of the ring buffer.
+  uint8_t* buf = static_cast<uint8_t*>(buf_.Get());
+  memcpy(&buf[wr_], data, data_len);
+  wr_ += data_len;
+}
+
+RingBufferMessageReader::Message RingBufferMessageReader::ReadMessage() {
+  if (failed_)
+    return FramingError();
+
+  if (fastpath_.valid()) {
+    // The fastpath can only be hit when the buffer is empty.
+    PERFETTO_CHECK(rd_ == wr_);
+    auto msg = std::move(fastpath_);
+    fastpath_ = Message{};
+    return msg;
+  }
+
+  uint8_t* buf = static_cast<uint8_t*>(buf_.Get());
+
+  PERFETTO_DCHECK(rd_ <= wr_);
+  if (rd_ >= wr_)
+    return Message{};  // Completely empty.
+
+  auto msg = TryReadMessage(&buf[rd_], &buf[wr_]);
+  if (!msg.valid()) {
+    failed_ = failed_ || msg.fatal_framing_error;
+    return msg;  // Return |msg| because it could be a framing error.
+  }
+
+  const uint8_t* msg_end = msg.start + msg.len;
+  PERFETTO_CHECK(msg_end > &buf[rd_] && msg_end <= &buf[wr_]);
+  auto msg_outer_len = static_cast<size_t>(msg_end - &buf[rd_]);
+  rd_ += msg_outer_len;
+  return msg;
+}
+
+ProtoRingBuffer::ProtoRingBuffer() = default;
+ProtoRingBuffer::~ProtoRingBuffer() = default;
+
+ProtoRingBuffer::Message ProtoRingBuffer::TryReadMessage(const uint8_t* start,
+                                                         const uint8_t* end) {
+  return TryReadProtoMessage(start, end);
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/proto_ring_buffer_unittest.cc b/src/libtracing/protozero_src/proto_ring_buffer_unittest.cc
new file mode 100644
index 000000000..5766d0a94
--- /dev/null
+++ b/src/libtracing/protozero_src/proto_ring_buffer_unittest.cc
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/ext/protozero/proto_ring_buffer.h"
+
+#include <stdint.h>
+#include <sys/types.h>
+
+#include <list>
+#include <ostream>
+#include <random>
+#include <vector>
+
+#include "perfetto/ext/base/utils.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "test/gtest_and_gmock.h"
+
+using testing::ElementsAre;
+
+namespace protozero {
+
+// For ASSERT_EQ()
+inline bool operator==(const ProtoRingBuffer::Message& a,
+                       const ProtoRingBuffer::Message& b) {
+  if (a.field_id != b.field_id || a.len != b.len || a.valid() != b.valid())
+    return false;
+  if (!a.valid())
+    return true;
+  return memcmp(a.start, b.start, a.len) == 0;
+}
+
+inline std::ostream& operator<<(std::ostream& stream,
+                                const ProtoRingBuffer::Message& msg) {
+  stream << "Message{field_id:" << msg.field_id << ", len:" << msg.len;
+  stream << ", payload: \"";
+  static constexpr uint32_t kTruncLen = 16;
+  for (uint32_t i = 0; i < std::min(msg.len, kTruncLen); i++)
+    stream << static_cast<char>(msg.start[i]);
+  if (msg.len > kTruncLen)
+    stream << "...";
+  stream << "\"}";
+  return stream;
+}
+
+namespace {
+
+using ::perfetto::base::ArraySize;
+
+constexpr uint32_t kMaxMsgSize = ProtoRingBuffer::kMaxMsgSize;
+
+class ProtoRingBufferTest : public ::testing::Test {
+ public:
+  ProtoRingBuffer::Message MakeProtoMessage(uint32_t field_id,
+                                            uint32_t len,
+                                            bool append = false) {
+    ProtoRingBuffer::Message msg{};
+    namespace proto_utils = protozero::proto_utils;
+    const uint8_t* initial_ptr = last_msg_.data();
+    if (!append)
+      last_msg_.clear();
+    size_t initial_size = last_msg_.size();
+
+    // 20 is an over-estimation of the preamble (fixed by the 2nd resize below).
+    last_msg_.resize(initial_size + len + 20);
+    uint8_t* wptr = &last_msg_[initial_size];
+    auto tag = proto_utils::MakeTagLengthDelimited(field_id);
+    wptr = proto_utils::WriteVarInt(tag, wptr);
+    wptr = proto_utils::WriteVarInt(len, wptr);
+    msg.start = wptr;
+    msg.len = len;
+    msg.field_id = field_id;
+    for (uint32_t i = 0; i < len; i++)
+      *(wptr++) = '0' + ((len + i) % 73);  // 73 prime for more unique patterns.
+
+    PERFETTO_CHECK(wptr <= &last_msg_.back());
+    last_msg_.resize(static_cast<size_t>(wptr - &last_msg_[0]));
+
+    // Vector must not expand, because the returned Mesdage relies on pointer
+    // stability. The TEST_F must reserve enough capacity.
+    if (append)
+      PERFETTO_CHECK(last_msg_.data() == initial_ptr);
+    return msg;
+  }
+
+  std::vector<uint8_t> last_msg_;
+};
+
+// Test that when appending buffers that contain whole messages the ring buffer
+// is skipped.
+TEST_F(ProtoRingBufferTest, Fastpath) {
+  ProtoRingBuffer buf;
+  for (uint32_t i = 0; i < 10; i++) {
+    // Write a whole message that hits the fastpath.
+    auto expected = MakeProtoMessage(/*field_id=*/i + 1, /*len=*/i * 7);
+    buf.Append(last_msg_.data(), last_msg_.size());
+    // Shouln't take any space the buffer because it hits the fastpath.
+    EXPECT_EQ(buf.avail(), buf.capacity());
+    auto actual = buf.ReadMessage();
+    ASSERT_TRUE(actual.valid());
+    EXPECT_EQ(actual.start, expected.start);  // Should point to the same buf.
+    EXPECT_EQ(actual, expected);
+
+    // Now write a message in two fragments. It won't hit the fastpath
+    expected = MakeProtoMessage(/*field_id*/ 1, /*len=*/32);
+    buf.Append(last_msg_.data(), 13);
+    EXPECT_LT(buf.avail(), buf.capacity());
+    EXPECT_FALSE(buf.ReadMessage().valid());
+
+    // Append 2nd fragment.
+    buf.Append(last_msg_.data() + 13, last_msg_.size() - 13);
+    actual = buf.ReadMessage();
+    ASSERT_TRUE(actual.valid());
+    EXPECT_EQ(actual, expected);
+  }
+}
+
+TEST_F(ProtoRingBufferTest, CoalescingStream) {
+  ProtoRingBuffer buf;
+  last_msg_.reserve(1024);
+  std::list<ProtoRingBuffer::Message> expected;
+
+  // Build 6 messages of 100 bytes each (100 does not include preambles).
+  for (uint32_t i = 1; i <= 6; i++)
+    expected.emplace_back(MakeProtoMessage(i, 100, /*append=*/true));
+
+  uint32_t frag_lens[] = {120, 20, 471, 1};
+  uint32_t frag_sum = 0;
+  for (uint32_t i = 0; i < ArraySize(frag_lens); i++)
+    frag_sum += frag_lens[i];
+  ASSERT_EQ(frag_sum, last_msg_.size());
+
+  // Append the messages in such a way that each appen either passes a portion
+  // of a message (the 20 ones) or more than a message.
+  uint32_t written = 0;
+  for (uint32_t i = 0; i < ArraySize(frag_lens); i++) {
+    buf.Append(&last_msg_[written], frag_lens[i]);
+    written += frag_lens[i];
+    for (;;) {
+      auto msg = buf.ReadMessage();
+      if (!msg.valid())
+        break;
+      ASSERT_FALSE(expected.empty());
+      ASSERT_EQ(expected.front(), msg);
+      expected.pop_front();
+    }
+  }
+  EXPECT_TRUE(expected.empty());
+}
+
+TEST_F(ProtoRingBufferTest, RandomSizes) {
+  ProtoRingBuffer buf;
+  std::minstd_rand0 rnd(0);
+
+  last_msg_.reserve(1024 * 1024 * 64);
+  std::list<ProtoRingBuffer::Message> expected;
+
+  const uint32_t kNumMsg = 100;
+  for (uint32_t i = 0; i < kNumMsg; i++) {
+    uint32_t field_id = static_cast<uint32_t>(1 + (rnd() % 1024u));
+    uint32_t rndval = static_cast<uint32_t>(rnd());
+    uint32_t len = 1 + (rndval % 1024);
+    if ((rndval % 100) < 2) {
+      len *= 10 * 1024;  // 2% of messages will get close to kMaxMsgSize
+    } else if ((rndval % 100) < 20) {
+      len *= 512;  // 18% will be around 500K;
+    }
+    len = std::max(std::min(len, kMaxMsgSize), 1u);
+    expected.push_back(MakeProtoMessage(field_id, len, /*append=*/true));
+  }
+
+  uint32_t total = static_cast<uint32_t>(last_msg_.size());
+  for (uint32_t frag_sum = 0; frag_sum < total;) {
+    uint32_t frag_len = static_cast<uint32_t>(1 + (rnd() % 32768));
+    frag_len = std::min(frag_len, total - frag_sum);
+    buf.Append(&last_msg_[frag_sum], frag_len);
+    frag_sum += frag_len;
+    for (;;) {
+      auto msg = buf.ReadMessage();
+      if (!msg.valid())
+        break;
+      ASSERT_FALSE(expected.empty());
+      ASSERT_EQ(expected.front(), msg);
+      expected.pop_front();
+    }
+  }
+  EXPECT_TRUE(expected.empty());
+}
+
+TEST_F(ProtoRingBufferTest, HandleProtoErrorsGracefully) {
+  ProtoRingBuffer buf;
+
+  // Apppend a partial valid 32 byte message, followed by some invalild
+  // data.
+  auto expected = MakeProtoMessage(1, 32);
+  buf.Append(last_msg_.data(), last_msg_.size() - 1);
+  auto msg = buf.ReadMessage();
+  EXPECT_FALSE(msg.valid());
+  EXPECT_FALSE(msg.fatal_framing_error);
+
+  uint8_t invalid[] = {0x7f, 0x7f, 0x7f, 0x7f};
+  invalid[0] = last_msg_.back();
+  buf.Append(invalid, sizeof(invalid));
+
+  // The first message shoudl be valild
+  msg = buf.ReadMessage();
+  EXPECT_EQ(msg, expected);
+
+  // All the rest should be a framing error.
+  for (int i = 0; i < 3; i++) {
+    msg = buf.ReadMessage();
+    EXPECT_FALSE(msg.valid());
+    EXPECT_TRUE(msg.fatal_framing_error);
+
+    buf.Append(invalid, sizeof(invalid));
+  }
+}
+
+// A customised ring buffer message reader where every message has a
+// fixed length of |message_length|.
+class FixedLengthRingBuffer final : public RingBufferMessageReader {
+ public:
+  FixedLengthRingBuffer(size_t message_length)
+      : RingBufferMessageReader(), message_length_(message_length) {}
+
+ protected:
+  virtual Message TryReadMessage(const uint8_t* start,
+                                 const uint8_t* end) override {
+    Message msg{};
+    if (message_length_ <= static_cast<size_t>(end - start)) {
+      msg.start = start;
+      msg.len = static_cast<uint32_t>(message_length_);
+      msg.field_id = 0;
+    }
+    return msg;
+  }
+
+ private:
+  size_t message_length_;
+};
+
+TEST(RingBufferTest, FixedLengthRingBuffer) {
+  FixedLengthRingBuffer buf(3);
+  EXPECT_FALSE(buf.ReadMessage().valid());
+  buf.Append("a", 1);
+  EXPECT_FALSE(buf.ReadMessage().valid());
+  buf.Append("bc", 2);
+  FixedLengthRingBuffer::Message msg = buf.ReadMessage();
+  EXPECT_TRUE(msg.valid());
+  EXPECT_EQ(std::string(reinterpret_cast<const char*>(msg.start),
+                        static_cast<size_t>(msg.len)),
+            "abc");
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/proto_utils_unittest.cc b/src/libtracing/protozero_src/proto_utils_unittest.cc
new file mode 100644
index 000000000..1cd808201
--- /dev/null
+++ b/src/libtracing/protozero_src/proto_utils_unittest.cc
@@ -0,0 +1,232 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/proto_utils.h"
+
+#include <limits>
+
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+namespace proto_utils {
+namespace {
+
+using ::perfetto::base::ArraySize;
+
+struct VarIntExpectation {
+  const char* encoded;
+  size_t encoded_size;
+  uint64_t int_value;
+};
+
+const VarIntExpectation kVarIntExpectations[] = {
+    {"\x00", 1, 0},
+    {"\x01", 1, 0x1},
+    {"\x7f", 1, 0x7F},
+    {"\xFF\x01", 2, 0xFF},
+    {"\xFF\x7F", 2, 0x3FFF},
+    {"\x80\x80\x01", 3, 0x4000},
+    {"\xFF\xFF\x7F", 3, 0x1FFFFF},
+    {"\x80\x80\x80\x01", 4, 0x200000},
+    {"\xFF\xFF\xFF\x7F", 4, 0xFFFFFFF},
+    {"\x80\x80\x80\x80\x01", 5, 0x10000000},
+    {"\xFF\xFF\xFF\xFF\x0F", 5, 0xFFFFFFFF},
+    {"\x80\x80\x80\x80\x10", 5, 0x100000000},
+    {"\xFF\xFF\xFF\xFF\x7F", 5, 0x7FFFFFFFF},
+    {"\x80\x80\x80\x80\x80\x01", 6, 0x800000000},
+    {"\xFF\xFF\xFF\xFF\xFF\x7F", 6, 0x3FFFFFFFFFF},
+    {"\x80\x80\x80\x80\x80\x80\x01", 7, 0x40000000000},
+    {"\xFF\xFF\xFF\xFF\xFF\xFF\x7F", 7, 0x1FFFFFFFFFFFF},
+    {"\x80\x80\x80\x80\x80\x80\x80\x01", 8, 0x2000000000000},
+    {"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F", 8, 0xFFFFFFFFFFFFFF},
+    {"\x80\x80\x80\x80\x80\x80\x80\x80\x01", 9, 0x100000000000000},
+    {"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F", 9, 0x7FFFFFFFFFFFFFFF},
+    {"\x80\x80\x80\x80\x80\x80\x80\x80\x80\x01", 10, 0x8000000000000000},
+    {"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x01", 10, 0xFFFFFFFFFFFFFFFF},
+};
+
+TEST(ProtoUtilsTest, FieldPreambleEncoding) {
+  // According to C++ standard, right shift of negative value has
+  // implementation-defined resulting value.
+  if ((static_cast<int32_t>(0x80000000u) >> 31) != -1)
+    FAIL() << "Platform has unsupported negative number format or arithmetic";
+
+  EXPECT_EQ(0x08u, MakeTagVarInt(1));
+  EXPECT_EQ(0x09u, MakeTagFixed<uint64_t>(1));
+  EXPECT_EQ(0x0Au, MakeTagLengthDelimited(1));
+  EXPECT_EQ(0x0Du, MakeTagFixed<uint32_t>(1));
+
+  EXPECT_EQ(0x03F8u, MakeTagVarInt(0x7F));
+  EXPECT_EQ(0x03F9u, MakeTagFixed<int64_t>(0x7F));
+  EXPECT_EQ(0x03FAu, MakeTagLengthDelimited(0x7F));
+  EXPECT_EQ(0x03FDu, MakeTagFixed<int32_t>(0x7F));
+
+  EXPECT_EQ(0x0400u, MakeTagVarInt(0x80));
+  EXPECT_EQ(0x0401u, MakeTagFixed<double>(0x80));
+  EXPECT_EQ(0x0402u, MakeTagLengthDelimited(0x80));
+  EXPECT_EQ(0x0405u, MakeTagFixed<float>(0x80));
+
+  EXPECT_EQ(0x01FFF8u, MakeTagVarInt(0x3fff));
+  EXPECT_EQ(0x01FFF9u, MakeTagFixed<int64_t>(0x3fff));
+  EXPECT_EQ(0x01FFFAu, MakeTagLengthDelimited(0x3fff));
+  EXPECT_EQ(0x01FFFDu, MakeTagFixed<int32_t>(0x3fff));
+
+  EXPECT_EQ(0x020000u, MakeTagVarInt(0x4000));
+  EXPECT_EQ(0x020001u, MakeTagFixed<int64_t>(0x4000));
+  EXPECT_EQ(0x020002u, MakeTagLengthDelimited(0x4000));
+  EXPECT_EQ(0x020005u, MakeTagFixed<int32_t>(0x4000));
+}
+
+TEST(ProtoUtilsTest, ZigZagEncoding) {
+  EXPECT_EQ(0u, ZigZagEncode(0));
+  EXPECT_EQ(1u, ZigZagEncode(-1));
+  EXPECT_EQ(2u, ZigZagEncode(1));
+  EXPECT_EQ(3u, ZigZagEncode(-2));
+  EXPECT_EQ(4294967293u, ZigZagEncode(-2147483647));
+  EXPECT_EQ(4294967294u, ZigZagEncode(2147483647));
+  EXPECT_EQ(std::numeric_limits<uint32_t>::max(),
+            ZigZagEncode(std::numeric_limits<int32_t>::min()));
+  EXPECT_EQ(std::numeric_limits<uint64_t>::max(),
+            ZigZagEncode(std::numeric_limits<int64_t>::min()));
+
+  EXPECT_EQ(0, ZigZagDecode(ZigZagEncode(0)));
+  EXPECT_EQ(-1, ZigZagDecode(ZigZagEncode(-1)));
+  EXPECT_EQ(1, ZigZagDecode(ZigZagEncode(1)));
+  EXPECT_EQ(-127, ZigZagDecode(ZigZagEncode(-127)));
+  EXPECT_EQ(0x7fffffff, ZigZagDecode(ZigZagEncode(0x7fffffff)));
+  EXPECT_EQ(9000000000, ZigZagDecode(ZigZagEncode(9000000000)));
+  EXPECT_EQ(-9000000000, ZigZagDecode(ZigZagEncode(-9000000000)));
+}
+
+TEST(ProtoUtilsTest, VarIntEncoding) {
+  for (size_t i = 0; i < ArraySize(kVarIntExpectations); ++i) {
+    const VarIntExpectation& exp = kVarIntExpectations[i];
+    uint8_t buf[32];
+    uint8_t* res = WriteVarInt<uint64_t>(exp.int_value, buf);
+    ASSERT_EQ(exp.encoded_size, static_cast<size_t>(res - buf));
+    ASSERT_EQ(0, memcmp(buf, exp.encoded, exp.encoded_size));
+
+    if (exp.int_value <= std::numeric_limits<uint32_t>::max()) {
+      uint8_t* res_32 =
+          WriteVarInt<uint32_t>(static_cast<uint32_t>(exp.int_value), buf);
+      ASSERT_EQ(exp.encoded_size, static_cast<size_t>(res_32 - buf));
+      ASSERT_EQ(0, memcmp(buf, exp.encoded, exp.encoded_size));
+    }
+  }
+}
+
+TEST(ProtoUtilsTest, VarIntEncodingNegative) {
+  uint8_t buf[32];
+  size_t expected_size = 10;
+  uint8_t expected[] = "\x9c\xff\xff\xff\xff\xff\xff\xff\xff\x01";
+
+  {
+    uint8_t* res = WriteVarInt<int8_t>(-100, buf);
+    ASSERT_EQ(expected_size, static_cast<size_t>(res - buf));
+    ASSERT_EQ(0, memcmp(buf, expected, expected_size));
+  }
+
+  {
+    uint8_t* res = WriteVarInt<int16_t>(-100, buf);
+    ASSERT_EQ(expected_size, static_cast<size_t>(res - buf));
+    ASSERT_EQ(0, memcmp(buf, expected, expected_size));
+  }
+
+  {
+    uint8_t* res = WriteVarInt<int32_t>(-100, buf);
+    ASSERT_EQ(expected_size, static_cast<size_t>(res - buf));
+    ASSERT_EQ(0, memcmp(buf, expected, expected_size));
+  }
+
+  {
+    uint8_t* res = WriteVarInt<int64_t>(-100, buf);
+    ASSERT_EQ(expected_size, static_cast<size_t>(res - buf));
+    ASSERT_EQ(0, memcmp(buf, expected, expected_size));
+  }
+}
+
+TEST(ProtoUtilsTest, RedundantVarIntEncoding) {
+  uint8_t buf[kMessageLengthFieldSize];
+
+  WriteRedundantVarInt(0, buf);
+  EXPECT_EQ(0, memcmp("\x80\x80\x80\x00", buf, sizeof(buf)));
+
+  WriteRedundantVarInt(1, buf);
+  EXPECT_EQ(0, memcmp("\x81\x80\x80\x00", buf, sizeof(buf)));
+
+  WriteRedundantVarInt(0x80, buf);
+  EXPECT_EQ(0, memcmp("\x80\x81\x80\x00", buf, sizeof(buf)));
+
+  WriteRedundantVarInt(0x332211, buf);
+  EXPECT_EQ(0, memcmp("\x91\xC4\xCC\x01", buf, sizeof(buf)));
+
+  // Largest allowed length.
+  WriteRedundantVarInt(0x0FFFFFFF, buf);
+  EXPECT_EQ(0, memcmp("\xFF\xFF\xFF\x7F", buf, sizeof(buf)));
+}
+
+TEST(ProtoUtilsTest, VarIntDecoding) {
+  for (size_t i = 0; i < ArraySize(kVarIntExpectations); ++i) {
+    const VarIntExpectation& exp = kVarIntExpectations[i];
+    uint64_t value = std::numeric_limits<uint64_t>::max();
+    const uint8_t* res = ParseVarInt(
+        reinterpret_cast<const uint8_t*>(exp.encoded),
+        reinterpret_cast<const uint8_t*>(exp.encoded + exp.encoded_size),
+        &value);
+    ASSERT_EQ(reinterpret_cast<const void*>(exp.encoded + exp.encoded_size),
+              reinterpret_cast<const void*>(res));
+    ASSERT_EQ(exp.int_value, value);
+  }
+}
+
+// ParseVarInt() must fail gracefully if we hit the |end| without seeing the
+// MSB == 0 (i.e. end-of-sequence).
+TEST(ProtoUtilsTest, VarIntDecodingOutOfBounds) {
+  uint8_t buf[] = {0xff, 0xff, 0xff, 0xff};
+  for (size_t i = 0; i < 5; i++) {
+    uint64_t value = static_cast<uint64_t>(-1);
+    const uint8_t* res = ParseVarInt(buf, buf + i, &value);
+    EXPECT_EQ(&buf[0], res);
+    EXPECT_EQ(0u, value);
+  }
+}
+
+// Even if we see a valid end-of-sequence, ParseVarInt() must fail if the number
+// is larger than 10 bytes. That would cause subtl bugs when trying to shift
+// left by more than 64 bits.
+TEST(ProtoUtilsTest, RejectVarIntTooBig) {
+  // This is the biggest valid varint we support (2**64 - 1).
+  uint8_t good[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01};
+
+  // Parsing this value must succeed.
+  uint64_t value = static_cast<uint64_t>(-1);
+  const uint8_t* res = ParseVarInt(&good[0], &good[sizeof(good)], &value);
+  EXPECT_EQ(&good[sizeof(good)], res);
+  EXPECT_EQ(value, static_cast<uint64_t>(-1));
+
+  uint8_t bad[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                   0xff, 0xff, 0xff, 0xff, 0x01};
+  value = static_cast<uint64_t>(-1);
+  res = ParseVarInt(&bad[0], &bad[sizeof(bad)], &value);
+  EXPECT_EQ(&bad[0], res);
+  EXPECT_EQ(0u, value);
+}
+
+}  // namespace
+}  // namespace proto_utils
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/protoc_plugin/cppgen_plugin.cc b/src/libtracing/protozero_src/protoc_plugin/cppgen_plugin.cc
new file mode 100644
index 000000000..425761305
--- /dev/null
+++ b/src/libtracing/protozero_src/protoc_plugin/cppgen_plugin.cc
@@ -0,0 +1,913 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <set>
+#include <stack>
+#include <vector>
+
+#include <google/protobuf/compiler/code_generator.h>
+#include <google/protobuf/compiler/importer.h>
+#include <google/protobuf/compiler/plugin.h>
+#include <google/protobuf/io/printer.h>
+
+#include "perfetto/ext/base/string_utils.h"
+
+namespace protozero {
+namespace {
+
+using namespace google::protobuf;
+using namespace google::protobuf::compiler;
+using namespace google::protobuf::io;
+using perfetto::base::SplitString;
+using perfetto::base::StripChars;
+using perfetto::base::StripSuffix;
+using perfetto::base::ToUpper;
+
+static constexpr auto TYPE_STRING = FieldDescriptor::TYPE_STRING;
+static constexpr auto TYPE_MESSAGE = FieldDescriptor::TYPE_MESSAGE;
+static constexpr auto TYPE_SINT32 = FieldDescriptor::TYPE_SINT32;
+static constexpr auto TYPE_SINT64 = FieldDescriptor::TYPE_SINT64;
+
+static const char kHeader[] =
+    "// DO NOT EDIT. Autogenerated by Perfetto cppgen_plugin\n";
+
+class CppObjGenerator : public ::google::protobuf::compiler::CodeGenerator {
+ public:
+  CppObjGenerator();
+  ~CppObjGenerator() override;
+
+  // CodeGenerator implementation
+  bool Generate(const google::protobuf::FileDescriptor* file,
+                const std::string& options,
+                GeneratorContext* context,
+                std::string* error) const override;
+
+ private:
+  std::string GetCppType(const FieldDescriptor* field, bool constref) const;
+  std::string GetProtozeroSetter(const FieldDescriptor* field) const;
+  std::string GetPackedBuffer(const FieldDescriptor* field) const;
+  std::string GetPackedWireType(const FieldDescriptor* field) const;
+
+  void GenEnum(const EnumDescriptor*, Printer*) const;
+  void GenEnumAliases(const EnumDescriptor*, Printer*) const;
+  void GenClassDecl(const Descriptor*, Printer*) const;
+  void GenClassDef(const Descriptor*, Printer*) const;
+
+  std::vector<std::string> GetNamespaces(const FileDescriptor* file) const {
+    std::string pkg = file->package() + wrapper_namespace_;
+    return SplitString(pkg, ".");
+  }
+
+  template <typename T = Descriptor>
+  std::string GetFullName(const T* msg, bool with_namespace = false) const {
+    std::string full_type;
+    full_type.append(msg->name());
+    for (const Descriptor* par = msg->containing_type(); par;
+         par = par->containing_type()) {
+      full_type.insert(0, par->name() + "_");
+    }
+    if (with_namespace) {
+      std::string prefix;
+      for (const std::string& ns : GetNamespaces(msg->file())) {
+        prefix += ns + "::";
+      }
+      full_type = prefix + full_type;
+    }
+    return full_type;
+  }
+
+  template <class T>
+  bool HasSamePackage(const T* descriptor) const {
+    return descriptor->file()->package() == package_;
+  }
+
+  mutable std::string wrapper_namespace_;
+  mutable std::string package_;
+};
+
+CppObjGenerator::CppObjGenerator() = default;
+CppObjGenerator::~CppObjGenerator() = default;
+
+bool CppObjGenerator::Generate(const google::protobuf::FileDescriptor* file,
+                               const std::string& options,
+                               GeneratorContext* context,
+                               std::string* error) const {
+  for (const std::string& option : SplitString(options, ",")) {
+    std::vector<std::string> option_pair = SplitString(option, "=");
+    if (option_pair[0] == "wrapper_namespace") {
+      wrapper_namespace_ =
+          option_pair.size() == 2 ? "." + option_pair[1] : std::string();
+    } else {
+      *error = "Unknown plugin option: " + option_pair[0];
+      return false;
+    }
+  }
+
+  package_ = file->package();
+
+  auto get_file_name = [](const FileDescriptor* proto) {
+    return StripSuffix(proto->name(), ".proto") + ".gen";
+  };
+
+  const std::unique_ptr<ZeroCopyOutputStream> h_fstream(
+      context->Open(get_file_name(file) + ".h"));
+  const std::unique_ptr<ZeroCopyOutputStream> cc_fstream(
+      context->Open(get_file_name(file) + ".cc"));
+
+  // Variables are delimited by $.
+  Printer h_printer(h_fstream.get(), '$');
+  Printer cc_printer(cc_fstream.get(), '$');
+
+  std::string include_guard = file->package() + "_" + file->name() + "_CPP_H_";
+  include_guard = ToUpper(include_guard);
+  include_guard = StripChars(include_guard, ".-/\\", '_');
+
+  h_printer.Print(kHeader);
+  h_printer.Print("#ifndef $g$\n#define $g$\n\n", "g", include_guard);
+  h_printer.Print("#include <stdint.h>\n");
+  h_printer.Print("#include <bitset>\n");
+  h_printer.Print("#include <vector>\n");
+  h_printer.Print("#include <string>\n");
+  h_printer.Print("#include <type_traits>\n\n");
+  h_printer.Print("#include \"perfetto/protozero/cpp_message_obj.h\"\n");
+  h_printer.Print("#include \"perfetto/protozero/copyable_ptr.h\"\n");
+  h_printer.Print("#include \"perfetto/base/export.h\"\n\n");
+
+  cc_printer.Print("#include \"perfetto/protozero/gen_field_helpers.h\"\n");
+  cc_printer.Print("#include \"perfetto/protozero/message.h\"\n");
+  cc_printer.Print(
+      "#include \"perfetto/protozero/packed_repeated_fields.h\"\n");
+  cc_printer.Print("#include \"perfetto/protozero/proto_decoder.h\"\n");
+  cc_printer.Print("#include \"perfetto/protozero/scattered_heap_buffer.h\"\n");
+  cc_printer.Print(kHeader);
+  cc_printer.Print("#if defined(__GNUC__) || defined(__clang__)\n");
+  cc_printer.Print("#pragma GCC diagnostic push\n");
+  cc_printer.Print("#pragma GCC diagnostic ignored \"-Wfloat-equal\"\n");
+  cc_printer.Print("#endif\n");
+
+  // Generate includes for translated types of dependencies.
+
+  // Figure out the subset of imports that are used only for lazy fields. We
+  // won't emit a C++ #include for them. This code is overly aggressive at
+  // removing imports: it rules them out as soon as it sees one lazy field
+  // whose type is defined in that import. A 100% correct solution would require
+  // to check that *all* dependent types for a given import are lazy before
+  // excluding that. In practice we don't need that because we don't use imports
+  // for both lazy and non-lazy fields.
+  std::set<std::string> lazy_imports;
+  for (int m = 0; m < file->message_type_count(); m++) {
+    const Descriptor* msg = file->message_type(m);
+    for (int i = 0; i < msg->field_count(); i++) {
+      const FieldDescriptor* field = msg->field(i);
+      if (field->options().lazy()) {
+        lazy_imports.insert(field->message_type()->file()->name());
+      }
+    }
+  }
+
+  // Recursively traverse all imports and turn them into #include(s).
+  std::vector<const FileDescriptor*> imports_to_visit;
+  std::set<const FileDescriptor*> imports_visited;
+  imports_to_visit.push_back(file);
+
+  while (!imports_to_visit.empty()) {
+    const FileDescriptor* cur = imports_to_visit.back();
+    imports_to_visit.pop_back();
+    imports_visited.insert(cur);
+    std::string base_name = StripSuffix(cur->name(), ".proto");
+    cc_printer.Print("#include \"$f$.gen.h\"\n", "f", base_name);
+    for (int i = 0; i < cur->dependency_count(); i++) {
+      const FileDescriptor* dep = cur->dependency(i);
+      if (imports_visited.count(dep) || lazy_imports.count(dep->name()))
+        continue;
+      imports_to_visit.push_back(dep);
+    }
+  }
+
+  // Compute all nested types to generate forward declarations later.
+
+  std::set<const Descriptor*> all_types_seen;  // All deps
+  std::set<const EnumDescriptor*> all_enums_seen;
+
+  // We track the types additionally in vectors to guarantee a stable order in
+  // the generated output.
+  std::vector<const Descriptor*> local_types;  // Cur .proto file only.
+  std::vector<const Descriptor*> all_types;    // All deps
+  std::vector<const EnumDescriptor*> local_enums;
+  std::vector<const EnumDescriptor*> all_enums;
+
+  auto add_enum = [&local_enums, &all_enums, &all_enums_seen,
+                   &file](const EnumDescriptor* enum_desc) {
+    if (all_enums_seen.count(enum_desc))
+      return;
+    all_enums_seen.insert(enum_desc);
+    all_enums.push_back(enum_desc);
+    if (enum_desc->file() == file)
+      local_enums.push_back(enum_desc);
+  };
+
+  for (int i = 0; i < file->enum_type_count(); i++)
+    add_enum(file->enum_type(i));
+
+  std::stack<const Descriptor*> recursion_stack;
+  for (int i = 0; i < file->message_type_count(); i++)
+    recursion_stack.push(file->message_type(i));
+
+  while (!recursion_stack.empty()) {
+    const Descriptor* msg = recursion_stack.top();
+    recursion_stack.pop();
+    if (all_types_seen.count(msg))
+      continue;
+    all_types_seen.insert(msg);
+    all_types.push_back(msg);
+    if (msg->file() == file)
+      local_types.push_back(msg);
+
+    for (int i = 0; i < msg->nested_type_count(); i++)
+      recursion_stack.push(msg->nested_type(i));
+
+    for (int i = 0; i < msg->enum_type_count(); i++)
+      add_enum(msg->enum_type(i));
+
+    for (int i = 0; i < msg->field_count(); i++) {
+      const FieldDescriptor* field = msg->field(i);
+      if (field->has_default_value()) {
+        *error = "field " + field->name() +
+                 ": Explicitly declared default values are not supported";
+        return false;
+      }
+      if (field->options().lazy() &&
+          (field->is_repeated() || field->type() != TYPE_MESSAGE)) {
+        *error = "[lazy=true] is supported only on non-repeated fields\n";
+        return false;
+      }
+
+      if (field->type() == TYPE_MESSAGE && !field->options().lazy())
+        recursion_stack.push(field->message_type());
+
+      if (field->type() == FieldDescriptor::TYPE_ENUM)
+        add_enum(field->enum_type());
+    }
+  }  //  while (!recursion_stack.empty())
+
+  // Generate forward declarations in the header for proto types.
+  // Note: do NOT add #includes to other generated headers (either .gen.h or
+  // .pbzero.h). Doing so is extremely hard to handle at the build-system level
+  // and requires propagating public_deps everywhere.
+  cc_printer.Print("\n");
+
+  // -- Begin of fwd declarations.
+
+  // Build up the map of forward declarations.
+  std::multimap<std::string /*namespace*/, std::string /*decl*/> fwd_decls;
+  enum FwdType { kClass, kEnum };
+  auto add_fwd_decl = [&fwd_decls](FwdType cpp_type,
+                                   const std::string& full_name) {
+    auto dot = full_name.rfind("::");
+    PERFETTO_CHECK(dot != std::string::npos);
+    auto package = full_name.substr(0, dot);
+    auto name = full_name.substr(dot + 2);
+    if (cpp_type == kClass) {
+      fwd_decls.emplace(package, "class " + name + ";");
+    } else {
+      PERFETTO_CHECK(cpp_type == kEnum);
+      fwd_decls.emplace(package, "enum " + name + " : int;");
+    }
+  };
+
+  add_fwd_decl(kClass, "protozero::Message");
+  for (const Descriptor* msg : all_types) {
+    add_fwd_decl(kClass, GetFullName(msg, true));
+  }
+  for (const EnumDescriptor* enm : all_enums) {
+    add_fwd_decl(kEnum, GetFullName(enm, true));
+  }
+
+  // Emit forward declarations grouping by package.
+  std::string last_package;
+  auto close_last_package = [&last_package, &h_printer] {
+    if (!last_package.empty()) {
+      for (const std::string& ns : SplitString(last_package, "::"))
+        h_printer.Print("}  // namespace $ns$\n", "ns", ns);
+      h_printer.Print("\n");
+    }
+  };
+  for (const auto& kv : fwd_decls) {
+    const std::string& package = kv.first;
+    if (package != last_package) {
+      close_last_package();
+      last_package = package;
+      for (const std::string& ns : SplitString(package, "::"))
+        h_printer.Print("namespace $ns$ {\n", "ns", ns);
+    }
+    h_printer.Print("$decl$\n", "decl", kv.second);
+  }
+  close_last_package();
+
+  // -- End of fwd declarations.
+
+  for (const std::string& ns : GetNamespaces(file)) {
+    h_printer.Print("namespace $n$ {\n", "n", ns);
+    cc_printer.Print("namespace $n$ {\n", "n", ns);
+  }
+
+  // Generate declarations and definitions.
+  for (const EnumDescriptor* enm : local_enums)
+    GenEnum(enm, &h_printer);
+
+  for (const Descriptor* msg : local_types) {
+    GenClassDecl(msg, &h_printer);
+    GenClassDef(msg, &cc_printer);
+  }
+
+  for (const std::string& ns : GetNamespaces(file)) {
+    h_printer.Print("}  // namespace $n$\n", "n", ns);
+    cc_printer.Print("}  // namespace $n$\n", "n", ns);
+  }
+  cc_printer.Print("#if defined(__GNUC__) || defined(__clang__)\n");
+  cc_printer.Print("#pragma GCC diagnostic pop\n");
+  cc_printer.Print("#endif\n");
+
+  h_printer.Print("\n#endif  // $g$\n", "g", include_guard);
+
+  return true;
+}
+
+std::string CppObjGenerator::GetCppType(const FieldDescriptor* field,
+                                        bool constref) const {
+  switch (field->type()) {
+    case FieldDescriptor::TYPE_DOUBLE:
+      return "double";
+    case FieldDescriptor::TYPE_FLOAT:
+      return "float";
+    case FieldDescriptor::TYPE_FIXED32:
+    case FieldDescriptor::TYPE_UINT32:
+      return "uint32_t";
+    case FieldDescriptor::TYPE_SFIXED32:
+    case FieldDescriptor::TYPE_INT32:
+    case FieldDescriptor::TYPE_SINT32:
+      return "int32_t";
+    case FieldDescriptor::TYPE_FIXED64:
+    case FieldDescriptor::TYPE_UINT64:
+      return "uint64_t";
+    case FieldDescriptor::TYPE_SFIXED64:
+    case FieldDescriptor::TYPE_SINT64:
+    case FieldDescriptor::TYPE_INT64:
+      return "int64_t";
+    case FieldDescriptor::TYPE_BOOL:
+      return "bool";
+    case FieldDescriptor::TYPE_STRING:
+    case FieldDescriptor::TYPE_BYTES:
+      return constref ? "const std::string&" : "std::string";
+    case FieldDescriptor::TYPE_MESSAGE:
+      assert(!field->options().lazy());
+      return constref
+                 ? "const " +
+                       GetFullName(field->message_type(),
+                                   !HasSamePackage(field->message_type())) +
+                       "&"
+                 : GetFullName(field->message_type(),
+                               !HasSamePackage(field->message_type()));
+    case FieldDescriptor::TYPE_ENUM:
+      return GetFullName(field->enum_type(),
+                         !HasSamePackage(field->enum_type()));
+    case FieldDescriptor::TYPE_GROUP:
+      abort();
+  }
+  abort();  // for gcc
+}
+
+std::string CppObjGenerator::GetProtozeroSetter(
+    const FieldDescriptor* field) const {
+  switch (field->type()) {
+    case FieldDescriptor::TYPE_BOOL:
+      return "::protozero::internal::gen_helpers::SerializeTinyVarInt";
+    case FieldDescriptor::TYPE_INT32:
+    case FieldDescriptor::TYPE_INT64:
+    case FieldDescriptor::TYPE_UINT32:
+    case FieldDescriptor::TYPE_UINT64:
+    case FieldDescriptor::TYPE_ENUM:
+      return "::protozero::internal::gen_helpers::SerializeVarInt";
+    case FieldDescriptor::TYPE_SINT32:
+    case FieldDescriptor::TYPE_SINT64:
+      return "::protozero::internal::gen_helpers::SerializeSignedVarInt";
+    case FieldDescriptor::TYPE_FIXED32:
+    case FieldDescriptor::TYPE_FIXED64:
+    case FieldDescriptor::TYPE_SFIXED32:
+    case FieldDescriptor::TYPE_SFIXED64:
+    case FieldDescriptor::TYPE_FLOAT:
+    case FieldDescriptor::TYPE_DOUBLE:
+      return "::protozero::internal::gen_helpers::SerializeFixed";
+    case FieldDescriptor::TYPE_STRING:
+    case FieldDescriptor::TYPE_BYTES:
+      return "::protozero::internal::gen_helpers::SerializeString";
+    case FieldDescriptor::TYPE_GROUP:
+    case FieldDescriptor::TYPE_MESSAGE:
+      abort();
+  }
+  abort();
+}
+
+std::string CppObjGenerator::GetPackedBuffer(
+    const FieldDescriptor* field) const {
+  switch (field->type()) {
+    case FieldDescriptor::TYPE_FIXED32:
+      return "::protozero::PackedFixedSizeInt<uint32_t>";
+    case FieldDescriptor::TYPE_SFIXED32:
+      return "::protozero::PackedFixedSizeInt<int32_t>";
+    case FieldDescriptor::TYPE_FIXED64:
+      return "::protozero::PackedFixedSizeInt<uint64_t>";
+    case FieldDescriptor::TYPE_SFIXED64:
+      return "::protozero::PackedFixedSizeInt<int64_t>";
+    case FieldDescriptor::TYPE_DOUBLE:
+      return "::protozero::PackedFixedSizeInt<double>";
+    case FieldDescriptor::TYPE_FLOAT:
+      return "::protozero::PackedFixedSizeInt<float>";
+    case FieldDescriptor::TYPE_INT32:
+    case FieldDescriptor::TYPE_SINT32:
+    case FieldDescriptor::TYPE_UINT32:
+    case FieldDescriptor::TYPE_INT64:
+    case FieldDescriptor::TYPE_UINT64:
+    case FieldDescriptor::TYPE_SINT64:
+    case FieldDescriptor::TYPE_BOOL:
+    case FieldDescriptor::TYPE_ENUM:
+      return "::protozero::PackedVarInt";
+    case FieldDescriptor::TYPE_STRING:
+    case FieldDescriptor::TYPE_BYTES:
+    case FieldDescriptor::TYPE_MESSAGE:
+    case FieldDescriptor::TYPE_GROUP:
+      break;  // Will abort()
+  }
+  abort();
+}
+
+std::string CppObjGenerator::GetPackedWireType(
+    const FieldDescriptor* field) const {
+  switch (field->type()) {
+    case FieldDescriptor::TYPE_FIXED32:
+    case FieldDescriptor::TYPE_SFIXED32:
+    case FieldDescriptor::TYPE_FLOAT:
+      return "::protozero::proto_utils::ProtoWireType::kFixed32";
+    case FieldDescriptor::TYPE_FIXED64:
+    case FieldDescriptor::TYPE_SFIXED64:
+    case FieldDescriptor::TYPE_DOUBLE:
+      return "::protozero::proto_utils::ProtoWireType::kFixed64";
+    case FieldDescriptor::TYPE_INT32:
+    case FieldDescriptor::TYPE_SINT32:
+    case FieldDescriptor::TYPE_UINT32:
+    case FieldDescriptor::TYPE_INT64:
+    case FieldDescriptor::TYPE_UINT64:
+    case FieldDescriptor::TYPE_SINT64:
+    case FieldDescriptor::TYPE_BOOL:
+    case FieldDescriptor::TYPE_ENUM:
+      return "::protozero::proto_utils::ProtoWireType::kVarInt";
+    case FieldDescriptor::TYPE_STRING:
+    case FieldDescriptor::TYPE_BYTES:
+    case FieldDescriptor::TYPE_MESSAGE:
+    case FieldDescriptor::TYPE_GROUP:
+      break;  // Will abort()
+  }
+  abort();
+}
+
+void CppObjGenerator::GenEnum(const EnumDescriptor* enum_desc,
+                              Printer* p) const {
+  std::string full_name = GetFullName(enum_desc);
+
+  // When generating enums, there are two cases:
+  // 1. Enums nested in a message (most frequent case), e.g.:
+  //    message MyMsg { enum MyEnum { FOO=1; BAR=2; } }
+  // 2. Enum defined at the package level, outside of any message.
+  //
+  // In the case 1, the C++ code generated by the official protobuf library is:
+  // enum MyEnum {  MyMsg_MyEnum_FOO=1, MyMsg_MyEnum_BAR=2 }
+  // class MyMsg { static const auto FOO = MyMsg_MyEnum_FOO; ... same for BAR }
+  //
+  // In the case 2, the C++ code is simply:
+  // enum MyEnum { FOO=1, BAR=2 }
+  // Hence this |prefix| logic.
+  std::string prefix = enum_desc->containing_type() ? full_name + "_" : "";
+  p->Print("enum $f$ : int {\n", "f", full_name);
+  for (int e = 0; e < enum_desc->value_count(); e++) {
+    const EnumValueDescriptor* value = enum_desc->value(e);
+    p->Print("  $p$$n$ = $v$,\n", "p", prefix, "n", value->name(), "v",
+             std::to_string(value->number()));
+  }
+  p->Print("};\n");
+}
+
+void CppObjGenerator::GenEnumAliases(const EnumDescriptor* enum_desc,
+                                     Printer* p) const {
+  int min_value = std::numeric_limits<int>::max();
+  int max_value = std::numeric_limits<int>::min();
+  std::string min_name;
+  std::string max_name;
+  std::string full_name = GetFullName(enum_desc);
+  for (int e = 0; e < enum_desc->value_count(); e++) {
+    const EnumValueDescriptor* value = enum_desc->value(e);
+    p->Print("static constexpr auto $n$ = $f$_$n$;\n", "f", full_name, "n",
+             value->name());
+    if (value->number() < min_value) {
+      min_value = value->number();
+      min_name = full_name + "_" + value->name();
+    }
+    if (value->number() > max_value) {
+      max_value = value->number();
+      max_name = full_name + "_" + value->name();
+    }
+  }
+  p->Print("static constexpr auto $n$_MIN = $m$;\n", "n", enum_desc->name(),
+           "m", min_name);
+  p->Print("static constexpr auto $n$_MAX = $m$;\n", "n", enum_desc->name(),
+           "m", max_name);
+}
+
+void CppObjGenerator::GenClassDecl(const Descriptor* msg, Printer* p) const {
+  std::string full_name = GetFullName(msg);
+  p->Print(
+      "\nclass PERFETTO_EXPORT_COMPONENT $n$ : public "
+      "::protozero::CppMessageObj {\n",
+      "n", full_name);
+  p->Print(" public:\n");
+  p->Indent();
+
+  // Do a first pass to generate aliases for nested types.
+  // e.g., using Foo = Parent_Foo;
+  for (int i = 0; i < msg->nested_type_count(); i++) {
+    const Descriptor* nested_msg = msg->nested_type(i);
+    p->Print("using $n$ = $f$;\n", "n", nested_msg->name(), "f",
+             GetFullName(nested_msg));
+  }
+  for (int i = 0; i < msg->enum_type_count(); i++) {
+    const EnumDescriptor* nested_enum = msg->enum_type(i);
+    p->Print("using $n$ = $f$;\n", "n", nested_enum->name(), "f",
+             GetFullName(nested_enum));
+    GenEnumAliases(nested_enum, p);
+  }
+
+  // Generate constants with field numbers.
+  p->Print("enum FieldNumbers {\n");
+  for (int i = 0; i < msg->field_count(); i++) {
+    const FieldDescriptor* field = msg->field(i);
+    std::string name = field->camelcase_name();
+    name[0] = perfetto::base::Uppercase(name[0]);
+    p->Print("  k$n$FieldNumber = $num$,\n", "n", name, "num",
+             std::to_string(field->number()));
+  }
+  p->Print("};\n\n");
+
+  p->Print("$n$();\n", "n", full_name);
+  p->Print("~$n$() override;\n", "n", full_name);
+  p->Print("$n$($n$&&) noexcept;\n", "n", full_name);
+  p->Print("$n$& operator=($n$&&);\n", "n", full_name);
+  p->Print("$n$(const $n$&);\n", "n", full_name);
+  p->Print("$n$& operator=(const $n$&);\n", "n", full_name);
+  p->Print("bool operator==(const $n$&) const;\n", "n", full_name);
+  p->Print(
+      "bool operator!=(const $n$& other) const { return !(*this == other); }\n",
+      "n", full_name);
+  p->Print("\n");
+
+  std::string proto_type = GetFullName(msg, true);
+  p->Print("bool ParseFromArray(const void*, size_t) override;\n");
+  p->Print("std::string SerializeAsString() const override;\n");
+  p->Print("std::vector<uint8_t> SerializeAsArray() const override;\n");
+  p->Print("void Serialize(::protozero::Message*) const;\n");
+
+  // Generate accessors.
+  for (int i = 0; i < msg->field_count(); i++) {
+    const FieldDescriptor* field = msg->field(i);
+    auto set_bit = "_has_field_.set(" + std::to_string(field->number()) + ")";
+    p->Print("\n");
+    if (field->options().lazy()) {
+      p->Print("const std::string& $n$_raw() const { return $n$_; }\n", "n",
+               field->lowercase_name());
+      p->Print(
+          "void set_$n$_raw(const std::string& raw) { $n$_ = raw; $s$; }\n",
+          "n", field->lowercase_name(), "s", set_bit);
+    } else if (!field->is_repeated()) {
+      p->Print("bool has_$n$() const { return _has_field_[$bit$]; }\n", "n",
+               field->lowercase_name(), "bit", std::to_string(field->number()));
+      if (field->type() == TYPE_MESSAGE) {
+        p->Print("$t$ $n$() const { return *$n$_; }\n", "t",
+                 GetCppType(field, true), "n", field->lowercase_name());
+        p->Print("$t$* mutable_$n$() { $s$; return $n$_.get(); }\n", "t",
+                 GetCppType(field, false), "n", field->lowercase_name(), "s",
+                 set_bit);
+      } else {
+        p->Print("$t$ $n$() const { return $n$_; }\n", "t",
+                 GetCppType(field, true), "n", field->lowercase_name());
+        p->Print("void set_$n$($t$ value) { $n$_ = value; $s$; }\n", "t",
+                 GetCppType(field, true), "n", field->lowercase_name(), "s",
+                 set_bit);
+        if (field->type() == FieldDescriptor::TYPE_BYTES) {
+          p->Print(
+              "void set_$n$(const void* p, size_t s) { "
+              "$n$_.assign(reinterpret_cast<const char*>(p), s); $s$; }\n",
+              "n", field->lowercase_name(), "s", set_bit);
+        }
+      }
+    } else {  // is_repeated()
+      p->Print("const std::vector<$t$>& $n$() const { return $n$_; }\n", "t",
+               GetCppType(field, false), "n", field->lowercase_name());
+      p->Print("std::vector<$t$>* mutable_$n$() { return &$n$_; }\n", "t",
+               GetCppType(field, false), "n", field->lowercase_name());
+
+      // Generate accessors for repeated message types in the .cc file so that
+      // the header doesn't depend on the full definition of all nested types.
+      if (field->type() == TYPE_MESSAGE) {
+        p->Print("int $n$_size() const;\n", "t", GetCppType(field, false), "n",
+                 field->lowercase_name());
+        p->Print("void clear_$n$();\n", "n", field->lowercase_name());
+        p->Print("$t$* add_$n$();\n", "t", GetCppType(field, false), "n",
+                 field->lowercase_name());
+      } else {  // Primitive type.
+        p->Print(
+            "int $n$_size() const { return static_cast<int>($n$_.size()); }\n",
+            "t", GetCppType(field, false), "n", field->lowercase_name());
+        p->Print("void clear_$n$() { $n$_.clear(); }\n", "n",
+                 field->lowercase_name());
+        p->Print("void add_$n$($t$ value) { $n$_.emplace_back(value); }\n", "t",
+                 GetCppType(field, false), "n", field->lowercase_name());
+        // TODO(primiano): this should be done only for TYPE_MESSAGE.
+        // Unfortuntely we didn't realize before and now we have a bunch of code
+        // that does: *msg->add_int_value() = 42 instead of
+        // msg->add_int_value(42).
+        p->Print(
+            "$t$* add_$n$() { $n$_.emplace_back(); return &$n$_.back(); }\n",
+            "t", GetCppType(field, false), "n", field->lowercase_name());
+      }
+    }
+  }
+  p->Outdent();
+  p->Print("\n private:\n");
+  p->Indent();
+
+  // Generate fields.
+  int max_field_id = 1;
+  for (int i = 0; i < msg->field_count(); i++) {
+    const FieldDescriptor* field = msg->field(i);
+    max_field_id = std::max(max_field_id, field->number());
+    if (field->options().lazy()) {
+      p->Print("std::string $n$_;  // [lazy=true]\n", "n",
+               field->lowercase_name());
+    } else if (!field->is_repeated()) {
+      std::string type = GetCppType(field, false);
+      if (field->type() == TYPE_MESSAGE) {
+        type = "::protozero::CopyablePtr<" + type + ">";
+        p->Print("$t$ $n$_;\n", "t", type, "n", field->lowercase_name());
+      } else {
+        p->Print("$t$ $n$_{};\n", "t", type, "n", field->lowercase_name());
+      }
+    } else {  // is_repeated()
+      p->Print("std::vector<$t$> $n$_;\n", "t", GetCppType(field, false), "n",
+               field->lowercase_name());
+    }
+  }
+  p->Print("\n");
+  p->Print("// Allows to preserve unknown protobuf fields for compatibility\n");
+  p->Print("// with future versions of .proto files.\n");
+  p->Print("std::string unknown_fields_;\n");
+
+  p->Print("\nstd::bitset<$id$> _has_field_{};\n", "id",
+           std::to_string(max_field_id + 1));
+
+  p->Outdent();
+  p->Print("};\n\n");
+}
+
+void CppObjGenerator::GenClassDef(const Descriptor* msg, Printer* p) const {
+  p->Print("\n");
+  std::string full_name = GetFullName(msg);
+
+  p->Print("$n$::$n$() = default;\n", "n", full_name);
+  p->Print("$n$::~$n$() = default;\n", "n", full_name);
+  p->Print("$n$::$n$(const $n$&) = default;\n", "n", full_name);
+  p->Print("$n$& $n$::operator=(const $n$&) = default;\n", "n", full_name);
+  p->Print("$n$::$n$($n$&&) noexcept = default;\n", "n", full_name);
+  p->Print("$n$& $n$::operator=($n$&&) = default;\n", "n", full_name);
+
+  p->Print("\n");
+
+  // Comparison operator
+  p->Print("bool $n$::operator==(const $n$& other) const {\n", "n", full_name);
+  p->Indent();
+
+  p->Print(
+      "return ::protozero::internal::gen_helpers::EqualsField(unknown_fields_, "
+      "other.unknown_fields_)");
+  for (int i = 0; i < msg->field_count(); i++)
+    p->Print(
+        "\n && ::protozero::internal::gen_helpers::EqualsField($n$_, "
+        "other.$n$_)",
+        "n", msg->field(i)->lowercase_name());
+  p->Print(";");
+  p->Outdent();
+  p->Print("\n}\n\n");
+
+  // Accessors for repeated message fields.
+  for (int i = 0; i < msg->field_count(); i++) {
+    const FieldDescriptor* field = msg->field(i);
+    if (field->options().lazy() || !field->is_repeated() ||
+        field->type() != TYPE_MESSAGE) {
+      continue;
+    }
+    p->Print(
+        "int $c$::$n$_size() const { return static_cast<int>($n$_.size()); }\n",
+        "c", full_name, "t", GetCppType(field, false), "n",
+        field->lowercase_name());
+    p->Print("void $c$::clear_$n$() { $n$_.clear(); }\n", "c", full_name, "n",
+             field->lowercase_name());
+    p->Print(
+        "$t$* $c$::add_$n$() { $n$_.emplace_back(); return &$n$_.back(); }\n",
+        "c", full_name, "t", GetCppType(field, false), "n",
+        field->lowercase_name());
+  }
+
+  std::string proto_type = GetFullName(msg, true);
+
+  // Generate the ParseFromArray() method definition.
+  p->Print("bool $f$::ParseFromArray(const void* raw, size_t size) {\n", "f",
+           full_name);
+  p->Indent();
+  for (int i = 0; i < msg->field_count(); i++) {
+    const FieldDescriptor* field = msg->field(i);
+    if (field->is_repeated())
+      p->Print("$n$_.clear();\n", "n", field->lowercase_name());
+  }
+  p->Print("unknown_fields_.clear();\n");
+  p->Print("bool packed_error = false;\n");
+  p->Print("\n");
+  p->Print("::protozero::ProtoDecoder dec(raw, size);\n");
+  p->Print("for (auto field = dec.ReadField(); field.valid(); ");
+  p->Print("field = dec.ReadField()) {\n");
+  p->Indent();
+  p->Print("if (field.id() < _has_field_.size()) {\n");
+  p->Print("  _has_field_.set(field.id());\n");
+  p->Print("}\n");
+  p->Print("switch (field.id()) {\n");
+  p->Indent();
+  for (int i = 0; i < msg->field_count(); i++) {
+    const FieldDescriptor* field = msg->field(i);
+    p->Print("case $id$ /* $n$ */:\n", "id", std::to_string(field->number()),
+             "n", field->lowercase_name());
+    p->Indent();
+    if (field->options().lazy()) {
+      p->Print(
+          "::protozero::internal::gen_helpers::DeserializeString(field, "
+          "&$n$_);\n",
+          "n", field->lowercase_name());
+    } else {
+      std::string statement;
+      if (field->type() == TYPE_MESSAGE) {
+        statement = "$rval$.ParseFromArray(field.data(), field.size());\n";
+      } else {
+        if (field->type() == TYPE_SINT32 || field->type() == TYPE_SINT64) {
+          // sint32/64 fields are special and need to be zig-zag-decoded.
+          statement = "field.get_signed(&$rval$);\n";
+        } else if (field->type() == TYPE_STRING) {
+          statement =
+              "::protozero::internal::gen_helpers::DeserializeString(field, "
+              "&$rval$);\n";
+        } else {
+          statement = "field.get(&$rval$);\n";
+        }
+      }
+      if (field->is_packed()) {
+        PERFETTO_CHECK(field->is_repeated());
+        if (field->type() == TYPE_SINT32 || field->type() == TYPE_SINT64) {
+          PERFETTO_FATAL("packed signed (zigzag) fields are not supported");
+        }
+        p->Print(
+            "if "
+            "(!::protozero::internal::gen_helpers::DeserializePackedRepeated"
+            "<$w$, $c$>(field, &$n$_)) {\n",
+            "w", GetPackedWireType(field), "c", GetCppType(field, false), "n",
+            field->lowercase_name());
+        p->Print("  packed_error = true;");
+        p->Print("}\n");
+      } else if (field->is_repeated()) {
+        p->Print("$n$_.emplace_back();\n", "n", field->lowercase_name());
+        p->Print(statement.c_str(), "rval",
+                 field->lowercase_name() + "_.back()");
+      } else if (field->type() == TYPE_MESSAGE) {
+        p->Print(statement.c_str(), "rval",
+                 "(*" + field->lowercase_name() + "_)");
+      } else {
+        p->Print(statement.c_str(), "rval", field->lowercase_name() + "_");
+      }
+    }
+    p->Print("break;\n");
+    p->Outdent();
+  }  // for (field)
+  p->Print("default:\n");
+  p->Print("  field.SerializeAndAppendTo(&unknown_fields_);\n");
+  p->Print("  break;\n");
+  p->Outdent();
+  p->Print("}\n");  // switch(field.id)
+  p->Outdent();
+  p->Print("}\n");                                           // for(field)
+  p->Print("return !packed_error && !dec.bytes_left();\n");  // for(field)
+  p->Outdent();
+  p->Print("}\n\n");
+
+  // Generate the SerializeAsString() method definition.
+  p->Print("std::string $f$::SerializeAsString() const {\n", "f", full_name);
+  p->Indent();
+  p->Print("::protozero::internal::gen_helpers::MessageSerializer msg;\n");
+  p->Print("Serialize(msg.get());\n");
+  p->Print("return msg.SerializeAsString();\n");
+  p->Outdent();
+  p->Print("}\n\n");
+
+  // Generate the SerializeAsArray() method definition.
+  p->Print("std::vector<uint8_t> $f$::SerializeAsArray() const {\n", "f",
+           full_name);
+  p->Indent();
+  p->Print("::protozero::internal::gen_helpers::MessageSerializer msg;\n");
+  p->Print("Serialize(msg.get());\n");
+  p->Print("return msg.SerializeAsArray();\n");
+  p->Outdent();
+  p->Print("}\n\n");
+
+  // Generate the Serialize() method that writes the fields into the passed
+  // protozero |msg| write-only interface |msg|.
+  p->Print("void $f$::Serialize(::protozero::Message* msg) const {\n", "f",
+           full_name);
+  p->Indent();
+  for (int i = 0; i < msg->field_count(); i++) {
+    const FieldDescriptor* field = msg->field(i);
+    std::map<std::string, std::string> args;
+    args["id"] = std::to_string(field->number());
+    args["n"] = field->lowercase_name();
+    p->Print(args, "// Field $id$: $n$\n");
+    if (field->is_packed()) {
+      PERFETTO_CHECK(field->is_repeated());
+      p->Print("{\n");
+      p->Indent();
+      p->Print("$p$ pack;\n", "p", GetPackedBuffer(field));
+      p->Print(args, "for (auto& it : $n$_)\n");
+      p->Print(args, "  pack.Append(it);\n");
+      p->Print(args, "msg->AppendBytes($id$, pack.data(), pack.size());\n");
+      p->Outdent();
+      p->Print("}\n");
+    } else {
+      if (field->is_repeated()) {
+        p->Print(args, "for (auto& it : $n$_) {\n");
+        args["lvalue"] = "it";
+        args["rvalue"] = "it";
+      } else {
+        p->Print(args, "if (_has_field_[$id$]) {\n");
+        args["lvalue"] = "(*" + field->lowercase_name() + "_)";
+        args["rvalue"] = field->lowercase_name() + "_";
+      }
+      p->Indent();
+      if (field->options().lazy()) {
+        p->Print(args, "msg->AppendString($id$, $rvalue$);\n");
+      } else if (field->type() == TYPE_MESSAGE) {
+        p->Print(args,
+                 "$lvalue$.Serialize("
+                 "msg->BeginNestedMessage<::protozero::Message>($id$));\n");
+      } else {
+        args["setter"] = GetProtozeroSetter(field);
+        p->Print(args, "$setter$($id$, $rvalue$, msg);\n");
+      }
+      p->Outdent();
+      p->Print("}\n");
+    }
+
+    p->Print("\n");
+  }  // for (field)
+  p->Print(
+      "protozero::internal::gen_helpers::SerializeUnknownFields(unknown_fields_"
+      ", msg);\n");
+  p->Outdent();
+  p->Print("}\n\n");
+}
+
+}  // namespace
+}  // namespace protozero
+
+int main(int argc, char** argv) {
+  ::protozero::CppObjGenerator generator;
+  return google::protobuf::compiler::PluginMain(argc, argv, &generator);
+}
diff --git a/src/libtracing/protozero_src/protoc_plugin/protozero_c_plugin.cc b/src/libtracing/protozero_src/protoc_plugin/protozero_c_plugin.cc
new file mode 100644
index 000000000..5bd05dd57
--- /dev/null
+++ b/src/libtracing/protozero_src/protoc_plugin/protozero_c_plugin.cc
@@ -0,0 +1,623 @@
+/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+
+#include <limits>
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+
+#include <google/protobuf/compiler/code_generator.h>
+#include <google/protobuf/compiler/plugin.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.pb.h>
+#include <google/protobuf/io/printer.h>
+#include <google/protobuf/io/zero_copy_stream.h>
+
+#include "perfetto/ext/base/string_utils.h"
+
+namespace protozero {
+namespace {
+
+using google::protobuf::Descriptor;
+using google::protobuf::EnumDescriptor;
+using google::protobuf::EnumValueDescriptor;
+using google::protobuf::FieldDescriptor;
+using google::protobuf::FileDescriptor;
+using google::protobuf::compiler::GeneratorContext;
+using google::protobuf::io::Printer;
+using google::protobuf::io::ZeroCopyOutputStream;
+using perfetto::base::SplitString;
+using perfetto::base::StripChars;
+using perfetto::base::StripPrefix;
+using perfetto::base::StripSuffix;
+using perfetto::base::ToUpper;
+using perfetto::base::Uppercase;
+
+void Assert(bool condition) {
+  if (!condition)
+    abort();
+}
+
+struct FileDescriptorComp {
+  bool operator()(const FileDescriptor* lhs, const FileDescriptor* rhs) const {
+    int comp = lhs->name().compare(rhs->name());
+    Assert(comp != 0 || lhs == rhs);
+    return comp < 0;
+  }
+};
+
+struct DescriptorComp {
+  bool operator()(const Descriptor* lhs, const Descriptor* rhs) const {
+    int comp = lhs->full_name().compare(rhs->full_name());
+    Assert(comp != 0 || lhs == rhs);
+    return comp < 0;
+  }
+};
+
+struct EnumDescriptorComp {
+  bool operator()(const EnumDescriptor* lhs, const EnumDescriptor* rhs) const {
+    int comp = lhs->full_name().compare(rhs->full_name());
+    Assert(comp != 0 || lhs == rhs);
+    return comp < 0;
+  }
+};
+
+inline std::string ProtoStubName(const FileDescriptor* proto) {
+  return StripSuffix(proto->name(), ".proto") + ".pzc";
+}
+
+class GeneratorJob {
+ public:
+  GeneratorJob(const FileDescriptor* file, Printer* stub_h_printer)
+      : source_(file), stub_h_(stub_h_printer) {}
+
+  bool GenerateStubs() {
+    Preprocess();
+    GeneratePrologue();
+    for (const EnumDescriptor* enumeration : enums_)
+      GenerateEnumDescriptor(enumeration);
+    for (const Descriptor* message : messages_)
+      GenerateMessageDescriptor(message);
+    GenerateEpilogue();
+    return error_.empty();
+  }
+
+  void SetOption(const std::string& name, const std::string& value) {
+    if (name == "wrapper_namespace") {
+      wrapper_namespace_ = value;
+    } else if (name == "guard_strip_prefix") {
+      guard_strip_prefix_ = value;
+    } else if (name == "guard_add_prefix") {
+      guard_add_prefix_ = value;
+    } else if (name == "path_strip_prefix") {
+      path_strip_prefix_ = value;
+    } else if (name == "path_add_prefix") {
+      path_add_prefix_ = value;
+    } else if (name == "invoker") {
+      invoker_ = value;
+    } else {
+      Abort(std::string() + "Unknown plugin option '" + name + "'.");
+    }
+  }
+
+  // If generator fails to produce stubs for a particular proto definitions
+  // it finishes with undefined output and writes the first error occurred.
+  const std::string& GetFirstError() const { return error_; }
+
+ private:
+  // Only the first error will be recorded.
+  void Abort(const std::string& reason) {
+    if (error_.empty())
+      error_ = reason;
+  }
+
+  // Get C++ class name corresponding to proto descriptor.
+  // Nested names are splitted by underscores. Underscores in type names aren't
+  // prohibited but not recommended in order to avoid name collisions.
+  template <class T>
+  inline std::string GetCppClassName(const T* descriptor) {
+    return StripChars(descriptor->full_name(), ".", '_');
+  }
+
+  const char* FieldTypeToPackedBufferType(FieldDescriptor::Type type) {
+    switch (type) {
+      case FieldDescriptor::TYPE_ENUM:
+      case FieldDescriptor::TYPE_INT32:
+        return "Int32";
+      case FieldDescriptor::TYPE_INT64:
+        return "Int64";
+      case FieldDescriptor::TYPE_UINT32:
+        return "Uint32";
+      case FieldDescriptor::TYPE_UINT64:
+        return "Uint64";
+      case FieldDescriptor::TYPE_SINT32:
+        return "Sint32";
+      case FieldDescriptor::TYPE_SINT64:
+        return "Sint64";
+      case FieldDescriptor::TYPE_FIXED32:
+        return "Fixed32";
+      case FieldDescriptor::TYPE_FIXED64:
+        return "Fixed64";
+      case FieldDescriptor::TYPE_SFIXED32:
+        return "Sfixed32";
+      case FieldDescriptor::TYPE_SFIXED64:
+        return "Sfixed64";
+      case FieldDescriptor::TYPE_FLOAT:
+        return "Float";
+      case FieldDescriptor::TYPE_DOUBLE:
+        return "Double";
+      case FieldDescriptor::TYPE_BOOL:
+      case FieldDescriptor::TYPE_STRING:
+      case FieldDescriptor::TYPE_BYTES:
+      case FieldDescriptor::TYPE_MESSAGE:
+      case FieldDescriptor::TYPE_GROUP:
+        break;
+    }
+    Abort("Unsupported packed type");
+    return "";
+  }
+  std::string FieldToCppTypeName(const FieldDescriptor* field) {
+    switch (field->type()) {
+      case FieldDescriptor::TYPE_BOOL:
+        return "bool";
+      case FieldDescriptor::TYPE_INT32:
+        return "int32_t";
+      case FieldDescriptor::TYPE_INT64:
+        return "int64_t";
+      case FieldDescriptor::TYPE_UINT32:
+        return "uint32_t";
+      case FieldDescriptor::TYPE_UINT64:
+        return "uint64_t";
+      case FieldDescriptor::TYPE_SINT32:
+        return "int32_t";
+      case FieldDescriptor::TYPE_SINT64:
+        return "int64_t";
+      case FieldDescriptor::TYPE_FIXED32:
+        return "uint32_t";
+      case FieldDescriptor::TYPE_FIXED64:
+        return "uint64_t";
+      case FieldDescriptor::TYPE_SFIXED32:
+        return "int32_t";
+      case FieldDescriptor::TYPE_SFIXED64:
+        return "int64_t";
+      case FieldDescriptor::TYPE_FLOAT:
+        return "float";
+      case FieldDescriptor::TYPE_DOUBLE:
+        return "double";
+      case FieldDescriptor::TYPE_ENUM:
+        return "enum " + GetCppClassName(field->enum_type());
+      case FieldDescriptor::TYPE_STRING:
+      case FieldDescriptor::TYPE_BYTES:
+        return "const char*";
+      case FieldDescriptor::TYPE_MESSAGE:
+        return GetCppClassName(field->message_type());
+      case FieldDescriptor::TYPE_GROUP:
+        Abort("Groups not supported.");
+        return "";
+    }
+    Abort("Unrecognized FieldDescriptor::Type.");
+    return "";
+  }
+
+  void CollectDescriptors() {
+    // Collect message descriptors in DFS order.
+    std::vector<const Descriptor*> stack;
+    stack.reserve(static_cast<size_t>(source_->message_type_count()));
+    for (int i = 0; i < source_->message_type_count(); ++i)
+      stack.push_back(source_->message_type(i));
+
+    while (!stack.empty()) {
+      const Descriptor* message = stack.back();
+      stack.pop_back();
+
+      if (message->extension_count() > 0) {
+        if (message->field_count() > 0 || message->nested_type_count() > 0 ||
+            message->enum_type_count() > 0) {
+          Abort("message with extend blocks shouldn't contain anything else");
+        }
+
+        // Iterate over all fields in "extend" blocks.
+        for (int i = 0; i < message->extension_count(); ++i) {
+          const FieldDescriptor* extension = message->extension(i);
+
+          // Protoc plugin API does not group fields in "extend" blocks.
+          // As the support for extensions in protozero is limited, the code
+          // assumes that extend blocks are located inside a wrapper message and
+          // name of this message is used to group them.
+          std::string extension_name = extension->extension_scope()->name();
+          extensions_[extension_name].push_back(extension);
+        }
+      } else {
+        messages_.push_back(message);
+        for (int i = 0; i < message->nested_type_count(); ++i) {
+          stack.push_back(message->nested_type(i));
+          // Emit a forward declaration of nested message types, as the outer
+          // class will refer to them when creating type aliases.
+          referenced_messages_.insert(message->nested_type(i));
+        }
+      }
+    }
+
+    // Collect enums.
+    for (int i = 0; i < source_->enum_type_count(); ++i)
+      enums_.push_back(source_->enum_type(i));
+
+    if (source_->extension_count() > 0)
+      Abort("top-level extension blocks are not supported");
+
+    for (const Descriptor* message : messages_) {
+      for (int i = 0; i < message->enum_type_count(); ++i) {
+        enums_.push_back(message->enum_type(i));
+      }
+    }
+  }
+
+  void CollectDependencies() {
+    // Public import basically means that callers only need to import this
+    // proto in order to use the stuff publicly imported by this proto.
+    for (int i = 0; i < source_->public_dependency_count(); ++i)
+      public_imports_.insert(source_->public_dependency(i));
+
+    if (source_->weak_dependency_count() > 0)
+      Abort("Weak imports are not supported.");
+
+    // Validations. Collect public imports (of collected imports) in DFS order.
+    // Visibilty for current proto:
+    // - all imports listed in current proto,
+    // - public imports of everything imported (recursive).
+    std::vector<const FileDescriptor*> stack;
+    for (int i = 0; i < source_->dependency_count(); ++i) {
+      const FileDescriptor* imp = source_->dependency(i);
+      stack.push_back(imp);
+      if (public_imports_.count(imp) == 0) {
+        private_imports_.insert(imp);
+      }
+    }
+
+    while (!stack.empty()) {
+      const FileDescriptor* imp = stack.back();
+      stack.pop_back();
+
+      for (int i = 0; i < imp->public_dependency_count(); ++i) {
+        stack.push_back(imp->public_dependency(i));
+      }
+    }
+
+    // Collect descriptors of messages and enums used in current proto.
+    // It will be used to generate necessary forward declarations and
+    // check that everything lays in the same namespace.
+    for (const Descriptor* message : messages_) {
+      for (int i = 0; i < message->field_count(); ++i) {
+        const FieldDescriptor* field = message->field(i);
+
+        if (field->type() == FieldDescriptor::TYPE_MESSAGE) {
+          if (public_imports_.count(field->message_type()->file()) == 0) {
+            // Avoid multiple forward declarations since
+            // public imports have been already included.
+            referenced_messages_.insert(field->message_type());
+          }
+        } else if (field->type() == FieldDescriptor::TYPE_ENUM) {
+          if (public_imports_.count(field->enum_type()->file()) == 0) {
+            referenced_enums_.insert(field->enum_type());
+          }
+        }
+      }
+    }
+  }
+
+  void Preprocess() {
+    // Package name maps to a series of namespaces.
+    package_ = source_->package();
+    namespaces_ = SplitString(package_, ".");
+    if (!wrapper_namespace_.empty())
+      namespaces_.push_back(wrapper_namespace_);
+
+    full_namespace_prefix_ = "";
+    for (size_t i = 0; i < namespaces_.size(); i++) {
+      full_namespace_prefix_ += namespaces_[i];
+      if (i + 1 != namespaces_.size()) {
+        full_namespace_prefix_ += "_";
+      }
+    }
+
+    CollectDescriptors();
+    CollectDependencies();
+  }
+
+  std::string GenerateGuard() {
+    std::string guard = StripSuffix(source_->name(), ".proto");
+    guard = ToUpper(guard);
+    guard = StripChars(guard, ".-/\\", '_');
+    guard = StripPrefix(guard, guard_strip_prefix_);
+    guard = guard_add_prefix_ + guard + "_PZC_H_";
+    return guard;
+  }
+
+  // Print top header, namespaces and forward declarations.
+  void GeneratePrologue() {
+    stub_h_->Print(
+        R"(/*
+ * Copyright (C) 2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+)");
+    stub_h_->Print("// Autogenerated by the ProtoZero C compiler plugin.\n");
+    if (!invoker_.empty()) {
+      stub_h_->Print("// Invoked by $invoker$\n", "invoker", invoker_);
+    }
+    stub_h_->Print("// DO NOT EDIT.\n");
+
+    stub_h_->Print(
+        "#ifndef $guard$\n"
+        "#define $guard$\n\n"
+        "#include <stdbool.h>\n"
+        "#include <stdint.h>\n\n"
+        "#include \"perfetto/public/pb_macros.h\"\n",
+        "guard", GenerateGuard());
+
+    // Print includes for public imports and enums which cannot be forward
+    // declared.
+    std::vector<std::string> imports;
+    for (const FileDescriptor* dependency : public_imports_) {
+      imports.push_back(ProtoStubName(dependency));
+    }
+    for (const EnumDescriptor* e : referenced_enums_) {
+      if (e->file() != source_) {
+        imports.push_back(ProtoStubName(e->file()));
+      }
+    }
+
+    std::sort(imports.begin(), imports.end());
+
+    for (const std::string& imp : imports) {
+      std::string include_path = imp;
+      if (!path_strip_prefix_.empty()) {
+        include_path = StripPrefix(imp, path_strip_prefix_);
+      }
+      include_path = path_add_prefix_ + include_path;
+
+      stub_h_->Print("#include \"$name$.h\"\n", "name", include_path);
+    }
+    stub_h_->Print("\n");
+
+    // Print forward declarations.
+    for (const Descriptor* message : referenced_messages_) {
+      stub_h_->Print("PERFETTO_PB_MSG_DECL($class$);\n", "class",
+                     GetCppClassName(message));
+    }
+
+    stub_h_->Print("\n");
+  }
+
+  void GenerateEnumDescriptor(const EnumDescriptor* enumeration) {
+    if (enumeration->containing_type()) {
+      stub_h_->Print("PERFETTO_PB_ENUM_IN_MSG($msg$, $class$){\n", "msg",
+                     GetCppClassName(enumeration->containing_type()), "class",
+                     enumeration->name());
+    } else {
+      stub_h_->Print("PERFETTO_PB_ENUM($class$){\n", "class",
+                     GetCppClassName(enumeration));
+    }
+    stub_h_->Indent();
+
+    for (int i = 0; i < enumeration->value_count(); ++i) {
+      const EnumValueDescriptor* value = enumeration->value(i);
+      const std::string value_name = value->name();
+
+      if (enumeration->containing_type()) {
+        stub_h_->Print(
+            "PERFETTO_PB_ENUM_IN_MSG_ENTRY($msg$, $val$) = $number$,\n", "msg",
+            GetCppClassName(enumeration->containing_type()), "val", value_name,
+            "number", std::to_string(value->number()));
+      } else {
+        stub_h_->Print("PERFETTO_PB_ENUM_ENTRY($val$) = $number$, \n", "val",
+                       full_namespace_prefix_ + "_" + value_name, "number",
+                       std::to_string(value->number()));
+      }
+    }
+    stub_h_->Outdent();
+    stub_h_->Print("};\n\n");
+  }
+
+  // Packed repeated fields are encoded as a length-delimited field on the wire,
+  // where the payload is the concatenation of invidually encoded elements.
+  void GeneratePackedRepeatedFieldDescriptor(
+      const std::string& message_cpp_type,
+      const FieldDescriptor* field) {
+    std::map<std::string, std::string> setter;
+    setter["id"] = std::to_string(field->number());
+    setter["name"] = field->lowercase_name();
+    setter["class"] = message_cpp_type;
+    setter["buffer_type"] = FieldTypeToPackedBufferType(field->type());
+    stub_h_->Print(
+        setter,
+        "PERFETTO_PB_FIELD($class$, PACKED, $buffer_type$, $name$, $id$);\n");
+  }
+
+  void GenerateSimpleFieldDescriptor(const std::string& message_cpp_type,
+                                     const FieldDescriptor* field) {
+    std::map<std::string, std::string> setter;
+    setter["id"] = std::to_string(field->number());
+    setter["name"] = field->lowercase_name();
+    setter["ctype"] = FieldToCppTypeName(field);
+    setter["class"] = message_cpp_type;
+
+    switch (field->type()) {
+      case FieldDescriptor::TYPE_BYTES:
+      case FieldDescriptor::TYPE_STRING:
+        stub_h_->Print(
+            setter,
+            "PERFETTO_PB_FIELD($class$, STRING, const char*, $name$, $id$);\n");
+        break;
+      case FieldDescriptor::TYPE_UINT64:
+      case FieldDescriptor::TYPE_UINT32:
+      case FieldDescriptor::TYPE_INT64:
+      case FieldDescriptor::TYPE_INT32:
+      case FieldDescriptor::TYPE_BOOL:
+      case FieldDescriptor::TYPE_ENUM:
+        stub_h_->Print(
+            setter,
+            "PERFETTO_PB_FIELD($class$, VARINT, $ctype$, $name$, $id$);\n");
+        break;
+      case FieldDescriptor::TYPE_SINT64:
+      case FieldDescriptor::TYPE_SINT32:
+        stub_h_->Print(
+            setter,
+            "PERFETTO_PB_FIELD($class$, ZIGZAG, $ctype$, $name$, $id$);\n");
+        break;
+      case FieldDescriptor::TYPE_SFIXED32:
+      case FieldDescriptor::TYPE_FIXED32:
+      case FieldDescriptor::TYPE_FLOAT:
+        stub_h_->Print(
+            setter,
+            "PERFETTO_PB_FIELD($class$, FIXED32, $ctype$, $name$, $id$);\n");
+        break;
+      case FieldDescriptor::TYPE_SFIXED64:
+      case FieldDescriptor::TYPE_FIXED64:
+      case FieldDescriptor::TYPE_DOUBLE:
+        stub_h_->Print(
+            setter,
+            "PERFETTO_PB_FIELD($class$, FIXED64, $ctype$, $name$, $id$);\n");
+        break;
+      case FieldDescriptor::TYPE_MESSAGE:
+      case FieldDescriptor::TYPE_GROUP:
+        Abort("Groups not supported.");
+        break;
+    }
+  }
+
+  void GenerateNestedMessageFieldDescriptor(const std::string& message_cpp_type,
+                                            const FieldDescriptor* field) {
+    std::string inner_class = GetCppClassName(field->message_type());
+    stub_h_->Print(
+        "PERFETTO_PB_FIELD($class$, MSG, $inner_class$, $name$, $id$);\n",
+        "class", message_cpp_type, "id", std::to_string(field->number()),
+        "name", field->lowercase_name(), "inner_class", inner_class);
+  }
+
+  void GenerateMessageDescriptor(const Descriptor* message) {
+    stub_h_->Print("PERFETTO_PB_MSG($name$);\n", "name",
+                   GetCppClassName(message));
+
+    // Field descriptors.
+    for (int i = 0; i < message->field_count(); ++i) {
+      GenerateFieldDescriptor(GetCppClassName(message), message->field(i));
+    }
+    stub_h_->Print("\n");
+  }
+
+  void GenerateFieldDescriptor(const std::string& message_cpp_type,
+                               const FieldDescriptor* field) {
+    // GenerateFieldMetadata(message_cpp_type, field);
+    if (field->is_packed()) {
+      GeneratePackedRepeatedFieldDescriptor(message_cpp_type, field);
+    } else if (field->type() != FieldDescriptor::TYPE_MESSAGE) {
+      GenerateSimpleFieldDescriptor(message_cpp_type, field);
+    } else {
+      GenerateNestedMessageFieldDescriptor(message_cpp_type, field);
+    }
+  }
+
+  void GenerateEpilogue() {
+    stub_h_->Print("#endif  // $guard$\n", "guard", GenerateGuard());
+  }
+
+  const FileDescriptor* const source_;
+  Printer* const stub_h_;
+  std::string error_;
+
+  std::string package_;
+  std::string wrapper_namespace_;
+  std::string guard_strip_prefix_;
+  std::string guard_add_prefix_;
+  std::string path_strip_prefix_;
+  std::string path_add_prefix_;
+  std::string invoker_;
+  std::vector<std::string> namespaces_;
+  std::string full_namespace_prefix_;
+  std::vector<const Descriptor*> messages_;
+  std::vector<const EnumDescriptor*> enums_;
+  std::map<std::string, std::vector<const FieldDescriptor*>> extensions_;
+
+  // The custom *Comp comparators are to ensure determinism of the generator.
+  std::set<const FileDescriptor*, FileDescriptorComp> public_imports_;
+  std::set<const FileDescriptor*, FileDescriptorComp> private_imports_;
+  std::set<const Descriptor*, DescriptorComp> referenced_messages_;
+  std::set<const EnumDescriptor*, EnumDescriptorComp> referenced_enums_;
+};
+
+class ProtoZeroCGenerator : public google::protobuf::compiler::CodeGenerator {
+ public:
+  explicit ProtoZeroCGenerator();
+  ~ProtoZeroCGenerator() override;
+
+  // CodeGenerator implementation
+  bool Generate(const google::protobuf::FileDescriptor* file,
+                const std::string& options,
+                GeneratorContext* context,
+                std::string* error) const override;
+};
+
+ProtoZeroCGenerator::ProtoZeroCGenerator() {}
+
+ProtoZeroCGenerator::~ProtoZeroCGenerator() {}
+
+bool ProtoZeroCGenerator::Generate(const FileDescriptor* file,
+                                   const std::string& options,
+                                   GeneratorContext* context,
+                                   std::string* error) const {
+  const std::unique_ptr<ZeroCopyOutputStream> stub_h_file_stream(
+      context->Open(ProtoStubName(file) + ".h"));
+
+  // Variables are delimited by $.
+  Printer stub_h_printer(stub_h_file_stream.get(), '$');
+  GeneratorJob job(file, &stub_h_printer);
+
+  // Parse additional options.
+  for (const std::string& option : SplitString(options, ",")) {
+    std::vector<std::string> option_pair = SplitString(option, "=");
+    job.SetOption(option_pair[0], option_pair[1]);
+  }
+
+  if (!job.GenerateStubs()) {
+    *error = job.GetFirstError();
+    return false;
+  }
+  return true;
+}
+
+}  // namespace
+}  // namespace protozero
+
+int main(int argc, char* argv[]) {
+  protozero::ProtoZeroCGenerator generator;
+  return google::protobuf::compiler::PluginMain(argc, argv, &generator);
+}
diff --git a/src/libtracing/protozero_src/protoc_plugin/protozero_plugin.cc b/src/libtracing/protozero_src/protoc_plugin/protozero_plugin.cc
new file mode 100644
index 000000000..5b082920c
--- /dev/null
+++ b/src/libtracing/protozero_src/protoc_plugin/protozero_plugin.cc
@@ -0,0 +1,1136 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+
+#include <limits>
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+
+#include <google/protobuf/compiler/code_generator.h>
+#include <google/protobuf/compiler/plugin.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.pb.h>
+#include <google/protobuf/io/printer.h>
+#include <google/protobuf/io/zero_copy_stream.h>
+
+#include "perfetto/ext/base/string_utils.h"
+
+namespace protozero {
+namespace {
+
+using google::protobuf::Descriptor;
+using google::protobuf::EnumDescriptor;
+using google::protobuf::EnumValueDescriptor;
+using google::protobuf::FieldDescriptor;
+using google::protobuf::FileDescriptor;
+using google::protobuf::compiler::GeneratorContext;
+using google::protobuf::io::Printer;
+using google::protobuf::io::ZeroCopyOutputStream;
+using perfetto::base::ReplaceAll;
+using perfetto::base::SplitString;
+using perfetto::base::StripChars;
+using perfetto::base::StripPrefix;
+using perfetto::base::StripSuffix;
+using perfetto::base::ToUpper;
+using perfetto::base::Uppercase;
+
+// Keep this value in sync with ProtoDecoder::kMaxDecoderFieldId. If they go out
+// of sync pbzero.h files will stop compiling, hitting the at() static_assert.
+// Not worth an extra dependency.
+constexpr int kMaxDecoderFieldId = 999;
+
+void Assert(bool condition) {
+  if (!condition)
+    abort();
+}
+
+struct FileDescriptorComp {
+  bool operator()(const FileDescriptor* lhs, const FileDescriptor* rhs) const {
+    int comp = lhs->name().compare(rhs->name());
+    Assert(comp != 0 || lhs == rhs);
+    return comp < 0;
+  }
+};
+
+struct DescriptorComp {
+  bool operator()(const Descriptor* lhs, const Descriptor* rhs) const {
+    int comp = lhs->full_name().compare(rhs->full_name());
+    Assert(comp != 0 || lhs == rhs);
+    return comp < 0;
+  }
+};
+
+struct EnumDescriptorComp {
+  bool operator()(const EnumDescriptor* lhs, const EnumDescriptor* rhs) const {
+    int comp = lhs->full_name().compare(rhs->full_name());
+    Assert(comp != 0 || lhs == rhs);
+    return comp < 0;
+  }
+};
+
+inline std::string ProtoStubName(const FileDescriptor* proto) {
+  return StripSuffix(proto->name(), ".proto") + ".pbzero";
+}
+
+class GeneratorJob {
+ public:
+  GeneratorJob(const FileDescriptor* file, Printer* stub_h_printer)
+      : source_(file), stub_h_(stub_h_printer) {}
+
+  bool GenerateStubs() {
+    Preprocess();
+    GeneratePrologue();
+    for (const EnumDescriptor* enumeration : enums_)
+      GenerateEnumDescriptor(enumeration);
+    for (const Descriptor* message : messages_)
+      GenerateMessageDescriptor(message);
+    for (const auto& key_value : extensions_)
+      GenerateExtension(key_value.first, key_value.second);
+    GenerateEpilogue();
+    return error_.empty();
+  }
+
+  void SetOption(const std::string& name, const std::string& value) {
+    if (name == "wrapper_namespace") {
+      wrapper_namespace_ = value;
+    } else if (name == "sdk") {
+      sdk_mode_ = (value == "true" || value == "1");
+    } else {
+      Abort(std::string() + "Unknown plugin option '" + name + "'.");
+    }
+  }
+
+  // If generator fails to produce stubs for a particular proto definitions
+  // it finishes with undefined output and writes the first error occurred.
+  const std::string& GetFirstError() const { return error_; }
+
+ private:
+  // Only the first error will be recorded.
+  void Abort(const std::string& reason) {
+    if (error_.empty())
+      error_ = reason;
+  }
+
+  template <class T>
+  bool HasSamePackage(const T* descriptor) const {
+    return descriptor->file()->package() == package_;
+  }
+
+  // Get C++ class name corresponding to proto descriptor.
+  // Nested names are splitted by underscores. Underscores in type names aren't
+  // prohibited but not recommended in order to avoid name collisions.
+  template <class T>
+  inline std::string GetCppClassName(const T* descriptor, bool full = false) {
+    std::string package = descriptor->file()->package();
+    std::string name = StripPrefix(descriptor->full_name(), package + ".");
+    name = StripChars(name, ".", '_');
+
+    if (full && !package.empty()) {
+      auto get_full_namespace = [&]() {
+        std::vector<std::string> namespaces = SplitString(package, ".");
+        if (!wrapper_namespace_.empty())
+          namespaces.push_back(wrapper_namespace_);
+
+        std::string result = "";
+        for (const std::string& ns : namespaces) {
+          result += "::";
+          result += ns;
+        }
+        return result;
+      };
+
+      std::string namespaces = ReplaceAll(package, ".", "::");
+      name = get_full_namespace() + "::" + name;
+    }
+
+    return name;
+  }
+
+  inline std::string GetFieldNumberConstant(const FieldDescriptor* field) {
+    std::string name = field->camelcase_name();
+    if (!name.empty()) {
+      name.at(0) = Uppercase(name.at(0));
+      name = "k" + name + "FieldNumber";
+    } else {
+      // Protoc allows fields like 'bool _ = 1'.
+      Abort("Empty field name in camel case notation.");
+    }
+    return name;
+  }
+
+  // Note: intentionally avoiding depending on protozero sources, as well as
+  // protobuf-internal WireFormat/WireFormatLite classes.
+  const char* FieldTypeToProtozeroWireType(FieldDescriptor::Type proto_type) {
+    switch (proto_type) {
+      case FieldDescriptor::TYPE_INT64:
+      case FieldDescriptor::TYPE_UINT64:
+      case FieldDescriptor::TYPE_INT32:
+      case FieldDescriptor::TYPE_BOOL:
+      case FieldDescriptor::TYPE_UINT32:
+      case FieldDescriptor::TYPE_ENUM:
+      case FieldDescriptor::TYPE_SINT32:
+      case FieldDescriptor::TYPE_SINT64:
+        return "::protozero::proto_utils::ProtoWireType::kVarInt";
+
+      case FieldDescriptor::TYPE_FIXED32:
+      case FieldDescriptor::TYPE_SFIXED32:
+      case FieldDescriptor::TYPE_FLOAT:
+        return "::protozero::proto_utils::ProtoWireType::kFixed32";
+
+      case FieldDescriptor::TYPE_FIXED64:
+      case FieldDescriptor::TYPE_SFIXED64:
+      case FieldDescriptor::TYPE_DOUBLE:
+        return "::protozero::proto_utils::ProtoWireType::kFixed64";
+
+      case FieldDescriptor::TYPE_STRING:
+      case FieldDescriptor::TYPE_MESSAGE:
+      case FieldDescriptor::TYPE_BYTES:
+        return "::protozero::proto_utils::ProtoWireType::kLengthDelimited";
+
+      case FieldDescriptor::TYPE_GROUP:
+        Abort("Groups not supported.");
+    }
+    Abort("Unrecognized FieldDescriptor::Type.");
+    return "";
+  }
+
+  const char* FieldTypeToPackedBufferType(FieldDescriptor::Type proto_type) {
+    switch (proto_type) {
+      case FieldDescriptor::TYPE_INT64:
+      case FieldDescriptor::TYPE_UINT64:
+      case FieldDescriptor::TYPE_INT32:
+      case FieldDescriptor::TYPE_BOOL:
+      case FieldDescriptor::TYPE_UINT32:
+      case FieldDescriptor::TYPE_ENUM:
+      case FieldDescriptor::TYPE_SINT32:
+      case FieldDescriptor::TYPE_SINT64:
+        return "::protozero::PackedVarInt";
+
+      case FieldDescriptor::TYPE_FIXED32:
+        return "::protozero::PackedFixedSizeInt<uint32_t>";
+      case FieldDescriptor::TYPE_SFIXED32:
+        return "::protozero::PackedFixedSizeInt<int32_t>";
+      case FieldDescriptor::TYPE_FLOAT:
+        return "::protozero::PackedFixedSizeInt<float>";
+
+      case FieldDescriptor::TYPE_FIXED64:
+        return "::protozero::PackedFixedSizeInt<uint64_t>";
+      case FieldDescriptor::TYPE_SFIXED64:
+        return "::protozero::PackedFixedSizeInt<int64_t>";
+      case FieldDescriptor::TYPE_DOUBLE:
+        return "::protozero::PackedFixedSizeInt<double>";
+
+      case FieldDescriptor::TYPE_STRING:
+      case FieldDescriptor::TYPE_MESSAGE:
+      case FieldDescriptor::TYPE_BYTES:
+      case FieldDescriptor::TYPE_GROUP:
+        Abort("Unexpected FieldDescritor::Type.");
+    }
+    Abort("Unrecognized FieldDescriptor::Type.");
+    return "";
+  }
+
+  const char* FieldToProtoSchemaType(const FieldDescriptor* field) {
+    switch (field->type()) {
+      case FieldDescriptor::TYPE_BOOL:
+        return "kBool";
+      case FieldDescriptor::TYPE_INT32:
+        return "kInt32";
+      case FieldDescriptor::TYPE_INT64:
+        return "kInt64";
+      case FieldDescriptor::TYPE_UINT32:
+        return "kUint32";
+      case FieldDescriptor::TYPE_UINT64:
+        return "kUint64";
+      case FieldDescriptor::TYPE_SINT32:
+        return "kSint32";
+      case FieldDescriptor::TYPE_SINT64:
+        return "kSint64";
+      case FieldDescriptor::TYPE_FIXED32:
+        return "kFixed32";
+      case FieldDescriptor::TYPE_FIXED64:
+        return "kFixed64";
+      case FieldDescriptor::TYPE_SFIXED32:
+        return "kSfixed32";
+      case FieldDescriptor::TYPE_SFIXED64:
+        return "kSfixed64";
+      case FieldDescriptor::TYPE_FLOAT:
+        return "kFloat";
+      case FieldDescriptor::TYPE_DOUBLE:
+        return "kDouble";
+      case FieldDescriptor::TYPE_ENUM:
+        return "kEnum";
+      case FieldDescriptor::TYPE_STRING:
+        return "kString";
+      case FieldDescriptor::TYPE_MESSAGE:
+        return "kMessage";
+      case FieldDescriptor::TYPE_BYTES:
+        return "kBytes";
+
+      case FieldDescriptor::TYPE_GROUP:
+        Abort("Groups not supported.");
+        return "";
+    }
+    Abort("Unrecognized FieldDescriptor::Type.");
+    return "";
+  }
+
+  std::string FieldToCppTypeName(const FieldDescriptor* field) {
+    switch (field->type()) {
+      case FieldDescriptor::TYPE_BOOL:
+        return "bool";
+      case FieldDescriptor::TYPE_INT32:
+        return "int32_t";
+      case FieldDescriptor::TYPE_INT64:
+        return "int64_t";
+      case FieldDescriptor::TYPE_UINT32:
+        return "uint32_t";
+      case FieldDescriptor::TYPE_UINT64:
+        return "uint64_t";
+      case FieldDescriptor::TYPE_SINT32:
+        return "int32_t";
+      case FieldDescriptor::TYPE_SINT64:
+        return "int64_t";
+      case FieldDescriptor::TYPE_FIXED32:
+        return "uint32_t";
+      case FieldDescriptor::TYPE_FIXED64:
+        return "uint64_t";
+      case FieldDescriptor::TYPE_SFIXED32:
+        return "int32_t";
+      case FieldDescriptor::TYPE_SFIXED64:
+        return "int64_t";
+      case FieldDescriptor::TYPE_FLOAT:
+        return "float";
+      case FieldDescriptor::TYPE_DOUBLE:
+        return "double";
+      case FieldDescriptor::TYPE_ENUM:
+        return GetCppClassName(field->enum_type(),
+                               !HasSamePackage(field->enum_type()));
+      case FieldDescriptor::TYPE_STRING:
+      case FieldDescriptor::TYPE_BYTES:
+        return "std::string";
+      case FieldDescriptor::TYPE_MESSAGE:
+        return GetCppClassName(field->message_type(),
+                               !HasSamePackage(field->message_type()));
+      case FieldDescriptor::TYPE_GROUP:
+        Abort("Groups not supported.");
+        return "";
+    }
+    Abort("Unrecognized FieldDescriptor::Type.");
+    return "";
+  }
+
+  const char* FieldToRepetitionType(const FieldDescriptor* field) {
+    if (!field->is_repeated())
+      return "kNotRepeated";
+    if (field->is_packed())
+      return "kRepeatedPacked";
+    return "kRepeatedNotPacked";
+  }
+
+  void CollectDescriptors() {
+    // Collect message descriptors in DFS order.
+    std::vector<const Descriptor*> stack;
+    stack.reserve(static_cast<size_t>(source_->message_type_count()));
+    for (int i = 0; i < source_->message_type_count(); ++i)
+      stack.push_back(source_->message_type(i));
+
+    while (!stack.empty()) {
+      const Descriptor* message = stack.back();
+      stack.pop_back();
+
+      if (message->extension_count() > 0) {
+        if (message->field_count() > 0 || message->nested_type_count() > 0 ||
+            message->enum_type_count() > 0) {
+          Abort("message with extend blocks shouldn't contain anything else");
+        }
+
+        // Iterate over all fields in "extend" blocks.
+        for (int i = 0; i < message->extension_count(); ++i) {
+          const FieldDescriptor* extension = message->extension(i);
+
+          // Protoc plugin API does not group fields in "extend" blocks.
+          // As the support for extensions in protozero is limited, the code
+          // assumes that extend blocks are located inside a wrapper message and
+          // name of this message is used to group them.
+          std::string extension_name = extension->extension_scope()->name();
+          extensions_[extension_name].push_back(extension);
+        }
+      } else {
+        messages_.push_back(message);
+        for (int i = 0; i < message->nested_type_count(); ++i) {
+          stack.push_back(message->nested_type(i));
+          // Emit a forward declaration of nested message types, as the outer
+          // class will refer to them when creating type aliases.
+          referenced_messages_.insert(message->nested_type(i));
+        }
+      }
+    }
+
+    // Collect enums.
+    for (int i = 0; i < source_->enum_type_count(); ++i)
+      enums_.push_back(source_->enum_type(i));
+
+    if (source_->extension_count() > 0)
+      Abort("top-level extension blocks are not supported");
+
+    for (const Descriptor* message : messages_) {
+      for (int i = 0; i < message->enum_type_count(); ++i) {
+        enums_.push_back(message->enum_type(i));
+      }
+    }
+  }
+
+  void CollectDependencies() {
+    // Public import basically means that callers only need to import this
+    // proto in order to use the stuff publicly imported by this proto.
+    for (int i = 0; i < source_->public_dependency_count(); ++i)
+      public_imports_.insert(source_->public_dependency(i));
+
+    if (source_->weak_dependency_count() > 0)
+      Abort("Weak imports are not supported.");
+
+    // Validations. Collect public imports (of collected imports) in DFS order.
+    // Visibilty for current proto:
+    // - all imports listed in current proto,
+    // - public imports of everything imported (recursive).
+    std::vector<const FileDescriptor*> stack;
+    for (int i = 0; i < source_->dependency_count(); ++i) {
+      const FileDescriptor* import = source_->dependency(i);
+      stack.push_back(import);
+      if (public_imports_.count(import) == 0) {
+        private_imports_.insert(import);
+      }
+    }
+
+    while (!stack.empty()) {
+      const FileDescriptor* import = stack.back();
+      stack.pop_back();
+      for (int i = 0; i < import->public_dependency_count(); ++i) {
+        stack.push_back(import->public_dependency(i));
+      }
+    }
+
+    // Collect descriptors of messages and enums used in current proto.
+    // It will be used to generate necessary forward declarations and
+    // check that everything lays in the same namespace.
+    for (const Descriptor* message : messages_) {
+      for (int i = 0; i < message->field_count(); ++i) {
+        const FieldDescriptor* field = message->field(i);
+
+        if (field->type() == FieldDescriptor::TYPE_MESSAGE) {
+          if (public_imports_.count(field->message_type()->file()) == 0) {
+            // Avoid multiple forward declarations since
+            // public imports have been already included.
+            referenced_messages_.insert(field->message_type());
+          }
+        } else if (field->type() == FieldDescriptor::TYPE_ENUM) {
+          if (public_imports_.count(field->enum_type()->file()) == 0) {
+            referenced_enums_.insert(field->enum_type());
+          }
+        }
+      }
+    }
+  }
+
+  void Preprocess() {
+    // Package name maps to a series of namespaces.
+    package_ = source_->package();
+    namespaces_ = SplitString(package_, ".");
+    if (!wrapper_namespace_.empty())
+      namespaces_.push_back(wrapper_namespace_);
+
+    full_namespace_prefix_ = "::";
+    for (const std::string& ns : namespaces_)
+      full_namespace_prefix_ += ns + "::";
+
+    CollectDescriptors();
+    CollectDependencies();
+  }
+
+  std::string GetNamespaceNameForInnerEnum(const EnumDescriptor* enumeration) {
+    return "perfetto_pbzero_enum_" +
+           GetCppClassName(enumeration->containing_type());
+  }
+
+  // Print top header, namespaces and forward declarations.
+  void GeneratePrologue() {
+    std::string greeting =
+        "// Autogenerated by the ProtoZero compiler plugin. DO NOT EDIT.\n";
+    std::string guard = package_ + "_" + source_->name() + "_H_";
+    guard = ToUpper(guard);
+    guard = StripChars(guard, ".-/\\", '_');
+
+    stub_h_->Print(
+        "$greeting$\n"
+        "#ifndef $guard$\n"
+        "#define $guard$\n\n"
+        "#include <stddef.h>\n"
+        "#include <stdint.h>\n\n",
+        "greeting", greeting, "guard", guard);
+
+    if (sdk_mode_) {
+      stub_h_->Print("#include \"perfetto.h\"\n");
+    } else {
+      stub_h_->Print(
+          "#include \"perfetto/protozero/field_writer.h\"\n"
+          "#include \"perfetto/protozero/message.h\"\n"
+          "#include \"perfetto/protozero/packed_repeated_fields.h\"\n"
+          "#include \"perfetto/protozero/proto_decoder.h\"\n"
+          "#include \"perfetto/protozero/proto_utils.h\"\n");
+    }
+
+    // Print includes for public imports. In sdk mode, all imports are assumed
+    // to be part of the sdk.
+    if (!sdk_mode_) {
+      for (const FileDescriptor* dependency : public_imports_) {
+        // Dependency name could contain slashes but importing from upper-level
+        // directories is not possible anyway since build system processes each
+        // proto file individually. Hence proto lookup path is always equal to
+        // the directory where particular proto file is located and protoc does
+        // not allow reference to upper directory (aka ..) in import path.
+        //
+        // Laconically said:
+        // - source_->name() may never have slashes,
+        // - dependency->name() may have slashes but always refers to inner
+        // path.
+        stub_h_->Print("#include \"$name$.h\"\n", "name",
+                       ProtoStubName(dependency));
+      }
+    }
+    stub_h_->Print("\n");
+
+    PrintForwardDeclarations();
+
+    // Print namespaces.
+    for (const std::string& ns : namespaces_) {
+      stub_h_->Print("namespace $ns$ {\n", "ns", ns);
+    }
+    stub_h_->Print("\n");
+  }
+
+  void PrintForwardDeclarations() {
+    struct Descriptors {
+      std::vector<const Descriptor*> messages_;
+      std::vector<const EnumDescriptor*> enums_;
+    };
+    std::map<std::string, Descriptors> package_to_descriptors;
+
+    for (const Descriptor* message : referenced_messages_) {
+      package_to_descriptors[message->file()->package()].messages_.push_back(
+          message);
+    }
+
+    for (const EnumDescriptor* enumeration : referenced_enums_) {
+      package_to_descriptors[enumeration->file()->package()].enums_.push_back(
+          enumeration);
+    }
+
+    for (const auto& [package, descriptors] : package_to_descriptors) {
+      std::vector<std::string> namespaces = SplitString(package, ".");
+      namespaces.push_back(wrapper_namespace_);
+
+      // open namespaces
+      for (const auto& ns : namespaces) {
+        stub_h_->Print("namespace $ns$ {\n", "ns", ns);
+      }
+
+      for (const Descriptor* message : descriptors.messages_) {
+        stub_h_->Print("class $class$;\n", "class", GetCppClassName(message));
+      }
+
+      for (const EnumDescriptor* enumeration : descriptors.enums_) {
+        if (enumeration->containing_type()) {
+          stub_h_->Print("namespace $namespace_name$ {\n", "namespace_name",
+                         GetNamespaceNameForInnerEnum(enumeration));
+        }
+        stub_h_->Print("enum $class$ : int32_t;\n", "class",
+                       enumeration->name());
+
+        if (enumeration->containing_type()) {
+          stub_h_->Print("}  // namespace $namespace_name$\n", "namespace_name",
+                         GetNamespaceNameForInnerEnum(enumeration));
+          stub_h_->Print("using $alias$ = $namespace_name$::$short_name$;\n",
+                         "alias", GetCppClassName(enumeration),
+                         "namespace_name",
+                         GetNamespaceNameForInnerEnum(enumeration),
+                         "short_name", enumeration->name());
+        }
+      }
+
+      // close namespaces
+      for (auto it = namespaces.crbegin(); it != namespaces.crend(); ++it) {
+        stub_h_->Print("} // Namespace $ns$.\n", "ns", *it);
+      }
+    }
+
+    stub_h_->Print("\n");
+  }
+
+  void GenerateEnumDescriptor(const EnumDescriptor* enumeration) {
+    bool is_inner_enum = !!enumeration->containing_type();
+    if (is_inner_enum) {
+      stub_h_->Print("namespace $namespace_name$ {\n", "namespace_name",
+                     GetNamespaceNameForInnerEnum(enumeration));
+    }
+
+    stub_h_->Print("enum $class$ : int32_t {\n", "class", enumeration->name());
+    stub_h_->Indent();
+
+    std::string min_name, max_name;
+    int min_val = std::numeric_limits<int>::max();
+    int max_val = -1;
+    for (int i = 0; i < enumeration->value_count(); ++i) {
+      const EnumValueDescriptor* value = enumeration->value(i);
+      const std::string value_name = value->name();
+      stub_h_->Print("$name$ = $number$,\n", "name", value_name, "number",
+                     std::to_string(value->number()));
+      if (value->number() < min_val) {
+        min_val = value->number();
+        min_name = value_name;
+      }
+      if (value->number() > max_val) {
+        max_val = value->number();
+        max_name = value_name;
+      }
+    }
+    stub_h_->Outdent();
+    stub_h_->Print("};\n");
+    if (is_inner_enum) {
+      const std::string namespace_name =
+          GetNamespaceNameForInnerEnum(enumeration);
+      stub_h_->Print("} // namespace $namespace_name$\n", "namespace_name",
+                     namespace_name);
+      stub_h_->Print(
+          "using $full_enum_name$ = $namespace_name$::$enum_name$;\n\n",
+          "full_enum_name", GetCppClassName(enumeration), "enum_name",
+          enumeration->name(), "namespace_name", namespace_name);
+    }
+    stub_h_->Print("\n");
+    stub_h_->Print("constexpr $class$ $class$_MIN = $class$::$min$;\n", "class",
+                   GetCppClassName(enumeration), "min", min_name);
+    stub_h_->Print("constexpr $class$ $class$_MAX = $class$::$max$;\n", "class",
+                   GetCppClassName(enumeration), "max", max_name);
+    stub_h_->Print("\n");
+
+    GenerateEnumToStringConversion(enumeration);
+  }
+
+  void GenerateEnumToStringConversion(const EnumDescriptor* enumeration) {
+    std::string fullClassName =
+        full_namespace_prefix_ + GetCppClassName(enumeration);
+    const char* function_header_stub = R"(
+PERFETTO_PROTOZERO_CONSTEXPR14_OR_INLINE
+const char* $class_name$_Name($full_class$ value) {
+)";
+    stub_h_->Print(function_header_stub, "full_class", fullClassName,
+                   "class_name", GetCppClassName(enumeration));
+    stub_h_->Indent();
+    stub_h_->Print("switch (value) {");
+    for (int index = 0; index < enumeration->value_count(); ++index) {
+      const EnumValueDescriptor* value = enumeration->value(index);
+      const char* switch_stub = R"(
+case $full_class$::$value_name$:
+  return "$value_name$";
+)";
+      stub_h_->Print(switch_stub, "full_class", fullClassName, "value_name",
+                     value->name());
+    }
+    stub_h_->Print("}\n");
+    stub_h_->Print(R"(return "PBZERO_UNKNOWN_ENUM_VALUE";)");
+    stub_h_->Print("\n");
+    stub_h_->Outdent();
+    stub_h_->Print("}\n\n");
+  }
+
+  // Packed repeated fields are encoded as a length-delimited field on the wire,
+  // where the payload is the concatenation of invidually encoded elements.
+  void GeneratePackedRepeatedFieldDescriptor(const FieldDescriptor* field) {
+    std::map<std::string, std::string> setter;
+    setter["name"] = field->lowercase_name();
+    setter["field_metadata"] = GetFieldMetadataTypeName(field);
+    setter["action"] = "set";
+    setter["buffer_type"] = FieldTypeToPackedBufferType(field->type());
+    stub_h_->Print(
+        setter,
+        "void $action$_$name$(const $buffer_type$& packed_buffer) {\n"
+        "  AppendBytes($field_metadata$::kFieldId, packed_buffer.data(),\n"
+        "              packed_buffer.size());\n"
+        "}\n");
+  }
+
+  void GenerateSimpleFieldDescriptor(const FieldDescriptor* field) {
+    std::map<std::string, std::string> setter;
+    setter["id"] = std::to_string(field->number());
+    setter["name"] = field->lowercase_name();
+    setter["field_metadata"] = GetFieldMetadataTypeName(field);
+    setter["action"] = field->is_repeated() ? "add" : "set";
+    setter["cpp_type"] = FieldToCppTypeName(field);
+    setter["proto_field_type"] = FieldToProtoSchemaType(field);
+
+    const char* code_stub =
+        "void $action$_$name$($cpp_type$ value) {\n"
+        "  static constexpr uint32_t field_id = $field_metadata$::kFieldId;\n"
+        "  // Call the appropriate protozero::Message::Append(field_id, ...)\n"
+        "  // method based on the type of the field.\n"
+        "  ::protozero::internal::FieldWriter<\n"
+        "    ::protozero::proto_utils::ProtoSchemaType::$proto_field_type$>\n"
+        "      ::Append(*this, field_id, value);\n"
+        "}\n";
+
+    if (field->type() == FieldDescriptor::TYPE_STRING) {
+      // Strings and bytes should have an additional accessor which specifies
+      // the length explicitly.
+      const char* additional_method =
+          "void $action$_$name$(const char* data, size_t size) {\n"
+          "  AppendBytes($field_metadata$::kFieldId, data, size);\n"
+          "}\n"
+          "void $action$_$name$(::protozero::ConstChars chars) {\n"
+          "  AppendBytes($field_metadata$::kFieldId, chars.data, chars.size);\n"
+          "}\n";
+      stub_h_->Print(setter, additional_method);
+    } else if (field->type() == FieldDescriptor::TYPE_BYTES) {
+      const char* additional_method =
+          "void $action$_$name$(const uint8_t* data, size_t size) {\n"
+          "  AppendBytes($field_metadata$::kFieldId, data, size);\n"
+          "}\n"
+          "void $action$_$name$(::protozero::ConstBytes bytes) {\n"
+          "  AppendBytes($field_metadata$::kFieldId, bytes.data, bytes.size);\n"
+          "}\n";
+      stub_h_->Print(setter, additional_method);
+    } else if (field->type() == FieldDescriptor::TYPE_GROUP ||
+               field->type() == FieldDescriptor::TYPE_MESSAGE) {
+      Abort("Unsupported field type.");
+      return;
+    }
+
+    stub_h_->Print(setter, code_stub);
+  }
+
+  void GenerateNestedMessageFieldDescriptor(const FieldDescriptor* field) {
+    std::string action = field->is_repeated() ? "add" : "set";
+    std::string inner_class = GetCppClassName(
+        field->message_type(), !HasSamePackage(field->message_type()));
+    stub_h_->Print(
+        "template <typename T = $inner_class$> T* $action$_$name$() {\n"
+        "  return BeginNestedMessage<T>($id$);\n"
+        "}\n\n",
+        "id", std::to_string(field->number()), "name", field->lowercase_name(),
+        "action", action, "inner_class", inner_class);
+    if (field->options().lazy()) {
+      stub_h_->Print(
+          "void $action$_$name$_raw(const std::string& raw) {\n"
+          "  return AppendBytes($id$, raw.data(), raw.size());\n"
+          "}\n\n",
+          "id", std::to_string(field->number()), "name",
+          field->lowercase_name(), "action", action, "inner_class",
+          inner_class);
+    }
+  }
+
+  void GenerateDecoder(const Descriptor* message) {
+    int max_field_id = 0;
+    bool has_nonpacked_repeated_fields = false;
+    for (int i = 0; i < message->field_count(); ++i) {
+      const FieldDescriptor* field = message->field(i);
+      if (field->number() > kMaxDecoderFieldId)
+        continue;
+      max_field_id = std::max(max_field_id, field->number());
+      if (field->is_repeated() && !field->is_packed())
+        has_nonpacked_repeated_fields = true;
+    }
+
+    std::string class_name = GetCppClassName(message) + "_Decoder";
+    stub_h_->Print(
+        "class $name$ : public "
+        "::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/$max$, "
+        "/*HAS_NONPACKED_REPEATED_FIELDS=*/$rep$> {\n",
+        "name", class_name, "max", std::to_string(max_field_id), "rep",
+        has_nonpacked_repeated_fields ? "true" : "false");
+    stub_h_->Print(" public:\n");
+    stub_h_->Indent();
+    stub_h_->Print(
+        "$name$(const uint8_t* data, size_t len) "
+        ": TypedProtoDecoder(data, len) {}\n",
+        "name", class_name);
+    stub_h_->Print(
+        "explicit $name$(const std::string& raw) : "
+        "TypedProtoDecoder(reinterpret_cast<const uint8_t*>(raw.data()), "
+        "raw.size()) {}\n",
+        "name", class_name);
+    stub_h_->Print(
+        "explicit $name$(const ::protozero::ConstBytes& raw) : "
+        "TypedProtoDecoder(raw.data, raw.size) {}\n",
+        "name", class_name);
+
+    for (int i = 0; i < message->field_count(); ++i) {
+      const FieldDescriptor* field = message->field(i);
+      if (field->number() > max_field_id) {
+        stub_h_->Print("// field $name$ omitted because its id is too high\n",
+                       "name", field->name());
+        continue;
+      }
+      std::string getter;
+      std::string cpp_type;
+      switch (field->type()) {
+        case FieldDescriptor::TYPE_BOOL:
+          getter = "as_bool";
+          cpp_type = "bool";
+          break;
+        case FieldDescriptor::TYPE_SFIXED32:
+        case FieldDescriptor::TYPE_INT32:
+          getter = "as_int32";
+          cpp_type = "int32_t";
+          break;
+        case FieldDescriptor::TYPE_SINT32:
+          getter = "as_sint32";
+          cpp_type = "int32_t";
+          break;
+        case FieldDescriptor::TYPE_SFIXED64:
+        case FieldDescriptor::TYPE_INT64:
+          getter = "as_int64";
+          cpp_type = "int64_t";
+          break;
+        case FieldDescriptor::TYPE_SINT64:
+          getter = "as_sint64";
+          cpp_type = "int64_t";
+          break;
+        case FieldDescriptor::TYPE_FIXED32:
+        case FieldDescriptor::TYPE_UINT32:
+          getter = "as_uint32";
+          cpp_type = "uint32_t";
+          break;
+        case FieldDescriptor::TYPE_FIXED64:
+        case FieldDescriptor::TYPE_UINT64:
+          getter = "as_uint64";
+          cpp_type = "uint64_t";
+          break;
+        case FieldDescriptor::TYPE_FLOAT:
+          getter = "as_float";
+          cpp_type = "float";
+          break;
+        case FieldDescriptor::TYPE_DOUBLE:
+          getter = "as_double";
+          cpp_type = "double";
+          break;
+        case FieldDescriptor::TYPE_ENUM:
+          getter = "as_int32";
+          cpp_type = "int32_t";
+          break;
+        case FieldDescriptor::TYPE_STRING:
+          getter = "as_string";
+          cpp_type = "::protozero::ConstChars";
+          break;
+        case FieldDescriptor::TYPE_MESSAGE:
+        case FieldDescriptor::TYPE_BYTES:
+          getter = "as_bytes";
+          cpp_type = "::protozero::ConstBytes";
+          break;
+        case FieldDescriptor::TYPE_GROUP:
+          continue;
+      }
+
+      stub_h_->Print("bool has_$name$() const { return at<$id$>().valid(); }\n",
+                     "name", field->lowercase_name(), "id",
+                     std::to_string(field->number()));
+
+      if (field->is_packed()) {
+        const char* protozero_wire_type =
+            FieldTypeToProtozeroWireType(field->type());
+        stub_h_->Print(
+            "::protozero::PackedRepeatedFieldIterator<$wire_type$, $cpp_type$> "
+            "$name$(bool* parse_error_ptr) const { return "
+            "GetPackedRepeated<$wire_type$, $cpp_type$>($id$, "
+            "parse_error_ptr); }\n",
+            "wire_type", protozero_wire_type, "cpp_type", cpp_type, "name",
+            field->lowercase_name(), "id", std::to_string(field->number()));
+      } else if (field->is_repeated()) {
+        stub_h_->Print(
+            "::protozero::RepeatedFieldIterator<$cpp_type$> $name$() const { "
+            "return "
+            "GetRepeated<$cpp_type$>($id$); }\n",
+            "name", field->lowercase_name(), "cpp_type", cpp_type, "id",
+            std::to_string(field->number()));
+      } else {
+        stub_h_->Print(
+            "$cpp_type$ $name$() const { return at<$id$>().$getter$(); }\n",
+            "name", field->lowercase_name(), "id",
+            std::to_string(field->number()), "cpp_type", cpp_type, "getter",
+            getter);
+      }
+    }
+    stub_h_->Outdent();
+    stub_h_->Print("};\n\n");
+  }
+
+  void GenerateConstantsForMessageFields(const Descriptor* message) {
+    const bool has_fields = (message->field_count() > 0);
+
+    // Field number constants.
+    if (has_fields) {
+      stub_h_->Print("enum : int32_t {\n");
+      stub_h_->Indent();
+
+      for (int i = 0; i < message->field_count(); ++i) {
+        const FieldDescriptor* field = message->field(i);
+        stub_h_->Print("$name$ = $id$,\n", "name",
+                       GetFieldNumberConstant(field), "id",
+                       std::to_string(field->number()));
+      }
+      stub_h_->Outdent();
+      stub_h_->Print("};\n");
+    }
+  }
+
+  void GenerateMessageDescriptor(const Descriptor* message) {
+    GenerateDecoder(message);
+
+    stub_h_->Print(
+        "class $name$ : public ::protozero::Message {\n"
+        " public:\n",
+        "name", GetCppClassName(message));
+    stub_h_->Indent();
+
+    stub_h_->Print("using Decoder = $name$_Decoder;\n", "name",
+                   GetCppClassName(message));
+
+    GenerateConstantsForMessageFields(message);
+
+    stub_h_->Print(
+        "static constexpr const char* GetName() { return \".$name$\"; }\n\n",
+        "name", message->full_name());
+
+    // Using statements for nested messages.
+    for (int i = 0; i < message->nested_type_count(); ++i) {
+      const Descriptor* nested_message = message->nested_type(i);
+      stub_h_->Print("using $local_name$ = $global_name$;\n", "local_name",
+                     nested_message->name(), "global_name",
+                     GetCppClassName(nested_message, true));
+    }
+
+    // Using statements for nested enums.
+    for (int i = 0; i < message->enum_type_count(); ++i) {
+      const EnumDescriptor* nested_enum = message->enum_type(i);
+      const char* stub = R"(
+using $local_name$ = $global_name$;
+static inline const char* $local_name$_Name($local_name$ value) {
+  return $global_name$_Name(value);
+}
+)";
+      stub_h_->Print(stub, "local_name", nested_enum->name(), "global_name",
+                     GetCppClassName(nested_enum, true));
+    }
+
+    // Values of nested enums.
+    for (int i = 0; i < message->enum_type_count(); ++i) {
+      const EnumDescriptor* nested_enum = message->enum_type(i);
+
+      for (int j = 0; j < nested_enum->value_count(); ++j) {
+        const EnumValueDescriptor* value = nested_enum->value(j);
+        stub_h_->Print(
+            "static inline const $class$ $name$ = $class$::$name$;\n", "class",
+            nested_enum->name(), "name", value->name());
+      }
+    }
+
+    // Field descriptors.
+    for (int i = 0; i < message->field_count(); ++i) {
+      GenerateFieldDescriptor(GetCppClassName(message), message->field(i));
+    }
+
+    stub_h_->Outdent();
+    stub_h_->Print("};\n\n");
+  }
+
+  std::string GetFieldMetadataTypeName(const FieldDescriptor* field) {
+    std::string name = field->camelcase_name();
+    if (isalpha(name[0]))
+      name[0] = static_cast<char>(toupper(name[0]));
+    return "FieldMetadata_" + name;
+  }
+
+  std::string GetFieldMetadataVariableName(const FieldDescriptor* field) {
+    std::string name = field->camelcase_name();
+    if (isalpha(name[0]))
+      name[0] = static_cast<char>(toupper(name[0]));
+    return "k" + name;
+  }
+
+  void GenerateFieldMetadata(const std::string& message_cpp_type,
+                             const FieldDescriptor* field) {
+    const char* code_stub = R"(
+using $field_metadata_type$ =
+  ::protozero::proto_utils::FieldMetadata<
+    $field_id$,
+    ::protozero::proto_utils::RepetitionType::$repetition_type$,
+    ::protozero::proto_utils::ProtoSchemaType::$proto_field_type$,
+    $cpp_type$,
+    $message_cpp_type$>;
+
+static constexpr $field_metadata_type$ $field_metadata_var${};
+)";
+
+    stub_h_->Print(code_stub, "field_id", std::to_string(field->number()),
+                   "repetition_type", FieldToRepetitionType(field),
+                   "proto_field_type", FieldToProtoSchemaType(field),
+                   "cpp_type", FieldToCppTypeName(field), "message_cpp_type",
+                   message_cpp_type, "field_metadata_type",
+                   GetFieldMetadataTypeName(field), "field_metadata_var",
+                   GetFieldMetadataVariableName(field));
+  }
+
+  void GenerateFieldDescriptor(const std::string& message_cpp_type,
+                               const FieldDescriptor* field) {
+    GenerateFieldMetadata(message_cpp_type, field);
+    if (field->is_packed()) {
+      GeneratePackedRepeatedFieldDescriptor(field);
+    } else if (field->type() != FieldDescriptor::TYPE_MESSAGE) {
+      GenerateSimpleFieldDescriptor(field);
+    } else {
+      GenerateNestedMessageFieldDescriptor(field);
+    }
+  }
+
+  // Generate extension class for a group of FieldDescriptor instances
+  // representing one "extend" block in proto definition. For example:
+  //
+  //   message SpecificExtension {
+  //     extend GeneralThing {
+  //       optional Fizz fizz = 101;
+  //       optional Buzz buzz = 102;
+  //     }
+  //   }
+  //
+  // This is going to be passed as a vector of two elements, "fizz" and
+  // "buzz". Wrapping message is used to provide a name for generated
+  // extension class.
+  //
+  // In the example above, generated code is going to look like:
+  //
+  //   class SpecificExtension : public GeneralThing {
+  //     Fizz* set_fizz();
+  //     Buzz* set_buzz();
+  //   }
+  void GenerateExtension(
+      const std::string& extension_name,
+      const std::vector<const FieldDescriptor*>& descriptors) {
+    // Use an arbitrary descriptor in order to get generic information not
+    // specific to any of them.
+    const FieldDescriptor* descriptor = descriptors[0];
+    const Descriptor* base_message = descriptor->containing_type();
+
+    // TODO(ddrone): ensure that this code works when containing_type located in
+    // other file or namespace.
+    stub_h_->Print("class $name$ : public $extendee$ {\n", "name",
+                   extension_name, "extendee",
+                   GetCppClassName(base_message, /*full=*/true));
+    stub_h_->Print(" public:\n");
+    stub_h_->Indent();
+    for (const FieldDescriptor* field : descriptors) {
+      if (field->containing_type() != base_message) {
+        Abort("one wrapper should extend only one message");
+        return;
+      }
+      GenerateFieldDescriptor(extension_name, field);
+    }
+    stub_h_->Outdent();
+    stub_h_->Print("};\n");
+  }
+
+  void GenerateEpilogue() {
+    for (unsigned i = 0; i < namespaces_.size(); ++i) {
+      stub_h_->Print("} // Namespace.\n");
+    }
+    stub_h_->Print("#endif  // Include guard.\n");
+  }
+
+  const FileDescriptor* const source_;
+  Printer* const stub_h_;
+  std::string error_;
+
+  std::string package_;
+  std::string wrapper_namespace_;
+  std::vector<std::string> namespaces_;
+  std::string full_namespace_prefix_;
+  std::vector<const Descriptor*> messages_;
+  std::vector<const EnumDescriptor*> enums_;
+  std::map<std::string, std::vector<const FieldDescriptor*>> extensions_;
+
+  // Generate headers that can be used with the Perfetto SDK.
+  bool sdk_mode_ = false;
+
+  // The custom *Comp comparators are to ensure determinism of the generator.
+  std::set<const FileDescriptor*, FileDescriptorComp> public_imports_;
+  std::set<const FileDescriptor*, FileDescriptorComp> private_imports_;
+  std::set<const Descriptor*, DescriptorComp> referenced_messages_;
+  std::set<const EnumDescriptor*, EnumDescriptorComp> referenced_enums_;
+};
+
+class ProtoZeroGenerator : public ::google::protobuf::compiler::CodeGenerator {
+ public:
+  explicit ProtoZeroGenerator();
+  ~ProtoZeroGenerator() override;
+
+  // CodeGenerator implementation
+  bool Generate(const google::protobuf::FileDescriptor* file,
+                const std::string& options,
+                GeneratorContext* context,
+                std::string* error) const override;
+};
+
+ProtoZeroGenerator::ProtoZeroGenerator() {}
+
+ProtoZeroGenerator::~ProtoZeroGenerator() {}
+
+bool ProtoZeroGenerator::Generate(const FileDescriptor* file,
+                                  const std::string& options,
+                                  GeneratorContext* context,
+                                  std::string* error) const {
+  const std::unique_ptr<ZeroCopyOutputStream> stub_h_file_stream(
+      context->Open(ProtoStubName(file) + ".h"));
+  const std::unique_ptr<ZeroCopyOutputStream> stub_cc_file_stream(
+      context->Open(ProtoStubName(file) + ".cc"));
+
+  // Variables are delimited by $.
+  Printer stub_h_printer(stub_h_file_stream.get(), '$');
+  GeneratorJob job(file, &stub_h_printer);
+
+  Printer stub_cc_printer(stub_cc_file_stream.get(), '$');
+  stub_cc_printer.Print("// Intentionally empty (crbug.com/998165)\n");
+
+  // Parse additional options.
+  for (const std::string& option : SplitString(options, ",")) {
+    std::vector<std::string> option_pair = SplitString(option, "=");
+    job.SetOption(option_pair[0], option_pair[1]);
+  }
+
+  if (!job.GenerateStubs()) {
+    *error = job.GetFirstError();
+    return false;
+  }
+  return true;
+}
+
+}  // namespace
+}  // namespace protozero
+
+int main(int argc, char* argv[]) {
+  ::protozero::ProtoZeroGenerator generator;
+  return google::protobuf::compiler::PluginMain(argc, argv, &generator);
+}
diff --git a/src/libtracing/protozero_src/scattered_heap_buffer.cc b/src/libtracing/protozero_src/scattered_heap_buffer.cc
new file mode 100644
index 000000000..e2fc9af77
--- /dev/null
+++ b/src/libtracing/protozero_src/scattered_heap_buffer.cc
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/scattered_heap_buffer.h"
+
+#include <algorithm>
+
+namespace protozero {
+
+ScatteredHeapBuffer::Slice::Slice()
+    : buffer_(nullptr), size_(0u), unused_bytes_(0u) {}
+
+ScatteredHeapBuffer::Slice::Slice(size_t size)
+    : buffer_(std::unique_ptr<uint8_t[]>(new uint8_t[size])),
+      size_(size),
+      unused_bytes_(size) {
+  PERFETTO_DCHECK(size);
+  Clear();
+}
+
+ScatteredHeapBuffer::Slice::Slice(Slice&& slice) noexcept = default;
+
+ScatteredHeapBuffer::Slice::~Slice() = default;
+
+ScatteredHeapBuffer::Slice& ScatteredHeapBuffer::Slice::operator=(Slice&&) =
+    default;
+
+void ScatteredHeapBuffer::Slice::Clear() {
+  unused_bytes_ = size_;
+#if PERFETTO_DCHECK_IS_ON()
+  memset(start(), 0xff, size_);
+#endif  // PERFETTO_DCHECK_IS_ON()
+}
+
+ScatteredHeapBuffer::ScatteredHeapBuffer(size_t initial_slice_size_bytes,
+                                         size_t maximum_slice_size_bytes)
+    : next_slice_size_(initial_slice_size_bytes),
+      maximum_slice_size_(maximum_slice_size_bytes) {
+  PERFETTO_DCHECK(next_slice_size_ && maximum_slice_size_);
+  PERFETTO_DCHECK(maximum_slice_size_ >= initial_slice_size_bytes);
+}
+
+ScatteredHeapBuffer::~ScatteredHeapBuffer() = default;
+
+protozero::ContiguousMemoryRange ScatteredHeapBuffer::GetNewBuffer() {
+  PERFETTO_CHECK(writer_);
+  AdjustUsedSizeOfCurrentSlice();
+
+  if (cached_slice_.start()) {
+    slices_.push_back(std::move(cached_slice_));
+    PERFETTO_DCHECK(!cached_slice_.start());
+  } else {
+    slices_.emplace_back(next_slice_size_);
+  }
+  next_slice_size_ = std::min(maximum_slice_size_, next_slice_size_ * 2);
+  return slices_.back().GetTotalRange();
+}
+
+const std::vector<ScatteredHeapBuffer::Slice>&
+ScatteredHeapBuffer::GetSlices() {
+  AdjustUsedSizeOfCurrentSlice();
+  return slices_;
+}
+
+std::vector<uint8_t> ScatteredHeapBuffer::StitchSlices() {
+  size_t stitched_size = 0u;
+  const auto& slices = GetSlices();
+  for (const auto& slice : slices)
+    stitched_size += slice.size() - slice.unused_bytes();
+
+  std::vector<uint8_t> buffer;
+  buffer.reserve(stitched_size);
+  for (const auto& slice : slices) {
+    auto used_range = slice.GetUsedRange();
+    buffer.insert(buffer.end(), used_range.begin, used_range.end);
+  }
+  return buffer;
+}
+
+std::vector<protozero::ContiguousMemoryRange> ScatteredHeapBuffer::GetRanges() {
+  std::vector<protozero::ContiguousMemoryRange> ranges;
+  for (const auto& slice : GetSlices())
+    ranges.push_back(slice.GetUsedRange());
+  return ranges;
+}
+
+void ScatteredHeapBuffer::AdjustUsedSizeOfCurrentSlice() {
+  if (!slices_.empty())
+    slices_.back().set_unused_bytes(writer_->bytes_available());
+}
+
+size_t ScatteredHeapBuffer::GetTotalSize() {
+  size_t total_size = 0;
+  for (auto& slice : slices_) {
+    total_size += slice.size();
+  }
+  return total_size;
+}
+
+void ScatteredHeapBuffer::Reset() {
+  if (slices_.empty())
+    return;
+  cached_slice_ = std::move(slices_.front());
+  cached_slice_.Clear();
+  slices_.clear();
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/scattered_stream_null_delegate.cc b/src/libtracing/protozero_src/scattered_stream_null_delegate.cc
new file mode 100644
index 000000000..404327ba0
--- /dev/null
+++ b/src/libtracing/protozero_src/scattered_stream_null_delegate.cc
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/scattered_stream_null_delegate.h"
+
+namespace protozero {
+
+// An implementation of ScatteredStreamWriter::Delegate which always returns
+// the same piece of memory.
+// This is used when we need to no-op the writers (e.g. during teardown or in
+// case of resource exhaustion), avoiding that the clients have to deal with
+// nullptr checks.
+ScatteredStreamWriterNullDelegate::ScatteredStreamWriterNullDelegate(
+    size_t chunk_size)
+    : chunk_size_(chunk_size),
+      chunk_(std::unique_ptr<uint8_t[]>(new uint8_t[chunk_size_])) {}
+
+ScatteredStreamWriterNullDelegate::~ScatteredStreamWriterNullDelegate() {}
+
+ContiguousMemoryRange ScatteredStreamWriterNullDelegate::GetNewBuffer() {
+  return {chunk_.get(), chunk_.get() + chunk_size_};
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/scattered_stream_writer.cc b/src/libtracing/protozero_src/scattered_stream_writer.cc
new file mode 100644
index 000000000..2743a689f
--- /dev/null
+++ b/src/libtracing/protozero_src/scattered_stream_writer.cc
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+#include <algorithm>
+
+#include "perfetto/base/logging.h"
+
+namespace protozero {
+
+ScatteredStreamWriter::Delegate::~Delegate() {}
+
+uint8_t* ScatteredStreamWriter::Delegate::AnnotatePatch(uint8_t* patch_addr) {
+  // In most cases, a patch is transparent. The caller can write directly into
+  // `to_patch`, because its memory is not going away. TraceWriterImpl, however,
+  // requires a more complicated logic, because the chunks might be copied
+  // earlier.
+  return patch_addr;
+}
+
+ScatteredStreamWriter::ScatteredStreamWriter(Delegate* delegate)
+    : delegate_(delegate),
+      cur_range_({nullptr, nullptr}),
+      write_ptr_(nullptr) {}
+
+ScatteredStreamWriter::~ScatteredStreamWriter() {}
+
+void ScatteredStreamWriter::Reset(ContiguousMemoryRange range) {
+  written_previously_ += static_cast<uint64_t>(write_ptr_ - cur_range_.begin);
+  cur_range_ = range;
+  write_ptr_ = range.begin;
+  PERFETTO_DCHECK(!write_ptr_ || write_ptr_ < cur_range_.end);
+}
+
+void ScatteredStreamWriter::Extend() {
+  Reset(delegate_->GetNewBuffer());
+}
+
+void ScatteredStreamWriter::WriteBytesSlowPath(const uint8_t* src,
+                                               size_t size) {
+  size_t bytes_left = size;
+  while (bytes_left > 0) {
+    if (write_ptr_ >= cur_range_.end)
+      Extend();
+    const size_t burst_size = std::min(bytes_available(), bytes_left);
+    WriteBytesUnsafe(src, burst_size);
+    bytes_left -= burst_size;
+    src += burst_size;
+  }
+}
+
+// TODO(primiano): perf optimization: I suspect that at the end this will always
+// be called with |size| == 4, in which case we might just hardcode it.
+uint8_t* ScatteredStreamWriter::ReserveBytes(size_t size) {
+  if (write_ptr_ + size > cur_range_.end) {
+    // Assume the reservations are always < Delegate::GetNewBuffer().size(),
+    // so that one single call to Extend() will definitely give enough headroom.
+    Extend();
+    PERFETTO_DCHECK(write_ptr_ + size <= cur_range_.end);
+  }
+  uint8_t* begin = write_ptr_;
+  write_ptr_ += size;
+#if PERFETTO_DCHECK_IS_ON()
+  // In the past, the service had a matching DCHECK in
+  // TraceBuffer::TryPatchChunkContents, which was assuming that service and all
+  // producers are built with matching DCHECK levels. This turned out to be a
+  // source of problems and was removed in b/197340286. This memset is useless
+  // these days and is here only to maintain ABI compatibility between producers
+  // that use a v20+ SDK and older versions of the service that were built in
+  // debug mode. At some point around 2023 it should be safe to remove it.
+  // (running a debug version of traced in production seems a bad idea
+  // regardless).
+  memset(begin, 0, size);
+#endif
+  return begin;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/scattered_stream_writer_unittest.cc b/src/libtracing/protozero_src/scattered_stream_writer_unittest.cc
new file mode 100644
index 000000000..af75cbfa9
--- /dev/null
+++ b/src/libtracing/protozero_src/scattered_stream_writer_unittest.cc
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+#include <string.h>
+
+#include <memory>
+
+#include "perfetto/base/logging.h"
+#include "src/protozero/test/fake_scattered_buffer.h"
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+namespace {
+
+constexpr size_t kChunkSize = 8;
+
+TEST(ScatteredStreamWriterTest, ScatteredWrites) {
+  FakeScatteredBuffer delegate(kChunkSize);
+  ScatteredStreamWriter ssw(&delegate);
+
+  const uint8_t kOneByteBuf[] = {0x40};
+  const uint8_t kThreeByteBuf[] = {0x50, 0x51, 0x52};
+  const uint8_t kFourByteBuf[] = {0x60, 0x61, 0x62, 0x63};
+  uint8_t kTwentyByteBuf[20];
+  for (uint8_t i = 0; i < sizeof(kTwentyByteBuf); ++i)
+    kTwentyByteBuf[i] = 0xA0 + i;
+
+  // Writing up to the chunk size should cause only the initial extension.
+  for (uint8_t i = 0; i < kChunkSize; ++i) {
+    ssw.WriteByte(i);
+    EXPECT_EQ(kChunkSize - i - 1, ssw.bytes_available());
+  }
+  EXPECT_EQ(1u, delegate.chunks().size());
+  EXPECT_EQ(0u, ssw.bytes_available());
+
+  // This extra write will cause the first extension.
+  ssw.WriteBytes(kOneByteBuf, sizeof(kOneByteBuf));
+  EXPECT_EQ(2u, delegate.chunks().size());
+  EXPECT_EQ(7u, ssw.bytes_available());
+
+  // This starts at offset 1, to make sure we don't hardcode any assumption
+  // about alignment.
+  uint8_t* reserved_range_1 = ssw.ReserveBytes(4);
+  EXPECT_EQ(2u, delegate.chunks().size());
+  EXPECT_EQ(3u, ssw.bytes_available());
+
+  ssw.WriteByte(0xFF);
+  ssw.WriteBytes(kThreeByteBuf, sizeof(kThreeByteBuf));
+  EXPECT_EQ(3u, delegate.chunks().size());
+  EXPECT_EQ(7u, ssw.bytes_available());
+
+  uint8_t* reserved_range_2 = ssw.ReserveBytes(4);
+  ssw.WriteBytes(kTwentyByteBuf, sizeof(kTwentyByteBuf));
+  EXPECT_EQ(6u, delegate.chunks().size());
+  EXPECT_EQ(7u, ssw.bytes_available());
+
+  // Writing reserved bytes should not change the bytes_available().
+  memcpy(reserved_range_1, kFourByteBuf, sizeof(kFourByteBuf));
+  memcpy(reserved_range_2, kFourByteBuf, sizeof(kFourByteBuf));
+  EXPECT_EQ(6u, delegate.chunks().size());
+  EXPECT_EQ(7u, ssw.bytes_available());
+
+  // Check that reserving more bytes than what left creates a brand new chunk
+  // even if the previous one is not exhausted
+  for (uint8_t i = 0; i < 5; ++i)
+    ssw.WriteByte(0xFF);
+  memcpy(ssw.ReserveBytes(4), kFourByteBuf, sizeof(kFourByteBuf));
+  memcpy(ssw.ReserveBytesUnsafe(3), kThreeByteBuf, sizeof(kThreeByteBuf));
+  memcpy(ssw.ReserveBytes(3), kThreeByteBuf, sizeof(kThreeByteBuf));
+  memcpy(ssw.ReserveBytesUnsafe(1), kOneByteBuf, sizeof(kOneByteBuf));
+  memcpy(ssw.ReserveBytes(1), kOneByteBuf, sizeof(kOneByteBuf));
+
+  EXPECT_EQ(8u, delegate.chunks().size());
+  EXPECT_EQ(3u, ssw.bytes_available());
+
+  EXPECT_EQ("0001020304050607", delegate.GetChunkAsString(0));
+  EXPECT_EQ("4060616263FF5051", delegate.GetChunkAsString(1));
+  EXPECT_EQ("5260616263A0A1A2", delegate.GetChunkAsString(2));
+  EXPECT_EQ("A3A4A5A6A7A8A9AA", delegate.GetChunkAsString(3));
+  EXPECT_EQ("ABACADAEAFB0B1B2", delegate.GetChunkAsString(4));
+  EXPECT_EQ("B3FFFFFFFFFF0000", delegate.GetChunkAsString(5));
+  EXPECT_EQ("6061626350515200", delegate.GetChunkAsString(6));
+  EXPECT_EQ("5051524040000000", delegate.GetChunkAsString(7));
+
+  // Finally reset the writer to a new buffer.
+  uint8_t other_buffer[8] = {0};
+  ssw.Reset({other_buffer, other_buffer + sizeof(other_buffer)});
+  EXPECT_EQ(other_buffer, ssw.write_ptr());
+  ssw.WriteByte(1);
+  ssw.WriteBytes(kThreeByteBuf, sizeof(kThreeByteBuf));
+  EXPECT_EQ(1u, other_buffer[0]);
+  EXPECT_EQ(0x52u, other_buffer[3]);
+}
+
+TEST(ScatteredStreamWriterTest, Rewind) {
+  FakeScatteredBuffer delegate(kChunkSize);
+  ScatteredStreamWriter ssw(&delegate);
+  const uint8_t kTestBytes[] = {0x01, 0x02, 0x03, 0x04};
+
+  ssw.WriteBytes(kTestBytes, sizeof(kTestBytes));
+  EXPECT_EQ("0102030400000000", delegate.GetChunkAsString(0));
+  EXPECT_EQ(ssw.write_ptr(), ssw.cur_range().begin + 4u);
+
+  ssw.Rewind(3, 1);
+  EXPECT_EQ(ssw.write_ptr(), ssw.cur_range().begin + 3u);
+  EXPECT_EQ("0203040400000000", delegate.GetChunkAsString(0));
+
+  ssw.Rewind(1, 2);
+  EXPECT_EQ(ssw.write_ptr(), ssw.cur_range().begin + 1u);
+  EXPECT_EQ("0403040400000000", delegate.GetChunkAsString(0));
+
+  ssw.Rewind(1, 0);
+  EXPECT_EQ(ssw.write_ptr(), ssw.cur_range().begin + 1u);
+  EXPECT_EQ("0403040400000000", delegate.GetChunkAsString(0));
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/static_buffer.cc b/src/libtracing/protozero_src/static_buffer.cc
new file mode 100644
index 000000000..cb4737b7d
--- /dev/null
+++ b/src/libtracing/protozero_src/static_buffer.cc
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/static_buffer.h"
+
+#include "perfetto/base/logging.h"
+
+namespace protozero {
+
+StaticBufferDelegate::~StaticBufferDelegate() = default;
+
+ContiguousMemoryRange StaticBufferDelegate::GetNewBuffer() {
+  if (get_new_buffer_called_once_) {
+    // This is the 2nd time GetNewBuffer is called. The estimate is wrong. We
+    // shouldn't try to grow the buffer after the initial call.
+    PERFETTO_FATAL("Static buffer too small");
+  }
+  get_new_buffer_called_once_ = true;
+  return range_;
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/test/cppgen_conformance_unittest.cc b/src/libtracing/protozero_src/test/cppgen_conformance_unittest.cc
new file mode 100644
index 000000000..d8d284e40
--- /dev/null
+++ b/src/libtracing/protozero_src/test/cppgen_conformance_unittest.cc
@@ -0,0 +1,401 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <limits>
+#include <memory>
+#include <vector>
+
+#include "perfetto/protozero/message_handle.h"
+#include "perfetto/protozero/packed_repeated_fields.h"
+#include "test/gtest_and_gmock.h"
+
+// Autogenerated headers in out/*/gen/
+#include "src/protozero/test/example_proto/library.gen.h"
+#include "src/protozero/test/example_proto/other_package/test_messages.gen.h"
+#include "src/protozero/test/example_proto/subpackage/test_messages.gen.h"
+#include "src/protozero/test/example_proto/test_messages.gen.h"
+#include "src/protozero/test/example_proto/test_messages.pb.h"
+
+// Generated by the cppgen compiler.
+namespace pbtest = protozero::test::protos::gen;
+namespace pbtest_subpackage = protozero::test::protos::subpackage::gen;
+namespace pbtest_otherpackage = other_package::gen;
+
+// Generated by the official protobuf compiler.
+namespace pbgold = protozero::test::protos;
+namespace pbgold_subpackage = protozero::test::protos::subpackage;
+namespace pbgold_other_package = other_package;
+
+namespace protozero {
+namespace {
+
+using testing::ElementsAreArray;
+
+// The two functions below are templated because they are re-used both on the
+// libprotobuf and protozero versions to check both libproto -> zero and
+// zero -> libproto compatibility.
+template <typename T>
+void SetTestingFields(T* msg) {
+  msg->set_field_int32(-1);
+  msg->set_field_int64(-333123456789ll);
+  msg->set_field_uint32(600);
+  msg->set_field_uint64(333123456789ll);
+  msg->set_field_sint32(-5);
+  msg->set_field_sint64(-9000);
+  msg->set_field_fixed32(12345);
+  msg->set_field_fixed64(444123450000ll);
+  msg->set_field_sfixed32(-69999);
+  msg->set_field_sfixed64(-200);
+  msg->set_field_float(3.14f);
+  msg->set_field_double(0.5555);
+  msg->set_field_bool(true);
+
+  msg->set_small_enum(decltype(msg->small_enum())::TO_BE);
+  msg->set_signed_enum(decltype(msg->signed_enum())::NEGATIVE);
+  msg->set_big_enum(decltype(msg->big_enum())::BEGIN);
+
+  msg->set_field_string("FizzBuzz");
+  msg->set_field_bytes(reinterpret_cast<const uint8_t*>("\x11\x00\xBE\xEF"),
+                       4u);
+  msg->add_repeated_int32(1);
+  msg->add_repeated_int32(-1);
+  msg->add_repeated_int32(100);
+  msg->add_repeated_int32(2000000);
+}
+
+template <typename T>
+void CheckTestingFields(const T& msg) {
+  EXPECT_EQ(-1, msg.field_int32());
+  EXPECT_EQ(-333123456789ll, msg.field_int64());
+  EXPECT_EQ(600u, msg.field_uint32());
+  EXPECT_EQ(333123456789ull, msg.field_uint64());
+  EXPECT_EQ(-5, msg.field_sint32());
+  EXPECT_EQ(-9000, msg.field_sint64());
+  EXPECT_EQ(12345u, msg.field_fixed32());
+  EXPECT_EQ(444123450000ull, msg.field_fixed64());
+  EXPECT_EQ(-69999, msg.field_sfixed32());
+  EXPECT_EQ(-200, msg.field_sfixed64());
+  EXPECT_FLOAT_EQ(3.14f, msg.field_float());
+  EXPECT_DOUBLE_EQ(0.5555, msg.field_double());
+  EXPECT_EQ(true, msg.field_bool());
+  EXPECT_EQ(decltype(msg.small_enum())::TO_BE, msg.small_enum());
+  EXPECT_EQ(decltype(msg.signed_enum())::NEGATIVE, msg.signed_enum());
+  EXPECT_EQ(decltype(msg.big_enum())::BEGIN, msg.big_enum());
+  EXPECT_EQ("FizzBuzz", msg.field_string());
+  EXPECT_EQ(std::string("\x11\x00\xBE\xEF", 4), msg.field_bytes());
+  ASSERT_THAT(msg.repeated_int32(), ElementsAreArray({1, -1, 100, 2000000}));
+}
+
+TEST(ProtoCppConformanceTest, GenEncode_GoldDecode) {
+  pbtest::EveryField msg;
+  SetTestingFields(&msg);
+  std::string serialized = msg.SerializeAsString();
+
+  pbgold::EveryField gold_msg;
+  gold_msg.ParseFromString(serialized);
+  CheckTestingFields(gold_msg);
+  EXPECT_EQ(serialized.size(), static_cast<size_t>(gold_msg.ByteSizeLong()));
+}
+
+TEST(ProtoCppConformanceTest, GoldEncode_GenDecode) {
+  pbgold::EveryField gold_msg;
+  SetTestingFields(&gold_msg);
+  std::string serialized = gold_msg.SerializeAsString();
+
+  pbtest::EveryField msg;
+  EXPECT_TRUE(msg.ParseFromString(serialized));
+  CheckTestingFields(msg);
+}
+
+TEST(ProtoCppConformanceTest, GenEncode_GenDecode) {
+  pbtest::EveryField msg;
+  SetTestingFields(&msg);
+  std::string serialized = msg.SerializeAsString();
+
+  pbtest::EveryField dec_msg;
+  dec_msg.ParseFromString(serialized);
+  CheckTestingFields(dec_msg);
+  EXPECT_EQ(serialized.size(), dec_msg.SerializeAsString().size());
+}
+
+TEST(ProtoCppConformanceTest, NestedMessages) {
+  pbtest::NestedA msg_a;
+  pbtest::NestedA::NestedB* msg_b = msg_a.add_repeated_a();
+  pbtest::NestedA::NestedB::NestedC* msg_c = msg_b->mutable_value_b();
+  msg_c->set_value_c(321);
+  msg_b = msg_a.add_repeated_a();
+  msg_a.mutable_super_nested()->set_value_c(1000);
+  std::string serialized = msg_a.SerializeAsString();
+
+  pbgold::NestedA gold_msg_a;
+  gold_msg_a.ParseFromString(serialized);
+  EXPECT_EQ(2, gold_msg_a.repeated_a_size());
+  EXPECT_EQ(321, gold_msg_a.repeated_a(0).value_b().value_c());
+  EXPECT_FALSE(gold_msg_a.repeated_a(1).has_value_b());
+  EXPECT_EQ(gold_msg_a.repeated_a(1).value_b().value_c(), 0);
+  EXPECT_EQ(1000, gold_msg_a.super_nested().value_c());
+}
+
+// Tests that unknown fields are preserved when re-serializing. This test uses
+// the messages NestedA and NestedA_V2, where NestedA_V2 mimics a future
+// extension of NestedA. It starts filling the V2 version, than decodes it with
+// V1, then re-encodes V1 and decodes with V2 and finally check that all the V2
+// original fields have been preserved.
+TEST(ProtoCppConformanceTest, PreserveUnknownFields) {
+  std::string serialized;
+  {
+    pbtest::TestVersioning_V2 msg_v2;
+    msg_v2.set_root_int(10);
+    msg_v2.set_root_int_v2(11);
+    msg_v2.add_enumz(pbtest::TestVersioning_V2::ONE);
+    msg_v2.add_enumz(pbtest::TestVersioning_V2::TWO);
+    msg_v2.add_enumz(pbtest::TestVersioning_V2::THREE_V2);
+    msg_v2.set_root_string("root-string");
+    msg_v2.add_rep_string("root-rep-string-1");
+    msg_v2.add_rep_string("root-rep-string-2");
+    for (int i = 0; i < 3; i++) {
+      auto* sub1 = i == 0 ? msg_v2.mutable_sub1() : msg_v2.add_sub1_rep();
+      sub1->set_sub1_int(12);
+      sub1->set_sub1_string("sub1-string");
+      sub1->set_sub1_int_v2(13);
+      sub1->set_sub1_string_v2("sub1-string-v2");
+
+      auto* sub2 = i == 0 ? msg_v2.mutable_sub2() : msg_v2.add_sub2_rep();
+      sub2->set_sub2_int(14);
+      sub2->set_sub2_string("sub2-string");
+    }
+    {
+      pbtest::TestVersioning_V2::Sub1_V2 lazy;
+      lazy.set_sub1_int(15);
+      lazy.set_sub1_string("sub1-lazy-string");
+      lazy.set_sub1_int_v2(16);
+      lazy.set_sub1_string_v2("sub1-lazy-string-v2");
+      msg_v2.set_sub1_lazy_raw(lazy.SerializeAsString());
+    }
+    {
+      pbtest::TestVersioning_V2::Sub2_V2 lazy;
+      lazy.set_sub2_int(17);
+      lazy.set_sub2_string("sub2-v2-lazy-string");
+      msg_v2.set_sub2_lazy_raw(lazy.SerializeAsString());
+    }
+
+    serialized = msg_v2.SerializeAsString();
+  }
+
+  // Now decode with an earlier version that has less fields. Then re-serialize
+  // the v1 message.
+  {
+    pbtest::TestVersioning_V1 msg_v1;
+    EXPECT_TRUE(msg_v1.ParseFromString(serialized));
+    EXPECT_EQ(msg_v1.root_int(), 10);
+    EXPECT_EQ(msg_v1.enumz_size(), 3);
+    // These are to workaround "ODR-usage" rules that would require that the
+    // constexpr in the .gen.h file have a matching symbol definition in the .cc
+    // file.
+    const auto ONE = pbtest::TestVersioning_V1::ONE;
+    const auto TWO = pbtest::TestVersioning_V1::TWO;
+    EXPECT_EQ(msg_v1.enumz()[0], ONE);
+    EXPECT_EQ(msg_v1.enumz()[1], TWO);
+    EXPECT_EQ(static_cast<int>(msg_v1.enumz()[2]), 3);
+    EXPECT_EQ(msg_v1.root_string(), "root-string");
+    EXPECT_EQ(msg_v1.rep_string_size(), 2);
+    EXPECT_EQ(msg_v1.rep_string()[0], "root-rep-string-1");
+    EXPECT_EQ(msg_v1.rep_string()[1], "root-rep-string-2");
+    EXPECT_EQ(msg_v1.sub1_rep_size(), 2);
+    for (size_t i = 0; i < 3; i++) {
+      auto* sub1 = i == 0 ? &msg_v1.sub1() : &msg_v1.sub1_rep()[i - 1];
+      EXPECT_EQ(sub1->sub1_int(), 12);
+      EXPECT_EQ(sub1->sub1_string(), "sub1-string");
+    }
+
+    // Append an extra field and change the valaue of an existing one before
+    // re-serializing.
+    msg_v1.set_root_int(101);
+    msg_v1.add_rep_string("extra-string");
+    serialized = msg_v1.SerializeAsString();
+  }
+
+  // Decode the re-serialized v1 message with with v2. Check that the _v2
+  // fields have been preserved in the double de/serializataion across versions.
+  {
+    pbtest::TestVersioning_V2 msg_v2;
+    EXPECT_TRUE(msg_v2.ParseFromString(serialized));
+    EXPECT_EQ(msg_v2.root_int(), 101);
+    EXPECT_EQ(msg_v2.root_int_v2(), 11);
+    EXPECT_EQ(msg_v2.enumz_size(), 3);
+    const auto ONE = pbtest::TestVersioning_V2::ONE;
+    const auto TWO = pbtest::TestVersioning_V2::TWO;
+    const auto THREE_V2 = pbtest::TestVersioning_V2::THREE_V2;
+    EXPECT_EQ(msg_v2.enumz()[0], ONE);
+    EXPECT_EQ(msg_v2.enumz()[1], TWO);
+    EXPECT_EQ(msg_v2.enumz()[2], THREE_V2);
+    EXPECT_EQ(msg_v2.root_string(), "root-string");
+    EXPECT_EQ(msg_v2.rep_string_size(), 3);
+    EXPECT_EQ(msg_v2.rep_string()[0], "root-rep-string-1");
+    EXPECT_EQ(msg_v2.rep_string()[1], "root-rep-string-2");
+    EXPECT_EQ(msg_v2.rep_string()[2], "extra-string");
+    EXPECT_EQ(msg_v2.sub1_rep_size(), 2);
+    for (size_t i = 0; i < 3; i++) {
+      auto* sub1 = i == 0 ? &msg_v2.sub1() : &msg_v2.sub1_rep()[i - 1];
+      EXPECT_EQ(sub1->sub1_int(), 12);
+      EXPECT_EQ(sub1->sub1_string(), "sub1-string");
+      EXPECT_EQ(sub1->sub1_int_v2(), 13);
+      EXPECT_EQ(sub1->sub1_string_v2(), "sub1-string-v2");
+      auto* sub2 = i == 0 ? &msg_v2.sub2() : &msg_v2.sub2_rep()[i - 1];
+      EXPECT_EQ(sub2->sub2_int(), 14);
+      EXPECT_EQ(sub2->sub2_string(), "sub2-string");
+    }
+    {
+      pbtest::TestVersioning_V2::Sub1_V2 lazy;
+      EXPECT_TRUE(lazy.ParseFromString(msg_v2.sub1_lazy_raw()));
+      EXPECT_EQ(lazy.sub1_int(), 15);
+      EXPECT_EQ(lazy.sub1_string(), "sub1-lazy-string");
+      EXPECT_EQ(lazy.sub1_int_v2(), 16);
+      EXPECT_EQ(lazy.sub1_string_v2(), "sub1-lazy-string-v2");
+    }
+    {
+      pbtest::TestVersioning_V2::Sub2_V2 lazy;
+      EXPECT_TRUE(lazy.ParseFromString(msg_v2.sub2_lazy_raw()));
+      EXPECT_EQ(lazy.sub2_int(), 17);
+      EXPECT_EQ(lazy.sub2_string(), "sub2-v2-lazy-string");
+    }
+  }
+}
+
+// Checks that unset fields aren't zero-initialized in the decode -> re-encode
+// process.
+TEST(ProtoCppConformanceTest, DontDefaultInitialize) {
+  pbtest::EveryField msg;
+  EXPECT_FALSE(msg.has_field_int32());
+  msg.set_field_int32(0);
+  EXPECT_TRUE(msg.has_field_int32());
+
+  EXPECT_FALSE(msg.has_field_float());
+  msg.set_field_float(.0f);
+  EXPECT_TRUE(msg.has_field_float());
+
+  EXPECT_FALSE(msg.has_field_string());
+  msg.set_field_string("");
+  EXPECT_TRUE(msg.has_field_string());
+
+  pbtest::EveryField dec;
+  dec.ParseFromString(msg.SerializeAsString());
+  std::string reserialized = dec.SerializeAsString();
+
+  pbgold::EveryField gold_msg;
+  gold_msg.ParseFromString(reserialized);
+  EXPECT_TRUE(gold_msg.has_field_int32());
+  EXPECT_EQ(gold_msg.field_int32(), 0);
+  EXPECT_TRUE(gold_msg.has_field_float());
+  EXPECT_FLOAT_EQ(gold_msg.field_float(), .0f);
+  EXPECT_TRUE(gold_msg.has_field_string());
+  EXPECT_EQ(gold_msg.field_string(), "");
+  EXPECT_FALSE(gold_msg.has_field_int64());
+  EXPECT_FALSE(gold_msg.has_field_uint64());
+  EXPECT_FALSE(gold_msg.has_field_bytes());
+}
+
+// Tests serialization and deserialization of packed encoding fields.
+TEST(ProtoCppConformanceTest, PackedRepeatedFields) {
+  std::string serialized;
+  {
+    pbtest::PackedRepeatedFields msg;
+
+    for (int i = -100; i < 100; i++)
+      msg.add_field_int32(i);
+
+    for (uint32_t i = 100; i < 200; i++)
+      msg.add_field_fixed32(i);
+
+    for (int64_t i = 5000000000; i < 5000001000; i++)
+      msg.add_field_sfixed64(i);
+
+    serialized = msg.SerializeAsString();
+  }
+  {
+    pbtest::PackedRepeatedFields msg;
+    EXPECT_TRUE(msg.ParseFromString(serialized));
+
+    std::vector<int> exp_int32;
+    for (int i = -100; i < 100; i++)
+      exp_int32.emplace_back(i);
+    ASSERT_THAT(msg.field_int32(), ElementsAreArray(exp_int32));
+
+    std::vector<uint32_t> exp_fixed32;
+    for (uint32_t i = 100; i < 200; i++)
+      exp_fixed32.emplace_back(i);
+    ASSERT_THAT(msg.field_fixed32(), ElementsAreArray(exp_fixed32));
+
+    std::vector<int64_t> exp_sfixed64;
+    for (int64_t i = 5000000000; i < 5000001000; i++)
+      exp_sfixed64.emplace_back(i);
+    ASSERT_THAT(msg.field_sfixed64(), ElementsAreArray(exp_sfixed64));
+  }
+}
+
+TEST(ProtoCppConformanceTest, DifferentPackages) {
+  pbtest::DifferentPackages msg;
+
+  // Pupulate fields defined in "protozero.test.protos.subpackage"
+  pbtest_subpackage::Message* msgSubpackage = msg.mutable_subpackage_message();
+  msgSubpackage->set_field_int32(1);
+  msgSubpackage->set_field_enum(pbtest_subpackage::Enum::A);
+  msgSubpackage->set_field_nested_enum(pbtest_subpackage::Message_NestedEnum_C);
+  msg.mutable_subpackage_nested_message()->set_field_int32(2);
+  msg.set_subpackage_enum(pbtest_subpackage::Enum::B);
+  msg.set_subpackage_nested_enum(pbtest_subpackage::Message_NestedEnum_D);
+
+  // Pupulate fields defined in "other_package"
+  pbtest_otherpackage::Message* msgOtherPackage =
+      msg.mutable_otherpackage_message();
+  msgOtherPackage->set_field_int32(11);
+  msgOtherPackage->set_field_enum(pbtest_otherpackage::Enum::A);
+  msgOtherPackage->set_field_nested_enum(
+      pbtest_otherpackage::Message_NestedEnum_C);
+  msg.mutable_otherpackage_nested_message()->set_field_int32(12);
+  msg.set_otherpackage_enum(pbtest_otherpackage::Enum::B);
+  msg.set_otherpackage_nested_enum(pbtest_otherpackage::Message_NestedEnum_D);
+
+  // Deserialize into golden proto
+  std::string serialized = msg.SerializeAsString();
+  pbgold::DifferentPackages gold_msg;
+  gold_msg.ParseFromString(serialized);
+  EXPECT_EQ(serialized.size(), static_cast<size_t>(gold_msg.ByteSizeLong()));
+
+  // Check fields defined in "protozero.test.protos.subpackage"
+  EXPECT_EQ(1, gold_msg.subpackage_message().field_int32());
+  EXPECT_EQ(pbgold_subpackage::Enum::A,
+            gold_msg.subpackage_message().field_enum());
+  EXPECT_EQ(pbgold_subpackage::Message_NestedEnum_C,
+            gold_msg.subpackage_message().field_nested_enum());
+  EXPECT_EQ(2, gold_msg.subpackage_nested_message().field_int32());
+  EXPECT_EQ(pbgold_subpackage::Enum::B, gold_msg.subpackage_enum());
+  EXPECT_EQ(pbgold_subpackage::Message_NestedEnum_D,
+            gold_msg.subpackage_nested_enum());
+
+  // Check fields defined in "other_package"
+  EXPECT_EQ(11, gold_msg.otherpackage_message().field_int32());
+  EXPECT_EQ(pbgold_other_package::Enum::A,
+            gold_msg.otherpackage_message().field_enum());
+  EXPECT_EQ(pbgold_other_package::Message_NestedEnum_C,
+            gold_msg.otherpackage_message().field_nested_enum());
+  EXPECT_EQ(12, gold_msg.otherpackage_nested_message().field_int32());
+  EXPECT_EQ(pbgold_other_package::Enum::B, gold_msg.otherpackage_enum());
+  EXPECT_EQ(pbgold_other_package::Message_NestedEnum_D,
+            gold_msg.otherpackage_nested_enum());
+}
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/test/example_proto/extensions.proto b/src/libtracing/protozero_src/test/example_proto/extensions.proto
new file mode 100644
index 000000000..bbc344d76
--- /dev/null
+++ b/src/libtracing/protozero_src/test/example_proto/extensions.proto
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package protozero.test.protos;
+
+message RealFakeEvent {
+  optional uint32 base_int = 1;
+  optional string base_string = 2;
+
+  extensions 10 to 99;
+}
+
+message SystemA {
+  optional uint32 int_a = 1;
+  optional string string_a = 2;
+}
+
+message SystemB {
+  optional uint32 int_b = 1;
+  optional string string_b = 2;
+}
+
+// Dummy message used for naming purposes.
+message BrowserExtension {
+  extend RealFakeEvent {
+    optional SystemA extension_a = 10;
+    optional SystemB extension_b = 11;
+  }
+}
diff --git a/src/libtracing/protozero_src/test/example_proto/library.proto b/src/libtracing/protozero_src/test/example_proto/library.proto
new file mode 100644
index 000000000..e01069903
--- /dev/null
+++ b/src/libtracing/protozero_src/test/example_proto/library.proto
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package protozero.test.protos;
+
+import public "src/protozero/test/example_proto/library_internals/galaxies.proto";
+
+message TransgalacticMessage {
+  optional Galaxy origin_galaxy = 1;
+  optional string origin_planet = 2;
+  optional Galaxy destination_galaxy = 3;
+  optional string destination_planet = 4;
+  optional bytes proto_message = 5;
+
+  enum MessageType {
+    REGULAR = 0;
+    EXPRESS = 1;
+  }
+}
diff --git a/src/libtracing/protozero_src/test/example_proto/library_internals/galaxies.proto b/src/libtracing/protozero_src/test/example_proto/library_internals/galaxies.proto
new file mode 100644
index 000000000..75b156a6a
--- /dev/null
+++ b/src/libtracing/protozero_src/test/example_proto/library_internals/galaxies.proto
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package protozero.test.protos;
+
+import public "src/protozero/test/example_proto/upper_import.proto";
+
+enum Galaxy {
+  MILKY_WAY = 1;
+  ANDROMEDA = 2;
+  SUNFLOWER = 3;
+}
diff --git a/src/libtracing/protozero_src/test/example_proto/other_package/test_messages.proto b/src/libtracing/protozero_src/test/example_proto/other_package/test_messages.proto
new file mode 100644
index 000000000..d2990826d
--- /dev/null
+++ b/src/libtracing/protozero_src/test/example_proto/other_package/test_messages.proto
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package other_package;
+
+enum Enum {
+  A = 10;
+  B = 11;
+}
+
+message Message {
+  message NestedMessage {
+    optional int32 field_int32 = 1;
+  }
+
+  enum NestedEnum {
+    C = 12;
+    D = 13;
+  }
+
+  optional int32 field_int32 = 1;
+  optional Enum field_enum = 2;
+  optional NestedEnum field_nested_enum = 3;
+  optional NestedMessage field_nested_message = 4;
+}
diff --git a/src/libtracing/protozero_src/test/example_proto/subpackage/test_messages.proto b/src/libtracing/protozero_src/test/example_proto/subpackage/test_messages.proto
new file mode 100644
index 000000000..6f7c0cce2
--- /dev/null
+++ b/src/libtracing/protozero_src/test/example_proto/subpackage/test_messages.proto
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package protozero.test.protos.subpackage;
+
+enum Enum {
+  A = 1;
+  B = 2;
+}
+
+message Message {
+  message NestedMessage {
+    optional int32 field_int32 = 1;
+  }
+
+  enum NestedEnum {
+    C = 3;
+    D = 4;
+  }
+
+  optional int32 field_int32 = 1;
+  optional Enum field_enum = 2;
+  optional NestedEnum field_nested_enum = 3;
+  optional NestedMessage field_nested_message = 4;
+}
diff --git a/src/libtracing/protozero_src/test/example_proto/test_messages.proto b/src/libtracing/protozero_src/test/example_proto/test_messages.proto
new file mode 100644
index 000000000..b54d8831f
--- /dev/null
+++ b/src/libtracing/protozero_src/test/example_proto/test_messages.proto
@@ -0,0 +1,195 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package protozero.test.protos;
+
+import "src/protozero/test/example_proto/library.proto";
+import "src/protozero/test/example_proto/other_package/test_messages.proto";
+import "src/protozero/test/example_proto/subpackage/test_messages.proto";
+
+// This file contains comprehensive set of supported message structures and
+// data types. Unit tests depends on the plugin-processed version of this file.
+
+// Tests importing message definition from another proto file.
+message TransgalacticParcel {
+  optional TransgalacticMessage message = 1;
+  optional string tracking_code = 2;
+  optional TransgalacticMessage.MessageType message_type = 3;
+}
+
+enum SmallEnum {
+  TO_BE = 1;
+  NOT_TO_BE = 0;
+}
+
+enum SignedEnum {
+  POSITIVE = 1;
+  NEUTRAL = 0;
+  NEGATIVE = -1;
+}
+
+enum BigEnum {
+  BEGIN = 10;
+  END = 100500;
+}
+
+message EveryField {
+  optional int32 field_int32 = 1;
+  optional int64 field_int64 = 2;
+  optional uint32 field_uint32 = 3;
+  optional uint64 field_uint64 = 4;
+  optional sint32 field_sint32 = 5;
+  optional sint64 field_sint64 = 6;
+  optional fixed32 field_fixed32 = 7;
+  optional fixed64 field_fixed64 = 8;
+  optional sfixed32 field_sfixed32 = 9;
+  optional sfixed64 field_sfixed64 = 10;
+  optional float field_float = 11;
+  optional double field_double = 12;
+  optional bool field_bool = 13;
+  repeated EveryField field_nested = 14;
+
+  optional SmallEnum small_enum = 51;
+  optional SignedEnum signed_enum = 52;
+  optional BigEnum big_enum = 53;
+
+  optional string field_string = 500;
+  optional bytes field_bytes = 505;
+
+  enum NestedEnum {
+    PING = 1;
+    PONG = 2;
+  }
+  optional NestedEnum nested_enum = 600;
+
+  repeated string repeated_string = 700;
+  repeated fixed64 repeated_fixed64 = 701;
+  repeated sfixed32 repeated_sfixed32 = 702;
+
+  repeated int32 repeated_int32 = 999;
+}
+
+message NestedA {
+  message NestedB {
+    message NestedC { optional int32 value_c = 1; }
+    optional NestedC value_b = 1;
+  }
+  repeated NestedB repeated_a = 2;
+  optional NestedB.NestedC super_nested = 3;
+}
+
+message CamelCaseFields {
+  // To check that any reasonable name converts to camel case correctly.
+  optional bool foo_bar_baz = 1;
+  optional bool barBaz = 2;
+  optional bool MooMoo = 3;
+  optional bool URLEncoder = 4;
+  optional bool XMap = 5;
+  optional bool UrLE_nco__der = 6;
+  optional bool __bigBang = 7;
+  optional bool U2 = 8;
+  optional bool bangBig__ = 9;
+}
+
+message PackedRepeatedFields {
+  repeated int32 field_int32 = 1 [packed = true];
+  repeated int64 field_int64 = 4 [packed = true];
+  repeated uint32 field_uint32 = 5 [packed = true];
+  repeated uint64 field_uint64 = 6 [packed = true];
+  // Repeated packed Zig-zag fields are currently unsupported by our protoc
+  // plugin.
+  // repeated sint32 field_sint32 = 7 [packed = true];
+  // repeated sint64 field_sint64 = 8 [packed = true];
+  repeated fixed32 field_fixed32 = 2 [packed = true];
+  repeated fixed64 field_fixed64 = 9 [packed = true];
+  repeated sfixed32 field_sfixed32 = 10 [packed = true];
+  repeated sfixed64 field_sfixed64 = 3 [packed = true];
+  repeated float field_float = 11 [packed = true];
+  repeated double field_double = 12 [packed = true];
+  // Repeated (even non-packed) bool fields are currently unsupported by our
+  // protoc plugin.
+  // repeated bool field_bool = 13 [packed = true];
+  repeated SmallEnum small_enum = 51 [packed = true];
+  repeated SignedEnum signed_enum = 52 [packed = true];
+  repeated BigEnum big_enum = 53 [packed = true];
+}
+
+// The following two messages are for testing that unknown fields being
+// preserved in the decode->reencode path.
+
+message TestVersioning_V1 {
+  enum Enumz_V1 {
+    ONE = 1;
+    TWO = 2;
+  }
+  message Sub1_V1 {
+    optional int32 sub1_int = 1;
+    optional string sub1_string = 2;
+  }
+  optional int32 root_int = 1;
+  repeated Enumz_V1 enumz = 2;
+  optional string root_string = 3;
+  repeated string rep_string = 4;
+  optional Sub1_V1 sub1 = 5;
+  repeated Sub1_V1 sub1_rep = 6;
+  optional Sub1_V1 sub1_lazy = 7 [lazy = true];
+}
+
+message TestVersioning_V2 {
+  enum Enumz_V2 {
+    ONE = 1;
+    TWO = 2;
+    THREE_V2 = 3;
+  }
+  message Sub1_V2 {
+    optional int32 sub1_int = 1;
+    optional string sub1_string = 2;
+    optional int32 sub1_int_v2 = 3;      // New in v2.
+    optional string sub1_string_v2 = 4;  // New in v2.
+  }
+  message Sub2_V2 {  // New in v2.
+    optional int32 sub2_int = 1;
+    optional string sub2_string = 2;
+  }
+
+  optional int32 root_int = 1;
+  repeated Enumz_V2 enumz = 2;
+  optional string root_string = 3;
+  repeated string rep_string = 4;
+  optional Sub1_V2 sub1 = 5;
+  repeated Sub1_V2 sub1_rep = 6;
+  optional Sub1_V2 sub1_lazy = 7 [lazy = true];
+
+  // New fields introduced in V2.
+  optional int32 root_int_v2 = 10;
+  optional Sub2_V2 sub2 = 11;
+  repeated Sub2_V2 sub2_rep = 12;
+  optional Sub2_V2 sub2_lazy = 13 [lazy = true];
+}
+
+message DifferentPackages {
+  optional subpackage.Message subpackage_message = 1;
+  optional subpackage.Message.NestedMessage subpackage_nested_message = 2;
+  optional subpackage.Enum subpackage_enum = 3;
+  optional subpackage.Message.NestedEnum subpackage_nested_enum = 4;
+
+  optional .other_package.Message otherpackage_message = 5;
+  optional .other_package.Message.NestedMessage otherpackage_nested_message = 6;
+  optional .other_package.Enum otherpackage_enum = 7;
+  optional .other_package.Message.NestedEnum otherpackage_nested_enum = 8;
+}
diff --git a/src/libtracing/protozero_src/test/example_proto/upper_import.proto b/src/libtracing/protozero_src/test/example_proto/upper_import.proto
new file mode 100644
index 000000000..4479c2506
--- /dev/null
+++ b/src/libtracing/protozero_src/test/example_proto/upper_import.proto
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package protozero.test.protos;
+
+message TrickyPublicImport {}
diff --git a/src/libtracing/protozero_src/test/fake_scattered_buffer.cc b/src/libtracing/protozero_src/test/fake_scattered_buffer.cc
new file mode 100644
index 000000000..1c360634c
--- /dev/null
+++ b/src/libtracing/protozero_src/test/fake_scattered_buffer.cc
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/protozero/test/fake_scattered_buffer.h"
+
+#include <iomanip>
+#include <sstream>
+#include <utility>
+
+#include "test/gtest_and_gmock.h"
+
+namespace protozero {
+
+namespace {
+
+std::string ToHex(const void* data, size_t length) {
+  std::ostringstream ss;
+  ss << std::hex << std::setfill('0');
+  ss << std::uppercase;
+  for (size_t i = 0; i < length; i++) {
+    char c = reinterpret_cast<const char*>(data)[i];
+    ss << std::setw(2) << (static_cast<unsigned>(c) & 0xFF);
+  }
+  return ss.str();
+}
+
+}  // namespace
+
+FakeScatteredBuffer::FakeScatteredBuffer(size_t chunk_size)
+    : chunk_size_(chunk_size) {}
+
+FakeScatteredBuffer::~FakeScatteredBuffer() {}
+
+ContiguousMemoryRange FakeScatteredBuffer::GetNewBuffer() {
+  std::unique_ptr<uint8_t[]> chunk(new uint8_t[chunk_size_]);
+  uint8_t* begin = chunk.get();
+  memset(begin, 0, chunk_size_);
+  chunks_.push_back(std::move(chunk));
+  return {begin, begin + chunk_size_};
+}
+
+std::string FakeScatteredBuffer::GetChunkAsString(size_t chunk_index) {
+  return ToHex(chunks_[chunk_index].get(), chunk_size_);
+}
+
+void FakeScatteredBuffer::GetBytes(size_t start, size_t length, uint8_t* buf) {
+  ASSERT_LE(start + length, chunks_.size() * chunk_size_);
+  for (size_t pos = 0; pos < length; ++pos) {
+    size_t chunk_index = (start + pos) / chunk_size_;
+    size_t chunk_offset = (start + pos) % chunk_size_;
+    buf[pos] = chunks_[chunk_index].get()[chunk_offset];
+  }
+}
+
+std::string FakeScatteredBuffer::GetBytesAsString(size_t start, size_t length) {
+  std::unique_ptr<uint8_t[]> buffer(new uint8_t[length]);
+  GetBytes(start, length, buffer.get());
+  return ToHex(buffer.get(), length);
+}
+
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/test/fake_scattered_buffer.h b/src/libtracing/protozero_src/test/fake_scattered_buffer.h
new file mode 100644
index 000000000..2ccfb8100
--- /dev/null
+++ b/src/libtracing/protozero_src/test/fake_scattered_buffer.h
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_PROTOZERO_TEST_FAKE_SCATTERED_BUFFER_H_
+#define SRC_PROTOZERO_TEST_FAKE_SCATTERED_BUFFER_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "perfetto/protozero/scattered_stream_writer.h"
+
+namespace protozero {
+
+// A simple ScatteredStreamWriter::Delegate implementation which just allocates
+// chunks of a fixed size.
+class FakeScatteredBuffer : public ScatteredStreamWriter::Delegate {
+ public:
+  explicit FakeScatteredBuffer(size_t chunk_size);
+  ~FakeScatteredBuffer() override;
+
+  // ScatteredStreamWriter::Delegate implementation.
+  ContiguousMemoryRange GetNewBuffer() override;
+
+  std::string GetChunkAsString(size_t chunk_index);
+
+  void GetBytes(size_t start, size_t length, uint8_t* buf);
+  std::string GetBytesAsString(size_t start, size_t length);
+
+  const std::vector<std::unique_ptr<uint8_t[]>>& chunks() const {
+    return chunks_;
+  }
+
+ private:
+  const size_t chunk_size_;
+  std::vector<std::unique_ptr<uint8_t[]>> chunks_;
+};
+
+}  // namespace protozero
+
+#endif  // SRC_PROTOZERO_TEST_FAKE_SCATTERED_BUFFER_H_
diff --git a/src/libtracing/protozero_src/test/proto_ring_buffer_benchmark.cc b/src/libtracing/protozero_src/test/proto_ring_buffer_benchmark.cc
new file mode 100644
index 000000000..0c0f7f9af
--- /dev/null
+++ b/src/libtracing/protozero_src/test/proto_ring_buffer_benchmark.cc
@@ -0,0 +1,75 @@
+// Copyright (C) 2022 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.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <benchmark/benchmark.h>
+
+#include <algorithm>
+#include <string>
+
+#include "perfetto/ext/base/file_utils.h"
+#include "perfetto/ext/protozero/proto_ring_buffer.h"
+#include "src/base/test/utils.h"
+
+static void BM_ProtoRingBufferReadLargeChunks(benchmark::State& state) {
+  std::string trace_data;
+  static const char kTestTrace[] = "test/data/example_android_trace_30s.pb";
+  perfetto::base::ReadFile(perfetto::base::GetTestDataPath(kTestTrace),
+                           &trace_data);
+  PERFETTO_CHECK(!trace_data.empty());
+
+  size_t total_packet_size = 0;
+  protozero::ProtoRingBuffer buffer;
+  for (auto _ : state) {
+    protozero::ProtoRingBuffer::Message msg = buffer.ReadMessage();
+    if (msg.valid()) {
+      total_packet_size += msg.len;
+    } else {
+      state.PauseTiming();
+      buffer.Append(trace_data.data(), trace_data.size());
+      state.ResumeTiming();
+    }
+  }
+  benchmark::DoNotOptimize(total_packet_size);
+}
+
+BENCHMARK(BM_ProtoRingBufferReadLargeChunks);
+
+static void BM_ProtoRingBufferRead(benchmark::State& state) {
+  std::string trace_data;
+  static const char kTestTrace[] = "test/data/example_android_trace_30s.pb";
+  perfetto::base::ReadFile(perfetto::base::GetTestDataPath(kTestTrace),
+                           &trace_data);
+  PERFETTO_CHECK(!trace_data.empty());
+
+  constexpr size_t kChunkSize = 1024 * 1024 * 3;
+
+  size_t offset = 0;
+  size_t total_packet_size = 0;
+  protozero::ProtoRingBuffer buffer;
+  for (auto _ : state) {
+    protozero::ProtoRingBuffer::Message msg = buffer.ReadMessage();
+    if (msg.valid()) {
+      total_packet_size += msg.len;
+    } else {
+      state.PauseTiming();
+      size_t sz = std::min(kChunkSize, trace_data.size() - offset);
+      buffer.Append(trace_data.data() + offset, sz);
+      offset = (offset + sz) % trace_data.size();
+      state.ResumeTiming();
+    }
+  }
+  benchmark::DoNotOptimize(total_packet_size);
+}
+
+BENCHMARK(BM_ProtoRingBufferRead);
diff --git a/src/libtracing/protozero_src/test/protozero_benchmark.cc b/src/libtracing/protozero_src/test/protozero_benchmark.cc
new file mode 100644
index 000000000..656eee06c
--- /dev/null
+++ b/src/libtracing/protozero_src/test/protozero_benchmark.cc
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// See /docs/design-docs/protozero.md for rationale and results.
+
+#include <memory>
+#include <vector>
+
+#include <unistd.h>
+
+#include <benchmark/benchmark.h>
+
+#include "perfetto/base/compiler.h"
+#include "perfetto/protozero/static_buffer.h"
+
+// Autogenerated headers in out/*/gen/
+#include "src/protozero/test/example_proto/library.pbzero.h"
+#include "src/protozero/test/example_proto/test_messages.pb.h"
+#include "src/protozero/test/example_proto/test_messages.pbzero.h"
+
+// Generated by the protozero plugin.
+namespace pbzero = protozero::test::protos::pbzero;
+
+// Generated by the official protobuf compiler.
+namespace pblite = protozero::test::protos;
+
+namespace {
+
+// This needs to be > the max size written by each iteration.
+constexpr size_t kBufPerIteration = 512;
+
+// Write cyclically on a 64 MB buffer set to simulate a realistic tracing
+// scenario.
+constexpr size_t kTotalWorkingSetSize = 64 * 1024 * 1024;
+alignas(uint64_t) char g_out_buffer[kTotalWorkingSetSize];
+
+char* g_cur = g_out_buffer;
+
+uint64_t g_fake_input_simple[] = {0x12345678,
+                                  0x90ABCDEF,
+                                  0x11111111,
+                                  0xFFFFFFFF,
+                                  0x6666666666666666ULL,
+                                  0x6666666666666666ULL,
+                                  0x6666666666666666ULL,
+                                  0x0066666666666666ULL};
+
+// Speed-of-light serializer. Aa very simple C++ class that just appends data
+// into a linear buffer making all sorts of favourable assumptions. It does not
+// use any binary-stable encoding, it does not perform bound checking,
+// all writes are 64-bit aligned, it doesn't deal with any thread-safety.
+// The speed-of-light serializer serves as a reference for how fast a serializer
+// could be if argument marshalling and bound checking were zero cost.
+struct SOLMsg {
+  template <typename T>
+  void Append(T x) {
+    // The reinterpret_cast is to give favorable alignment guarantees.
+    // The memcpy will be elided by the compiler, which will emit just a
+    // 64-bit aligned mov instruction.
+    memcpy(reinterpret_cast<void*>(ptr_), &x, sizeof(x));
+    ptr_ += sizeof(uint64_t);
+  }
+
+  void set_field_int32(int32_t x) { Append(x); }
+  void set_field_uint32(uint32_t x) { Append(x); }
+  void set_field_int64(int64_t x) { Append(x); }
+  void set_field_uint64(uint64_t x) { Append(x); }
+  void set_field_string(const char* str) { ptr_ = strcpy(ptr_, str); }
+
+  SOLMsg* add_field_nested() { return new (this + 1) SOLMsg(); }
+
+  alignas(uint64_t) char storage_[sizeof(g_fake_input_simple) + 8];
+  char* ptr_ = &storage_[0];
+};
+
+template <typename T>
+PERFETTO_ALWAYS_INLINE void FillMessage_Simple(T* msg) {
+  benchmark::DoNotOptimize(g_fake_input_simple);
+  msg->set_field_int32(static_cast<int32_t>(g_fake_input_simple[0]));
+  msg->set_field_uint32(static_cast<uint32_t>(g_fake_input_simple[1]));
+  msg->set_field_int64(static_cast<int64_t>(g_fake_input_simple[2]));
+  msg->set_field_uint64(static_cast<uint64_t>(g_fake_input_simple[3]));
+  msg->set_field_string(reinterpret_cast<const char*>(&g_fake_input_simple[4]));
+}
+
+template <typename T>
+PERFETTO_ALWAYS_INLINE void FillMessage_Nested(T* msg, int depth = 0) {
+  benchmark::DoNotOptimize(g_fake_input_simple);
+  FillMessage_Simple(msg);
+  if (depth < 3) {
+    auto* child = msg->add_field_nested();
+    FillMessage_Nested(child, depth + 1);
+  }
+}
+
+PERFETTO_ALWAYS_INLINE void Clobber(benchmark::State& state) {
+  uint64_t* buf = reinterpret_cast<uint64_t*>(g_cur);
+
+  // Read-back the data written to have a realistic evaluation of the
+  // speed-of-light scenario. This is to deal with architecture of modern CPUs.
+  // If we write a bunch of memory bytes, never read-back from them, and then
+  // just over-write them, the CPU can just throw away the whole stream of
+  // instructions that produced them, if that's still in flight and tracked in
+  // the out-of-order units.
+  // The buf[i-1] ^= buf forces the CPU to consume the result of the writes.
+  buf[0] = reinterpret_cast<uint64_t>(&state);
+  for (size_t i = 1; i < kBufPerIteration / sizeof(uint64_t); i++)
+    buf[i] ^= buf[i - 1];
+  if (buf[(kBufPerIteration / sizeof(uint64_t)) - 1] == 42)
+    PERFETTO_LOG(".");
+  benchmark::DoNotOptimize(buf);
+
+  constexpr size_t kWrap = kTotalWorkingSetSize / kBufPerIteration;
+  g_cur = &g_out_buffer[(state.iterations() % kWrap) * kBufPerIteration];
+  benchmark::ClobberMemory();
+}
+
+}  // namespace
+
+static void BM_Protozero_Simple_Libprotobuf(benchmark::State& state) {
+  while (state.KeepRunning()) {
+    {
+      // The nested block is to account for RAII finalizers.
+      pblite::EveryField msg;
+      FillMessage_Simple(&msg);
+      msg.SerializeToArray(g_cur, kBufPerIteration);
+    }
+    Clobber(state);
+  }
+}
+
+static void BM_Protozero_Simple_Protozero(benchmark::State& state) {
+  while (state.KeepRunning()) {
+    {
+      protozero::StaticBuffered<pbzero::EveryField> msg(g_cur,
+                                                        kBufPerIteration);
+      FillMessage_Simple(msg.get());
+    }
+    Clobber(state);
+  }
+}
+
+static void BM_Protozero_Simple_SpeedOfLight(benchmark::State& state) {
+  while (state.KeepRunning()) {
+    SOLMsg* msg = new (g_cur) SOLMsg();
+    FillMessage_Simple(msg);
+    Clobber(state);
+  }
+}
+
+static void BM_Protozero_Nested_Libprotobuf(benchmark::State& state) {
+  while (state.KeepRunning()) {
+    {
+      pblite::EveryField msg;
+      FillMessage_Nested(&msg);
+      msg.SerializeToArray(g_cur, kBufPerIteration);
+    }
+    Clobber(state);
+  }
+}
+
+static void BM_Protozero_Nested_Protozero(benchmark::State& state) {
+  while (state.KeepRunning()) {
+    {
+      protozero::StaticBuffered<pbzero::EveryField> msg(g_cur,
+                                                        kBufPerIteration);
+      FillMessage_Nested(msg.get());
+    }
+    Clobber(state);
+  }
+}
+
+static void BM_Protozero_Nested_SpeedOfLight(benchmark::State& state) {
+  while (state.KeepRunning()) {
+    SOLMsg* msg = new (g_cur) SOLMsg();
+    FillMessage_Nested(msg);
+    Clobber(state);
+  }
+}
+
+BENCHMARK(BM_Protozero_Simple_Libprotobuf);
+BENCHMARK(BM_Protozero_Simple_Protozero);
+BENCHMARK(BM_Protozero_Simple_SpeedOfLight);
+
+BENCHMARK(BM_Protozero_Nested_Libprotobuf);
+BENCHMARK(BM_Protozero_Nested_Protozero);
+BENCHMARK(BM_Protozero_Nested_SpeedOfLight);
diff --git a/src/libtracing/protozero_src/test/protozero_conformance_unittest.cc b/src/libtracing/protozero_src/test/protozero_conformance_unittest.cc
new file mode 100644
index 000000000..3a4b7cfaa
--- /dev/null
+++ b/src/libtracing/protozero_src/test/protozero_conformance_unittest.cc
@@ -0,0 +1,373 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <limits>
+#include <memory>
+#include <vector>
+
+#include "perfetto/protozero/message_handle.h"
+#include "perfetto/protozero/packed_repeated_fields.h"
+#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "test/gtest_and_gmock.h"
+
+// Autogenerated headers in out/*/gen/
+#include "src/protozero/test/example_proto/extensions.pb.h"
+#include "src/protozero/test/example_proto/extensions.pbzero.h"
+#include "src/protozero/test/example_proto/library.pbzero.h"
+#include "src/protozero/test/example_proto/other_package/test_messages.pbzero.h"
+#include "src/protozero/test/example_proto/subpackage/test_messages.pbzero.h"
+#include "src/protozero/test/example_proto/test_messages.pb.h"
+#include "src/protozero/test/example_proto/test_messages.pbzero.h"
+
+// Generated by the protozero plugin.
+namespace pbtest = protozero::test::protos::pbzero;
+namespace pbtest_subpackage = protozero::test::protos::subpackage::pbzero;
+namespace pbtest_otherpackage = other_package::pbzero;
+
+// Generated by the official protobuf compiler.
+namespace pbgold = protozero::test::protos;
+namespace pbgold_subpackage = protozero::test::protos::subpackage;
+namespace pbgold_other_package = other_package;
+
+namespace protozero {
+namespace {
+
+constexpr size_t kChunkSize = 42;
+
+TEST(ProtoZeroConformanceTest, SimpleFieldsNoNesting) {
+  HeapBuffered<pbtest::EveryField> msg{kChunkSize, kChunkSize};
+
+  msg->set_field_int32(-1);
+  msg->set_field_int64(-333123456789ll);
+  msg->set_field_uint32(600);
+  msg->set_field_uint64(333123456789ll);
+  msg->set_field_sint32(-5);
+  msg->set_field_sint64(-9000);
+  msg->set_field_fixed32(12345);
+  msg->set_field_fixed64(444123450000ll);
+  msg->set_field_sfixed32(-69999);
+  msg->set_field_sfixed64(-200);
+  msg->set_field_float(3.14f);
+  msg->set_field_double(0.5555);
+  msg->set_field_bool(true);
+  msg->set_small_enum(pbtest::SmallEnum::TO_BE);
+  msg->set_signed_enum(pbtest::SignedEnum::NEGATIVE);
+  msg->set_big_enum(pbtest::BigEnum::BEGIN);
+  msg->set_field_string("FizzBuzz");
+  msg->set_field_bytes(reinterpret_cast<const uint8_t*>("\x11\x00\xBE\xEF"), 4);
+  msg->add_repeated_int32(1);
+  msg->add_repeated_int32(-1);
+  msg->add_repeated_int32(100);
+  msg->add_repeated_int32(2000000);
+
+  std::string serialized = msg.SerializeAsString();
+  pbgold::EveryField gold_msg;
+  gold_msg.ParseFromString(serialized);
+
+  EXPECT_EQ(-1, gold_msg.field_int32());
+  EXPECT_EQ(-333123456789ll, gold_msg.field_int64());
+  EXPECT_EQ(600u, gold_msg.field_uint32());
+  EXPECT_EQ(333123456789ull, gold_msg.field_uint64());
+  EXPECT_EQ(-5, gold_msg.field_sint32());
+  EXPECT_EQ(-9000, gold_msg.field_sint64());
+  EXPECT_EQ(12345u, gold_msg.field_fixed32());
+  EXPECT_EQ(444123450000ull, gold_msg.field_fixed64());
+  EXPECT_EQ(-69999, gold_msg.field_sfixed32());
+  EXPECT_EQ(-200, gold_msg.field_sfixed64());
+  EXPECT_FLOAT_EQ(3.14f, gold_msg.field_float());
+  EXPECT_DOUBLE_EQ(0.5555, gold_msg.field_double());
+  EXPECT_EQ(true, gold_msg.field_bool());
+  EXPECT_EQ(pbgold::SmallEnum::TO_BE, gold_msg.small_enum());
+  EXPECT_EQ(pbgold::SignedEnum::NEGATIVE, gold_msg.signed_enum());
+  EXPECT_EQ(pbgold::BigEnum::BEGIN, gold_msg.big_enum());
+  EXPECT_EQ("FizzBuzz", gold_msg.field_string());
+  EXPECT_EQ(std::string("\x11\x00\xBE\xEF", 4), gold_msg.field_bytes());
+  EXPECT_EQ(4, gold_msg.repeated_int32_size());
+  EXPECT_EQ(1, gold_msg.repeated_int32(0));
+  EXPECT_EQ(-1, gold_msg.repeated_int32(1));
+  EXPECT_EQ(100, gold_msg.repeated_int32(2));
+  EXPECT_EQ(2000000, gold_msg.repeated_int32(3));
+  EXPECT_EQ(serialized.size(), static_cast<size_t>(gold_msg.ByteSizeLong()));
+}
+
+TEST(ProtoZeroConformanceTest, NestedMessages) {
+  HeapBuffered<pbtest::NestedA> msg_a{kChunkSize, kChunkSize};
+
+  pbtest::NestedA::NestedB* msg_b = msg_a->add_repeated_a();
+  pbtest::NestedA::NestedB::NestedC* msg_c = msg_b->set_value_b();
+  msg_c->set_value_c(321);
+  msg_b = msg_a->add_repeated_a();
+  msg_c = msg_a->set_super_nested();
+  msg_c->set_value_c(1000);
+
+  std::string serialized = msg_a.SerializeAsString();
+  EXPECT_EQ(serialized.size(), 14u);
+
+  pbgold::NestedA gold_msg_a;
+  gold_msg_a.ParseFromString(serialized);
+  EXPECT_EQ(2, gold_msg_a.repeated_a_size());
+  EXPECT_EQ(321, gold_msg_a.repeated_a(0).value_b().value_c());
+  EXPECT_FALSE(gold_msg_a.repeated_a(1).has_value_b());
+  EXPECT_EQ(1000, gold_msg_a.super_nested().value_c());
+}
+
+TEST(ProtoZeroConformanceTest, Extensions) {
+  HeapBuffered<pbtest::BrowserExtension> msg_a{kChunkSize, kChunkSize};
+
+  msg_a->set_base_int(4);
+
+  pbtest::SystemA* msg_b = msg_a->set_extension_a();
+  msg_b->set_int_a(3);
+  msg_b->set_string_a("string a");
+
+  pbtest::SystemB* msg_c = msg_a->set_extension_b();
+  msg_c->set_int_b(10);
+  msg_c->set_string_b("string b");
+
+  msg_a->set_base_string("base string");
+
+  std::string serialized = msg_a.SerializeAsString();
+  pbgold::RealFakeEvent gold_msg_a;
+  gold_msg_a.ParseFromString(serialized);
+
+  EXPECT_EQ(gold_msg_a.base_int(), 4u);
+  EXPECT_EQ(gold_msg_a.base_string(), "base string");
+
+  pbgold::SystemA gold_msg_b =
+      gold_msg_a.GetExtension(pbgold::BrowserExtension::extension_a);
+  EXPECT_EQ(gold_msg_b.int_a(), 3u);
+  EXPECT_EQ(gold_msg_b.string_a(), "string a");
+
+  pbgold::SystemB gold_msg_c =
+      gold_msg_a.GetExtension(pbgold::BrowserExtension::extension_b);
+  EXPECT_EQ(gold_msg_c.int_b(), 10u);
+  EXPECT_EQ(gold_msg_c.string_b(), "string b");
+}
+
+TEST(ProtoZeroConformanceTest, Import) {
+  // Test the includes for indirect public import: library.pbzero.h ->
+  // library_internals/galaxies.pbzero.h -> upper_import.pbzero.h .
+  EXPECT_LE(0u, sizeof(pbtest::TrickyPublicImport));
+}
+
+TEST(ProtoZeroConformanceTest, FieldNumbers) {
+  EXPECT_EQ(1, pbtest::CamelCaseFields::kFooBarBazFieldNumber);
+  EXPECT_EQ(2, pbtest::CamelCaseFields::kBarBazFieldNumber);
+  EXPECT_EQ(3, pbtest::CamelCaseFields::kMooMooFieldNumber);
+  EXPECT_EQ(4, pbtest::CamelCaseFields::kURLEncoderFieldNumber);
+  EXPECT_EQ(5, pbtest::CamelCaseFields::kXMapFieldNumber);
+  EXPECT_EQ(6, pbtest::CamelCaseFields::kUrLENcoDerFieldNumber);
+  EXPECT_EQ(7, pbtest::CamelCaseFields::kBigBangFieldNumber);
+  EXPECT_EQ(8, pbtest::CamelCaseFields::kU2FieldNumber);
+  EXPECT_EQ(9, pbtest::CamelCaseFields::kBangBigFieldNumber);
+}
+
+TEST(ProtoZeroConformanceTest, PackedRepeatedVarint) {
+  int values[] = {42, 255, -1};
+
+  HeapBuffered<pbtest::PackedRepeatedFields> msg{kChunkSize, kChunkSize};
+  PackedVarInt buf;
+  for (auto v : values)
+    buf.Append(v);
+  msg->set_field_int32(buf);
+  std::string serialized = msg.SerializeAsString();
+
+  // Serialized as a length-delimited field with a payload of
+  // concatenated varints. So the size should be:
+  // varint(42) -> 1 byte
+  // varint(255) -> 2 bytes
+  // varint(-1) -> 10 bytes
+  // varint(payload length) -> 1 byte
+  // field type & id(1) -> 1 byte
+  // total: 6 bytes
+  EXPECT_EQ(15u, serialized.size());
+  EXPECT_EQ(proto_utils::MakeTagLengthDelimited(
+                pbtest::PackedRepeatedFields::kFieldInt32FieldNumber),
+            static_cast<uint32_t>(serialized[0]));
+
+  // Correctly parsed by the protobuf library.
+  pbgold::PackedRepeatedFields parsed_gold_msg;
+  parsed_gold_msg.ParseFromString(serialized);
+  ASSERT_THAT(parsed_gold_msg.field_int32(), testing::ElementsAreArray(values));
+
+  // Encoded identically by the protobuf library.
+  pbgold::PackedRepeatedFields gold_msg;
+  for (auto v : values)
+    gold_msg.add_field_int32(v);
+  ASSERT_EQ(gold_msg.SerializeAsString(), serialized);
+}
+
+TEST(ProtoZeroConformanceTest, PackedRepeatedFixed32) {
+  uint32_t values[] = {1, 2, 4, 8};
+
+  HeapBuffered<pbtest::PackedRepeatedFields> msg{kChunkSize, kChunkSize};
+  PackedFixedSizeInt<uint32_t> buf;
+  for (auto v : values)
+    buf.Append(v);
+  msg->set_field_fixed32(buf);
+  std::string serialized = msg.SerializeAsString();
+
+  // 4x4 bytes payload + 1 byte length + 1 byte tag & field
+  EXPECT_EQ(18u, serialized.size());
+  EXPECT_EQ(proto_utils::MakeTagLengthDelimited(
+                pbtest::PackedRepeatedFields::kFieldFixed32FieldNumber),
+            static_cast<uint32_t>(serialized[0]));
+
+  // Correctly parsed by the protobuf library.
+  pbgold::PackedRepeatedFields parsed_gold_msg;
+  parsed_gold_msg.ParseFromString(serialized);
+  ASSERT_THAT(parsed_gold_msg.field_fixed32(),
+              testing::ElementsAreArray(values));
+
+  // Encoded identically by the protobuf library.
+  pbgold::PackedRepeatedFields gold_msg;
+  for (auto v : values)
+    gold_msg.add_field_fixed32(v);
+  ASSERT_EQ(gold_msg.SerializeAsString(), serialized);
+}
+
+TEST(ProtoZeroConformanceTest, PackedRepeatedFixed64) {
+  int64_t values[] = {1, -2, 4, -8};
+
+  HeapBuffered<pbtest::PackedRepeatedFields> msg{kChunkSize, kChunkSize};
+  PackedFixedSizeInt<int64_t> buf;
+  for (auto v : values)
+    buf.Append(v);
+  msg->set_field_sfixed64(buf);
+  std::string serialized = msg.SerializeAsString();
+
+  // 4x8 bytes payload + 1 byte length + 1 byte tag & field
+  EXPECT_EQ(34u, serialized.size());
+  EXPECT_EQ(proto_utils::MakeTagLengthDelimited(
+                pbtest::PackedRepeatedFields::kFieldSfixed64FieldNumber),
+            static_cast<uint32_t>(serialized[0]));
+
+  // Correctly parsed by the protobuf library.
+  pbgold::PackedRepeatedFields parsed_gold_msg;
+  parsed_gold_msg.ParseFromString(serialized);
+  ASSERT_THAT(parsed_gold_msg.field_sfixed64(),
+              testing::ElementsAreArray(values));
+
+  // Encoded identically by the protobuf library.
+  pbgold::PackedRepeatedFields gold_msg;
+  for (auto v : values)
+    gold_msg.add_field_sfixed64(v);
+  ASSERT_EQ(gold_msg.SerializeAsString(), serialized);
+}
+
+TEST(ProtoZeroConformanceTest, EmptyPackedRepeatedField) {
+  HeapBuffered<pbtest::PackedRepeatedFields> msg;
+  PackedVarInt buf;
+  msg->set_field_int32(buf);
+  std::string serialized = msg.SerializeAsString();
+
+  // Encoded as 2 bytes: tag/field, and a length of zero.
+  EXPECT_EQ(2u, serialized.size());
+  EXPECT_EQ(proto_utils::MakeTagLengthDelimited(
+                pbtest::PackedRepeatedFields::kFieldInt32FieldNumber),
+            static_cast<uint32_t>(serialized[0]));
+  EXPECT_EQ(0, serialized[1]);
+
+  // Correctly parsed by the protobuf library.
+  pbgold::PackedRepeatedFields parsed_gold_msg;
+  parsed_gold_msg.ParseFromString(serialized);
+  EXPECT_EQ(0, parsed_gold_msg.field_int32_size());
+}
+
+// Tests that the stack -> heap expansion dosn't lose data.
+TEST(ProtoZeroConformanceTest, PackedRepeatedResize) {
+  const int kNumValues = 32768;
+  const int64_t kMultiplier = 10000000;
+  HeapBuffered<pbtest::PackedRepeatedFields> msg{kChunkSize, kChunkSize};
+  PackedFixedSizeInt<int64_t> buf;
+  for (int i = 0; i < kNumValues; i++)
+    buf.Append(i * kMultiplier);
+  msg->set_field_sfixed64(buf);
+  std::string serialized = msg.SerializeAsString();
+
+  // Correctly parsed by the protobuf library.
+  pbgold::PackedRepeatedFields parsed_gold_msg;
+  parsed_gold_msg.ParseFromString(serialized);
+  ASSERT_EQ(parsed_gold_msg.field_sfixed64().size(), kNumValues);
+  for (int i = 0; i < kNumValues; i++) {
+    ASSERT_EQ(parsed_gold_msg.field_sfixed64(i), i * kMultiplier);
+  }
+}
+
+TEST(ProtoZeroConformanceTest, EnumToString) {
+  EXPECT_STREQ(protozero::test::protos::pbzero::SmallEnum_Name(
+                   protozero::test::protos::pbzero::SmallEnum::TO_BE),
+               "TO_BE");
+  EXPECT_STREQ(protozero::test::protos::pbzero::EveryField::NestedEnum_Name(
+                   protozero::test::protos::pbzero::EveryField::PING),
+               "PING");
+}
+
+TEST(ProtoZeroConformanceTest, DifferentPackages) {
+  HeapBuffered<pbtest::DifferentPackages> msg{kChunkSize, kChunkSize};
+
+  // Pupulate fields defined in "protozero.test.protos.subpackage"
+  pbtest_subpackage::Message* msgSubpackage = msg->set_subpackage_message();
+  msgSubpackage->set_field_int32(1);
+  msgSubpackage->set_field_enum(pbtest_subpackage::Enum::A);
+  msgSubpackage->set_field_nested_enum(
+      pbtest_subpackage::Message::NestedEnum::C);
+  msg->set_subpackage_nested_message()->set_field_int32(2);
+  msg->set_subpackage_enum(pbtest_subpackage::Enum::B);
+  msg->set_subpackage_nested_enum(pbtest_subpackage::Message_NestedEnum::D);
+
+  // Pupulate fields defined in "other_package"
+  pbtest_otherpackage::Message* msgOtherPackage =
+      msg->set_otherpackage_message();
+  msgOtherPackage->set_field_int32(11);
+  msgOtherPackage->set_field_enum(pbtest_otherpackage::Enum::A);
+  msgOtherPackage->set_field_nested_enum(
+      pbtest_otherpackage::Message::NestedEnum::C);
+  msg->set_otherpackage_nested_message()->set_field_int32(12);
+  msg->set_otherpackage_enum(pbtest_otherpackage::Enum::B);
+  msg->set_otherpackage_nested_enum(pbtest_otherpackage::Message_NestedEnum::D);
+
+  // Deserialize into golden proto
+  std::string serialized = msg.SerializeAsString();
+  pbgold::DifferentPackages gold_msg;
+  gold_msg.ParseFromString(serialized);
+  EXPECT_EQ(serialized.size(), static_cast<size_t>(gold_msg.ByteSizeLong()));
+
+  // Check fields defined in "protozero.test.protos.subpackage"
+  EXPECT_EQ(1, gold_msg.subpackage_message().field_int32());
+  EXPECT_EQ(pbgold_subpackage::Enum::A,
+            gold_msg.subpackage_message().field_enum());
+  EXPECT_EQ(pbgold_subpackage::Message_NestedEnum_C,
+            gold_msg.subpackage_message().field_nested_enum());
+  EXPECT_EQ(2, gold_msg.subpackage_nested_message().field_int32());
+  EXPECT_EQ(pbgold_subpackage::Enum::B, gold_msg.subpackage_enum());
+  EXPECT_EQ(pbgold_subpackage::Message_NestedEnum_D,
+            gold_msg.subpackage_nested_enum());
+
+  // Check fields defined in "other_package"
+  EXPECT_EQ(11, gold_msg.otherpackage_message().field_int32());
+  EXPECT_EQ(pbgold_other_package::Enum::A,
+            gold_msg.otherpackage_message().field_enum());
+  EXPECT_EQ(pbgold_other_package::Message_NestedEnum_C,
+            gold_msg.otherpackage_message().field_nested_enum());
+  EXPECT_EQ(12, gold_msg.otherpackage_nested_message().field_int32());
+  EXPECT_EQ(pbgold_other_package::Enum::B, gold_msg.otherpackage_enum());
+  EXPECT_EQ(pbgold_other_package::Message_NestedEnum_D,
+            gold_msg.otherpackage_nested_enum());
+}
+
+}  // namespace
+}  // namespace protozero
diff --git a/src/libtracing/protozero_src/virtual_destructors.cc b/src/libtracing/protozero_src/virtual_destructors.cc
new file mode 100644
index 000000000..1c9c8a6d6
--- /dev/null
+++ b/src/libtracing/protozero_src/virtual_destructors.cc
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/protozero/cpp_message_obj.h"
+#include "perfetto/protozero/message_handle.h"
+
+namespace protozero {
+
+CppMessageObj::~CppMessageObj() = default;
+MessageFinalizationListener::~MessageFinalizationListener() = default;
+
+}  // namespace protozero