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",
diff --git a/BUILD b/BUILD
index 9f710ed..e6649d9 100644
--- a/BUILD
+++ b/BUILD
@@ -219,7 +219,7 @@
         ":src_trace_processor_db_column_column",
         ":src_trace_processor_db_db",
         ":src_trace_processor_db_minimal",
-        ":src_trace_processor_export_json_sources",
+        ":src_trace_processor_export_json",
         ":src_trace_processor_importers_android_bugreport_android_bugreport",
         ":src_trace_processor_importers_common_common",
         ":src_trace_processor_importers_common_parser_types",
@@ -2822,9 +2822,9 @@
     linkstatic = True,
 )
 
-# GN target: //src/trace_processor:export_json_sources
+# GN target: //src/trace_processor:export_json
 perfetto_filegroup(
-    name = "src_trace_processor_export_json_sources",
+    name = "src_trace_processor_export_json",
     srcs = [
         "src/trace_processor/export_json.cc",
         "src/trace_processor/export_json.h",
@@ -5538,7 +5538,7 @@
         ":src_trace_processor_db_column_column",
         ":src_trace_processor_db_db",
         ":src_trace_processor_db_minimal",
-        ":src_trace_processor_export_json_sources",
+        ":src_trace_processor_export_json",
         ":src_trace_processor_importers_android_bugreport_android_bugreport",
         ":src_trace_processor_importers_common_common",
         ":src_trace_processor_importers_common_parser_types",
@@ -5704,7 +5704,7 @@
         ":src_trace_processor_db_column_column",
         ":src_trace_processor_db_db",
         ":src_trace_processor_db_minimal",
-        ":src_trace_processor_export_json_sources",
+        ":src_trace_processor_export_json",
         ":src_trace_processor_importers_android_bugreport_android_bugreport",
         ":src_trace_processor_importers_common_common",
         ":src_trace_processor_importers_common_parser_types",
@@ -5928,7 +5928,7 @@
         ":src_trace_processor_db_column_column",
         ":src_trace_processor_db_db",
         ":src_trace_processor_db_minimal",
-        ":src_trace_processor_export_json_sources",
+        ":src_trace_processor_export_json",
         ":src_trace_processor_importers_android_bugreport_android_bugreport",
         ":src_trace_processor_importers_common_common",
         ":src_trace_processor_importers_common_parser_types",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index c8e257b..694b515 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -46,11 +46,19 @@
 # Depended upon by Chrome to do proto -> JSON conversion of traces.
 # Must be small binary size as all code here needs to be shipped in
 # Chrome.
-static_library("export_json") {
-  complete_static_lib = true
+source_set("export_json") {
+  sources = [
+    "export_json.cc",
+    "export_json.h",
+  ]
   deps = [
-    ":export_json_sources",
+    ":storage_minimal",
     "../../gn:default_deps",
+    "../../include/perfetto/ext/trace_processor:export_json",
+    "../base",
+    "importers/json:minimal",
+    "storage",
+    "types",
   ]
   public_deps = [ "../../include/perfetto/ext/trace_processor:export_json" ]
 }
@@ -129,22 +137,6 @@
   public_deps = [ "../../include/perfetto/trace_processor:storage" ]
 }
 
-source_set("export_json_sources") {
-  sources = [
-    "export_json.cc",
-    "export_json.h",
-  ]
-  deps = [
-    ":storage_minimal",
-    "../../gn:default_deps",
-    "../../include/perfetto/ext/trace_processor:export_json",
-    "../base",
-    "importers/json:minimal",
-    "storage",
-    "types",
-  ]
-}
-
 if (enable_perfetto_trace_processor_sqlite) {
   source_set("lib") {
     sources = [
@@ -261,7 +253,7 @@
     # windows.
     sources += [ "export_json_unittest.cc" ]
     deps += [
-      ":export_json_sources",
+      ":export_json",
       "../../gn:jsoncpp",
       "../../include/perfetto/ext/trace_processor:export_json",
       "containers",
diff --git a/src/trace_processor/perfetto_sql/intrinsics/functions/BUILD.gn b/src/trace_processor/perfetto_sql/intrinsics/functions/BUILD.gn
index ea8b3ae..e34973c 100644
--- a/src/trace_processor/perfetto_sql/intrinsics/functions/BUILD.gn
+++ b/src/trace_processor/perfetto_sql/intrinsics/functions/BUILD.gn
@@ -42,7 +42,7 @@
   ]
   deps = [
     "../../..:demangle",
-    "../../..:export_json_sources",
+    "../../..:export_json",
     "../../..:metatrace",
     "../../../../../gn:default_deps",
     "../../../../../gn:sqlite",