      (current_toolchain == v8_snapshot_toolchain &&
       v8_toolset_for_shell == "host") ||
      (current_toolchain != host_toolchain && v8_toolset_for_shell == "target")
-
+ 
 +if (!muon_build) {
  group("gn_all") {
    testonly = true
-
-@@ -2653,6 +2687,7 @@ v8_executable("v8_parser_shell") {
+ 
+@@ -2653,6 +2691,7 @@ v8_executable("v8_parser_shell") {
      deps += [ "//third_party/icu" ]
    }
  }
 +}
-
+ 
  if (want_v8_shell) {
    v8_executable("v8_shell") {
-@@ -2681,6 +2716,7 @@ if (want_v8_shell) {
+@@ -2681,6 +2720,7 @@ if (want_v8_shell) {
    }
  }
-
+ 
 +if (!muon_build) {
  template("v8_fuzzer") {
    name = target_name
    forward_variables_from(invoker, "*")
-@@ -3001,3 +3037,4 @@ v8_source_set("wasm_data_section_fuzzer") {
-
+@@ -3001,3 +3041,4 @@ v8_source_set("wasm_data_section_fuzzer") {
+ 
  v8_fuzzer("wasm_data_section_fuzzer") {
  }
 +}

 #include "src/base/platform/platform.h"
@@ -16,7 +16,6 @@
 #include "src/snapshot/startup-serializer.h"

 using namespace v8;
-
 class SnapshotWriter {

+  group("json_fuzzer") {}
+  group("regexp_fuzzer") {}
+  group("wasm_fuzzer") {}
+  group("v8_libbase") {}
+} else {
 ###############################################################################
 # Actions
 #
@@ -2465,13 +2502,14 @@ v8_executable("mkpeephole") {
 ###############################################################################
 # Public targets
 #
