summaryrefslogtreecommitdiff
path: root/chromium/v8/gni
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 15:28:34 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 13:54:51 +0000
commit2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch)
treeeb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/v8/gni
parentb014812705fc80bff0a5c120dfcef88f349816dc (diff)
downloadqtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/gni')
-rw-r--r--chromium/v8/gni/v8.gni7
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/v8/gni/v8.gni b/chromium/v8/gni/v8.gni
index 1cbba9fefdd..a5312f76acd 100644
--- a/chromium/v8/gni/v8.gni
+++ b/chromium/v8/gni/v8.gni
@@ -38,7 +38,7 @@ declare_args() {
v8_use_snapshot = !(is_win && host_os != "win" && target_cpu == "x64")
# Enable several snapshots side-by-side (e.g. default and for trusted code).
- v8_use_multi_snapshots = ""
+ v8_use_multi_snapshots = false
# Use external files for startup data blobs:
# the JS builtins sources and the start snapshot.
@@ -61,7 +61,10 @@ if (v8_use_external_startup_data == "") {
v8_use_external_startup_data = v8_use_snapshot && !is_ios
}
-if (v8_use_multi_snapshots == "") {
+if (v8_use_multi_snapshots) {
+ # Silently disable multi snapshots if they're incompatible with the current
+ # build configuration. This allows us to set v8_use_multi_snapshots=true on
+ # all bots, and e.g. no-snapshot bots will automatically do the right thing.
v8_use_multi_snapshots =
v8_use_external_startup_data && !build_with_chromium && !use_jumbo_build
}