OLD | NEW |
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 Loading... |
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 'locales/locales.gyp:*', |
35 '../chrome/chrome.gyp:chrome_resources', | 36 '../chrome/chrome.gyp:chrome_resources', |
36 '../chrome/chrome.gyp:chrome_strings', | 37 '../chrome/chrome.gyp:chrome_strings', |
37 '../chrome/chrome.gyp:packed_resources', | 38 '../chrome/chrome.gyp:packed_resources', |
38 '../chrome/chrome.gyp:theme_resources', | 39 '../chrome/chrome.gyp:theme_resources', |
39 '../skia/skia.gyp:skia', | 40 '../skia/skia.gyp:skia', |
40 ], | 41 ], |
41 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], | 42 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], |
42 'include_dirs': [ | 43 'include_dirs': [ |
43 # all our own includes are relative to src/ | 44 # all our own includes are relative to src/ |
44 '..', | 45 '..', |
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1032 # Use outputs of this action as inputs for the main target build. | 1033 # Use outputs of this action as inputs for the main target build. |
1033 # Seems as a misnomer but makes this happy on Linux (scons). | 1034 # Seems as a misnomer but makes this happy on Linux (scons). |
1034 'process_outputs_as_sources': 1, | 1035 'process_outputs_as_sources': 1, |
1035 }, | 1036 }, |
1036 ], | 1037 ], |
1037 }, | 1038 }, |
1038 ], | 1039 ], |
1039 }, ], # 'coverage!=0' | 1040 }, ], # 'coverage!=0' |
1040 ], # 'conditions' | 1041 ], # 'conditions' |
1041 } | 1042 } |
OLD | NEW |