OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'targets': [ | 6 'targets': [ |
7 { | 7 { |
8 'target_name': 'chrome', | 8 'target_name': 'chrome', |
9 'type': 'executable', | 9 'type': 'executable', |
10 'mac_bundle': 1, | 10 'mac_bundle': 1, |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 ], | 141 ], |
142 }, | 142 }, |
143 ], | 143 ], |
144 }], | 144 }], |
145 ['toolkit_uses_gtk == 1', { | 145 ['toolkit_uses_gtk == 1', { |
146 'dependencies': [ | 146 'dependencies': [ |
147 # On Linux, link the dependencies (libraries) that make up actua
l | 147 # On Linux, link the dependencies (libraries) that make up actua
l |
148 # Chromium functionality directly into the executable. | 148 # Chromium functionality directly into the executable. |
149 '<@(chromium_browser_dependencies)', | 149 '<@(chromium_browser_dependencies)', |
150 '<@(chromium_child_dependencies)', | 150 '<@(chromium_child_dependencies)', |
| 151 '../content/content.gyp:content_app_both', |
151 # Needed for chrome_main.cc initialization of libraries. | 152 # Needed for chrome_main.cc initialization of libraries. |
152 '../build/linux/system.gyp:gtk', | 153 '../build/linux/system.gyp:gtk', |
153 # Needed to use the master_preferences functions | 154 # Needed to use the master_preferences functions |
154 'installer_util', | 155 'installer_util', |
155 ], | 156 ], |
156 }, { # else toolkit_uses_gtk == 1 | 157 }, { # else toolkit_uses_gtk == 1 |
157 'dependencies': [ | 158 'dependencies': [ |
158 # On Linux, link the dependencies (libraries) that make up actua
l | 159 # On Linux, link the dependencies (libraries) that make up actua
l |
159 # Chromium functionality directly into the executable. | 160 # Chromium functionality directly into the executable. |
160 '<@(chromium_browser_dependencies)', | 161 '<@(chromium_browser_dependencies)', |
161 '<@(chromium_child_dependencies)', | 162 '<@(chromium_child_dependencies)', |
| 163 '../content/content.gyp:content_app_both', |
162 # Needed for chrome_main.cc initialization of libraries. | 164 # Needed for chrome_main.cc initialization of libraries. |
163 '../build/linux/system.gyp:x11', | 165 '../build/linux/system.gyp:x11', |
164 '../build/linux/system.gyp:pangocairo', | 166 '../build/linux/system.gyp:pangocairo', |
165 '../build/linux/system.gyp:xext', | 167 '../build/linux/system.gyp:xext', |
166 # Needed to use the master_preferences functions | 168 # Needed to use the master_preferences functions |
167 'installer_util', | 169 'installer_util', |
168 ], | 170 ], |
169 }], | 171 }], |
170 ], | 172 ], |
171 'sources': [ | 173 'sources': [ |
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
635 'dependencies': [ | 637 'dependencies': [ |
636 'chrome_nacl_win64', | 638 'chrome_nacl_win64', |
637 ], | 639 ], |
638 }], | 640 }], |
639 ], | 641 ], |
640 }, | 642 }, |
641 ], | 643 ], |
642 }], | 644 }], |
643 ], | 645 ], |
644 } | 646 } |
OLD | NEW |