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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 2702001: Add platform_locale_settings file for CrOS. This is necessary because... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros unittest 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 48638)
+++ chrome/chrome.gyp (working copy)
@@ -76,8 +76,16 @@
'NACL_LINUX=1',
'NACL_OSX=0',
],
- 'platform_locale_settings_grd':
- 'app/resources/locale_settings_linux.grd',
+ 'conditions': [
+ ['chromeos==1', {
+ 'platform_locale_settings_grd':
+ 'app/resources/locale_settings_cros.grd',
+ }],
+ ['chromeos!=1', {
+ 'platform_locale_settings_grd':
+ 'app/resources/locale_settings_linux.grd',
+ }],
+ ],
},],
['OS=="mac"', {
'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698