[build] Unify snapshot targets

Change-Id: I208b0e39b3755e84683aae9f6e23053858120b6c
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1906383Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#64904}

BUILD.gn

@@ -1384,94 +1384,50 @@ action("v8_dump_build_config") {
 # Source Sets (aka static libraries)
 #
 
-source_set("v8_maybe_snapshot") {
-  if (v8_use_external_startup_data) {
-    public_deps = [
-      ":v8_external_snapshot",
-    ]
-  } else {
-    public_deps = [
-      ":v8_snapshot",
-    ]
-  }
-}
-
-if (!v8_use_external_startup_data) {
-  v8_source_set("v8_snapshot") {
-    # Only targets in this file and the top-level visibility target can
-    # depend on this.
-    visibility = [
-      ":*",
-      "//:gn_visibility",
-    ]
+v8_source_set("v8_snapshot") {
+  visibility = [ ":*" ]  # Targets in this file can depend on this.
 
-    deps = []
-    public_deps = [
-      # This should be public so downstream targets can declare the snapshot
-      # output file as their inputs.
-      ":run_mksnapshot_default",
-      ":v8_maybe_icu",
-    ]
+  deps = []
+  public_deps = [
+    # This should be public so downstream targets can declare the snapshot
+    # output file as their inputs.
+    ":run_mksnapshot_default",
+  ]
 
-    # Do not publicize any header to remove build dependency.
-    public = []
+  # Do not publicize any header to remove build dependency.
+  public = []
 
-    sources = [
-      "$target_gen_dir/snapshot.cc",
-      "src/init/setup-isolate-deserialize.cc",
-    ]
-
-    if (emit_builtins_as_inline_asm) {
-      deps += [ ":asm_to_inline_asm_default" ]
-      sources += [ "$target_gen_dir/embedded.cc" ]
-    } else {
-      sources += [ "$target_gen_dir/embedded.S" ]
-    }
-
-    configs = [ ":internal_config" ]
+  sources = [ "src/init/setup-isolate-deserialize.cc" ]
+  if (emit_builtins_as_inline_asm) {
+    deps += [ ":asm_to_inline_asm_default" ]
+    sources += [ "$target_gen_dir/embedded.cc" ]
+  } else {
+    sources += [ "$target_gen_dir/embedded.S" ]
   }
-}
 
-if (v8_use_external_startup_data) {
-  v8_source_set("v8_external_snapshot") {
-    visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  configs = [ ":internal_config" ]
 
-    deps = [
-      ":v8_base",
-    ]
-    public_deps = [
-      ":run_mksnapshot_default",
-    ]
+  if (v8_use_external_startup_data) {
+    deps += [ ":v8_base" ]
+
+    sources += [ "src/snapshot/snapshot-external.cc" ]
 
     if (v8_use_multi_snapshots) {
       public_deps += [ ":run_mksnapshot_trusted" ]
-    }
-
-    sources = [
-      "src/init/setup-isolate-deserialize.cc",
-      "src/snapshot/snapshot-external.cc",
-    ]
-
-    # Do not publicize any header to remove build dependency.
-    public = []
-
-    if (emit_builtins_as_inline_asm) {
-      deps += [ ":asm_to_inline_asm_default" ]
-      sources += [ "$target_gen_dir/embedded.cc" ]
-
-      if (v8_use_multi_snapshots) {
+      if (emit_builtins_as_inline_asm) {
         deps += [ ":asm_to_inline_asm_trusted" ]
         sources += [ "$target_gen_dir/embedded_trusted.cc" ]
-      }
-    } else {
-      sources += [ "$target_gen_dir/embedded.S" ]
-
-      if (v8_use_multi_snapshots) {
+      } else {
         sources += [ "$target_gen_dir/embedded_trusted.S" ]
       }
     }
+  } else {
+    # Also top-level visibility targets can depend on this.
+    visibility += [ "//:gn_visibility" ]
 
-    configs = [ ":internal_config" ]
+    public_deps += [ ":v8_maybe_icu" ]
+
+    sources += [ "$target_gen_dir/snapshot.cc" ]
   }
 }
 
@@ -3771,7 +3727,7 @@ v8_static_library("wee8") {
     ":v8_libbase",
     ":v8_libplatform",
     ":v8_libsampler",
-    ":v8_maybe_snapshot",
+    ":v8_snapshot",
     "//build/win:default_exe_manifest",
   ]
 
@@ -4071,7 +4027,7 @@ if (is_component_build) {
 
     public_deps = [
       ":v8_base",
-      ":v8_maybe_snapshot",
+      ":v8_snapshot",
     ]
 
     configs = [ ":internal_config" ]
@@ -4092,7 +4048,7 @@ if (is_component_build) {
       ":v8_base",
       ":v8_headers",
       ":v8_initializers",
-      ":v8_maybe_snapshot",
+      ":v8_snapshot",
     ]
 
     configs = [ ":internal_config" ]
@@ -4103,7 +4059,7 @@ if (is_component_build) {
   group("v8") {
     public_deps = [
       ":v8_base",
-      ":v8_maybe_snapshot",
+      ":v8_snapshot",
     ]
 
     public_configs = [ ":external_config" ]
@@ -4117,7 +4073,7 @@ if (is_component_build) {
       ":torque_ls_base",
       ":v8_base",
       ":v8_initializers",
-      ":v8_maybe_snapshot",
+      ":v8_snapshot",
     ]
 
     public_configs = [ ":external_config" ]