Chromium Code Reviews| Index: chrome/chrome_syzygy.gyp |
| diff --git a/chrome/chrome_syzygy.gyp b/chrome/chrome_syzygy.gyp |
| index d4994ac1813c8432e8564dc25f185331d4a39f21..0801d18e62b43d9c9101ae5abbaa4698b74bffd6 100644 |
| --- a/chrome/chrome_syzygy.gyp |
| +++ b/chrome/chrome_syzygy.gyp |
| @@ -19,7 +19,8 @@ |
| ], |
| }], |
| # Note, not else. |
| - ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1', { |
| + ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' |
| + '(asan!=1 or buildtype!="Official")', { |
| 'variables': { |
| 'dll_name': 'chrome_child', |
| }, |
| @@ -33,6 +34,34 @@ |
| ], |
| }, |
| ], |
| + }, { |
| + 'conditions': [ |
| + ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' |
|
gab
2013/09/10 18:27:02
Feels like this would be cleaner if:
1) The condi
Sébastien Marchand
2013/09/10 18:58:56
Yeah, Chris is working on another CL that'll chang
|
| + 'asan==1 and buildtype=="Official"', { |
| + 'targets': [ |
| + { |
| + 'target_name': 'chrome_child_dll_syzygy', |
| + 'type': 'none', |
| + 'inputs': [ |
| + '<(PRODUCT_DIR)/chrome_child.dll', |
| + '<(PRODUCT_DIR)/chrome_child.dll.pdb', |
| + ], |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/syzygy/chrome_child.dll', |
| + '<(PRODUCT_DIR)/syzygy/chrome_child.dll.pdb', |
| + ], |
| + 'copies': [ |
| + { |
| + 'destination': '<(PRODUCT_DIR)/syzygy', |
| + 'files': [ |
| + '<(PRODUCT_DIR)/chrome_child.dll', |
| + '<(PRODUCT_DIR)/chrome_child.dll.pdb', |
| + ], |
|
gab
2013/09/10 18:27:02
Which doesn't the main chrome DLL need to do this
gab
2013/09/10 18:27:32
s/Which/Why
Sébastien Marchand
2013/09/10 18:58:56
The purpose of this CL was to be able to run an ex
|
| + }, |
| + ], |
| + }], |
| + }], |
| + ], |
| }], |
| ], |
| } |