diff options
| author | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 08:59:30 +0000 |
|---|---|---|
| committer | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 08:59:30 +0000 |
| commit | f5858a86634f595638dff89dba4fee9149419f7d (patch) | |
| tree | 6451e738acc744d68f280ade969327275d8dee11 /chrome/chrome_syzygy.gyp | |
| parent | 10e0513470f5a0b78284350f3b2fa1f8ef675f48 (diff) | |
| download | chromium_src-f5858a86634f595638dff89dba4fee9149419f7d.zip chromium_src-f5858a86634f595638dff89dba4fee9149419f7d.tar.gz chromium_src-f5858a86634f595638dff89dba4fee9149419f7d.tar.bz2 | |
Copy asan_rtl.* and agent_logger.exe to the syzygy directory for the ASan builds.
This is my second attempt to do this, the first time https://codereview.chromium.org/23460023/ has been reverted (https://codereview.chromium.org/23858006) because the new target 'copy_syzyasan_binaries' was not build, so the SyzyASan binaries were missing from the syzygy dir...
Currently the syzygy_optimize script was taking care of copying asan_rtl.[dll|pdb] to the syzygy directory, this was causing 2 warnings when building a SyzyASan splitted build with ninja:
- ninja: warning: multiple rules generate syzygy\asan_rtl.dll. builds involving this target will not be correct; continuing anyway
- ninja: warning: multiple rules generate syzygy\asan_rtl.dll.pdb. builds involving this target will not be correct; continuing anyway
The multiple rules come from the fact that both syzygy\chrome.dll and syzygy\chrome_child.dll were trying to generate those artifacts.
I've also added agent_logger.exe to the syzygy directory, with this it'll be easier for the person grabing a SyzyASan build from the LKGR builder to use it.
I've also removed all the "--agent-dll" logic from syzygy_instrument.py as it was only copying the asan binaries to the syzygy directory, it's now done directly in the 'copy_syzyasan_binaries' gyp target.
R=chrisha@chromium.org
BUG=
Review URL: https://codereview.chromium.org/25890006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_syzygy.gyp')
| -rw-r--r-- | chrome/chrome_syzygy.gyp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/chrome/chrome_syzygy.gyp b/chrome/chrome_syzygy.gyp index 0801d18..ea73fa5 100644 --- a/chrome/chrome_syzygy.gyp +++ b/chrome/chrome_syzygy.gyp @@ -3,6 +3,34 @@ # found in the LICENSE file. { 'conditions': [ + ['OS=="win" and asan==1', { + 'variables': { + 'dest_dir': '<(PRODUCT_DIR)/syzygy', + 'syzygy_exe_dir': '<(DEPTH)/third_party/syzygy/binaries/exe', + }, + # Copy the SyzyASan runtime and logger to the syzygy directory. + 'targets': [ + { + 'target_name': 'copy_syzyasan_binaries', + 'type': 'none', + 'outputs': [ + '<(dest_dir)/agent_logger.exe', + '<(dest_dir)/syzyasan_rtl.dll', + '<(dest_dir)/syzyasan_rtl.dll.pdb', + ], + 'copies': [ + { + 'destination': '<(dest_dir)', + 'files': [ + '<(syzygy_exe_dir)/agent_logger.exe', + '<(syzygy_exe_dir)/syzyasan_rtl.dll', + '<(syzygy_exe_dir)/syzyasan_rtl.dll.pdb', + ], + }, + ], + }, + ], + }], ['OS=="win" and fastbuild==0', { 'variables': { 'dll_name': 'chrome', |