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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 7759001: Revert 98426 - Revert 98103 - Switch to using .pak files for locale data on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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/tools/build/win/FILES.cfg ('k') | ui/base/l10n/l10n_util.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': '../tools/build/version.py', 10 'version_py_path': '../tools/build/version.py',
(...skipping 14 matching lines...) Expand all
25 }, { # OS != win 25 }, { # OS != win
26 'python': [ 26 'python': [
27 'python' 27 'python'
28 ], 28 ],
29 }], 29 }],
30 ], 30 ],
31 }, 31 },
32 'target_defaults': { 32 'target_defaults': {
33 'dependencies': [ 33 'dependencies': [
34 # locales need to be built for the chrome frame binaries to be loadable. 34 # locales need to be built for the chrome frame binaries to be loadable.
35 '../chrome/app/locales/locales.gyp:*',
36 '../chrome/chrome.gyp:chrome_resources', 35 '../chrome/chrome.gyp:chrome_resources',
37 '../chrome/chrome.gyp:chrome_strings', 36 '../chrome/chrome.gyp:chrome_strings',
37 '../chrome/chrome.gyp:packed_resources',
38 '../chrome/chrome.gyp:theme_resources', 38 '../chrome/chrome.gyp:theme_resources',
39 '../skia/skia.gyp:skia', 39 '../skia/skia.gyp:skia',
40 ], 40 ],
41 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], 41 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
42 'include_dirs': [ 42 'include_dirs': [
43 # all our own includes are relative to src/ 43 # all our own includes are relative to src/
44 '..', 44 '..',
45 ], 45 ],
46 }, 46 },
47 'targets': [ 47 'targets': [
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 # Use outputs of this action as inputs for the main target build. 1032 # Use outputs of this action as inputs for the main target build.
1033 # Seems as a misnomer but makes this happy on Linux (scons). 1033 # Seems as a misnomer but makes this happy on Linux (scons).
1034 'process_outputs_as_sources': 1, 1034 'process_outputs_as_sources': 1,
1035 }, 1035 },
1036 ], 1036 ],
1037 }, 1037 },
1038 ], 1038 ],
1039 }, ], # 'coverage!=0' 1039 }, ], # 'coverage!=0'
1040 ], # 'conditions' 1040 ], # 'conditions'
1041 } 1041 }
OLDNEW
« no previous file with comments | « chrome/tools/build/win/FILES.cfg ('k') | ui/base/l10n/l10n_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698