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

Side by Side Diff: chrome/app/locales/locales.gyp

Issue 385084: Partially revert WebKit.gyp switch-over, because it broke build bot setup... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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 | « build/all.gyp ('k') | chrome/chrome.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 { 1 {
2 'variables': { 2 'variables': {
3 'chromium_code': 1, 3 'chromium_code': 1,
4 'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 4 'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
5 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', 5 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
6 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 6 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
7 7
8 # TODO(sgk): eliminate this; see comment in build/common.gypi 8 # TODO(sgk): eliminate this; see comment in build/common.gypi
9 'msvs_debug_link_incremental': '1', 9 'msvs_debug_link_incremental': '1',
10 }, 10 },
11 'target_defaults': { 11 'target_defaults': {
12 'type': 'loadable_module', 12 'type': 'loadable_module',
13 'dependencies': [ 13 'dependencies': [
14 '../../chrome.gyp:chrome_strings', 14 '../../chrome.gyp:chrome_strings',
15 '../../../webkit/webkit_glue.gyp:webkit_strings', 15 '../../../webkit/webkit.gyp:webkit_strings',
16 '../../../app/app.gyp:app_strings', 16 '../../../app/app.gyp:app_strings',
17 ], 17 ],
18 'msvs_settings': { 18 'msvs_settings': {
19 'VCLinkerTool': { 19 'VCLinkerTool': {
20 'BaseAddress': '0x3CF00000', 20 'BaseAddress': '0x3CF00000',
21 'OutputFile': '$(OutDir)\\locales\\$(ProjectName).dll', 21 'OutputFile': '$(OutDir)\\locales\\$(ProjectName).dll',
22 'LinkIncremental': '1', # 1 == No 22 'LinkIncremental': '1', # 1 == No
23 'LinkTimeCodeGeneration': '0', 23 'LinkTimeCodeGeneration': '0',
24 'ResourceOnlyDLL': 'true', 24 'ResourceOnlyDLL': 'true',
25 }, 25 },
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 ], 662 ],
663 }], 663 }],
664 ], 664 ],
665 } 665 }
666 666
667 # Local Variables: 667 # Local Variables:
668 # tab-width:2 668 # tab-width:2
669 # indent-tabs-mode:nil 669 # indent-tabs-mode:nil
670 # End: 670 # End:
671 # vim: set expandtab tabstop=2 shiftwidth=2: 671 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698