AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

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

Browse Source 
Bug: v8:7441
Change-Id: I4dda34f22a1281c869fdf7b31108908f834ab30c
Reviewed-on: https://chromium-review.googlesource.com/960034
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51957}
This commit is contained in:
Michael Achenbach 2018-03-13 15:04:27 +01:00 committed by Commit Bot
parent 6ad63309ed
commit 19e1100c15
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BUILD.gn
View File

@ -820,24 +820,17 @@ if (v8_use_snapshot) {
sources = []
outputs = [
"$target_gen_dir/snapshot.cc",
]
if (v8_enable_embedded_builtins) {
outputs += [ "$target_gen_dir/embedded.cc" ]
}
outputs = []
args = [
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
"root_out_dir") + "/mksnapshot",
root_build_dir),
"--turbo_instruction_scheduling",
"--startup_src",
rebase_path("$target_gen_dir/snapshot.cc", root_build_dir),
]
if (v8_enable_embedded_builtins) {
outputs += [ "$target_gen_dir/embedded.cc" ]
args += [
"--embedded_src",
rebase_path("$target_gen_dir/embedded.cc", root_build_dir),
@ -868,6 +861,12 @@ if (v8_use_snapshot) {
"--startup_blob",
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 != "") {
@ -971,7 +970,7 @@ v8_source_set("v8_nosnapshot") {
configs = [ ":internal_config" ]
}
if (v8_use_snapshot) {
if (v8_use_snapshot && !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.
@ -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") {
visibility = [ ":*" ] # Only targets in this file can depend on this.