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

Side by Side Diff: content/content.gyp

Issue 498673005: Cleanup: Rename content_resources.gyp to content_resources.gypi and include in content.gyp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ios Created 6 years, 3 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 | « no previous file | content/content_resources.gyp » ('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': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' , 9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' ,
10 }, 10 },
11 'target_defaults': { 11 'target_defaults': {
12 'defines': ['CONTENT_IMPLEMENTATION'], 12 'defines': ['CONTENT_IMPLEMENTATION'],
13 'conditions': [ 13 'conditions': [
14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. 14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
15 ['OS=="win" and target_arch=="x64"', { 15 ['OS=="win" and target_arch=="x64"', {
16 'msvs_settings': { 16 'msvs_settings': {
17 'VCCLCompilerTool': { 17 'VCCLCompilerTool': {
18 'AdditionalOptions': ['/bigobj'], 18 'AdditionalOptions': ['/bigobj'],
19 }, 19 },
20 }, 20 },
21 }], 21 }],
22 ], 22 ],
23 }, 23 },
24 'conditions': [ 24 'conditions': [
25 ['OS != "ios"', { 25 ['OS != "ios"', {
26 'includes': [ 26 'includes': [
27 'content_common_mojo_bindings.gypi', 27 'content_common_mojo_bindings.gypi',
28 'content_resources.gypi',
28 '../build/win_precompile.gypi', 29 '../build/win_precompile.gypi',
29 ], 30 ],
30 }], 31 }],
31 ['OS == "win"', { 32 ['OS == "win"', {
32 'targets': [ 33 'targets': [
33 { 34 {
34 'target_name': 'content_startup_helper_win', 35 'target_name': 'content_startup_helper_win',
35 'type': 'static_library', 36 'type': 'static_library',
36 'include_dirs': [ 37 'include_dirs': [
37 '..', 38 '..',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 { 146 {
146 # GN version: //content/browser and //content/public/browser 147 # GN version: //content/browser and //content/public/browser
147 'target_name': 'content_browser', 148 'target_name': 'content_browser',
148 'type': 'static_library', 149 'type': 'static_library',
149 'variables': { 'enable_wexit_time_destructors': 1, }, 150 'variables': { 'enable_wexit_time_destructors': 1, },
150 'includes': [ 151 'includes': [
151 'content_browser.gypi', 152 'content_browser.gypi',
152 ], 153 ],
153 'dependencies': [ 154 'dependencies': [
154 'content_common', 155 'content_common',
155 'content_resources.gyp:content_resources',
156 ], 156 ],
157 'export_dependent_settings': [ 157 'export_dependent_settings': [
158 'content_common', 158 'content_common',
159 ], 159 ],
160 'conditions': [ 160 'conditions': [
161 ['java_bridge==1', { 161 ['java_bridge==1', {
162 'dependencies': [ 162 'dependencies': [
163 'content_child', 163 'content_child',
164 ] 164 ]
165 }], 165 }],
166 ['OS=="android"', { 166 ['OS=="android"', {
167 'dependencies': [ 167 'dependencies': [
168 'content_gpu', 168 'content_gpu',
169 'content_utility', 169 'content_utility',
170 ], 170 ],
171 }], 171 }],
172 ['OS != "ios"', {
173 'dependencies': [
174 'content_resources',
175 ],
176 }],
172 ], 177 ],
173 }, 178 },
174 { 179 {
175 # GN version: //content/common and //content/public/common 180 # GN version: //content/common and //content/public/common
176 'target_name': 'content_common', 181 'target_name': 'content_common',
177 'type': 'static_library', 182 'type': 'static_library',
178 'variables': { 'enable_wexit_time_destructors': 1, }, 183 'variables': { 'enable_wexit_time_destructors': 1, },
179 'includes': [ 184 'includes': [
180 'content_common.gypi', 185 'content_common.gypi',
181 ], 186 ],
182 'conditions': [ 187 'conditions': [
183 ['OS != "ios"', { 188 ['OS != "ios"', {
184 'dependencies': [ 189 'dependencies': [
185 'content_resources.gyp:content_resources', 190 'content_resources',
186 ], 191 ],
187 }], 192 }],
188 ], 193 ],
189 # Disable c4267 warnings until we fix size_t to int truncations. 194 # Disable c4267 warnings until we fix size_t to int truncations.
190 'msvs_disabled_warnings': [ 4267, ], 195 'msvs_disabled_warnings': [ 4267, ],
191 }, 196 },
192 ], 197 ],
193 'conditions': [ 198 'conditions': [
194 ['OS != "ios"', { 199 ['OS != "ios"', {
195 'targets': [ 200 'targets': [
196 { 201 {
197 # GN version: //content/child and //content/public/child 202 # GN version: //content/child and //content/public/child
198 'target_name': 'content_child', 203 'target_name': 'content_child',
199 'type': 'static_library', 204 'type': 'static_library',
200 'variables': { 'enable_wexit_time_destructors': 1, }, 205 'variables': { 'enable_wexit_time_destructors': 1, },
201 'includes': [ 206 'includes': [
202 'content_child.gypi', 207 'content_child.gypi',
203 ], 208 ],
204 'dependencies': [ 209 'dependencies': [
205 'content_resources.gyp:content_resources', 210 'content_resources',
206 ], 211 ],
207 # Disable c4267 warnings until we fix size_t to int truncations. 212 # Disable c4267 warnings until we fix size_t to int truncations.
208 'msvs_disabled_warnings': [ 4267, ], 213 'msvs_disabled_warnings': [ 4267, ],
209 }, 214 },
210 { 215 {
211 # GN version: //content/gpu 216 # GN version: //content/gpu
212 'target_name': 'content_gpu', 217 'target_name': 'content_gpu',
213 'type': 'static_library', 218 'type': 'static_library',
214 'variables': { 'enable_wexit_time_destructors': 1, }, 219 'variables': { 'enable_wexit_time_destructors': 1, },
215 'includes': [ 220 'includes': [
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 # GN version: //content/renderer and //content/public/renderer 253 # GN version: //content/renderer and //content/public/renderer
249 'target_name': 'content_renderer', 254 'target_name': 'content_renderer',
250 'type': 'static_library', 255 'type': 'static_library',
251 'variables': { 'enable_wexit_time_destructors': 1, }, 256 'variables': { 'enable_wexit_time_destructors': 1, },
252 'includes': [ 257 'includes': [
253 'content_renderer.gypi', 258 'content_renderer.gypi',
254 ], 259 ],
255 'dependencies': [ 260 'dependencies': [
256 'content_child', 261 'content_child',
257 'content_common', 262 'content_common',
258 'content_resources.gyp:content_resources', 263 'content_resources',
259 ], 264 ],
260 'conditions': [ 265 'conditions': [
261 ['chromium_enable_vtune_jit_for_v8==1', { 266 ['chromium_enable_vtune_jit_for_v8==1', {
262 'dependencies': [ 267 'dependencies': [
263 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 268 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
264 ], 269 ],
265 }], 270 }],
266 ], 271 ],
267 }, 272 },
268 { 273 {
(...skipping 14 matching lines...) Expand all
283 ], 288 ],
284 }, 289 },
285 { # component != static_library 290 { # component != static_library
286 'targets': [ 291 'targets': [
287 { 292 {
288 # GN version: //content 293 # GN version: //content
289 'target_name': 'content', 294 'target_name': 'content',
290 'type': 'shared_library', 295 'type': 'shared_library',
291 'variables': { 'enable_wexit_time_destructors': 1, }, 296 'variables': { 'enable_wexit_time_destructors': 1, },
292 'dependencies': [ 297 'dependencies': [
293 'content_resources.gyp:content_resources', 298 'content_resources',
294 ], 299 ],
295 'conditions': [ 300 'conditions': [
296 ['chromium_enable_vtune_jit_for_v8==1', { 301 ['chromium_enable_vtune_jit_for_v8==1', {
297 'dependencies': [ 302 'dependencies': [
298 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 303 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
299 ], 304 ],
300 }], 305 }],
301 ], 306 ],
302 'includes': [ 307 'includes': [
303 'content_app.gypi', 308 'content_app.gypi',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 # GN version: //content/browser and //content/public/browser 348 # GN version: //content/browser and //content/public/browser
344 'target_name': 'content_browser', 349 'target_name': 'content_browser',
345 'type': 'none', 350 'type': 'none',
346 'dependencies': ['content'], 351 'dependencies': ['content'],
347 'export_dependent_settings': ['content'], 352 'export_dependent_settings': ['content'],
348 }, 353 },
349 { 354 {
350 # GN version: //content/common and //content/public/common 355 # GN version: //content/common and //content/public/common
351 'target_name': 'content_common', 356 'target_name': 'content_common',
352 'type': 'none', 357 'type': 'none',
353 'dependencies': ['content', 'content_resources.gyp:content_resources'] , 358 'dependencies': ['content', 'content_resources'],
354 # Disable c4267 warnings until we fix size_t to int truncations. 359 # Disable c4267 warnings until we fix size_t to int truncations.
355 'msvs_disabled_warnings': [ 4267, ], 360 'msvs_disabled_warnings': [ 4267, ],
356 'export_dependent_settings': ['content'], 361 'export_dependent_settings': ['content'],
357 }, 362 },
358 { 363 {
359 # GN Version: //content/child 364 # GN Version: //content/child
360 'target_name': 'content_child', 365 'target_name': 'content_child',
361 'type': 'none', 366 'type': 'none',
362 'dependencies': ['content'], 367 'dependencies': ['content'],
363 }, 368 },
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 'browser/gamepad/canonical_axis_index_list.h', 617 'browser/gamepad/canonical_axis_index_list.h',
613 'browser/gamepad/canonical_button_index_list.h', 618 'browser/gamepad/canonical_button_index_list.h',
614 ], 619 ],
615 }, 620 },
616 'includes': [ '../build/android/java_cpp_template.gypi' ], 621 'includes': [ '../build/android/java_cpp_template.gypi' ],
617 }, 622 },
618 ], 623 ],
619 }], # OS == "android" 624 }], # OS == "android"
620 ], 625 ],
621 } 626 }
OLDNEW
« no previous file with comments | « no previous file | content/content_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698