Partial revert of "Partial revert of aosp/2166563"
This reverts commit 241aa3e101f9434b5fcbe683f79c576da9c0cf35.
Let's reenable the test outside of Chromium. The underlying code is for trace processor only, so we don't really need it in Chromium anyway.
The Chromium roll is tested in crrev.com/c/3829089
Bug: b/241234937
Change-Id: I09819543e3c668d2b121e7b4b491804dc9b87517
diff --git a/Android.bp b/Android.bp
index 3121f00..559160d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9534,6 +9534,14 @@
name: "perfetto_src_trace_processor_util_interned_message_view",
}
+// GN: //src/trace_processor/util:proto_profiler
+filegroup {
+ name: "perfetto_src_trace_processor_util_proto_profiler",
+ srcs: [
+ "src/trace_processor/util/proto_profiler.cc",
+ ],
+}
+
// GN: //src/trace_processor/util:proto_to_args_parser
filegroup {
name: "perfetto_src_trace_processor_util_proto_to_args_parser",
@@ -9565,6 +9573,7 @@
srcs: [
"src/trace_processor/util/debug_annotation_parser_unittest.cc",
"src/trace_processor/util/gzip_utils_unittest.cc",
+ "src/trace_processor/util/proto_profiler_unittest.cc",
"src/trace_processor/util/proto_to_args_parser_unittest.cc",
"src/trace_processor/util/protozero_to_text_unittests.cc",
"src/trace_processor/util/streaming_line_reader_unittest.cc",
@@ -10780,6 +10789,7 @@
":perfetto_protos_perfetto_trace_translation_cpp_gen",
":perfetto_protos_perfetto_trace_translation_lite_gen",
":perfetto_protos_perfetto_trace_translation_zero_gen",
+ ":perfetto_protos_third_party_pprof_zero_gen",
":perfetto_protos_third_party_statsd_config_zero_gen",
":perfetto_src_android_internal_headers",
":perfetto_src_android_internal_lazy_library_loader",
@@ -10880,6 +10890,7 @@
":perfetto_src_trace_processor_util_descriptors",
":perfetto_src_trace_processor_util_gzip",
":perfetto_src_trace_processor_util_interned_message_view",
+ ":perfetto_src_trace_processor_util_proto_profiler",
":perfetto_src_trace_processor_util_proto_to_args_parser",
":perfetto_src_trace_processor_util_protozero_to_text",
":perfetto_src_trace_processor_util_stack_traces_util",
@@ -11065,6 +11076,7 @@
"perfetto_protos_perfetto_trace_translation_cpp_gen_headers",
"perfetto_protos_perfetto_trace_translation_lite_gen_headers",
"perfetto_protos_perfetto_trace_translation_zero_gen_headers",
+ "perfetto_protos_third_party_pprof_zero_gen_headers",
"perfetto_protos_third_party_statsd_config_zero_gen_headers",
"perfetto_src_base_version_gen_h",
"perfetto_src_ipc_test_messages_cpp_gen_headers",