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

Side by Side Diff: chrome/chrome.gyp

Issue 2855021: Revert 50761 - Move the files in resources/shared/ into resources.pak... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 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/shared_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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/bookmark_manager_resources.grd',
63 'browser/resources/net_internals_resources.grd', 63 'browser/resources/net_internals_resources.grd',
64 'browser/resources/shared_resources.grd'
65 ], 64 ],
66 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], 65 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
67 'grit_cmd': ['python', '../tools/grit/grit.py'], 66 'grit_cmd': ['python', '../tools/grit/grit.py'],
68 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 67 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
69 # TODO: remove this helper when we have loops in GYP 68 # TODO: remove this helper when we have loops in GYP
70 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], 69 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
71 'conditions': [ 70 'conditions': [
72 ['OS=="win"', { 71 ['OS=="win"', {
73 'nacl_defines': [ 72 'nacl_defines': [
74 'NACL_WINDOWS=1', 73 'NACL_WINDOWS=1',
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 'dependencies': [ 1503 'dependencies': [
1505 'chrome_extra_resources', 1504 'chrome_extra_resources',
1506 ], 1505 ],
1507 'actions': [ 1506 'actions': [
1508 { 1507 {
1509 'action_name': 'repack_resources', 1508 'action_name': 'repack_resources',
1510 'variables': { 1509 'variables': {
1511 'pak_inputs': [ 1510 'pak_inputs': [
1512 '<(grit_out_dir)/bookmark_manager_resources.pak', 1511 '<(grit_out_dir)/bookmark_manager_resources.pak',
1513 '<(grit_out_dir)/net_internals_resources.pak', 1512 '<(grit_out_dir)/net_internals_resources.pak',
1514 '<(grit_out_dir)/shared_resources.pak',
1515 ], 1513 ],
1516 }, 1514 },
1517 'inputs': [ 1515 'inputs': [
1518 '<(repack_path)', 1516 '<(repack_path)',
1519 '<@(pak_inputs)', 1517 '<@(pak_inputs)',
1520 ], 1518 ],
1521 'outputs': [ 1519 'outputs': [
1522 '<(PRODUCT_DIR)/resources.pak', 1520 '<(PRODUCT_DIR)/resources.pak',
1523 ], 1521 ],
1524 'action': ['python', '<(repack_path)', '<@(_outputs)', 1522 'action': ['python', '<(repack_path)', '<@(_outputs)',
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
1913 }], # targets 1911 }], # targets
1914 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1912 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1915 ], # 'conditions' 1913 ], # 'conditions'
1916 } 1914 }
1917 1915
1918 # Local Variables: 1916 # Local Variables:
1919 # tab-width:2 1917 # tab-width:2
1920 # indent-tabs-mode:nil 1918 # indent-tabs-mode:nil
1921 # End: 1919 # End:
1922 # vim: set expandtab tabstop=2 shiftwidth=2: 1920 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/resources/shared_resources.grd ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698