Put the syzygy targets behind a 'syzygy_optimize' flag.

chrome/chrome_syzygy.gypi

Index: chrome/chrome_syzygy.gypi
diff --git a/chrome/chrome_syzygy.gypi b/chrome/chrome_syzygy.gypi
index a5273ba446dbfc28eb9141938bab2856aa8ed530..bfc4a3f7e008fcc042ef47fe1ccc9927057784b7 100644
--- a/chrome/chrome_syzygy.gypi
+++ b/chrome/chrome_syzygy.gypi
@@ -17,7 +17,7 @@
     'dest_dir': '<(PRODUCT_DIR)/syzygy',
   },
   'conditions': [
-    ['syzyasan!=1', {
+    ['syzyasan!=1 and syzygy_optimize==1', {
       # Reorder chrome DLL executable.
       # If there's a matching chrome.dll-ordering.json file present in
       # the output directory, chrome.dll will be ordered according to
@@ -42,7 +42,8 @@
           ],
         },
       ],
-    }, {
+    }],
+    ['syzyasan==1', {

[chrisha, 2014/03/14 22:01:36]

Should syzygy_optimize and syzyasan be mutually exclusive? Do you want to check
syzyasan==1 and syzygy_optimize==0 like above?

[Sébastien Marchand, 2014/03/17 17:41:14]

Done.

       # Instrument chrome DLL executable with SyzyAsan.
       'actions': [
         {