| Index: build/config/c++/c++.gni
|
| diff --git a/build/config/c++/c++.gni b/build/config/c++/c++.gni
|
| index 5a62670afafef626d726682de03ba524f2a956c3..e83c50ecfa9be30fe0319d4a9d20032c2bcb3f53 100644
|
| --- a/build/config/c++/c++.gni
|
| +++ b/build/config/c++/c++.gni
|
| @@ -12,12 +12,8 @@
|
| # Use libc++ (buildtools/third_party/libc++ and
|
| # buildtools/third_party/libc++abi) instead of stdlibc++ as standard
|
| # library.
|
| - # TODO(thomasanderson): Clean up this complex condition. The
|
| - # is_tsan, is_msan, and (use_libfuzzer && !is_mac), clauses can be
|
| - # removed since they are only used on non-CrOs Linux. is_ubsan can
|
| - # probably also be removed for the same reason.
|
| use_custom_libcxx =
|
| - (is_linux && !is_chromeos && (!is_chromecast || is_cast_desktop_build)) ||
|
| - is_tsan || is_msan || is_ubsan || is_ubsan_security ||
|
| - (use_libfuzzer && !is_mac) || use_afl
|
| + (is_asan && is_linux && !is_chromeos &&
|
| + (!is_chromecast || is_cast_desktop_build)) || is_tsan || is_msan ||
|
| + is_ubsan || is_ubsan_security || (use_libfuzzer && !is_mac) || use_afl
|
| }
|
|
|