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

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: fix mac and win builds 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
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 '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 'target_defaults': { 10 'target_defaults': {
(...skipping 29 matching lines...) Expand all
40 'target_defines': [ 40 'target_defines': [
41 'COMPILE_CONTENT_STATICALLY', 41 'COMPILE_CONTENT_STATICALLY',
42 ], 42 ],
43 'targets': [ 43 'targets': [
44 { 44 {
45 'target_name': 'content', 45 'target_name': 'content',
46 'type': 'none', 46 'type': 'none',
47 'dependencies': [ 47 'dependencies': [
48 'content_app', 48 'content_app',
49 'content_browser', 49 'content_browser',
50 'content_common_plugin', 50 'content_common_child',
51 'content_common', 51 'content_common',
52 ], 52 ],
53 'conditions': [ 53 'conditions': [
54 ['OS != "ios" and chrome_split_dll != 1', { 54 ['OS != "ios" and chrome_split_dll != 1', {
55 'dependencies': [ 55 'dependencies': [
56 'content_gpu', 56 'content_gpu',
57 'content_plugin', 57 'content_plugin',
58 'content_ppapi_plugin', 58 'content_ppapi_plugin',
59 'content_renderer', 59 'content_renderer',
60 'content_utility', 60 'content_utility',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 'content_renderer', 92 'content_renderer',
93 ], 93 ],
94 }], 94 }],
95 ['chrome_split_dll', { 95 ['chrome_split_dll', {
96 'dependencies': [ 96 'dependencies': [
97 'content_gpu', 97 'content_gpu',
98 ], 98 ],
99 }], 99 }],
100 ['java_bridge==1', { 100 ['java_bridge==1', {
101 'dependencies': [ 101 'dependencies': [
102 'content_common_plugin', 102 'content_common_child',
103 ] 103 ]
104 }] 104 }]
105 ], 105 ],
106 }, 106 },
107 { 107 {
108 'target_name': 'content_common', 108 'target_name': 'content_common',
109 'type': 'static_library', 109 'type': 'static_library',
110 'variables': { 'enable_wexit_time_destructors': 1, }, 110 'variables': { 'enable_wexit_time_destructors': 1, },
111 'includes': [ 111 'includes': [
112 'content_common.gypi', 112 'content_common.gypi',
113 ], 113 ],
114 'conditions': [ 114 'conditions': [
115 ['OS != "ios"', { 115 ['OS != "ios"', {
116 'dependencies': [ 116 'dependencies': [
117 'content_resources.gyp:content_resources', 117 'content_resources.gyp:content_resources',
118 ], 118 ],
119 }], 119 }],
120 ], 120 ],
121 # Disable c4267 warnings until we fix size_t to int truncations. 121 # Disable c4267 warnings until we fix size_t to int truncations.
122 'msvs_disabled_warnings': [ 4267, ], 122 'msvs_disabled_warnings': [ 4267, ],
123 }, 123 },
124 { 124 {
125 'target_name': 'content_common_plugin', 125 'target_name': 'content_common_child',
126 'type': 'static_library', 126 'type': 'static_library',
127 'variables': { 'enable_wexit_time_destructors': 1, }, 127 'variables': { 'enable_wexit_time_destructors': 1, },
128 'includes': [ 128 'includes': [
129 'content_common_plugin.gypi', 129 'content_common_child.gypi',
130 ], 130 ],
131 'conditions': [ 131 'conditions': [
132 ['OS != "ios"', { 132 ['OS != "ios"', {
133 'dependencies': [ 133 'dependencies': [
134 'content_resources.gyp:content_resources', 134 'content_resources.gyp:content_resources',
135 ], 135 ],
136 }], 136 }],
137 ], 137 ],
138 # Disable c4267 warnings until we fix size_t to int truncations. 138 # Disable c4267 warnings until we fix size_t to int truncations.
139 'msvs_disabled_warnings': [ 4267, ], 139 'msvs_disabled_warnings': [ 4267, ],
(...skipping 15 matching lines...) Expand all
155 ], 155 ],
156 }, 156 },
157 { 157 {
158 'target_name': 'content_plugin', 158 'target_name': 'content_plugin',
159 'type': 'static_library', 159 'type': 'static_library',
160 'variables': { 'enable_wexit_time_destructors': 1, }, 160 'variables': { 'enable_wexit_time_destructors': 1, },
161 'includes': [ 161 'includes': [
162 'content_plugin.gypi', 162 'content_plugin.gypi',
163 ], 163 ],
164 'dependencies': [ 164 'dependencies': [
165 'content_common_plugin', 165 'content_common_child',
166 'content_common', 166 'content_common',
167 ], 167 ],
168 }, 168 },
169 { 169 {
170 'target_name': 'content_ppapi_plugin', 170 'target_name': 'content_ppapi_plugin',
171 'type': 'static_library', 171 'type': 'static_library',
172 'variables': { 'enable_wexit_time_destructors': 1, }, 172 'variables': { 'enable_wexit_time_destructors': 1, },
173 'includes': [ 173 'includes': [
174 'content_ppapi_plugin.gypi', 174 'content_ppapi_plugin.gypi',
175 ], 175 ],
176 # Disable c4267 warnings until we fix size_t to int truncations. 176 # Disable c4267 warnings until we fix size_t to int truncations.
177 'msvs_disabled_warnings': [ 4267, ], 177 'msvs_disabled_warnings': [ 4267, ],
178 }, 178 },
179 { 179 {
180 'target_name': 'content_renderer', 180 'target_name': 'content_renderer',
181 'type': 'static_library', 181 'type': 'static_library',
182 'variables': { 'enable_wexit_time_destructors': 1, }, 182 'variables': { 'enable_wexit_time_destructors': 1, },
183 'includes': [ 183 'includes': [
184 'content_renderer.gypi', 184 'content_renderer.gypi',
185 ], 185 ],
186 'dependencies': [ 186 'dependencies': [
187 'content_common_plugin', 187 'content_common_child',
188 'content_common', 188 'content_common',
189 'content_resources.gyp:content_resources', 189 'content_resources.gyp:content_resources',
190 ], 190 ],
191 }, 191 },
192 { 192 {
193 'target_name': 'content_utility', 193 'target_name': 'content_utility',
194 'type': 'static_library', 194 'type': 'static_library',
195 'variables': { 'enable_wexit_time_destructors': 1, }, 195 'variables': { 'enable_wexit_time_destructors': 1, },
196 'includes': [ 196 'includes': [
197 'content_utility.gypi', 197 'content_utility.gypi',
198 ], 198 ],
199 'dependencies': [ 199 'dependencies': [
200 'content_common', 200 'content_common',
201 ], 201 ],
202 }, 202 },
203 { 203 {
204 'target_name': 'content_worker', 204 'target_name': 'content_worker',
205 'type': 'static_library', 205 'type': 'static_library',
206 'variables': { 'enable_wexit_time_destructors': 1, }, 206 'variables': { 'enable_wexit_time_destructors': 1, },
207 'includes': [ 207 'includes': [
208 'content_worker.gypi', 208 'content_worker.gypi',
209 ], 209 ],
210 'dependencies': [ 210 'dependencies': [
211 'content_common_child',
211 'content_common', 212 'content_common',
212 ], 213 ],
213 }, 214 },
214 ], 215 ],
215 }], 216 }],
216 ], 217 ],
217 }, 218 },
218 { # component != static_library 219 { # component != static_library
219 'targets': [ 220 'targets': [
220 { 221 {
221 'target_name': 'content', 222 'target_name': 'content',
222 'type': 'shared_library', 223 'type': 'shared_library',
223 'variables': { 'enable_wexit_time_destructors': 1, }, 224 'variables': { 'enable_wexit_time_destructors': 1, },
224 'dependencies': [ 225 'dependencies': [
225 'content_resources.gyp:content_resources', 226 'content_resources.gyp:content_resources',
226 ], 227 ],
227 'conditions': [ 228 'conditions': [
228 ['OS=="mac"', { 229 ['OS=="mac"', {
229 'dependencies': [ 230 'dependencies': [
230 '<(DEPTH)/third_party/mach_override/mach_override.gyp:mach_overr ide', 231 '<(DEPTH)/third_party/mach_override/mach_override.gyp:mach_overr ide',
231 ], 232 ],
232 }], 233 }],
233 ], 234 ],
234 'includes': [ 235 'includes': [
235 'content_app.gypi', 236 'content_app.gypi',
236 'content_browser.gypi', 237 'content_browser.gypi',
237 'content_common_plugin.gypi', 238 'content_common_child.gypi',
238 'content_common.gypi', 239 'content_common.gypi',
239 'content_gpu.gypi', 240 'content_gpu.gypi',
240 'content_plugin.gypi', 241 'content_plugin.gypi',
241 'content_ppapi_plugin.gypi', 242 'content_ppapi_plugin.gypi',
242 'content_renderer.gypi', 243 'content_renderer.gypi',
243 'content_utility.gypi', 244 'content_utility.gypi',
244 'content_worker.gypi', 245 'content_worker.gypi',
245 ], 246 ],
246 'msvs_settings': { 247 'msvs_settings': {
247 'VCLinkerTool': { 248 'VCLinkerTool': {
(...skipping 16 matching lines...) Expand all
264 'dependencies': ['content'], 265 'dependencies': ['content'],
265 }, 266 },
266 { 267 {
267 'target_name': 'content_common', 268 'target_name': 'content_common',
268 'type': 'none', 269 'type': 'none',
269 'dependencies': ['content', 'content_resources.gyp:content_resources'] , 270 'dependencies': ['content', 'content_resources.gyp:content_resources'] ,
270 # Disable c4267 warnings until we fix size_t to int truncations. 271 # Disable c4267 warnings until we fix size_t to int truncations.
271 'msvs_disabled_warnings': [ 4267, ], 272 'msvs_disabled_warnings': [ 4267, ],
272 }, 273 },
273 { 274 {
274 'target_name': 'content_common_plugin', 275 'target_name': 'content_common_child',
275 'type': 'none', 276 'type': 'none',
276 'dependencies': ['content'], 277 'dependencies': ['content'],
277 }, 278 },
278 { 279 {
279 'target_name': 'content_gpu', 280 'target_name': 'content_gpu',
280 'type': 'none', 281 'type': 'none',
281 'dependencies': ['content'], 282 'dependencies': ['content'],
282 }, 283 },
283 { 284 {
284 'target_name': 'content_plugin', 285 'target_name': 'content_plugin',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 'include_dirs': [ 415 'include_dirs': [
415 '<(SHARED_INTERMEDIATE_DIR)/content', 416 '<(SHARED_INTERMEDIATE_DIR)/content',
416 ], 417 ],
417 }, 418 },
418 'includes': [ 'content_jni.gypi' ], 419 'includes': [ 'content_jni.gypi' ],
419 }, 420 },
420 ], 421 ],
421 }], # OS == "android" 422 }], # OS == "android"
422 ], 423 ],
423 } 424 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698