diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-04 17:20:24 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-12 08:15:25 +0000 |
commit | 8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch) | |
tree | 788d8d7549712682703a0310ca4a0f0860d4802b /chromium/buildtools | |
parent | 606d85f2a5386472314d39923da28c70c60dc8e7 (diff) | |
download | qtwebengine-chromium-8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b.tar.gz |
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/buildtools')
5 files changed, 18 insertions, 6 deletions
diff --git a/chromium/buildtools/reclient_cfgs/README.md b/chromium/buildtools/reclient_cfgs/README.md new file mode 100644 index 00000000000..ecab8824a12 --- /dev/null +++ b/chromium/buildtools/reclient_cfgs/README.md @@ -0,0 +1 @@ +This directory contains the config files accepted by re-client's rewrapper command in place of inline flags. diff --git a/chromium/buildtools/reclient_cfgs/rewrapper_chroot_compile.cfg b/chromium/buildtools/reclient_cfgs/rewrapper_chroot_compile.cfg new file mode 100644 index 00000000000..44371bbed9d --- /dev/null +++ b/chromium/buildtools/reclient_cfgs/rewrapper_chroot_compile.cfg @@ -0,0 +1,10 @@ +service=remotebuildexecution.googleapis.com:443 +instance=projects/goma-foundry-experiments/instances/default_instance +use_application_default_credentials=true +platform=container-image=docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1,dockerChrootPath=.,dockerRuntime=runsc +server_address=unix:///tmp/reproxy.sock +log_path=text:///tmp/reproxy_log.txt +labels=type=compile,compiler=clang,lang=cpp +inputs=etc/env.d/05gcc-x86_64-cros-linux-gnu,usr/share/gcc-data/x86_64-pc-linux-gnu/,usr/lib/gcc/x86_64-pc-linux-gnu,usr/x86_64-pc-linux-gnu/,var/cache/chromeos-chrome/chrome-src/src/out_amd64-generic/,bin/bash,bin/cat,usr/lib64/libreadline.so.8,lib64/libc.so.6,lib64/libtinfow.so.5,lib64/ld-linux-x86-64.so.2,usr/bin/x86_64-cros-linux-gnu-clang++,usr/bin/x86_64-cros-linux-gnu-clang,lib64/libpthread.so.0,usr/lib/locale/,usr/bin/clang++,usr/bin/clang,usr/bin/ccache,lib64/libm.so.6,/usr/lib64/libz.so.1,lib64/libdl.so.2,lib64/libtinfo.so.5,usr/lib64/libc++.so.1,usr/lib64/libc++abi.so.1,usr/lib/gcc/x86_64-pc-linux-gnu/10.2.0/libgcc_s.so.1,usr/lib/gcc/ +exec_root=/ +env_var_allowlist=PATH diff --git a/chromium/buildtools/third_party/libc++/BUILD.gn b/chromium/buildtools/third_party/libc++/BUILD.gn index 01d122aa78f..48f0bdb17e0 100644 --- a/chromium/buildtools/third_party/libc++/BUILD.gn +++ b/chromium/buildtools/third_party/libc++/BUILD.gn @@ -148,9 +148,7 @@ target(_libcxx_target_type, "libc++") { defines = [ "_LIBCPP_BUILDING_LIBRARY" ] if (!libcxx_is_shared) { - # TODO(https://crbug.com/946629): Remove use_xcode_clang condition once - # XCode clang is updated to support -fvisibility-global-new-delete-hidden. - if ((is_mac || (is_ios && !use_xcode_clang)) && is_clang) { + if (is_apple && is_clang) { # We want operator new/delete to be private on Mac, but these functions # are implicitly created by the compiler for each translation unit, as # specified in the C++ spec 3.7.4p2, which makes them always have default diff --git a/chromium/buildtools/third_party/libc++abi/BUILD.gn b/chromium/buildtools/third_party/libc++abi/BUILD.gn index b70deeb9c8f..1b0bea340d6 100644 --- a/chromium/buildtools/third_party/libc++abi/BUILD.gn +++ b/chromium/buildtools/third_party/libc++abi/BUILD.gn @@ -12,9 +12,9 @@ source_set("libc++abi") { } # Fuchsia builds don't link against any libraries that provide stack - # unwinding symbols, unlike Linux does with glibc. Build and link against - # libunwind manually to get this functionality. - if (is_fuchsia) { + # unwinding symbols, unlike Linux does with glibc (same applies for Android). + # Build and link against libunwind manually to get this functionality. + if (is_fuchsia || is_android) { deps = [ "//buildtools/third_party/libunwind" ] } diff --git a/chromium/buildtools/third_party/libunwind/BUILD.gn b/chromium/buildtools/third_party/libunwind/BUILD.gn index 923f928f88f..7560674b5bf 100644 --- a/chromium/buildtools/third_party/libunwind/BUILD.gn +++ b/chromium/buildtools/third_party/libunwind/BUILD.gn @@ -30,6 +30,7 @@ source_set("libunwind") { if (is_fuchsia) { visibility += [ "//buildtools/third_party/libc++abi" ] } else if (is_android) { + visibility += [ "//buildtools/third_party/libc++abi" ] visibility += [ "//services/tracing/public/cpp" ] } if (!is_component_build) { @@ -55,11 +56,13 @@ source_set("libunwind") { "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/coverage:default_coverage", + "//build/config/compiler:default_optimization", ] configs += [ "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti", + "//build/config/compiler:optimize_speed", # Must be after no_chromium_code ":libunwind_config", |