Commit 19e1100c authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[build] Don't generate snapshot.cc with external startup data

Bug: v8:7441
Change-Id: I4dda34f22a1281c869fdf7b31108908f834ab30c
Reviewed-on: https://chromium-review.googlesource.com/960034Reviewed-by: 's avatarYang Guo <yangguo@chromium.org>
Reviewed-by: 's avatarJakob Gruber <jgruber@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51957}
parent 6ad63309
...@@ -820,24 +820,17 @@ if (v8_use_snapshot) { ...@@ -820,24 +820,17 @@ if (v8_use_snapshot) {
sources = [] sources = []
outputs = [ outputs = []
"$target_gen_dir/snapshot.cc",
]
if (v8_enable_embedded_builtins) {
outputs += [ "$target_gen_dir/embedded.cc" ]
}
args = [ args = [
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
"root_out_dir") + "/mksnapshot", "root_out_dir") + "/mksnapshot",
root_build_dir), root_build_dir),
"--turbo_instruction_scheduling", "--turbo_instruction_scheduling",
"--startup_src",
rebase_path("$target_gen_dir/snapshot.cc", root_build_dir),
] ]
if (v8_enable_embedded_builtins) { if (v8_enable_embedded_builtins) {
outputs += [ "$target_gen_dir/embedded.cc" ]
args += [ args += [
"--embedded_src", "--embedded_src",
rebase_path("$target_gen_dir/embedded.cc", root_build_dir), rebase_path("$target_gen_dir/embedded.cc", root_build_dir),
...@@ -868,6 +861,12 @@ if (v8_use_snapshot) { ...@@ -868,6 +861,12 @@ if (v8_use_snapshot) {
"--startup_blob", "--startup_blob",
rebase_path("$root_out_dir/snapshot_blob.bin", root_build_dir), rebase_path("$root_out_dir/snapshot_blob.bin", root_build_dir),
] ]
} else {
outputs += [ "$target_gen_dir/snapshot.cc" ]
args += [
"--startup_src",
rebase_path("$target_gen_dir/snapshot.cc", root_build_dir),
]
} }
if (v8_embed_script != "") { if (v8_embed_script != "") {
...@@ -971,7 +970,7 @@ v8_source_set("v8_nosnapshot") { ...@@ -971,7 +970,7 @@ v8_source_set("v8_nosnapshot") {
configs = [ ":internal_config" ] configs = [ ":internal_config" ]
} }
if (v8_use_snapshot) { if (v8_use_snapshot && !v8_use_external_startup_data) {
v8_source_set("v8_snapshot") { v8_source_set("v8_snapshot") {
# Only targets in this file and the top-level visibility target can # Only targets in this file and the top-level visibility target can
# depend on this. # depend on this.
...@@ -1017,7 +1016,7 @@ if (v8_use_snapshot) { ...@@ -1017,7 +1016,7 @@ if (v8_use_snapshot) {
} }
} }
if (v8_use_external_startup_data) { if (v8_use_snapshot && v8_use_external_startup_data) {
v8_source_set("v8_external_snapshot") { v8_source_set("v8_external_snapshot") {
visibility = [ ":*" ] # Only targets in this file can depend on this. visibility = [ ":*" ] # Only targets in this file can depend on this.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment