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

Side by Side Diff: content/content_shell.gypi

Issue 407243002: Some linking fixes for GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 years, 5 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/content_resources.gyp ('k') | content/public/plugin/BUILD.gn » ('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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
11 'content_shell_version': '19.77.34.5', 11 'content_shell_version': '19.77.34.5',
12 'conditions': [ 12 'conditions': [
13 ['OS=="linux"', { 13 ['OS=="linux"', {
14 'use_custom_freetype%': 1, 14 'use_custom_freetype%': 1,
15 }, { 15 }, {
16 'use_custom_freetype%': 0, 16 'use_custom_freetype%': 0,
17 }], 17 }],
18 ], 18 ],
19 }, 19 },
20 'targets': [ 20 'targets': [
21 { 21 {
22 # GN version: //content/shell:content_shell_lib
22 'target_name': 'content_shell_lib', 23 'target_name': 'content_shell_lib',
23 'type': 'static_library', 24 'type': 'static_library',
24 'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'], 25 'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'],
25 'variables': { 26 'variables': {
26 'chromium_code': 1, 27 'chromium_code': 1,
27 }, 28 },
28 'dependencies': [ 29 'dependencies': [
29 'content.gyp:content_app_both', 30 'content.gyp:content_app_both',
30 'content.gyp:content_browser', 31 'content.gyp:content_browser',
31 'content.gyp:content_common', 32 'content.gyp:content_common',
(...skipping 29 matching lines...) Expand all
61 '../ui/gl/gl.gyp:gl', 62 '../ui/gl/gl.gyp:gl',
62 '../url/url.gyp:url_lib', 63 '../url/url.gyp:url_lib',
63 '../v8/tools/gyp/v8.gyp:v8', 64 '../v8/tools/gyp/v8.gyp:v8',
64 '../webkit/storage_browser.gyp:webkit_storage_browser', 65 '../webkit/storage_browser.gyp:webkit_storage_browser',
65 '../webkit/webkit_resources.gyp:webkit_resources', 66 '../webkit/webkit_resources.gyp:webkit_resources',
66 ], 67 ],
67 'include_dirs': [ 68 'include_dirs': [
68 '..', 69 '..',
69 ], 70 ],
70 'sources': [ 71 'sources': [
72 # Note: sources list duplicated in GN build.
71 'shell/android/shell_jni_registrar.cc', 73 'shell/android/shell_jni_registrar.cc',
72 'shell/android/shell_jni_registrar.h', 74 'shell/android/shell_jni_registrar.h',
73 'shell/android/shell_manager.cc', 75 'shell/android/shell_manager.cc',
74 'shell/android/shell_manager.h', 76 'shell/android/shell_manager.h',
75 'shell/app/paths_mac.h', 77 'shell/app/paths_mac.h',
76 'shell/app/paths_mac.mm', 78 'shell/app/paths_mac.mm',
77 'shell/app/shell_breakpad_client.cc', 79 'shell/app/shell_breakpad_client.cc',
78 'shell/app/shell_breakpad_client.h', 80 'shell/app/shell_breakpad_client.h',
79 'shell/app/shell_main_delegate.cc', 81 'shell/app/shell_main_delegate.cc',
80 'shell/app/shell_main_delegate.h', 82 'shell/app/shell_main_delegate.h',
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 'shell/renderer/test_runner/web_test_runner.h', 241 'shell/renderer/test_runner/web_test_runner.h',
240 'shell/renderer/webkit_test_runner.cc', 242 'shell/renderer/webkit_test_runner.cc',
241 'shell/renderer/webkit_test_runner.h', 243 'shell/renderer/webkit_test_runner.h',
242 ], 244 ],
243 'msvs_settings': { 245 'msvs_settings': {
244 'VCLinkerTool': { 246 'VCLinkerTool': {
245 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 247 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
246 }, 248 },
247 }, 249 },
248 'conditions': [ 250 'conditions': [
249 ['OS=="mac"', {
250 'sources/': [
251 ['exclude', 'WebTestThemeEngineMock.cpp'],
252 ],
253 }],
254 ['OS=="win" and win_use_allocator_shim==1', { 251 ['OS=="win" and win_use_allocator_shim==1', {
255 'dependencies': [ 252 'dependencies': [
256 '../base/allocator/allocator.gyp:allocator', 253 '../base/allocator/allocator.gyp:allocator',
257 ], 254 ],
258 }], 255 }],
259 ['OS=="win"', { 256 ['OS=="win"', {
260 'resource_include_dirs': [ 257 'resource_include_dirs': [
261 '<(SHARED_INTERMEDIATE_DIR)/webkit', 258 '<(SHARED_INTERMEDIATE_DIR)/webkit',
262 ], 259 ],
263 'dependencies': [ 260 'dependencies': [
264 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 261 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
265 ], 262 ],
266 'configurations': { 263 'configurations': {
267 'Debug_Base': { 264 'Debug_Base': {
268 'msvs_settings': { 265 'msvs_settings': {
269 'VCLinkerTool': { 266 'VCLinkerTool': {
270 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 267 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
271 }, 268 },
272 }, 269 },
273 }, 270 },
274 }, 271 },
275 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 272 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
276 'msvs_disabled_warnings': [ 4267, ], 273 'msvs_disabled_warnings': [ 4267, ],
277 }, { # OS!="win"
278 'sources/': [
279 ['exclude', 'Win\\.cpp$'],
280 ],
281 }], # OS=="win" 274 }], # OS=="win"
282 ['OS=="linux"', { 275 ['OS=="linux"', {
283 'dependencies': [ 276 'dependencies': [
284 '../build/linux/system.gyp:fontconfig', 277 '../build/linux/system.gyp:fontconfig',
285 ], 278 ],
286 }], 279 }],
287 ['use_x11 == 1', { 280 ['use_x11 == 1', {
288 'dependencies': [ 281 'dependencies': [
289 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 282 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
290 ], 283 ],
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 '../chromeos/chromeos.gyp:chromeos', 343 '../chromeos/chromeos.gyp:chromeos',
351 '../ui/wm/wm.gyp:wm_test_support', 344 '../ui/wm/wm.gyp:wm_test_support',
352 ], 345 ],
353 }], # chromeos==1 346 }], # chromeos==1
354 ['use_custom_freetype==1', { 347 ['use_custom_freetype==1', {
355 'dependencies': [ 348 'dependencies': [
356 '../third_party/freetype2/freetype2.gyp:freetype2', 349 '../third_party/freetype2/freetype2.gyp:freetype2',
357 ], 350 ],
358 }], 351 }],
359 ['enable_plugins==0', { 352 ['enable_plugins==0', {
360 'sources/': [ 353 'sources!': [
361 ['exclude', 'shell/browser/shell_plugin_service_filter.cc'], 354 'shell/browser/shell_plugin_service_filter.cc',
362 ['exclude', 'shell/browser/shell_plugin_service_filter.h'], 355 'shell/browser/shell_plugin_service_filter.h',
363 ], 356 ],
364 }] 357 }]
365 ], 358 ],
366 }, 359 },
367 { 360 {
361 # GN version: //content/shell:resources
368 'target_name': 'content_shell_resources', 362 'target_name': 'content_shell_resources',
369 'type': 'none', 363 'type': 'none',
370 'variables': { 364 'variables': {
371 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content', 365 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
372 }, 366 },
373 'actions': [ 367 'actions': [
374 { 368 {
375 'action_name': 'generate_content_shell_resources', 369 'action_name': 'generate_content_shell_resources',
376 'variables': { 370 'variables': {
377 'grit_grd_file': 'shell/shell_resources.grd', 371 'grit_grd_file': 'shell/shell_resources.grd',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 'shell/renderer/test_runner/resources/fonts/android_main_fonts.xml ', 418 'shell/renderer/test_runner/resources/fonts/android_main_fonts.xml ',
425 'shell/renderer/test_runner/resources/fonts/android_fallback_fonts .xml', 419 'shell/renderer/test_runner/resources/fonts/android_fallback_fonts .xml',
426 ] 420 ]
427 }], 421 }],
428 }], 422 }],
429 ], 423 ],
430 }, 424 },
431 { 425 {
432 # We build a minimal set of resources so WebKit in content_shell has 426 # We build a minimal set of resources so WebKit in content_shell has
433 # access to necessary resources. 427 # access to necessary resources.
428 # GN version: //content/shell:pak
434 'target_name': 'content_shell_pak', 429 'target_name': 'content_shell_pak',
435 'type': 'none', 430 'type': 'none',
436 'dependencies': [ 431 'dependencies': [
432 'browser/tracing/tracing_resources.gyp:tracing_resources',
437 'content_resources.gyp:content_resources', 433 'content_resources.gyp:content_resources',
438 'content_shell_resources', 434 'content_shell_resources',
439 '<(DEPTH)/net/net.gyp:net_resources', 435 '<(DEPTH)/net/net.gyp:net_resources',
440 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 436 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
441 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings', 437 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
442 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 438 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
443 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 439 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
444 ], 440 ],
445 'conditions': [ 441 'conditions': [
446 ['OS!="android" and OS!="ios"', {
447 'dependencies': [
448 'browser/tracing/tracing_resources.gyp:tracing_resources',
449 ],
450 }],
451 ['OS!="android"', { 442 ['OS!="android"', {
452 'dependencies': [ 443 'dependencies': [
453 'browser/devtools/devtools_resources.gyp:devtools_resources', 444 'browser/devtools/devtools_resources.gyp:devtools_resources',
454 ], 445 ],
455 }], 446 }],
456 ], 447 ],
457 'actions': [ 448 'actions': [
458 { 449 {
459 'action_name': 'repack_content_shell_pack', 450 'action_name': 'repack_content_shell_pack',
460 'variables': { 451 'variables': {
(...skipping 17 matching lines...) Expand all
478 }, { 469 }, {
479 'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell .pak', 470 'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell .pak',
480 }], 471 }],
481 ], 472 ],
482 }, 473 },
483 'includes': [ '../build/repack_action.gypi' ], 474 'includes': [ '../build/repack_action.gypi' ],
484 }, 475 },
485 ], 476 ],
486 }, 477 },
487 { 478 {
479 # GN version: //content/shell:content_shell
488 'target_name': 'content_shell', 480 'target_name': 'content_shell',
489 'type': 'executable', 481 'type': 'executable',
490 'mac_bundle': 1, 482 'mac_bundle': 1,
491 'variables': { 483 'variables': {
492 'chromium_code': 1, 484 'chromium_code': 1,
493 }, 485 },
494 'dependencies': [ 486 'dependencies': [
495 'content_shell_lib', 487 'content_shell_lib',
496 'content_shell_pak', 488 'content_shell_pak',
497 '../third_party/mesa/mesa.gyp:osmesa', 489 '../third_party/mesa/mesa.gyp:osmesa',
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1092 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1101 '--destination_dir', '<(dest_dir)', 1093 '--destination_dir', '<(dest_dir)',
1102 ], 1094 ],
1103 }, 1095 },
1104 ], 1096 ],
1105 }, 1097 },
1106 ], 1098 ],
1107 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1099 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1108 ] 1100 ]
1109 } 1101 }
OLDNEW
« no previous file with comments | « content/content_resources.gyp ('k') | content/public/plugin/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698