diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 12:48:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:33:43 +0000 |
| commit | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch) | |
| tree | fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/build_overrides | |
| parent | 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff) | |
| download | qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz | |
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build_overrides')
| -rw-r--r-- | chromium/build_overrides/angle.gni | 1 | ||||
| -rw-r--r-- | chromium/build_overrides/build.gni | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chromium/build_overrides/angle.gni b/chromium/build_overrides/angle.gni index 68669474d1b..25f5854f88e 100644 --- a/chromium/build_overrides/angle.gni +++ b/chromium/build_overrides/angle.gni @@ -16,3 +16,4 @@ 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" +angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator" diff --git a/chromium/build_overrides/build.gni b/chromium/build_overrides/build.gni index e8471bfc681..050e6719aa9 100644 --- a/chromium/build_overrides/build.gni +++ b/chromium/build_overrides/build.gni @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//base/trace_event/features.gni") import("//build/config/gclient_args.gni") # Uncomment these to specify a different NDK location and version in @@ -12,9 +13,6 @@ import("//build/config/gclient_args.gni") # Some non-Chromium builds don't support building java targets. 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 and blacklist # files for sanitizer tools. # asan_suppressions_file = "path/to/asan_suppressions.cc" |