Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: chrome/chrome_syzygy.gyp

Issue 199633004: Put the syzygy targets behind a 'syzygy_optimize' flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 ['syzyasan==1', { 6 ['syzyasan==1', {
7 'variables': { 7 'variables': {
8 'dest_dir': '<(PRODUCT_DIR)/syzygy', 8 'dest_dir': '<(PRODUCT_DIR)/syzygy',
9 'syzygy_exe_dir': '<(DEPTH)/third_party/syzygy/binaries/exe', 9 'syzygy_exe_dir': '<(DEPTH)/third_party/syzygy/binaries/exe',
10 }, 10 },
(...skipping 13 matching lines...) Expand all
24 'files': [ 24 'files': [
25 '<(syzygy_exe_dir)/agent_logger.exe', 25 '<(syzygy_exe_dir)/agent_logger.exe',
26 '<(syzygy_exe_dir)/syzyasan_rtl.dll', 26 '<(syzygy_exe_dir)/syzyasan_rtl.dll',
27 '<(syzygy_exe_dir)/syzyasan_rtl.dll.pdb', 27 '<(syzygy_exe_dir)/syzyasan_rtl.dll.pdb',
28 ], 28 ],
29 }, 29 },
30 ], 30 ],
31 }, 31 },
32 ], 32 ],
33 }], 33 }],
34 ['OS=="win" and fastbuild==0', { 34 ['OS=="win" and fastbuild==0 and (syzygy_optimize==1 or syzyasan==1)', {
35 'variables': { 35 'variables': {
36 'dll_name': 'chrome', 36 'dll_name': 'chrome',
37 }, 37 },
38 'targets': [ 38 'targets': [
39 { 39 {
40 'target_name': 'chrome_dll_syzygy', 40 'target_name': 'chrome_dll_syzygy',
41 'type': 'none', 41 'type': 'none',
42 'sources' : [], 42 'sources' : [],
43 'includes': [ 43 'includes': [
44 'chrome_syzygy.gypi', 44 'chrome_syzygy.gypi',
45 ], 45 ],
46 }, 46 },
47 ], 47 ],
48 }], 48 }],
49 # Note, not else. 49 # Note, not else.
50 ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' 50 ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and '
51 '(syzyasan!=1 or buildtype!="Official")', { 51 '(syzyasan!=1 or buildtype!="Official") and '
52 '(syzygy_optimize==1 or syzyasan==1)', {
chrisha 2014/03/14 22:01:36 A comment to describe this logic? It's a bit tortu
Sébastien Marchand 2014/03/17 17:41:14 I've refactored this file a little bit.
52 'variables': { 53 'variables': {
53 'dll_name': 'chrome_child', 54 'dll_name': 'chrome_child',
54 }, 55 },
55 'targets': [ 56 'targets': [
56 { 57 {
57 'target_name': 'chrome_child_dll_syzygy', 58 'target_name': 'chrome_child_dll_syzygy',
58 'type': 'none', 59 'type': 'none',
59 'sources' : [], 60 'sources' : [],
60 'includes': [ 61 'includes': [
61 'chrome_syzygy.gypi', 62 'chrome_syzygy.gypi',
(...skipping 24 matching lines...) Expand all
86 '<(PRODUCT_DIR)/chrome_child.dll.pdb', 87 '<(PRODUCT_DIR)/chrome_child.dll.pdb',
87 ], 88 ],
88 }, 89 },
89 ], 90 ],
90 }], 91 }],
91 }], 92 }],
92 ], 93 ],
93 }], 94 }],
94 ], 95 ],
95 } 96 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698