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

Side by Side Diff: content/content_shell.gypi

Issue 273783002: Simplify content_shell_resources target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « apps/shell/app_shell.gyp ('k') | no next file » | 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.
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 'sources/': [ 358 'sources/': [
359 ['exclude', 'shell/browser/shell_plugin_service_filter.cc'], 359 ['exclude', 'shell/browser/shell_plugin_service_filter.cc'],
360 ['exclude', 'shell/browser/shell_plugin_service_filter.h'], 360 ['exclude', 'shell/browser/shell_plugin_service_filter.h'],
361 ], 361 ],
362 }] 362 }]
363 ], 363 ],
364 }, 364 },
365 { 365 {
366 'target_name': 'content_shell_resources', 366 'target_name': 'content_shell_resources',
367 'type': 'none', 367 'type': 'none',
368 'dependencies': [
369 'generate_content_shell_resources',
370 ],
371 'variables': { 368 'variables': {
372 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content', 369 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
373 }, 370 },
371 'actions': [
372 {
373 'action_name': 'generate_content_shell_resources',
374 'variables': {
375 'grit_grd_file': 'shell/shell_resources.grd',
376 },
377 'includes': [ '../build/grit_action.gypi' ],
378 },
379 ],
374 'includes': [ '../build/grit_target.gypi' ], 380 'includes': [ '../build/grit_target.gypi' ],
375 'copies': [ 381 'copies': [
376 { 382 {
377 'destination': '<(PRODUCT_DIR)', 383 'destination': '<(PRODUCT_DIR)',
378 'files': [ 384 'files': [
379 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak' 385 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak'
380 ], 386 ],
381 }, 387 },
382 ], 388 ],
383 'conditions': [ 389 'conditions': [
(...skipping 28 matching lines...) Expand all
412 'files': [ 418 'files': [
413 'shell/renderer/test_runner/resources/fonts/AHEM____.TTF', 419 'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
414 'shell/renderer/test_runner/resources/fonts/android_main_fonts.xml ', 420 'shell/renderer/test_runner/resources/fonts/android_main_fonts.xml ',
415 'shell/renderer/test_runner/resources/fonts/android_fallback_fonts .xml', 421 'shell/renderer/test_runner/resources/fonts/android_fallback_fonts .xml',
416 ] 422 ]
417 }], 423 }],
418 }], 424 }],
419 ], 425 ],
420 }, 426 },
421 { 427 {
422 'target_name': 'generate_content_shell_resources',
423 'type': 'none',
424 'variables': {
425 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
426 },
427 'actions': [
428 {
429 'action_name': 'content_shell_resources',
430 'variables': {
431 'grit_grd_file': 'shell/shell_resources.grd',
432 },
433 'includes': [ '../build/grit_action.gypi' ],
434 },
435 ],
436 },
437 {
438 # We build a minimal set of resources so WebKit in content_shell has 428 # We build a minimal set of resources so WebKit in content_shell has
439 # access to necessary resources. 429 # access to necessary resources.
440 'target_name': 'content_shell_pak', 430 'target_name': 'content_shell_pak',
441 'type': 'none', 431 'type': 'none',
442 'dependencies': [ 432 'dependencies': [
443 'content_resources.gyp:content_resources', 433 'content_resources.gyp:content_resources',
444 'content_shell_resources', 434 'content_shell_resources',
445 '<(DEPTH)/net/net.gyp:net_resources', 435 '<(DEPTH)/net/net.gyp:net_resources',
446 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', 436 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
447 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 437 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1089 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1100 '--destination_dir', '<(dest_dir)', 1090 '--destination_dir', '<(dest_dir)',
1101 ], 1091 ],
1102 }, 1092 },
1103 ], 1093 ],
1104 }, 1094 },
1105 ], 1095 ],
1106 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1096 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1107 ] 1097 ]
1108 } 1098 }
OLDNEW
« no previous file with comments | « apps/shell/app_shell.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698