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/buildtools/third_party | |
| 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/buildtools/third_party')
| -rw-r--r-- | chromium/buildtools/third_party/eu-strip/OWNERS | 1 | ||||
| -rw-r--r-- | chromium/buildtools/third_party/libc++/BUILD.gn | 3 | ||||
| -rw-r--r-- | chromium/buildtools/third_party/libunwind/BUILD.gn | 11 |
3 files changed, 15 insertions, 0 deletions
diff --git a/chromium/buildtools/third_party/eu-strip/OWNERS b/chromium/buildtools/third_party/eu-strip/OWNERS index 4644c968361..c253f751147 100644 --- a/chromium/buildtools/third_party/eu-strip/OWNERS +++ b/chromium/buildtools/third_party/eu-strip/OWNERS @@ -1,3 +1,4 @@ dpranke@chromium.org +dpranke@google.com thestig@chromium.org thomasanderson@chromium.org diff --git a/chromium/buildtools/third_party/libc++/BUILD.gn b/chromium/buildtools/third_party/libc++/BUILD.gn index 7a4cdd72f2d..82ad7e27b68 100644 --- a/chromium/buildtools/third_party/libc++/BUILD.gn +++ b/chromium/buildtools/third_party/libc++/BUILD.gn @@ -110,6 +110,9 @@ target(_libcxx_target_type, "libc++") { "//build/config/coverage:default_coverage", ] if (is_android && libcxx_is_shared) { + # Use libc++_chrome to avoid conflicting with system libc++ + # See crbug.com/1076244#c11 for more detail. + output_name = "libc++_chrome" configs -= [ "//build/config/android:hide_all_but_jni_onload" ] } configs += [ diff --git a/chromium/buildtools/third_party/libunwind/BUILD.gn b/chromium/buildtools/third_party/libunwind/BUILD.gn index 1e4fbcb8893..923f928f88f 100644 --- a/chromium/buildtools/third_party/libunwind/BUILD.gn +++ b/chromium/buildtools/third_party/libunwind/BUILD.gn @@ -11,7 +11,18 @@ config("libunwind_config") { # ValueAsBitPattern in Unwind-EHABI.cpp is only used on Debug builds. "-Wno-unused-function", + + # libunwind expects to be compiled with unwind tables so it can + # unwind its own frames. + "-funwind-tables", ] + + if (is_fuchsia) { + # Workaround for https://bugs.llvm.org/show_bug.cgi?id=45875: + # compiling the C code with -fexceptions ensures that accurate + # unwinding information is generated for _Unwind_RaiseException. + cflags_c = [ "-fexceptions" ] + } } source_set("libunwind") { |