Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: BUILD.gn

Issue 1996533002: Revert of Reland changes to v8_snapshot GN build arg. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | snapshot_toolchain.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index d0ec22748df149d8916655bd6e49d504fdb894bf..b55e5639a0e542d22143be85bde8096d1408c6e3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -615,7 +615,7 @@
visibility = [ ":*" ] # Only targets in this file can depend on this.
deps = [
- ":mksnapshot($v8_snapshot_toolchain)",
+ ":mksnapshot($snapshot_toolchain)",
]
script = "tools/run.py"
@@ -625,7 +625,7 @@
]
args = [
- "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
+ "./" + rebase_path(get_label_info(":mksnapshot($snapshot_toolchain)",
"root_out_dir") + "/mksnapshot",
root_build_dir),
"--startup_src",
@@ -2012,7 +2012,7 @@
# Executables
#
-if (current_toolchain == v8_snapshot_toolchain) {
+if (current_toolchain == snapshot_toolchain) {
executable("mksnapshot") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
@@ -2114,7 +2114,7 @@
}
}
-if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") || (current_toolchain == v8_snapshot_toolchain && v8_toolset_for_shell == "host") || (current_toolchain != host_toolchain && v8_toolset_for_shell == "target")) {
+if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") || (current_toolchain == snapshot_toolchain && v8_toolset_for_shell == "host") || (current_toolchain != host_toolchain && v8_toolset_for_shell == "target")) {
executable("v8_shell") {
sources = [
"samples/shell.cc",
« no previous file with comments | « no previous file | snapshot_toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698