diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/build_overrides | |
parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/build_overrides')
-rw-r--r-- | chromium/build_overrides/build.gni | 36 | ||||
-rw-r--r-- | chromium/build_overrides/v8.gni | 19 |
2 files changed, 30 insertions, 25 deletions
diff --git a/chromium/build_overrides/build.gni b/chromium/build_overrides/build.gni index c607f818b7e..7b632bd2e64 100644 --- a/chromium/build_overrides/build.gni +++ b/chromium/build_overrides/build.gni @@ -2,12 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Several dependencies of Chrome require a different min sdk and/or deployment -# target when built as stand-alone projects. If this is ever not the case, these -# variables can be removed. +# Several dependencies of Chrome require a different min sdk when built +# as stand-alone projects. If this is ever not the case, these variables +# can be removed. # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453. mac_sdk_min_build_override = "10.10" -mac_deployment_target_build_override = "10.9" # Variable that can be used to support multiple build scenarios, like having # Chromium specific targets in a client project's GN file etc. @@ -24,10 +23,19 @@ enable_java_templates = true # Some non-Chromium builds don't use Chromium's third_party/binutils. linux_use_bundled_binutils_override = true -# Allows different projects to specify their own suppressions files. -asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc" -lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc" -tsan_suppressions_file = "//build/sanitizers/tsan_suppressions.cc" +# Allows different projects to specify their own suppressions and blacklist +# files for sanitizer tools. +# asan_suppressions_file = "path/to/asan_suppressions.cc" +# asan_blacklist_path = "path/to/asan/blacklist.txt" +# asan_win_blacklist_path = "path/to/asan/blacklist_win.txt" +# lsan_suppressions_file = "path/to/lsan_suppressions.cc" +# tsan_suppressions_file = "path/to/tsan_suppressions.cc" +# tsan_blacklist_path = "path/to/tsan/ignores.txt" +# msan_blacklist_path = "path/to/msan/blacklist.txt" +# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt" +# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt" +# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt" +# cfi_blacklist_path = "path/to/cfi/blacklist.txt" # Uncomment these to specify a different lint suppressions file for android # lint_suppressions_file = path/to/your/suppressions/file/suppressions.xml @@ -47,12 +55,8 @@ declare_args() { } if (use_system_xcode == "") { - if (target_os == "mac") { - _result = - exec_script("//build/mac/should_use_hermetic_xcode.py", [], "value") - use_system_xcode = _result == 0 - } - if (target_os == "ios") { - use_system_xcode = true - } + _result = exec_script("//build/mac/should_use_hermetic_xcode.py", + [ target_os ], + "value") + use_system_xcode = _result == 0 } diff --git a/chromium/build_overrides/v8.gni b/chromium/build_overrides/v8.gni index 1a8346d5ebc..59132e3caa4 100644 --- a/chromium/build_overrides/v8.gni +++ b/chromium/build_overrides/v8.gni @@ -2,22 +2,23 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -if (is_android) { - import("//build/config/android/config.gni") -} - -# TODO(sky): nuke this. Temporary while sorting out http://crbug.com/465456. -enable_correct_v8_arch = false - # V8 extras # Adding V8 extras files requires API owners review -# Be sure to synchronize with build/common.gypi -v8_extra_library_files = [ +# This list is for files that export symbols that are used in other extras +# files. Putting them here causes them to be executed first during snapshot +# creation. +_v8_extras_dependencies = + [ "//third_party/WebKit/Source/core/streams/CommonStrings.js" ] + +_v8_extras = [ "//third_party/WebKit/Source/core/streams/ByteLengthQueuingStrategy.js", "//third_party/WebKit/Source/core/streams/CountQueuingStrategy.js", "//third_party/WebKit/Source/core/streams/ReadableStream.js", ] + +v8_extra_library_files = _v8_extras_dependencies + _v8_extras + v8_experimental_extra_library_files = [ "//third_party/WebKit/Source/core/streams/WritableStream.js" ] |