Add GYP variable for disabling sanitizer_options.

In https://codereview.chromium.org/238123003 an import
of base.gyp is introduced in build/common.gypi. This
makes GYP fail for some client projects using the Chromium
build toolchain. By adding a condition variable for this
part, it is possible to avoid this include by setting
use_sanitizer_options=0.

NOTRY=True
BUG=302040
TEST=passing runhooks on a variety of trybots.

Review URL: https://codereview.chromium.org/250883003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266514 0039d316-1c4b-4281-b951-d872f2087c98
parent 82cc04b2
......@@ -355,6 +355,10 @@
# controls coverage granularity (experimental).
'asan_coverage%': 0,
# Enable Chromium overrides of the default configurations for various
# dynamic tools (like ASan).
'use_sanitizer_options%': 1,
# Enable building with SyzyAsan.
# See https://code.google.com/p/sawbuck/wiki/SyzyASanHowTo
'syzyasan%': 0,
......@@ -979,6 +983,7 @@
'mac_want_real_dsym%': '<(mac_want_real_dsym)',
'asan%': '<(asan)',
'asan_coverage%': '<(asan_coverage)',
'use_sanitizer_options%': '<(use_sanitizer_options)',
'syzyasan%': '<(syzyasan)',
'syzygy_optimize%': '<(syzygy_optimize)',
'lsan%': '<(lsan)',
......@@ -3651,7 +3656,7 @@
],
# TODO(glider): enable the default options on other systems.
'conditions': [
['OS=="linux" and (chromeos==0 or target_arch!="ia32")', {
['use_sanitizer_options==1 and OS=="linux" and (chromeos==0 or target_arch!="ia32")', {
'dependencies': [
'<(DEPTH)/base/base.gyp:sanitizer_options',
],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment