diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 13:30:24 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 13:30:24 +0000 |
| commit | 3fac9271902c30d0eb7fe4db6f6870a8d2526672 (patch) | |
| tree | 323341b5c1236d41db5aa2e55ca1e54ad2ec62e1 /chrome/chrome_syzygy.gypi | |
| parent | c66b5aaf621108f64ad8c2e99629528518a0f2b7 (diff) | |
| download | chromium_src-3fac9271902c30d0eb7fe4db6f6870a8d2526672.zip chromium_src-3fac9271902c30d0eb7fe4db6f6870a8d2526672.tar.gz chromium_src-3fac9271902c30d0eb7fe4db6f6870a8d2526672.tar.bz2 | |
Revert 222650 "Copy asan_rtl.* and agent_logger.exe to the syzyg..."
The change breaks the official ASAN Canaries.
BUG=290090
NOTRY=true
> Copy asan_rtl.* and agent_logger.exe to the syzygy directory for the ASan builds.
>
> 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://chromiumcodereview.appspot.com/23460023
TBR=sebmarchand@chromium.org
Review URL: https://codereview.chromium.org/23858006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_syzygy.gypi')
| -rw-r--r-- | chrome/chrome_syzygy.gypi | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/chrome_syzygy.gypi b/chrome/chrome_syzygy.gypi index f4e3a81..a3201cc 100644 --- a/chrome/chrome_syzygy.gypi +++ b/chrome/chrome_syzygy.gypi @@ -50,20 +50,16 @@ 'action_name': 'Instrument Chrome with SyzyAsan', 'msvs_cygwin_shell': 0, 'inputs': [ - '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt', - '<(dest_dir)/asan_rtl.dll', - '<(dest_dir)/asan_rtl.dll.pdb', - '<(dest_dir)/agent_logger.exe', '<(PRODUCT_DIR)/<(dll_name).dll', + '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt', ], 'outputs': [ '<(dest_dir)/<(dll_name).dll', '<(dest_dir)/<(dll_name).dll.pdb', + '<(dest_dir)/asan_rtl.dll', + '<(dest_dir)/asan_rtl.dll.pdb', '<(dest_dir)/win-syzyasan-filter-<(dll_name).txt.json', ], - 'dependencies': [ - '<(DEPTH)/chrome/chrome_syzygy.gyp:copy_syzyasan_binaries', - ], 'action': [ 'python', '<(DEPTH)/chrome/tools/build/win/syzygy_instrument.py', |