diff options
| author | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 17:29:03 +0000 |
|---|---|---|
| committer | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 17:29:03 +0000 |
| commit | 74a26d7aa51cd54616a48ec6d830381e57c7c805 (patch) | |
| tree | 239b7d95f25c2aba11ed8a355821479f8ebb3501 | |
| parent | 38c2f8047af8511d003796b41ad880da4d29812f (diff) | |
| download | chromium_src-74a26d7aa51cd54616a48ec6d830381e57c7c805.zip chromium_src-74a26d7aa51cd54616a48ec6d830381e57c7c805.tar.gz chromium_src-74a26d7aa51cd54616a48ec6d830381e57c7c805.tar.bz2 | |
_pyautolib.so is linked with libasan.a if ASAN is used.
BUG=chromium-os:20711
TEST=run autotests under ASAN
Review URL: http://codereview.chromium.org/8065007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103298 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index ef9b233..26868ae 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1759,7 +1759,8 @@ # Only in the linux section for now, since ASAN doesn't # work on Mac yet. 'cflags': [ - '-fasan -w', + '-fasan', + '-w', ], 'ldflags': [ '-fasan', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 431e05a..63076e4 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -15,6 +15,17 @@ 'test/automation/tab_proxy.cc', 'test/automation/tab_proxy.h', ], + 'pyautolib_libraries': [ + ], + 'conditions': [ + ['asan==1', { + 'pyautolib_libraries': [ + # Link in the libasan32.a because this binary will be loaded by + # Python that does not have libasan in. + '-lasan32', + ] + }], + ], }, 'targets': [ { @@ -3667,6 +3678,9 @@ '-Wno-uninitialized', '-Wno-self-assign', # to keep clang happy for generated code. ], + 'libraries': [ + '<@(pyautolib_libraries)', + ], 'sources': [ 'test/automation/proxy_launcher.cc', 'test/automation/proxy_launcher.h', |