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

Side by Side Diff: chrome/chrome.gyp

Issue 2865010: Load net-internals resources from resources.pak. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: mini installer 2 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
« no previous file with comments | « chrome/browser/dom_ui/net_internals_ui.cc ('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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 'branded_env': 'CHROMIUM_BUILD=chromium', 441 'branded_env': 'CHROMIUM_BUILD=chromium',
442 }], 442 }],
443 ], 443 ],
444 }, 444 },
445 'inputs': [ 445 'inputs': [
446 '<@(chrome_extra_resources_inputs)', 446 '<@(chrome_extra_resources_inputs)',
447 ], 447 ],
448 'outputs': [ 448 'outputs': [
449 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h', 449 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
450 '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak', 450 '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak',
451 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.cc',
452 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.h',
451 # TODO(bradnelson): move to something like this instead 453 # TODO(bradnelson): move to something like this instead
452 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resour ces_grds))', 454 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resour ces_grds))',
453 # This currently cannot work because gyp only evaluates the 455 # This currently cannot work because gyp only evaluates the
454 # outputs once (rather than per case where the rule applies). 456 # outputs once (rather than per case where the rule applies).
455 # This means you end up with all the outputs from all the grd 457 # This means you end up with all the outputs from all the grd
456 # files, which angers scons and confuses vstudio. 458 # files, which angers scons and confuses vstudio.
457 # One alternative would be to turn this into several actions, 459 # One alternative would be to turn this into several actions,
458 # but that would be rather verbose. 460 # but that would be rather verbose.
459 ], 461 ],
460 'action': ['<@(grit_cmd)', '-i', 462 'action': ['<@(grit_cmd)', '-i',
(...skipping 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 }], # targets 1862 }], # targets
1861 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1863 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1862 ], # 'conditions' 1864 ], # 'conditions'
1863 } 1865 }
1864 1866
1865 # Local Variables: 1867 # Local Variables:
1866 # tab-width:2 1868 # tab-width:2
1867 # indent-tabs-mode:nil 1869 # indent-tabs-mode:nil
1868 # End: 1870 # End:
1869 # vim: set expandtab tabstop=2 shiftwidth=2: 1871 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/net_internals_ui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698