OLD | NEW |
---|---|
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 { | 4 { |
5 'conditions': [ | 5 'conditions': [ |
6 ['OS=="win" and fastbuild==0', { | 6 ['OS=="win" and fastbuild==0', { |
7 'variables': { | 7 'variables': { |
8 'dll_name': 'chrome', | 8 'dll_name': 'chrome', |
9 }, | 9 }, |
10 'targets': [ | 10 'targets': [ |
11 { | 11 { |
12 'target_name': 'chrome_dll_syzygy', | 12 'target_name': 'chrome_dll_syzygy', |
13 'type': 'none', | 13 'type': 'none', |
14 'sources' : [], | 14 'sources' : [], |
15 'includes': [ | 15 'includes': [ |
16 'chrome_syzygy.gypi', | 16 'chrome_syzygy.gypi', |
17 ], | 17 ], |
18 }, | 18 }, |
19 ], | 19 ], |
20 }], | 20 }], |
21 # Note, not else. | 21 # Note, not else. |
22 ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1', { | 22 ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' |
23 '(asan!=1 or buildtype!="Official")', { | |
23 'variables': { | 24 'variables': { |
24 'dll_name': 'chrome_child', | 25 'dll_name': 'chrome_child', |
25 }, | 26 }, |
26 'targets': [ | 27 'targets': [ |
27 { | 28 { |
28 'target_name': 'chrome_child_dll_syzygy', | 29 'target_name': 'chrome_child_dll_syzygy', |
29 'type': 'none', | 30 'type': 'none', |
30 'sources' : [], | 31 'sources' : [], |
31 'includes': [ | 32 'includes': [ |
32 'chrome_syzygy.gypi', | 33 'chrome_syzygy.gypi', |
33 ], | 34 ], |
34 }, | 35 }, |
35 ], | 36 ], |
37 }, { | |
38 'conditions': [ | |
39 ['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
| |
40 'asan==1 and buildtype=="Official"', { | |
41 'targets': [ | |
42 { | |
43 'target_name': 'chrome_child_dll_syzygy', | |
44 'type': 'none', | |
45 'inputs': [ | |
46 '<(PRODUCT_DIR)/chrome_child.dll', | |
47 '<(PRODUCT_DIR)/chrome_child.dll.pdb', | |
48 ], | |
49 'outputs': [ | |
50 '<(PRODUCT_DIR)/syzygy/chrome_child.dll', | |
51 '<(PRODUCT_DIR)/syzygy/chrome_child.dll.pdb', | |
52 ], | |
53 'copies': [ | |
54 { | |
55 'destination': '<(PRODUCT_DIR)/syzygy', | |
56 'files': [ | |
57 '<(PRODUCT_DIR)/chrome_child.dll', | |
58 '<(PRODUCT_DIR)/chrome_child.dll.pdb', | |
59 ], | |
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
| |
60 }, | |
61 ], | |
62 }], | |
63 }], | |
64 ], | |
36 }], | 65 }], |
37 ], | 66 ], |
38 } | 67 } |
OLD | NEW |