| Index: build/config/sanitizers/sanitizers.gni
|
| diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni
|
| index 7d6a79fb2bc4c23e71806e951c63ee71466e3aa7..da79bd79e2a7e1d96397e51693f0a1d11287b5dd 100644
|
| --- a/build/config/sanitizers/sanitizers.gni
|
| +++ b/build/config/sanitizers/sanitizers.gni
|
| @@ -80,8 +80,8 @@ declare_args() {
|
| # Use libc++ (buildtools/third_party/libc++ and
|
| # buildtools/third_party/libc++abi) instead of stdlibc++ as standard library.
|
| # This is intended to be used for instrumented builds.
|
| - use_custom_libcxx = (is_asan && is_linux) || is_tsan || is_msan || is_ubsan ||
|
| - is_ubsan_security || use_libfuzzer
|
| + use_custom_libcxx = (is_asan && is_linux && !is_chromeos) || is_tsan ||
|
| + is_msan || is_ubsan || is_ubsan_security || use_libfuzzer
|
|
|
| # Enable -fsanitize-coverage.
|
| use_sanitizer_coverage = use_libfuzzer || sanitizer_coverage_flags != ""
|
|
|