diff --git a/BUILD.gn b/BUILD.gn
index 367b8b6..812ddb8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -48,6 +48,9 @@
     ":perfetto_unittests",
     "src/protozero/protoc_plugin($host_toolchain)",
   ]
+  if (perfetto_build_standalone || build_with_chromium) {
+    deps += [ ":trace_processor" ]
+  }
   if (perfetto_build_standalone || perfetto_build_with_android) {
     deps += [
       ":perfetto",
@@ -64,7 +67,6 @@
     if (perfetto_build_standalone) {
       deps += [
         ":perfetto_benchmarks",
-        ":trace_processor",
         "src/profiling/memory:ring_buffer",
         "src/tracing:consumer_api_test",
         "test/configs",
@@ -87,13 +89,6 @@
       }
     }
   }
-
-  # TODO(khokhlov): Remove this once the chrome dep is added. This is a
-  # temporary target to make sure that we don't regress trace processor support
-  # for the Windows build.
-  if (build_with_chromium) {
-    deps += [ "src/trace_processor:lib" ]
-  }
 }
 
 # TODO(primiano): temporary workaround to:
@@ -106,15 +101,9 @@
   ]
 }
 
-if (perfetto_build_standalone) {
-  group("ui") {
-    deps = [
-      "ui",
-    ]
-  }
-
-  # The trace processor shell executable. An interactive shell that allows to
-  # make queries on the trace using the terminal.
+# The trace processor shell executable. An interactive shell that allows to
+# make queries on the trace using the terminal.
+if (perfetto_build_standalone || build_with_chromium) {
   group("trace_processor") {
     deps = [
       "src/trace_processor:trace_processor_shell",
@@ -123,6 +112,14 @@
   }
 }
 
+if (perfetto_build_standalone) {
+  group("ui") {
+    deps = [
+      "ui",
+    ]
+  }
+}
+
 test("perfetto_unittests") {
   deps = [
     "gn:default_deps",