Internal change PiperOrigin-RevId: 348827329 Change-Id: I22a02095c800af4ca50cdca4bf94ffa2c9766765
diff --git a/patch/patch.cfg b/patch/patch.cfg index d51a9b0..635abaa 100755 --- a/patch/patch.cfg +++ b/patch/patch.cfg
@@ -91,9 +91,9 @@ 'path': 'cef', }, { - # Increase the symbol limit on a header included in the CEF sandbox build. - # We hit this limit in our Windows build on the 4280 branch, but don't know - # why. + # Disregard the preprocessor symbol limits included in the CEF build. We hit + # this limit in our Windows sandbox build starting on the 4280 branch, but + # don't know why. # # Bug: b/175682493 'name': 'symbol_limit'
diff --git a/patch/patches/symbol_limit.patch b/patch/patches/symbol_limit.patch index 6d8b78c..2068e57 100644 --- a/patch/patches/symbol_limit.patch +++ b/patch/patches/symbol_limit.patch
@@ -1,12 +1,17 @@ -diff --git base/notreached.cc base/notreached.cc ---- base/notreached.cc -+++ base/notreached.cc -@@ -8,7 +8,7 @@ - // build time. Try not to raise this limit unless absolutely necessary. See - // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md - #ifndef NACL_TC_REV --#pragma clang max_tokens_here 17000 -+#pragma clang max_tokens_here 50000 - #endif +diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn +--- build/config/compiler/BUILD.gn ++++ build/config/compiler/BUILD.gn +@@ -1566,12 +1566,7 @@ + "-Wno-implicit-fallthrough", + ] - #include "base/logging.h" ++ cflags += [ "-Wno-max-tokens" ] +- if (enable_wmax_tokens) { +- cflags += [ "-Wmax-tokens" ] +- } else { +- # TODO(https://crbug.com/1049569): Remove after Clang 87b235db. +- cflags += [ "-Wno-max-tokens" ] +- } + } + } + }