commit e459edf74e1c07e626dc24dc712fb06748faab9f
author Lalit Maganti <lalitm@google.com> Fri Feb 16 15:39:30 2024 +0000
committer Lalit Maganti <lalitm@google.com> Fri Feb 16 15:39:30 2024 +0000
tree c4025b0cafe655e533610610ac09c7fea15ef9f4
parent 755d0d2468967c0637492a135d5c632d11f69162

tp: change export_json back to a source_set

Turns out static_library creates duplicate symbol problems so just turn
it back to a source_set

Change-Id: I75113cac81d3cf21d7de84d35db7c00a6dc50a98

Android.bp

diff --git a/Android.bp b/Android.bp
index 6ae4bc0..4165586 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2325,7 +2325,7 @@
         ":perfetto_src_trace_processor_db_column_column",
         ":perfetto_src_trace_processor_db_db",
         ":perfetto_src_trace_processor_db_minimal",
-        ":perfetto_src_trace_processor_export_json_sources",
+        ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
         ":perfetto_src_trace_processor_importers_common_parser_types",
@@ -11022,9 +11022,9 @@
     ],
 }
 
-// GN: //src/trace_processor:export_json_sources
+// GN: //src/trace_processor:export_json
 filegroup {
-    name: "perfetto_src_trace_processor_export_json_sources",
+    name: "perfetto_src_trace_processor_export_json",
     srcs: [
         "src/trace_processor/export_json.cc",
     ],
@@ -13800,7 +13800,7 @@
         ":perfetto_src_trace_processor_db_db",
         ":perfetto_src_trace_processor_db_minimal",
         ":perfetto_src_trace_processor_db_unittests",
-        ":perfetto_src_trace_processor_export_json_sources",
+        ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_android_bugreport_unittests",
         ":perfetto_src_trace_processor_importers_common_common",
@@ -14516,7 +14516,7 @@
         ":perfetto_src_trace_processor_db_column_column",
         ":perfetto_src_trace_processor_db_db",
         ":perfetto_src_trace_processor_db_minimal",
-        ":perfetto_src_trace_processor_export_json_sources",
+        ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
         ":perfetto_src_trace_processor_importers_common_parser_types",
@@ -14751,7 +14751,7 @@
         ":perfetto_src_trace_processor_db_column_column",
         ":perfetto_src_trace_processor_db_db",
         ":perfetto_src_trace_processor_db_minimal",
-        ":perfetto_src_trace_processor_export_json_sources",
+        ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
         ":perfetto_src_trace_processor_importers_common_parser_types",