Index: build/config/sanitizers/sanitizers.gni |
diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni |
index 7d6a79fb2bc4c23e71806e951c63ee71466e3aa7..1c08112da23a7dc9adb40ddac7871a0f96bede75 100644 |
--- a/build/config/sanitizers/sanitizers.gni |
+++ b/build/config/sanitizers/sanitizers.gni |
@@ -80,8 +80,9 @@ 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_android && !is_chromeos) || is_tsan || |
Dirk Pranke
2016/05/19 05:17:26
you shouldn't need !is_android here; is_linux impl
Sam McNally
2016/05/19 07:38:06
Done.
|
+ is_msan || is_ubsan || is_ubsan_security || use_libfuzzer |
# Enable -fsanitize-coverage. |
use_sanitizer_coverage = use_libfuzzer || sanitizer_coverage_flags != "" |