Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1270)

Unified Diff: chrome/chrome_tests.gypi

Issue 8065007: _pyautolib.so is linked with libasan.a if ASAN is used. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: avoid '5th level 'conditions' key error Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 77e53aab7c3058a6893af66561713aff3db540da..0cf61a2ecaa2105febbbba41afb6bf36b757ac8e 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': [
{
@@ -3666,6 +3677,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',
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698