1 files changed, 6 insertions, 35 deletions

diff --git a/protos/perfetto/trace/interned_data/interned_data.proto b/protos/perfetto/trace/interned_data/interned_data.proto
index 3cacef97c..4120e812b 100644
--- a/protos/perfetto/trace/interned_data/interned_data.proto
+++ b/protos/perfetto/trace/interned_data/interned_data.proto
@@ -17,11 +17,9 @@
 syntax = "proto2";
 option optimize_for = LITE_RUNTIME;
 
-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";
+import "perfetto/trace/track_event/debug_annotation.proto";
+import "perfetto/trace/track_event/task_execution.proto";
+import "perfetto/trace/track_event/track_event.proto";
 
 package perfetto.protos;
 
@@ -39,7 +37,7 @@ package perfetto.protos;
 // 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).
+// index is periodically reset (see |incremental_state_cleared| in TracePacket).
 // When packet loss occurs, the reader will only lose interning data up to the
 // next reset.
 // -----------------------------------------------------------------------------
@@ -51,12 +49,8 @@ package perfetto.protos;
 // 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: 23.
+// Next id: 5.
 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
@@ -65,31 +59,8 @@ message InternedData {
   // within the same tracing session, even after a reset of the emitted
   // interning state.
   repeated EventCategory event_categories = 1;
-  repeated EventName event_names = 2;
+  repeated LegacyEventName legacy_event_names = 2;
   repeated DebugAnnotationName debug_annotation_names = 3;
   repeated SourceLocation source_locations = 4;
-  repeated LogMessageBody log_message_body = 20;
-
   // 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;
 }