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

Side by Side Diff: content/content.gyp

Issue 15047014: Move child-common classes to content/common_child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « content/common_child/plugin_param_traits.cc ('k') | content/content_common.gypi » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 9 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
10 }, 10 },
(...skipping 30 matching lines...) Expand all
41 'target_defines': [ 41 'target_defines': [
42 'COMPILE_CONTENT_STATICALLY', 42 'COMPILE_CONTENT_STATICALLY',
43 ], 43 ],
44 'targets': [ 44 'targets': [
45 { 45 {
46 'target_name': 'content', 46 'target_name': 'content',
47 'type': 'none', 47 'type': 'none',
48 'dependencies': [ 48 'dependencies': [
49 'content_app', 49 'content_app',
50 'content_browser', 50 'content_browser',
51 'content_common_plugin', 51 'content_common_child',
52 'content_common', 52 'content_common',
53 ], 53 ],
54 'conditions': [ 54 'conditions': [
55 ['OS != "ios" and chrome_split_dll != 1', { 55 ['OS != "ios" and chrome_split_dll != 1', {
56 'dependencies': [ 56 'dependencies': [
57 'content_gpu', 57 'content_gpu',
58 'content_plugin', 58 'content_plugin',
59 'content_ppapi_plugin', 59 'content_ppapi_plugin',
60 'content_renderer', 60 'content_renderer',
61 'content_utility', 61 'content_utility',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 'content_renderer', 93 'content_renderer',
94 ], 94 ],
95 }], 95 }],
96 ['chrome_split_dll', { 96 ['chrome_split_dll', {
97 'dependencies': [ 97 'dependencies': [
98 'content_gpu', 98 'content_gpu',
99 ], 99 ],
100 }], 100 }],
101 ['java_bridge==1', { 101 ['java_bridge==1', {
102 'dependencies': [ 102 'dependencies': [
103 'content_common_plugin', 103 'content_common_child',
104 ] 104 ]
105 }] 105 }]
106 ], 106 ],
107 }, 107 },
108 { 108 {
109 'target_name': 'content_common', 109 'target_name': 'content_common',
110 'type': 'static_library', 110 'type': 'static_library',
111 'variables': { 'enable_wexit_time_destructors': 1, }, 111 'variables': { 'enable_wexit_time_destructors': 1, },
112 'includes': [ 112 'includes': [
113 'content_common.gypi', 113 'content_common.gypi',
114 ], 114 ],
115 'conditions': [ 115 'conditions': [
116 ['OS != "ios"', { 116 ['OS != "ios"', {
117 'dependencies': [ 117 'dependencies': [
118 'content_resources.gyp:content_resources', 118 'content_resources.gyp:content_resources',
119 ], 119 ],
120 }], 120 }],
121 ], 121 ],
122 # Disable c4267 warnings until we fix size_t to int truncations. 122 # Disable c4267 warnings until we fix size_t to int truncations.
123 'msvs_disabled_warnings': [ 4267, ], 123 'msvs_disabled_warnings': [ 4267, ],
124 }, 124 },
125 { 125 {
126 'target_name': 'content_common_plugin', 126 'target_name': 'content_common_child',
127 'type': 'static_library', 127 'type': 'static_library',
128 'variables': { 'enable_wexit_time_destructors': 1, }, 128 'variables': { 'enable_wexit_time_destructors': 1, },
129 'includes': [ 129 'includes': [
130 'content_common_plugin.gypi', 130 'content_common_child.gypi',
131 ], 131 ],
132 'conditions': [ 132 'conditions': [
133 ['OS != "ios"', { 133 ['OS != "ios"', {
134 'dependencies': [ 134 'dependencies': [
135 'content_resources.gyp:content_resources', 135 'content_resources.gyp:content_resources',
136 ], 136 ],
137 }], 137 }],
138 ], 138 ],
139 # Disable c4267 warnings until we fix size_t to int truncations. 139 # Disable c4267 warnings until we fix size_t to int truncations.
140 'msvs_disabled_warnings': [ 4267, ], 140 'msvs_disabled_warnings': [ 4267, ],
(...skipping 15 matching lines...) Expand all
156 ], 156 ],
157 }, 157 },
158 { 158 {
159 'target_name': 'content_plugin', 159 'target_name': 'content_plugin',
160 'type': 'static_library', 160 'type': 'static_library',
161 'variables': { 'enable_wexit_time_destructors': 1, }, 161 'variables': { 'enable_wexit_time_destructors': 1, },
162 'includes': [ 162 'includes': [
163 'content_plugin.gypi', 163 'content_plugin.gypi',
164 ], 164 ],
165 'dependencies': [ 165 'dependencies': [
166 'content_common_plugin', 166 'content_common_child',
167 'content_common', 167 'content_common',
168 ], 168 ],
169 }, 169 },
170 { 170 {
171 'target_name': 'content_ppapi_plugin', 171 'target_name': 'content_ppapi_plugin',
172 'type': 'static_library', 172 'type': 'static_library',
173 'variables': { 'enable_wexit_time_destructors': 1, }, 173 'variables': { 'enable_wexit_time_destructors': 1, },
174 'includes': [ 174 'includes': [
175 'content_ppapi_plugin.gypi', 175 'content_ppapi_plugin.gypi',
176 ], 176 ],
177 # Disable c4267 warnings until we fix size_t to int truncations. 177 # Disable c4267 warnings until we fix size_t to int truncations.
178 'msvs_disabled_warnings': [ 4267, ], 178 'msvs_disabled_warnings': [ 4267, ],
179 }, 179 },
180 { 180 {
181 'target_name': 'content_renderer', 181 'target_name': 'content_renderer',
182 'type': 'static_library', 182 'type': 'static_library',
183 'variables': { 'enable_wexit_time_destructors': 1, }, 183 'variables': { 'enable_wexit_time_destructors': 1, },
184 'includes': [ 184 'includes': [
185 'content_renderer.gypi', 185 'content_renderer.gypi',
186 ], 186 ],
187 'dependencies': [ 187 'dependencies': [
188 'content_common_plugin', 188 'content_common_child',
189 'content_common', 189 'content_common',
190 'content_resources.gyp:content_resources', 190 'content_resources.gyp:content_resources',
191 ], 191 ],
192 'conditions': [ 192 'conditions': [
193 ['chromium_enable_vtune_jit_for_v8==1', { 193 ['chromium_enable_vtune_jit_for_v8==1', {
194 'dependencies': [ 194 'dependencies': [
195 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 195 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
196 ], 196 ],
197 }], 197 }],
198 ], 198 ],
(...skipping 10 matching lines...) Expand all
209 ], 209 ],
210 }, 210 },
211 { 211 {
212 'target_name': 'content_worker', 212 'target_name': 'content_worker',
213 'type': 'static_library', 213 'type': 'static_library',
214 'variables': { 'enable_wexit_time_destructors': 1, }, 214 'variables': { 'enable_wexit_time_destructors': 1, },
215 'includes': [ 215 'includes': [
216 'content_worker.gypi', 216 'content_worker.gypi',
217 ], 217 ],
218 'dependencies': [ 218 'dependencies': [
219 'content_common_child',
219 'content_common', 220 'content_common',
220 ], 221 ],
221 }, 222 },
222 ], 223 ],
223 }], 224 }],
224 ], 225 ],
225 }, 226 },
226 { # component != static_library 227 { # component != static_library
227 'targets': [ 228 'targets': [
228 { 229 {
(...skipping 11 matching lines...) Expand all
240 }], 241 }],
241 ['chromium_enable_vtune_jit_for_v8==1', { 242 ['chromium_enable_vtune_jit_for_v8==1', {
242 'dependencies': [ 243 'dependencies': [
243 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 244 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
244 ], 245 ],
245 }], 246 }],
246 ], 247 ],
247 'includes': [ 248 'includes': [
248 'content_app.gypi', 249 'content_app.gypi',
249 'content_browser.gypi', 250 'content_browser.gypi',
250 'content_common_plugin.gypi', 251 'content_common_child.gypi',
251 'content_common.gypi', 252 'content_common.gypi',
252 'content_gpu.gypi', 253 'content_gpu.gypi',
253 'content_plugin.gypi', 254 'content_plugin.gypi',
254 'content_ppapi_plugin.gypi', 255 'content_ppapi_plugin.gypi',
255 'content_renderer.gypi', 256 'content_renderer.gypi',
256 'content_utility.gypi', 257 'content_utility.gypi',
257 'content_worker.gypi', 258 'content_worker.gypi',
258 ], 259 ],
259 'msvs_settings': { 260 'msvs_settings': {
260 'VCLinkerTool': { 261 'VCLinkerTool': {
(...skipping 16 matching lines...) Expand all
277 'dependencies': ['content'], 278 'dependencies': ['content'],
278 }, 279 },
279 { 280 {
280 'target_name': 'content_common', 281 'target_name': 'content_common',
281 'type': 'none', 282 'type': 'none',
282 'dependencies': ['content', 'content_resources.gyp:content_resources'] , 283 'dependencies': ['content', 'content_resources.gyp:content_resources'] ,
283 # Disable c4267 warnings until we fix size_t to int truncations. 284 # Disable c4267 warnings until we fix size_t to int truncations.
284 'msvs_disabled_warnings': [ 4267, ], 285 'msvs_disabled_warnings': [ 4267, ],
285 }, 286 },
286 { 287 {
287 'target_name': 'content_common_plugin', 288 'target_name': 'content_common_child',
288 'type': 'none', 289 'type': 'none',
289 'dependencies': ['content'], 290 'dependencies': ['content'],
290 }, 291 },
291 { 292 {
292 'target_name': 'content_gpu', 293 'target_name': 'content_gpu',
293 'type': 'none', 294 'type': 'none',
294 'dependencies': ['content'], 295 'dependencies': ['content'],
295 }, 296 },
296 { 297 {
297 'target_name': 'content_plugin', 298 'target_name': 'content_plugin',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 'include_dirs': [ 428 'include_dirs': [
428 '<(SHARED_INTERMEDIATE_DIR)/content', 429 '<(SHARED_INTERMEDIATE_DIR)/content',
429 ], 430 ],
430 }, 431 },
431 'includes': [ 'content_jni.gypi' ], 432 'includes': [ 'content_jni.gypi' ],
432 }, 433 },
433 ], 434 ],
434 }], # OS == "android" 435 }], # OS == "android"
435 ], 436 ],
436 } 437 }
OLDNEW
« no previous file with comments | « content/common_child/plugin_param_traits.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698