From 6a55a37d3a729d4414bea62adcf0e85e633bbb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Z=C3=BCnd?= <szuend@chromium.org>
Date: Tue, 22 Oct 2019 14:14:53 +0200
Subject: [PATCH] [Cleanup] Integrate v8_nosnapshot into mksnapshot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This CL integrates the "v8_nosnapshot" source set into the "mksnapshot"
binary. The "mksnapshot" binary is the last use-site after unconditionally
enabling snapshot and embedded builtins.

Bug: v8:8519
Change-Id: I8e737e10a3f7729e18ac71733b811bf399ebf330
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1873685
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Simon Zünd <szuend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#64494}
---
 BUILD.gn | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index c0a4d7fe88..f8766e3c33 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1338,25 +1338,6 @@ source_set("v8_maybe_snapshot") {
   }
 }
 
-v8_source_set("v8_nosnapshot") {
-  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-
-  deps = [
-    ":torque_generated_initializers",
-  ]
-
-  public_deps = [
-    ":v8_maybe_icu",
-  ]
-
-  sources = [
-    "src/snapshot/embedded/embedded-empty.cc",
-    "src/snapshot/snapshot-empty.cc",
-  ]
-
-  configs = [ ":internal_config" ]
-}
-
 if (!v8_use_external_startup_data) {
   v8_source_set("v8_snapshot") {
     # Only targets in this file and the top-level visibility target can
@@ -3811,6 +3792,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
 
     sources = [
+      "src/snapshot/embedded/embedded-empty.cc",
       "src/snapshot/embedded/embedded-file-writer.cc",
       "src/snapshot/embedded/embedded-file-writer.h",
       "src/snapshot/embedded/platform-embedded-file-writer-aix.cc",
@@ -3824,6 +3806,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
       "src/snapshot/embedded/platform-embedded-file-writer-win.cc",
       "src/snapshot/embedded/platform-embedded-file-writer-win.h",
       "src/snapshot/mksnapshot.cc",
+      "src/snapshot/snapshot-empty.cc",
     ]
 
     configs = [ ":internal_config" ]
@@ -3834,7 +3817,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
       ":v8_init",
       ":v8_libbase",
       ":v8_libplatform",
-      ":v8_nosnapshot",
+      ":v8_maybe_icu",
       "//build/win:default_exe_manifest",
     ]
   }