diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/build_overrides | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build_overrides')
| -rw-r--r-- | chromium/build_overrides/OWNERS | 3 | ||||
| -rw-r--r-- | chromium/build_overrides/build.gni | 25 |
2 files changed, 20 insertions, 8 deletions
diff --git a/chromium/build_overrides/OWNERS b/chromium/build_overrides/OWNERS index fc9fc3b3fe9..ce1d3530d8f 100644 --- a/chromium/build_overrides/OWNERS +++ b/chromium/build_overrides/OWNERS @@ -1,6 +1,3 @@ file://build/OWNERS machenbach@chromium.org mbonadei@chromium.org - -# COMPONENT: Build -# TEAM: infra-dev@chromium.org diff --git a/chromium/build_overrides/build.gni b/chromium/build_overrides/build.gni index 050e6719aa9..a86048fbbcf 100644 --- a/chromium/build_overrides/build.gni +++ b/chromium/build_overrides/build.gni @@ -2,7 +2,6 @@ # 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 @@ -13,6 +12,22 @@ import("//build/config/gclient_args.gni") # Some non-Chromium builds don't support building java targets. enable_java_templates = true +# Features used by //base/trace_event and //services/tracing. +declare_args() { + # Tracing support requires //third_party/perfetto, which is not available in + # libchrome (CrOS's version of //base). This flag can disable tracing support + # altogether, in which case all tracing instrumentation in //base becomes a + # no-op. + # TODO(crbug/1065905): Add dependency on perfetto to support typed events. + enable_base_tracing = true + + # Switches the TRACE_EVENT instrumentation from base's TraceLog implementation + # to //third_party/perfetto's client library. Not implemented yet, currently a + # no-op to set up trybot infrastructure. + # TODO(crbug/1006769): Switch to perfetto's client library. + use_perfetto_client_library = false +} + # Allows different projects to specify their own suppressions and blacklist # files for sanitizer tools. # asan_suppressions_file = "path/to/asan_suppressions.cc" @@ -27,9 +42,6 @@ enable_java_templates = true # 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 - 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. @@ -46,7 +58,10 @@ declare_args() { if (host_os == "mac" && use_system_xcode == "") { _result = exec_script("//build/mac/should_use_hermetic_xcode.py", - [ target_os ], + [ + "--xcode-version=$mac_xcode_version", + target_os, + ], "value") assert(_result != 2, |