diff options
| author | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-29 15:26:49 +0000 |
|---|---|---|
| committer | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-29 15:26:49 +0000 |
| commit | 75ae948317ddf6f7a2d1c62d53fda4d77e11b3cf (patch) | |
| tree | c22fe19d940755b36b960e498aee5bfea4d82362 | |
| parent | c99dfee7cbd919ec8c5e9d6a86a482694e2e5c12 (diff) | |
| download | chromium_src-75ae948317ddf6f7a2d1c62d53fda4d77e11b3cf.zip chromium_src-75ae948317ddf6f7a2d1c62d53fda4d77e11b3cf.tar.gz chromium_src-75ae948317ddf6f7a2d1c62d53fda4d77e11b3cf.tar.bz2 | |
Roll Syzygy DEPS to latest release build (0.7.0.1, built from r1810, checked in at r1811).
As we've renamed asan_rtl.dll* to syzyasan_rtl.dll* in this version this CL also update the references to asan_rtl.dll*
R=chrisha@chromium.org, thakis@chromium.org
BUG=294373
Review URL: https://codereview.chromium.org/25067002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225888 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/chrome_syzygy.gypi | 4 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 4 | ||||
| -rwxr-xr-x | chrome/tools/build/win/syzygy_instrument.py | 2 |
5 files changed, 7 insertions, 7 deletions
@@ -315,7 +315,7 @@ deps_os = { # Binary level profile guided optimizations. This points to the # latest release binaries for the toolchain. "src/third_party/syzygy/binaries": - (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@1770", + (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@1811", # Binaries for nacl sdk. "src/third_party/nacl_sdk_binaries": diff --git a/chrome/chrome_syzygy.gypi b/chrome/chrome_syzygy.gypi index a3201cc..50a05c3 100644 --- a/chrome/chrome_syzygy.gypi +++ b/chrome/chrome_syzygy.gypi @@ -56,8 +56,8 @@ '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)/syzyasan_rtl.dll', + '<(dest_dir)/syzyasan_rtl.dll.pdb', '<(dest_dir)/win-syzyasan-filter-<(dll_name).txt.json', ], 'action': [ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index e5f9347..e5d4528 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -5,7 +5,7 @@ [GENERAL] chrome.exe: %(ChromeDir)s\ wow_helper.exe: %(ChromeDir)s\ -asan_rtl.dll: %(VersionDir)s\ +syzyasan_rtl.dll: %(VersionDir)s\ chrome.dll: %(VersionDir)s\ chrome_child.dll: %(VersionDir)s\ nacl64.exe: %(VersionDir)s\ diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 287bff6..3fe110a 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -555,7 +555,7 @@ FILES = [ 'optional': ['dev'], }, { - 'filename': 'syzygy/asan_rtl.dll', + 'filename': 'syzygy/syzyasan_rtl.dll', 'arch': ['32bit'], 'buildtype': ['dev', 'official'], 'optional': ['dev', 'official'], @@ -749,7 +749,7 @@ FILES = [ 'optional': ['dev'], }, { - 'filename': 'syzygy/asan_rtl.dll.pdb', + 'filename': 'syzygy/syzyasan_rtl.dll.pdb', 'arch': ['32bit'], 'buildtype': ['dev', 'official'], 'archive': 'chrome-win32-syms.zip', diff --git a/chrome/tools/build/win/syzygy_instrument.py b/chrome/tools/build/win/syzygy_instrument.py index dfde310..6c6fcfe 100755 --- a/chrome/tools/build/win/syzygy_instrument.py +++ b/chrome/tools/build/win/syzygy_instrument.py @@ -22,7 +22,7 @@ _DEFAULT_SYZYGY_DIR = os.path.abspath(os.path.join( # Basenames of various tools. _INSTRUMENT_EXE = 'instrument.exe' _GENFILTER_EXE = 'genfilter.exe' -_ASAN_AGENT_DLL = 'asan_rtl.dll' +_ASAN_AGENT_DLL = 'syzyasan_rtl.dll' # Default agents for known modes. _DEFAULT_AGENT_DLLS = { 'asan': _ASAN_AGENT_DLL } |