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

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

Issue 119075: Revert last checkin to fix resources in Release builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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/app/chrome_dll.vcproj ('k') | chrome/app/theme/theme_dll.vcproj » ('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 # Switch to with chrome.sln landing.
5 #'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
6 'chrome_grit_out_dir': '$(OutDir)/grit_derived_sources',
5 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
6 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 8 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
7 9
8 # TODO(sgk): eliminate this; see comment in build/common.gypi 10 # TODO(sgk): eliminate this; see comment in build/common.gypi
9 'msvs_debug_link_incremental': '1', 11 'msvs_debug_link_incremental': '1',
10 }, 12 },
11 'includes': [ 13 'includes': [
12 '../../../build/common.gypi', 14 '../../../build/common.gypi',
13 ], 15 ],
14 'target_defaults': { 16 'target_defaults': {
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', 639 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc',
638 '<(app_grit_out_dir)/app_strings_zh-TW.rc', 640 '<(app_grit_out_dir)/app_strings_zh-TW.rc',
639 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', 641 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc',
640 ], 642 ],
641 }, 643 },
642 ], 644 ],
643 }], 645 }],
644 ], 646 ],
645 } 647 }
646 648
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll.vcproj ('k') | chrome/app/theme/theme_dll.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698