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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 1581253003: Add missing 'hard_dependency' in gyp targets using grit_action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « ash/ash_strings.gyp ('k') | chromecast/chromecast.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 'variables': { 5 'variables': {
6 # Apply Chrome-specific grit settings to all of this file. 6 # Apply Chrome-specific grit settings to all of this file.
7 # The advantage is that one entry here applies to the entire file. 7 # The advantage is that one entry here applies to the entire file.
8 # The caveat is these variables cannot be merged with other variable 8 # The caveat is these variables cannot be merged with other variable
9 # dictionaries in more inner scopes. If the variable should be merged, 9 # dictionaries in more inner scopes. If the variable should be merged,
10 # consider putting them in a gypi file and including it at the right scope 10 # consider putting them in a gypi file and including it at the right scope
11 # instead. e.g. with chrome_grit_action.gypi. 11 # instead. e.g. with chrome_grit_action.gypi.
12 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 12 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
13 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', 13 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt',
14 }, 14 },
15 'targets': [ 15 'targets': [
16 { 16 {
17 # GN version: //chrome:extra_resources 17 # GN version: //chrome:extra_resources
18 'target_name': 'chrome_extra_resources', 18 'target_name': 'chrome_extra_resources',
19 'type': 'none', 19 'type': 'none',
20 'hard_dependency': 1,
20 # These resources end up in resources.pak because they are resources 21 # These resources end up in resources.pak because they are resources
21 # used by internal pages. Putting them in a separate pak file makes 22 # used by internal pages. Putting them in a separate pak file makes
22 # it easier for us to reference them internally. 23 # it easier for us to reference them internally.
23 'actions': [ 24 'actions': [
24 { 25 {
25 # GN version: //chrome/browser/resources:memory_internals_resources 26 # GN version: //chrome/browser/resources:memory_internals_resources
26 'action_name': 'generate_memory_internals_resources', 27 'action_name': 'generate_memory_internals_resources',
27 'variables': { 28 'variables': {
28 'grit_grd_file': 'browser/resources/memory_internals_resources.grd', 29 'grit_grd_file': 'browser/resources/memory_internals_resources.grd',
29 }, 30 },
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'dependencies': [ 318 'dependencies': [
318 'chrome_strings', 319 'chrome_strings',
319 '../components/components_strings.gyp:components_strings', 320 '../components/components_strings.gyp:components_strings',
320 ], 321 ],
321 'actions': [ 322 'actions': [
322 { 323 {
323 'action_name': 'generate_ui_string_overrider', 324 'action_name': 'generate_ui_string_overrider',
324 'inputs': [ 325 'inputs': [
325 '../components/variations/service/generate_ui_string_overrider.py', 326 '../components/variations/service/generate_ui_string_overrider.py',
326 '<(grit_out_dir)/grit/chromium_strings.h', 327 '<(grit_out_dir)/grit/chromium_strings.h',
327 » '<(grit_out_dir)/grit/generated_resources.h', 328 '<(grit_out_dir)/grit/generated_resources.h',
328 '<(grit_out_dir)/grit/google_chrome_strings.h', 329 '<(grit_out_dir)/grit/google_chrome_strings.h',
329 '<(grit_out_dir)/grit/settings_chromium_strings.h', 330 '<(grit_out_dir)/grit/settings_chromium_strings.h',
330 '<(grit_out_dir)/grit/settings_google_chrome_strings.h', 331 '<(grit_out_dir)/grit/settings_google_chrome_strings.h',
331 '<(grit_out_dir)/grit/settings_strings.h', 332 '<(grit_out_dir)/grit/settings_strings.h',
332 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chrom ium_strings.h', 333 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chrom ium_strings.h',
333 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_googl e_chrome_strings.h', 334 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_googl e_chrome_strings.h',
334 » '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strin gs.h' 335 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strin gs.h'
335 ], 336 ],
336 'outputs': [ 337 'outputs': [
337 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_str ing_overrider_factory.cc', 338 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_str ing_overrider_factory.cc',
338 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_str ing_overrider_factory.h', 339 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_str ing_overrider_factory.h',
339 ], 340 ],
340 'action': [ 341 'action': [
341 'python', 342 'python',
342 '../components/variations/service/generate_ui_string_overrider.py', 343 '../components/variations/service/generate_ui_string_overrider.py',
343 '-N', 'chrome_variations', 344 '-N', 'chrome_variations',
344 '-o', '<(SHARED_INTERMEDIATE_DIR)', 345 '-o', '<(SHARED_INTERMEDIATE_DIR)',
345 '-S', 'chrome/browser/metrics/variations/ui_string_overrider_factory .cc', 346 '-S', 'chrome/browser/metrics/variations/ui_string_overrider_factory .cc',
346 '-H', 'chrome/browser/metrics/variations/ui_string_overrider_factory .h', 347 '-H', 'chrome/browser/metrics/variations/ui_string_overrider_factory .h',
347 '<(grit_out_dir)/grit/chromium_strings.h', 348 '<(grit_out_dir)/grit/chromium_strings.h',
348 » '<(grit_out_dir)/grit/generated_resources.h', 349 '<(grit_out_dir)/grit/generated_resources.h',
349 '<(grit_out_dir)/grit/google_chrome_strings.h', 350 '<(grit_out_dir)/grit/google_chrome_strings.h',
350 '<(grit_out_dir)/grit/settings_chromium_strings.h', 351 '<(grit_out_dir)/grit/settings_chromium_strings.h',
351 '<(grit_out_dir)/grit/settings_google_chrome_strings.h', 352 '<(grit_out_dir)/grit/settings_google_chrome_strings.h',
352 '<(grit_out_dir)/grit/settings_strings.h', 353 '<(grit_out_dir)/grit/settings_strings.h',
353 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chrom ium_strings.h', 354 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chrom ium_strings.h',
354 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_googl e_chrome_strings.h', 355 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_googl e_chrome_strings.h',
355 » '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strin gs.h' 356 '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strin gs.h'
356 ], 357 ],
357 'message': 'Generating generated resources map.', 358 'message': 'Generating generated resources map.',
358 } 359 }
359 ], 360 ],
360 }, 361 },
361 { 362 {
362 # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrid er_factory 363 # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrid er_factory
363 'target_name': 'chrome_ui_string_overrider_factory', 364 'target_name': 'chrome_ui_string_overrider_factory',
364 'type': 'static_library', 365 'type': 'static_library',
365 'dependencies': [ 366 'dependencies': [
366 '../components/components.gyp:variations_service', 367 '../components/components.gyp:variations_service',
367 'make_chrome_ui_string_overrider_factory', 368 'make_chrome_ui_string_overrider_factory',
368 ], 369 ],
369 'sources': [ 370 'sources': [
370 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_ overrider_factory.cc', 371 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_ overrider_factory.cc',
371 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_ overrider_factory.h', 372 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_ overrider_factory.h',
372 ], 373 ],
373 }, 374 },
374 { 375 {
375 # GN version: //chrome/app/resources:platform_locale_settings 376 # GN version: //chrome/app/resources:platform_locale_settings
376 'target_name': 'platform_locale_settings', 377 'target_name': 'platform_locale_settings',
377 'type': 'none', 378 'type': 'none',
379 'hard_dependency': 1,
378 'variables': { 380 'variables': {
379 'conditions': [ 381 'conditions': [
380 ['OS=="win"', { 382 ['OS=="win"', {
381 'platform_locale_settings_grd': 383 'platform_locale_settings_grd':
382 'app/resources/locale_settings_win.grd', 384 'app/resources/locale_settings_win.grd',
383 },], 385 },],
384 ['OS=="linux"', { 386 ['OS=="linux"', {
385 'conditions': [ 387 'conditions': [
386 ['chromeos==1', { 388 ['chromeos==1', {
387 'platform_locale_settings_grd': 389 'platform_locale_settings_grd':
(...skipping 22 matching lines...) Expand all
410 }, 412 },
411 'includes': [ 'chrome_grit_action.gypi' ], 413 'includes': [ 'chrome_grit_action.gypi' ],
412 }, 414 },
413 ], 415 ],
414 'includes': [ '../build/grit_target.gypi' ], 416 'includes': [ '../build/grit_target.gypi' ],
415 }, 417 },
416 { 418 {
417 # GN version: //chrome/app/theme:theme_resources 419 # GN version: //chrome/app/theme:theme_resources
418 'target_name': 'theme_resources', 420 'target_name': 'theme_resources',
419 'type': 'none', 421 'type': 'none',
422 'hard_dependency': 1,
420 'dependencies': [ 423 'dependencies': [
421 '../ui/resources/ui_resources.gyp:ui_resources', 424 '../ui/resources/ui_resources.gyp:ui_resources',
422 'chrome_unscaled_resources', 425 'chrome_unscaled_resources',
423 ], 426 ],
424 'actions': [ 427 'actions': [
425 { 428 {
426 'action_name': 'generate_theme_resources', 429 'action_name': 'generate_theme_resources',
427 'variables': { 430 'variables': {
428 'grit_grd_file': 'app/theme/theme_resources.grd', 431 'grit_grd_file': 'app/theme/theme_resources.grd',
429 }, 432 },
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 ], 635 ],
633 }], 636 }],
634 ], # conditions 637 ], # conditions
635 }], # end OS != "mac" and OS != "ios" 638 }], # end OS != "mac" and OS != "ios"
636 ], # conditions 639 ], # conditions
637 }, 640 },
638 { 641 {
639 # GN version: //chrome/app/theme:chrome_unscaled_resources 642 # GN version: //chrome/app/theme:chrome_unscaled_resources
640 'target_name': 'chrome_unscaled_resources', 643 'target_name': 'chrome_unscaled_resources',
641 'type': 'none', 644 'type': 'none',
645 'hard_dependency': 1,
642 'actions': [ 646 'actions': [
643 { 647 {
644 'action_name': 'generate_chrome_unscaled_resources', 648 'action_name': 'generate_chrome_unscaled_resources',
645 'variables': { 649 'variables': {
646 'grit_grd_file': 'app/theme/chrome_unscaled_resources.grd', 650 'grit_grd_file': 'app/theme/chrome_unscaled_resources.grd',
647 }, 651 },
648 'includes': [ 'chrome_grit_action.gypi' ], 652 'includes': [ 'chrome_grit_action.gypi' ],
649 }, 653 },
650 ], 654 ],
651 'includes': [ '../build/grit_target.gypi' ], 655 'includes': [ '../build/grit_target.gypi' ],
652 }, 656 },
653 { 657 {
654 # GN version: //chrome/browser/resources:options_test_resources 658 # GN version: //chrome/browser/resources:options_test_resources
655 'target_name': 'options_test_resources', 659 'target_name': 'options_test_resources',
656 'type': 'none', 660 'type': 'none',
661 'hard_dependency': 1,
657 'actions': [ 662 'actions': [
658 { 663 {
659 'action_name': 'generate_options_test_resources', 664 'action_name': 'generate_options_test_resources',
660 'variables': { 665 'variables': {
661 'grit_grd_file': 'browser/resources/options_test_resources.grd', 666 'grit_grd_file': 'browser/resources/options_test_resources.grd',
662 }, 667 },
663 'includes': [ 'chrome_grit_action.gypi' ], 668 'includes': [ 'chrome_grit_action.gypi' ],
664 }, 669 },
665 ], 670 ],
666 'includes': [ '../build/grit_target.gypi' ], 671 'includes': [ '../build/grit_target.gypi' ],
667 }, 672 },
668 { 673 {
669 # GN version: //chrome/test/data/resources:webui_test_resources 674 # GN version: //chrome/test/data/resources:webui_test_resources
670 'target_name': 'webui_test_resources', 675 'target_name': 'webui_test_resources',
671 'type': 'none', 676 'type': 'none',
677 'hard_dependency': 1,
672 'actions': [ 678 'actions': [
673 { 679 {
674 'action_name': 'generate_webui_test_resources', 680 'action_name': 'generate_webui_test_resources',
675 'variables': { 681 'variables': {
676 'grit_grd_file': 'test/data/webui_test_resources.grd', 682 'grit_grd_file': 'test/data/webui_test_resources.grd',
677 }, 683 },
678 'includes': [ 'chrome_grit_action.gypi' ], 684 'includes': [ 'chrome_grit_action.gypi' ],
679 }, 685 },
680 ], 686 ],
681 'includes': [ '../build/grit_target.gypi' ], 687 'includes': [ '../build/grit_target.gypi' ],
(...skipping 15 matching lines...) Expand all
697 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', 703 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
698 ], 704 ],
699 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', 705 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
700 }, 706 },
701 'includes': [ '../build/repack_action.gypi' ], 707 'includes': [ '../build/repack_action.gypi' ],
702 }, 708 },
703 ], 709 ],
704 }, 710 },
705 ], # targets 711 ], # targets
706 } 712 }
OLDNEW
« no previous file with comments | « ash/ash_strings.gyp ('k') | chromecast/chromecast.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698