diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
| commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
| tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/build_overrides | |
| parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
| download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz | |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/build_overrides')
| -rw-r--r-- | chromium/build_overrides/OWNERS | 2 | ||||
| -rw-r--r-- | chromium/build_overrides/angle.gni | 1 | ||||
| -rw-r--r-- | chromium/build_overrides/dawn.gni | 3 | ||||
| -rw-r--r-- | chromium/build_overrides/vulkan_headers.gni | 7 |
4 files changed, 11 insertions, 2 deletions
diff --git a/chromium/build_overrides/OWNERS b/chromium/build_overrides/OWNERS index ee6af5a7e9d..fc9fc3b3fe9 100644 --- a/chromium/build_overrides/OWNERS +++ b/chromium/build_overrides/OWNERS @@ -1,6 +1,6 @@ file://build/OWNERS machenbach@chromium.org -phoglund@chromium.org +mbonadei@chromium.org # COMPONENT: Build # TEAM: infra-dev@chromium.org diff --git a/chromium/build_overrides/angle.gni b/chromium/build_overrides/angle.gni index c4bda38821a..68669474d1b 100644 --- a/chromium/build_overrides/angle.gni +++ b/chromium/build_overrides/angle.gni @@ -14,4 +14,5 @@ angle_googletest_dir = "//third_party/googletest/src" angle_jsoncpp_dir = "//third_party/jsoncpp" angle_libpng_dir = "//third_party/libpng" angle_spirv_cross_dir = "//third_party/spirv-cross/spirv-cross" +angle_spirv_headers_dir = "//third_party/spirv-headers/src" angle_spirv_tools_dir = "//third_party/SPIRV-Tools/src" diff --git a/chromium/build_overrides/dawn.gni b/chromium/build_overrides/dawn.gni index ba0c60686ca..597200f7dd1 100644 --- a/chromium/build_overrides/dawn.gni +++ b/chromium/build_overrides/dawn.gni @@ -4,11 +4,12 @@ # The paths to Dawn's dependencies dawn_glfw_dir = "//third_party/glfw/src" -dawn_jinja2_dir = "//third_party/jinja2" dawn_googletest_dir = "//third_party/googletest/src" +dawn_jinja2_dir = "//third_party/jinja2" dawn_jsoncpp_dir = "//third_party/jsoncpp" dawn_shaderc_dir = "//third_party/shaderc/src" dawn_spirv_cross_dir = "//third_party/spirv-cross/spirv-cross" dawn_spirv_tools_dir = "//third_party/SPIRV-Tools/src" +dawn_swiftshader_dir = "//third_party/swiftshader" dawn_vulkan_validation_layers_dir = "//third_party/angle/third_party/vulkan-validation-layers/src" diff --git a/chromium/build_overrides/vulkan_headers.gni b/chromium/build_overrides/vulkan_headers.gni new file mode 100644 index 00000000000..6782a1f0418 --- /dev/null +++ b/chromium/build_overrides/vulkan_headers.gni @@ -0,0 +1,7 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ui.gni") + +vulkan_use_x11 = use_x11 |