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

Side by Side Diff: chrome/chrome_syzygy.gypi

Issue 199633004: Put the syzygy targets behind a 'syzygy_optimize' flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
« no previous file with comments | « chrome/chrome_syzygy.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 # Intended to be included by chrome_syzygy.gyp. A variable 'dll_name' should 5 # Intended to be included by chrome_syzygy.gyp. A variable 'dll_name' should
6 # be set to the base name of the DLL. This is used to generate the build steps 6 # be set to the base name of the DLL. This is used to generate the build steps
7 # for both chrome.dll and chrome_child.dll when in multiple dll mode. 7 # for both chrome.dll and chrome_child.dll when in multiple dll mode.
8 { 8 {
9 # Reorder or instrument the initial chrome DLL executable, placing the 9 # Reorder or instrument the initial chrome DLL executable, placing the
10 # optimized output and corresponding PDB file into the "syzygy" 10 # optimized output and corresponding PDB file into the "syzygy"
11 # subdirectory. 11 # subdirectory.
12 # This target won't build in fastbuild, since there are no PDBs. 12 # This target won't build in fastbuild, since there are no PDBs.
13 'dependencies': [ 13 'dependencies': [
14 '<(DEPTH)/chrome/chrome.gyp:<(dll_name)_dll', 14 '<(DEPTH)/chrome/chrome.gyp:<(dll_name)_dll',
15 ], 15 ],
16 'variables': { 16 'variables': {
17 'dest_dir': '<(PRODUCT_DIR)/syzygy', 17 'dest_dir': '<(PRODUCT_DIR)/syzygy',
18 }, 18 },
19 'conditions': [ 19 'conditions': [
20 ['syzyasan!=1', { 20 ['syzyasan==0 and syzygy_optimize==1', {
21 # Reorder chrome DLL executable. 21 # Reorder chrome DLL executable.
22 # If there's a matching chrome.dll-ordering.json file present in 22 # If there's a matching chrome.dll-ordering.json file present in
23 # the output directory, chrome.dll will be ordered according to 23 # the output directory, chrome.dll will be ordered according to
24 # that, otherwise it will be randomized. 24 # that, otherwise it will be randomized.
25 'actions': [ 25 'actions': [
26 { 26 {
27 'action_name': 'Reorder Chrome with Syzygy', 27 'action_name': 'Reorder Chrome with Syzygy',
28 'inputs': [ 28 'inputs': [
29 '<(PRODUCT_DIR)/<(dll_name).dll', 29 '<(PRODUCT_DIR)/<(dll_name).dll',
30 '<(PRODUCT_DIR)/<(dll_name).dll.pdb', 30 '<(PRODUCT_DIR)/<(dll_name).dll.pdb',
31 ], 31 ],
32 'outputs': [ 32 'outputs': [
33 '<(dest_dir)/<(dll_name).dll', 33 '<(dest_dir)/<(dll_name).dll',
34 '<(dest_dir)/<(dll_name).dll.pdb', 34 '<(dest_dir)/<(dll_name).dll.pdb',
35 ], 35 ],
36 'action': [ 36 'action': [
37 'python', 37 'python',
38 '<(DEPTH)/chrome/tools/build/win/syzygy_reorder.py', 38 '<(DEPTH)/chrome/tools/build/win/syzygy_reorder.py',
39 '--input_executable', '<(PRODUCT_DIR)/<(dll_name).dll', 39 '--input_executable', '<(PRODUCT_DIR)/<(dll_name).dll',
40 '--input_symbol', '<(PRODUCT_DIR)/<(dll_name).dll.pdb', 40 '--input_symbol', '<(PRODUCT_DIR)/<(dll_name).dll.pdb',
41 '--destination_dir', '<(dest_dir)', 41 '--destination_dir', '<(dest_dir)',
42 ], 42 ],
43 }, 43 },
44 ], 44 ],
45 }, { 45 }],
46 ['syzyasan==1 and syzygy_optimize==0', {
46 # Instrument chrome DLL executable with SyzyAsan. 47 # Instrument chrome DLL executable with SyzyAsan.
47 'actions': [ 48 'actions': [
48 { 49 {
49 'action_name': 'Instrument Chrome with SyzyAsan', 50 'action_name': 'Instrument Chrome with SyzyAsan',
50 'inputs': [ 51 'inputs': [
51 '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt', 52 '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt',
52 '<(PRODUCT_DIR)/<(dll_name).dll', 53 '<(PRODUCT_DIR)/<(dll_name).dll',
53 ], 54 ],
54 'outputs': [ 55 'outputs': [
55 '<(dest_dir)/<(dll_name).dll', 56 '<(dest_dir)/<(dll_name).dll',
(...skipping 13 matching lines...) Expand all
69 '--destination_dir', '<(dest_dir)', 70 '--destination_dir', '<(dest_dir)',
70 ], 71 ],
71 }, 72 },
72 ], 73 ],
73 'dependencies': [ 74 'dependencies': [
74 'copy_syzyasan_binaries', 75 'copy_syzyasan_binaries',
75 ], 76 ],
76 }], 77 }],
77 ], 78 ],
78 } 79 }
OLDNEW
« no previous file with comments | « chrome/chrome_syzygy.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698