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

Side by Side Diff: chrome/chrome_syzygy.gyp

Issue 167773002: Make SyzyAsan depend on 'syzyasan' GYP flag instead of 'asan==1 and OS=="win"' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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 | « build/common.gypi ('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 (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 asan==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 },
11 # Copy the SyzyASan runtime and logger to the syzygy directory. 11 # Copy the SyzyASan runtime and logger to the syzygy directory.
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'copy_syzyasan_binaries', 14 'target_name': 'copy_syzyasan_binaries',
15 'type': 'none', 15 'type': 'none',
16 'outputs': [ 16 'outputs': [
(...skipping 24 matching lines...) Expand all
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 '(asan!=1 or buildtype!="Official")', { 51 '(syzyasan!=1 or buildtype!="Official")', {
52 'variables': { 52 'variables': {
53 'dll_name': 'chrome_child', 53 'dll_name': 'chrome_child',
54 }, 54 },
55 'targets': [ 55 'targets': [
56 { 56 {
57 'target_name': 'chrome_child_dll_syzygy', 57 'target_name': 'chrome_child_dll_syzygy',
58 'type': 'none', 58 'type': 'none',
59 'sources' : [], 59 'sources' : [],
60 'includes': [ 60 'includes': [
61 'chrome_syzygy.gypi', 61 'chrome_syzygy.gypi',
62 ], 62 ],
63 }, 63 },
64 ], 64 ],
65 }, { 65 }, {
66 'conditions': [ 66 'conditions': [
67 ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' 67 ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and '
68 'asan==1 and buildtype=="Official"', { 68 'syzyasan==1 and buildtype=="Official"', {
69 'targets': [ 69 'targets': [
70 { 70 {
71 'target_name': 'chrome_child_dll_syzygy', 71 'target_name': 'chrome_child_dll_syzygy',
72 'type': 'none', 72 'type': 'none',
73 'inputs': [ 73 'inputs': [
74 '<(PRODUCT_DIR)/chrome_child.dll', 74 '<(PRODUCT_DIR)/chrome_child.dll',
75 '<(PRODUCT_DIR)/chrome_child.dll.pdb', 75 '<(PRODUCT_DIR)/chrome_child.dll.pdb',
76 ], 76 ],
77 'outputs': [ 77 'outputs': [
78 '<(PRODUCT_DIR)/syzygy/chrome_child.dll', 78 '<(PRODUCT_DIR)/syzygy/chrome_child.dll',
79 '<(PRODUCT_DIR)/syzygy/chrome_child.dll.pdb', 79 '<(PRODUCT_DIR)/syzygy/chrome_child.dll.pdb',
80 ], 80 ],
81 'copies': [ 81 'copies': [
82 { 82 {
83 'destination': '<(PRODUCT_DIR)/syzygy', 83 'destination': '<(PRODUCT_DIR)/syzygy',
84 'files': [ 84 'files': [
85 '<(PRODUCT_DIR)/chrome_child.dll', 85 '<(PRODUCT_DIR)/chrome_child.dll',
86 '<(PRODUCT_DIR)/chrome_child.dll.pdb', 86 '<(PRODUCT_DIR)/chrome_child.dll.pdb',
87 ], 87 ],
88 }, 88 },
89 ], 89 ],
90 }], 90 }],
91 }], 91 }],
92 ], 92 ],
93 }], 93 }],
94 ], 94 ],
95 } 95 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698