Move Syzygy build related things to their own directory with an OWNERS file, and add an allocation filter file.

BUG=

Review URL: https://codereview.chromium.org/773253004

Cr-Commit-Position: refs/heads/master@{#308637}

6 files changed, 21 insertions, 12 deletions

diff --git a/chrome/tools/build/win/OWNERS b/chrome/tools/build/win/OWNERS
index 2cc43ee..12dff52 100644
--- a/chrome/tools/build/win/OWNERS
+++ b/chrome/tools/build/win/OWNERS
@@ -5,11 +5,3 @@ robertshield@chromium.org
 # FILES.cfg OWNERS as in parent owner file.
 per-file FILES.cfg=kerz@chromium.org
 per-file FILES.cfg=mmoss@chromium.org
-
-# Syzygy files.
-per-file syzygy_instrument.py=chrisha@chromium.org
-per-file syzygy_instrument.py=siggi@chromium.org
-per-file syzygy_reorder.py=chrisha@chromium.org
-per-file syzygy_reorder.py=siggi@chromium.org
-per-file win-syzyasan-filter.txt=chrisha@chromium.org
-per-file win-syzyasan-filter.txt=siggi@chromium.org
diff --git a/chrome/tools/build/win/syzygy/OWNERS b/chrome/tools/build/win/syzygy/OWNERS
new file mode 100644
index 0000000..4fa8ee3
--- /dev/null
+++ b/chrome/tools/build/win/syzygy/OWNERS
@@ -0,0 +1,2 @@
+chrisha@chromium.org
+siggi@chromium.org
diff --git a/chrome/tools/build/win/syzygy_instrument.py b/chrome/tools/build/win/syzygy/instrument.py
index ae6558e..f3c725c 100755
--- a/chrome/tools/build/win/syzygy_instrument.py
+++ b/chrome/tools/build/win/syzygy/instrument.py
@@ -58,7 +58,7 @@ def _CompileFilter(syzygy_dir, executable, symbol, filter_file,
 
 
 def _InstrumentBinary(syzygy_dir, mode, executable, symbol, dst_dir,
-                      filter_file):
+                      filter_file, allocation_filter_file):
   """Instruments the executable found in input_dir, and writes the resultant
   instrumented executable and symbol files to dst_dir.
   """
@@ -76,9 +76,12 @@ def _InstrumentBinary(syzygy_dir, mode, executable, symbol, dst_dir,
   if mode == "asan":
     cmd.append('--no-augment-pdb')
 
-  # If a filter was specified then pass it on to the instrumenter.
+  # If any filters were specified then pass them on to the instrumenter.
   if filter_file:
     cmd.append('--filter=%s' % os.path.abspath(filter_file))
+  if allocation_filter_file:
+    cmd.append('--allocation-filter-config-file=%s' %
+        os.path.abspath(allocation_filter_file))
 
   return _Shell(*cmd)
 
@@ -104,7 +107,8 @@ def main(options):
                     options.input_executable,
                     options.input_symbol,
                     options.destination_dir,
-                    options.output_filter_file)
+                    options.output_filter_file,
+                    options.allocation_filter_file)
 
 
 def _ParseOptions():
@@ -125,6 +129,8 @@ def _ParseOptions():
   option_parser.add_option('--output-filter-file',
       help='The path where the compiled filter will be written. This is '
            'required if --filter is specified.')
+  option_parser.add_option('--allocation-filter-file',
+      help='The path to the SyzyASAN allocation filter to use.')
   options, args = option_parser.parse_args()
 
   if not options.mode:
diff --git a/chrome/tools/build/win/syzygy_reorder.py b/chrome/tools/build/win/syzygy/reorder.py
index 4d13463..4d13463 100755
--- a/chrome/tools/build/win/syzygy_reorder.py
+++ b/chrome/tools/build/win/syzygy/reorder.py
diff --git a/chrome/tools/build/win/syzygy/syzyasan-allocation-filter.txt b/chrome/tools/build/win/syzygy/syzyasan-allocation-filter.txt
new file mode 100644
index 0000000..d38e827
--- /dev/null
+++ b/chrome/tools/build/win/syzygy/syzyasan-allocation-filter.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# This file describes suspicious allocation sites that are to be treated
+# specially and served from the page heap. It is used at instrumentation time
+# to ensure allocations are runtime redirected from specified stack traces.
+#
+# See chrome_syzygy.gypi and instrument.py for more details.
diff --git a/chrome/tools/build/win/win-syzyasan-filter.txt b/chrome/tools/build/win/syzygy/syzyasan-instrumentation-filter.txt
index 534e05e..51af1bf 100644
--- a/chrome/tools/build/win/win-syzyasan-filter.txt
+++ b/chrome/tools/build/win/syzygy/syzyasan-instrumentation-filter.txt
@@ -7,4 +7,4 @@
 # disabling instrumentation of functions with known and deferred bugs, allowing
 # functional instrumented builds of Chrome to be produced in the meantime.
 #
-# See chrome_syzygy.gyp and syzygy_instrument.py for more details.
+# See chrome_syzygy.gypi and instrument.py for more details.