diff --git a/gn/perfetto.gni b/gn/perfetto.gni
index 4bf6252..2045502 100644
--- a/gn/perfetto.gni
+++ b/gn/perfetto.gni
@@ -161,8 +161,7 @@
 
   # Misc host executable under tools/.
   enable_perfetto_tools =
-      (perfetto_build_standalone && current_toolchain == host_toolchain) ||
-      perfetto_build_with_android
+      perfetto_build_with_android || perfetto_build_standalone
 
   # Allows to build the UI (TypeScript/ HTML / WASM)
   enable_perfetto_ui = perfetto_build_standalone
diff --git a/tools/tmux b/tools/tmux
index 7bc2734..2959ed0 100755
--- a/tools/tmux
+++ b/tools/tmux
@@ -186,7 +186,11 @@
   DIR=$(mktemp -p $TMPDIR -d perfetto.XXXXXX)
 fi
 
-tools/ninja -C "$OUT" traced traced_probes perfetto trace_to_text test/configs
+if is_android "$OUT"; then
+  tools/ninja -C "$OUT" traced traced_probes perfetto test/configs
+else
+  tools/ninja -C "$OUT" traced traced_probes perfetto test/configs trace_to_text
+fi
 
 push "$OUT/traced"
 push "$OUT/traced_probes"