diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/build_overrides | |
parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/build_overrides')
-rw-r--r-- | chromium/build_overrides/build.gni | 34 | ||||
-rw-r--r-- | chromium/build_overrides/pdfium.gni | 3 | ||||
-rw-r--r-- | chromium/build_overrides/v8.gni | 9 |
3 files changed, 37 insertions, 9 deletions
diff --git a/chromium/build_overrides/build.gni b/chromium/build_overrides/build.gni index 68be7a2fdd2..c607f818b7e 100644 --- a/chromium/build_overrides/build.gni +++ b/chromium/build_overrides/build.gni @@ -2,13 +2,12 @@ # 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. # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453. -# Some WebRTC targets require the 10.7 deployment version of the Mac SDK -# and a 10.11 min SDK, but those targets are only used in non-Chromium -# builds. We can remove this when Chromium drops 10.6 support and also -# requires 10.7. mac_sdk_min_build_override = "10.10" -mac_deployment_target_build_override = "10.7" +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. @@ -32,3 +31,28 @@ tsan_suppressions_file = "//build/sanitizers/tsan_suppressions.cc" # Uncomment these to specify a different lint suppressions file for android # lint_suppressions_file = path/to/your/suppressions/file/suppressions.xml + +declare_args() { + # Android 32-bit non-component, non-clang builds cannot have symbol_level=2 + # due to 4GiB file size limit, see https://crbug.com/648948. + # Set this flag to true to skip the assertion. + ignore_elf32_limitations = false + + # Use the system install of Xcode for tools like ibtool, libtool, etc. + # This does not affect the compiler. When this variable is false, targets will + # instead use a hermetic install of Xcode. [The hermetic install can be + # obtained with gclient sync after setting the environment variable + # FORCE_MAC_TOOLCHAIN]. + use_system_xcode = "" +} + +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 + } +} diff --git a/chromium/build_overrides/pdfium.gni b/chromium/build_overrides/pdfium.gni index bea5d705712..b5ee07ae818 100644 --- a/chromium/build_overrides/pdfium.gni +++ b/chromium/build_overrides/pdfium.gni @@ -11,5 +11,8 @@ pdf_enable_xfa_override = false # Disable use of Skia backend. pdf_use_skia_override = false +# Disable use of Skia backend, paths only (experimental) +pdf_use_skia_paths_override = false + # Enable experimental win32 GDI APIs. pdf_use_win32_gdi_override = true diff --git a/chromium/build_overrides/v8.gni b/chromium/build_overrides/v8.gni index f50e6b42d2e..1a8346d5ebc 100644 --- a/chromium/build_overrides/v8.gni +++ b/chromium/build_overrides/v8.gni @@ -14,10 +14,11 @@ enable_correct_v8_arch = false # Be sure to synchronize with build/common.gypi v8_extra_library_files = [ - "../third_party/WebKit/Source/core/streams/ByteLengthQueuingStrategy.js", - "../third_party/WebKit/Source/core/streams/CountQueuingStrategy.js", - "../third_party/WebKit/Source/core/streams/ReadableStream.js", + "//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_experimental_extra_library_files = [] +v8_experimental_extra_library_files = + [ "//third_party/WebKit/Source/core/streams/WritableStream.js" ] v8_enable_inspector_override = true |