| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index d00b6a70826b131ca5f16cea034b2ede8823d8df..1a82de6ffb7c42f33cdfe749a3e25d12a1451e74 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%': 1,
|
| + 'use_sanitizer_options%': 0,
|
|
|
| # Enable building with SyzyAsan.
|
| # See https://code.google.com/p/sawbuck/wiki/SyzyASanHowTo
|
| @@ -2140,6 +2140,7 @@
|
| ['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,
|
| @@ -3480,6 +3481,14 @@
|
| '-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',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| }],
|
| # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
|
| @@ -4096,14 +4105,6 @@
|
| ],
|
| }],
|
| ],
|
| - # 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': [
|
|
|