diff --git a/Android.bp b/Android.bp
index f3ebaa9..c42d742 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1931,6 +1931,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",
@@ -1953,6 +1954,7 @@
         "external/perfetto/protos/perfetto/common/commit_data_request.gen.cc",
         "external/perfetto/protos/perfetto/common/data_source_descriptor.gen.cc",
         "external/perfetto/protos/perfetto/common/descriptor.gen.cc",
+        "external/perfetto/protos/perfetto/common/ftrace_descriptor.gen.cc",
         "external/perfetto/protos/perfetto/common/gpu_counter_descriptor.gen.cc",
         "external/perfetto/protos/perfetto/common/interceptor_descriptor.gen.cc",
         "external/perfetto/protos/perfetto/common/observable_events.gen.cc",
@@ -1975,6 +1977,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",
@@ -1997,6 +2000,7 @@
         "external/perfetto/protos/perfetto/common/commit_data_request.gen.h",
         "external/perfetto/protos/perfetto/common/data_source_descriptor.gen.h",
         "external/perfetto/protos/perfetto/common/descriptor.gen.h",
+        "external/perfetto/protos/perfetto/common/ftrace_descriptor.gen.h",
         "external/perfetto/protos/perfetto/common/gpu_counter_descriptor.gen.h",
         "external/perfetto/protos/perfetto/common/interceptor_descriptor.gen.h",
         "external/perfetto/protos/perfetto/common/observable_events.gen.h",
@@ -2023,6 +2027,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",
@@ -2044,6 +2049,7 @@
         "external/perfetto/protos/perfetto/common/commit_data_request.pb.cc",
         "external/perfetto/protos/perfetto/common/data_source_descriptor.pb.cc",
         "external/perfetto/protos/perfetto/common/descriptor.pb.cc",
+        "external/perfetto/protos/perfetto/common/ftrace_descriptor.pb.cc",
         "external/perfetto/protos/perfetto/common/gpu_counter_descriptor.pb.cc",
         "external/perfetto/protos/perfetto/common/interceptor_descriptor.pb.cc",
         "external/perfetto/protos/perfetto/common/observable_events.pb.cc",
@@ -2066,6 +2072,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",
@@ -2087,6 +2094,7 @@
         "external/perfetto/protos/perfetto/common/commit_data_request.pb.h",
         "external/perfetto/protos/perfetto/common/data_source_descriptor.pb.h",
         "external/perfetto/protos/perfetto/common/descriptor.pb.h",
+        "external/perfetto/protos/perfetto/common/ftrace_descriptor.pb.h",
         "external/perfetto/protos/perfetto/common/gpu_counter_descriptor.pb.h",
         "external/perfetto/protos/perfetto/common/interceptor_descriptor.pb.h",
         "external/perfetto/protos/perfetto/common/observable_events.pb.h",
@@ -2113,6 +2121,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",
@@ -2135,6 +2144,7 @@
         "external/perfetto/protos/perfetto/common/commit_data_request.pbzero.cc",
         "external/perfetto/protos/perfetto/common/data_source_descriptor.pbzero.cc",
         "external/perfetto/protos/perfetto/common/descriptor.pbzero.cc",
+        "external/perfetto/protos/perfetto/common/ftrace_descriptor.pbzero.cc",
         "external/perfetto/protos/perfetto/common/gpu_counter_descriptor.pbzero.cc",
         "external/perfetto/protos/perfetto/common/interceptor_descriptor.pbzero.cc",
         "external/perfetto/protos/perfetto/common/observable_events.pbzero.cc",
@@ -2157,6 +2167,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",
@@ -2179,6 +2190,7 @@
         "external/perfetto/protos/perfetto/common/commit_data_request.pbzero.h",
         "external/perfetto/protos/perfetto/common/data_source_descriptor.pbzero.h",
         "external/perfetto/protos/perfetto/common/descriptor.pbzero.h",
+        "external/perfetto/protos/perfetto/common/ftrace_descriptor.pbzero.h",
         "external/perfetto/protos/perfetto/common/gpu_counter_descriptor.pbzero.h",
         "external/perfetto/protos/perfetto/common/interceptor_descriptor.pbzero.h",
         "external/perfetto/protos/perfetto/common/observable_events.pbzero.h",
@@ -2391,6 +2403,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",
@@ -4094,6 +4107,7 @@
         "protos/perfetto/common/commit_data_request.proto",
         "protos/perfetto/common/data_source_descriptor.proto",
         "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
         "protos/perfetto/common/gpu_counter_descriptor.proto",
         "protos/perfetto/common/interceptor_descriptor.proto",
         "protos/perfetto/common/observable_events.proto",