| Index: build/config/sanitizers/BUILD.gn
|
| diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
|
| index 19d0a3ff856c0f27e4035a0e596be7e3479f52e9..c958e2d3e2ed922ee2e5af0f4dab913aa03aa0a5 100644
|
| --- a/build/config/sanitizers/BUILD.gn
|
| +++ b/build/config/sanitizers/BUILD.gn
|
| @@ -102,8 +102,21 @@ config("default_sanitizer_flags") {
|
| "-fsanitize=address",
|
| "-fsanitize-blacklist=$asan_blacklist_path",
|
| ]
|
| - if (is_mac) {
|
| - cflags += [ "-mllvm -asan-globals=0" ] # http://crbug.com/352073
|
| + if (is_android) {
|
| + # Android build relies on -Wl,--gc-sections removing unreachable code.
|
| + # ASan instrumentation for globals inhibits this and results in a
|
| + # library with unresolvable relocations.
|
| + # TODO(eugenis): find a way to reenable this.
|
| + cflags += [
|
| + "-mllvm",
|
| + "-asan-globals=0",
|
| + ]
|
| + } else if (is_mac) {
|
| + # http://crbug.com/352073
|
| + cflags += [
|
| + "-mllvm",
|
| + "-asan-globals=0",
|
| + ]
|
| # TODO(GYP): deal with mac_bundles.
|
| }
|
| }
|
|
|