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

Side by Side Diff: chrome/chrome.gyp

Issue 6756008: Grit cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 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
« build/grit_target.gypi ('K') | « build/grit_target.gypi ('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) 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 ], 171 ],
172 'includes': [ '../build/grit_target.gypi' ], 172 'includes': [ '../build/grit_target.gypi' ],
173 }, 173 },
174 { 174 {
175 # TODO(mark): It would be better if each static library that needed 175 # TODO(mark): It would be better if each static library that needed
176 # to run grit would list its own .grd files, but unfortunately some 176 # to run grit would list its own .grd files, but unfortunately some
177 # of the static libraries currently have circular dependencies among 177 # of the static libraries currently have circular dependencies among
178 # generated headers. 178 # generated headers.
179 'target_name': 'chrome_strings', 179 'target_name': 'chrome_strings',
180 'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28', 180 'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28',
181 'type': 'none',
181 'conditions': [ 182 'conditions': [
182 ['OS=="win"', { 183 ['OS=="win"', {
183 # HACK(nsylvain): We want to enforce a fake dependency on 184 # HACK(nsylvain): We want to enforce a fake dependency on
184 # intaller_util_string. install_util depends on both 185 # intaller_util_string. install_util depends on both
185 # chrome_strings and installer_util_strings, but for some reasons 186 # chrome_strings and installer_util_strings, but for some reasons
186 # Incredibuild does not enforce it (most likely a bug). By changing 187 # Incredibuild does not enforce it (most likely a bug). By changing
187 # the type and making sure we depend on installer_util_strings, it 188 # the type and making sure we depend on installer_util_strings, it
188 # will always get built before installer_util. 189 # will always get built before installer_util.
189 'type': 'dummy_executable', 190 'type': 'dummy_executable',
190 'dependencies': ['installer_util_strings'], 191 'dependencies': ['installer_util_strings'],
191 }, {
192 'type': 'none',
193 }], 192 }],
194 ], 193 ],
195 'actions': [ 194 'actions': [
196 # Localizable resources. 195 # Localizable resources.
197 { 196 {
198 'action_name': 'locale_settings', 197 'action_name': 'locale_settings',
199 'variables': { 198 'variables': {
200 'grit_grd_file': 'app/resources/locale_settings.grd', 199 'grit_grd_file': 'app/resources/locale_settings.grd',
201 }, 200 },
202 'includes': [ '../build/grit_action.gypi' ], 201 'includes': [ '../build/grit_action.gypi' ],
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 }], # targets 1576 }], # targets
1578 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1577 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1579 ], # 'conditions' 1578 ], # 'conditions'
1580 } 1579 }
1581 1580
1582 # Local Variables: 1581 # Local Variables:
1583 # tab-width:2 1582 # tab-width:2
1584 # indent-tabs-mode:nil 1583 # indent-tabs-mode:nil
1585 # End: 1584 # End:
1586 # vim: set expandtab tabstop=2 shiftwidth=2: 1585 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« build/grit_target.gypi ('K') | « build/grit_target.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698