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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 ], 69 ],
70 'platform_locale_settings_grd': 70 'platform_locale_settings_grd':
71 'app/resources/locale_settings_win.grd', 71 'app/resources/locale_settings_win.grd',
72 },], 72 },],
73 ['OS=="linux"', { 73 ['OS=="linux"', {
74 'nacl_defines': [ 74 'nacl_defines': [
75 'NACL_WINDOWS=0', 75 'NACL_WINDOWS=0',
76 'NACL_LINUX=1', 76 'NACL_LINUX=1',
77 'NACL_OSX=0', 77 'NACL_OSX=0',
78 ], 78 ],
79 'platform_locale_settings_grd': 79 'conditions': [
80 'app/resources/locale_settings_linux.grd', 80 ['chromeos==1', {
81 'platform_locale_settings_grd':
82 'app/resources/locale_settings_cros.grd',
83 }],
84 ['chromeos!=1', {
85 'platform_locale_settings_grd':
86 'app/resources/locale_settings_linux.grd',
87 }],
88 ],
81 },], 89 },],
82 ['OS=="mac"', { 90 ['OS=="mac"', {
83 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist', 91 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
84 'nacl_defines': [ 92 'nacl_defines': [
85 'NACL_WINDOWS=0', 93 'NACL_WINDOWS=0',
86 'NACL_LINUX=0', 94 'NACL_LINUX=0',
87 'NACL_OSX=1', 95 'NACL_OSX=1',
88 ], 96 ],
89 'platform_locale_settings_grd': 97 'platform_locale_settings_grd':
90 'app/resources/locale_settings_mac.grd', 98 'app/resources/locale_settings_mac.grd',
(...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after
1721 }], # targets 1729 }], # targets
1722 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1730 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1723 ], # 'conditions' 1731 ], # 'conditions'
1724 } 1732 }
1725 1733
1726 # Local Variables: 1734 # Local Variables:
1727 # tab-width:2 1735 # tab-width:2
1728 # indent-tabs-mode:nil 1736 # indent-tabs-mode:nil
1729 # End: 1737 # End:
1730 # vim: set expandtab tabstop=2 shiftwidth=2: 1738 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« 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