| Index: build/common.gypi | 
| diff --git a/build/common.gypi b/build/common.gypi | 
| index 8fbd78c5b99acddeced6b58f66e1fb62f6e439ac..e51e310569dd2e911ca0a0ae7fb6b70aa02dd75e 100644 | 
| --- a/build/common.gypi | 
| +++ b/build/common.gypi | 
| @@ -389,7 +389,7 @@ | 
|  | 
| # Enable Chromium overrides of the default configurations for various | 
| # dynamic tools (like ASan). | 
| -      'use_sanitizer_options%': 0, | 
| +      'use_sanitizer_options%': 1, | 
|  | 
| # Enable building with SyzyAsan. | 
| # See https://code.google.com/p/sawbuck/wiki/SyzyASanHowTo | 
| @@ -2145,7 +2145,6 @@ | 
| ['asan==1 or msan==1 or lsan==1 or tsan==1', { | 
| 'clang%': 1, | 
| 'use_allocator%': 'none', | 
| -        'use_sanitizer_options%': 1, | 
| }], | 
| ['asan==1 and OS=="linux" and chromeos==0', { | 
| 'use_custom_libcxx%': 1, | 
| @@ -3484,14 +3483,6 @@ | 
| 'ldflags': [ | 
| '-Wl,-z,now', | 
| '-Wl,-z,relro', | 
| -        ], | 
| -        # TODO(glider): enable the default options on other systems. | 
| -        'conditions': [ | 
| -          ['use_sanitizer_options==1 and ((OS=="linux" and (chromeos==0 or target_arch!="ia32")) or OS=="mac")', { | 
| -            'dependencies': [ | 
| -              '<(DEPTH)/build/sanitizers/sanitizers.gyp:sanitizer_options', | 
| -            ], | 
| -          }], | 
| ], | 
| }, | 
| }], | 
| @@ -4108,6 +4099,14 @@ | 
| ], | 
| }], | 
| ], | 
| +            # TODO(glider): enable the default options on other systems. | 
| +            'conditions': [ | 
| +              ['use_sanitizer_options==1 and OS=="linux" and (chromeos==0 or target_arch!="ia32")', { | 
| +                'dependencies': [ | 
| +                  '<(DEPTH)/build/sanitizers/sanitizers.gyp:sanitizer_options', | 
| +                ], | 
| +              }], | 
| +            ], | 
| }], | 
| ['asan==1', { | 
| 'target_conditions': [ | 
|  |