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

Side by Side Diff: chrome/chrome.gyp

Issue 5977007: Expand scope of bookmark manager resources to all component extension resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/component_extension_resources.grd ('k') | chrome/chrome_browser.gypi » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 'chrome_resources_grds': [ 52 'chrome_resources_grds': [
53 # Data resources. 53 # Data resources.
54 'browser/browser_resources.grd', 54 'browser/browser_resources.grd',
55 'common/common_resources.grd', 55 'common/common_resources.grd',
56 'renderer/renderer_resources.grd', 56 'renderer/renderer_resources.grd',
57 ], 57 ],
58 'chrome_extra_resources_grds': [ 58 'chrome_extra_resources_grds': [
59 # These resources end up in resources.pak because they are resources 59 # These resources end up in resources.pak because they are resources
60 # used by internal pages. Putting them in a spearate pak file makes 60 # used by internal pages. Putting them in a spearate pak file makes
61 # it easier for us to reference them internally. 61 # it easier for us to reference them internally.
62 'browser/resources/bookmark_manager_resources.grd', 62 'browser/resources/component_extension_resources.grd',
63 'browser/resources/net_internals_resources.grd', 63 'browser/resources/net_internals_resources.grd',
64 'browser/resources/shared_resources.grd' 64 'browser/resources/shared_resources.grd'
65 ], 65 ],
66 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], 66 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
67 'grit_cmd': ['python', '../tools/grit/grit.py'], 67 'grit_cmd': ['python', '../tools/grit/grit.py'],
68 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 68 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
69 # TODO: remove this helper when we have loops in GYP 69 # TODO: remove this helper when we have loops in GYP
70 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], 70 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
71 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 71 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
72 'conditions': [ 72 'conditions': [
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 '-D', '<(chrome_build)', 475 '-D', '<(chrome_build)',
476 '-E', '<(branded_env)', 476 '-E', '<(branded_env)',
477 ], 477 ],
478 'conditions': [ 478 'conditions': [
479 ['chromeos==1', { 479 ['chromeos==1', {
480 'action': ['-D', 'chromeos'], 480 'action': ['-D', 'chromeos'],
481 }], 481 }],
482 ['use_titlecase_in_grd_files==1', { 482 ['use_titlecase_in_grd_files==1', {
483 'action': ['-D', 'use_titlecase'], 483 'action': ['-D', 'use_titlecase'],
484 }], 484 }],
485 ['touchui==1', {
486 'action': ['-D', 'touchui'],
487 }],
485 ], 488 ],
486 'message': 'Generating resources from <(RULE_INPUT_PATH)', 489 'message': 'Generating resources from <(RULE_INPUT_PATH)',
487 }, 490 },
488 ], 491 ],
489 'sources': [ 492 'sources': [
490 '<@(chrome_extra_resources_grds)', 493 '<@(chrome_extra_resources_grds)',
491 '<@(chrome_extra_resources_inputs)', 494 '<@(chrome_extra_resources_inputs)',
492 ], 495 ],
493 'direct_dependent_settings': { 496 'direct_dependent_settings': {
494 'include_dirs': [ 497 'include_dirs': [
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after
1535 'repack_path': '../tools/data_pack/repack.py', 1538 'repack_path': '../tools/data_pack/repack.py',
1536 }, 1539 },
1537 'dependencies': [ 1540 'dependencies': [
1538 'chrome_extra_resources', 1541 'chrome_extra_resources',
1539 ], 1542 ],
1540 'actions': [ 1543 'actions': [
1541 { 1544 {
1542 'action_name': 'repack_resources', 1545 'action_name': 'repack_resources',
1543 'variables': { 1546 'variables': {
1544 'pak_inputs': [ 1547 'pak_inputs': [
1545 '<(grit_out_dir)/bookmark_manager_resources.pak', 1548 '<(grit_out_dir)/component_extension_resources.pak',
1546 '<(grit_out_dir)/net_internals_resources.pak', 1549 '<(grit_out_dir)/net_internals_resources.pak',
1547 '<(grit_out_dir)/shared_resources.pak', 1550 '<(grit_out_dir)/shared_resources.pak',
1548 ], 1551 ],
1549 }, 1552 },
1550 'inputs': [ 1553 'inputs': [
1551 '<(repack_path)', 1554 '<(repack_path)',
1552 '<@(pak_inputs)', 1555 '<@(pak_inputs)',
1553 ], 1556 ],
1554 'outputs': [ 1557 'outputs': [
1555 '<(PRODUCT_DIR)/resources.pak', 1558 '<(PRODUCT_DIR)/resources.pak',
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1931 }], # targets 1934 }], # targets
1932 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1935 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1933 ], # 'conditions' 1936 ], # 'conditions'
1934 } 1937 }
1935 1938
1936 # Local Variables: 1939 # Local Variables:
1937 # tab-width:2 1940 # tab-width:2
1938 # indent-tabs-mode:nil 1941 # indent-tabs-mode:nil
1939 # End: 1942 # End:
1940 # vim: set expandtab tabstop=2 shiftwidth=2: 1943 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/resources/component_extension_resources.grd ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698