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

Side by Side Diff: content/content.gyp

Issue 8495043: Turn on -Wexit-time-destructors for ui and content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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 | Annotate | Revision Log
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 }, 9 },
10 'includes': [ 10 'includes': [
11 '../build/win_precompile.gypi', 11 '../build/win_precompile.gypi',
12 'content_shell.gypi', 12 'content_shell.gypi',
13 'content_tests.gypi', 13 'content_tests.gypi',
14 ], 14 ],
15 'target_defaults': { 15 'target_defaults': {
16 'defines': ['CONTENT_IMPLEMENTATION'], 16 'defines': ['CONTENT_IMPLEMENTATION'],
17 }, 17 },
18 'conditions': [ 18 'conditions': [
19 # In component mode, we build all of content as a single DLL. 19 # In component mode, we build all of content as a single DLL.
20 # However, in the static mode, we need to build content as multiple 20 # However, in the static mode, we need to build content as multiple
21 # targets in order to prevent dependencies from getting introduced 21 # targets in order to prevent dependencies from getting introduced
22 # upstream unnecessarily (e.g., content_renderer depends on allocator 22 # upstream unnecessarily (e.g., content_renderer depends on allocator
23 # and chrome_exe depends on content_common but we don't want 23 # and chrome_exe depends on content_common but we don't want
24 # chrome_exe to have to depend on allocator). 24 # chrome_exe to have to depend on allocator).
25 # TODO(dpranke): Uncomment: ['component == "static_library"', { 25 # TODO(dpranke): Uncomment: ['component == "static_library"', {
26 ['1 == 1', { 26 ['1 == 1', {
27 'targets': [ 27 'targets': [
28 {'target_name': 'content', 28 {'target_name': 'content',
29 'type': 'none', 29 'type': 'none',
30 'variables': { 'enable_wexit_time_destructors': 1, },
Mark Mentovai 2011/11/09 17:44:44 Not strictly necessary for a none-type target, but
Nico 2011/11/09 18:16:02 Removed.
30 'dependencies': [ 31 'dependencies': [
31 'content_app', 32 'content_app',
32 'content_browser', 33 'content_browser',
33 'content_common', 34 'content_common',
34 'content_gpu', 35 'content_gpu',
35 'content_plugin', 36 'content_plugin',
36 'content_ppapi_plugin', 37 'content_ppapi_plugin',
37 'content_renderer', 38 'content_renderer',
38 'content_utility', 39 'content_utility',
39 'content_worker', 40 'content_worker',
40 ], 41 ],
41 }, 42 },
42 {'target_name': 'content_app', 43 {'target_name': 'content_app',
43 'type': 'static_library', 44 'type': 'static_library',
45 'variables': { 'enable_wexit_time_destructors': 1, },
Mark Mentovai 2011/11/09 17:44:44 Why not put this in the variables block at the top
Nico 2011/11/09 18:16:02 I believe the included gypi files get it too in th
44 'includes': [ 46 'includes': [
45 'content_app.gypi', 47 'content_app.gypi',
46 ], 48 ],
47 'dependencies': [ 49 'dependencies': [
48 'content_common', 50 'content_common',
49 ], 51 ],
50 }, 52 },
51 {'target_name': 'content_browser', 53 {'target_name': 'content_browser',
52 'type': 'static_library', 54 'type': 'static_library',
55 'variables': { 'enable_wexit_time_destructors': 1, },
53 'includes': [ 56 'includes': [
54 'content_browser.gypi', 57 'content_browser.gypi',
55 ], 58 ],
56 'dependencies': [ 59 'dependencies': [
57 'content_common', 60 'content_common',
58 ], 61 ],
59 }, 62 },
60 {'target_name': 'content_common', 63 {'target_name': 'content_common',
61 'type': 'static_library', 64 'type': 'static_library',
65 'variables': { 'enable_wexit_time_destructors': 1, },
62 'includes': [ 66 'includes': [
63 'content_common.gypi', 67 'content_common.gypi',
64 ], 68 ],
65 }, 69 },
66 {'target_name': 'content_gpu', 70 {'target_name': 'content_gpu',
67 'type': 'static_library', 71 'type': 'static_library',
72 'variables': { 'enable_wexit_time_destructors': 1, },
68 'includes': [ 73 'includes': [
69 'content_gpu.gypi', 74 'content_gpu.gypi',
70 ], 75 ],
71 'dependencies': [ 76 'dependencies': [
72 'content_common', 77 'content_common',
73 ], 78 ],
74 }, 79 },
75 {'target_name': 'content_plugin', 80 {'target_name': 'content_plugin',
76 'type': 'static_library', 81 'type': 'static_library',
82 'variables': { 'enable_wexit_time_destructors': 1, },
77 'includes': [ 83 'includes': [
78 'content_plugin.gypi', 84 'content_plugin.gypi',
79 ], 85 ],
80 'dependencies': [ 86 'dependencies': [
81 'content_common', 87 'content_common',
82 ], 88 ],
83 }, 89 },
84 {'target_name': 'content_ppapi_plugin', 90 {'target_name': 'content_ppapi_plugin',
85 'type': 'static_library', 91 'type': 'static_library',
92 'variables': { 'enable_wexit_time_destructors': 1, },
86 'includes': [ 93 'includes': [
87 'content_ppapi_plugin.gypi', 94 'content_ppapi_plugin.gypi',
88 ], 95 ],
89 }, 96 },
90 {'target_name': 'content_renderer', 97 {'target_name': 'content_renderer',
91 'type': 'static_library', 98 'type': 'static_library',
99 'variables': { 'enable_wexit_time_destructors': 1, },
92 'includes': [ 100 'includes': [
93 'content_renderer.gypi', 101 'content_renderer.gypi',
94 ], 102 ],
95 'dependencies': [ 103 'dependencies': [
96 'content_common', 104 'content_common',
97 ], 105 ],
98 }, 106 },
99 {'target_name': 'content_utility', 107 {'target_name': 'content_utility',
100 'type': 'static_library', 108 'type': 'static_library',
109 'variables': { 'enable_wexit_time_destructors': 1, },
101 'includes': [ 110 'includes': [
102 'content_utility.gypi', 111 'content_utility.gypi',
103 ], 112 ],
104 'dependencies': [ 113 'dependencies': [
105 'content_common', 114 'content_common',
106 ], 115 ],
107 }, 116 },
108 {'target_name': 'content_worker', 117 {'target_name': 'content_worker',
109 'type': 'static_library', 118 'type': 'static_library',
119 'variables': { 'enable_wexit_time_destructors': 1, },
110 'includes': [ 120 'includes': [
111 'content_worker.gypi', 121 'content_worker.gypi',
112 ], 122 ],
113 'dependencies': [ 123 'dependencies': [
114 'content_common', 124 'content_common',
115 ], 125 ],
116 }, 126 },
117 ], 127 ],
118 'conditions': [ 128 'conditions': [
119 ['OS=="mac"', { 129 ['OS=="mac"', {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 ], 188 ],
179 }], 189 }],
180 ], 190 ],
181 }, 191 },
182 { # component != static_library 192 { # component != static_library
183 'target_defaults': { 193 'target_defaults': {
184 }, 194 },
185 'targets': [ 195 'targets': [
186 {'target_name': 'content', 196 {'target_name': 'content',
187 'type': 'shared_library', 197 'type': 'shared_library',
198 'variables': { 'enable_wexit_time_destructors': 1, },
188 'includes': [ 199 'includes': [
189 'content_app.gypi', 200 'content_app.gypi',
190 'content_browser.gypi', 201 'content_browser.gypi',
191 'content_common.gypi', 202 'content_common.gypi',
192 'content_gpu.gypi', 203 'content_gpu.gypi',
193 'content_plugin.gypi', 204 'content_plugin.gypi',
194 'content_ppapi_plugin.gypi', 205 'content_ppapi_plugin.gypi',
195 'content_renderer.gypi', 206 'content_renderer.gypi',
196 'content_utility.gypi', 207 'content_utility.gypi',
197 'content_worker.gypi', 208 'content_worker.gypi',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 }, 242 },
232 {'target_name': 'content_worker', 243 {'target_name': 'content_worker',
233 'type': 'none', 244 'type': 'none',
234 'dependencies': ['content'], 245 'dependencies': ['content'],
235 }, 246 },
236 ], 247 ],
237 }, 248 },
238 ], 249 ],
239 ], 250 ],
240 } 251 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698