| 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': 'none', | 9 'type': 'none', |
| 10 'dependencies': [ 'chrome_initial', ], | 10 'dependencies': [ 'chrome_initial', ], |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 }, | 180 }, |
| 181 ], | 181 ], |
| 182 }], | 182 }], |
| 183 # x11 build. Needed for chrome_main.cc initialization of libraries. | 183 # x11 build. Needed for chrome_main.cc initialization of libraries. |
| 184 ['use_x11==1', { | 184 ['use_x11==1', { |
| 185 'dependencies': [ | 185 'dependencies': [ |
| 186 '../build/linux/system.gyp:x11', | 186 '../build/linux/system.gyp:x11', |
| 187 '../build/linux/system.gyp:xext', | 187 '../build/linux/system.gyp:xext', |
| 188 ], | 188 ], |
| 189 }], | 189 }], |
| 190 # Needed for chrome_main.cc initialization of libraries. |
| 191 ['use_pango==1 and use_cairo==1', { |
| 192 'dependencies': [ |
| 193 '../build/linux/system.gyp:pangocairo', |
| 194 ], |
| 195 }], |
| 190 ], | 196 ], |
| 191 'sources': [ | 197 'sources': [ |
| 192 'app/chrome_dll_resource.h', | 198 'app/chrome_dll_resource.h', |
| 193 'app/chrome_main.cc', | 199 'app/chrome_main.cc', |
| 194 'app/chrome_main_delegate.cc', | 200 'app/chrome_main_delegate.cc', |
| 195 'app/chrome_main_delegate.h', | 201 'app/chrome_main_delegate.h', |
| 196 ], | 202 ], |
| 197 'dependencies': [ | 203 'dependencies': [ |
| 198 # On Linux, link the dependencies (libraries) that make up actual | 204 # On Linux, link the dependencies (libraries) that make up actual |
| 199 # Chromium functionality directly into the executable. | 205 # Chromium functionality directly into the executable. |
| 200 '<@(chromium_browser_dependencies)', | 206 '<@(chromium_browser_dependencies)', |
| 201 '<@(chromium_child_dependencies)', | 207 '<@(chromium_child_dependencies)', |
| 202 '../content/content.gyp:content_app_both', | 208 '../content/content.gyp:content_app_both', |
| 203 # Needed for chrome_main.cc initialization of libraries. | |
| 204 '../build/linux/system.gyp:pangocairo', | |
| 205 # Needed to use the master_preferences functions | 209 # Needed to use the master_preferences functions |
| 206 'installer_util', | 210 'installer_util', |
| 207 ], | 211 ], |
| 208 }], | 212 }], |
| 209 ['OS=="mac"', { | 213 ['OS=="mac"', { |
| 210 # 'branding' is a variable defined in common.gypi | 214 # 'branding' is a variable defined in common.gypi |
| 211 # (e.g. "Chromium", "Chrome") | 215 # (e.g. "Chromium", "Chrome") |
| 212 'conditions': [ | 216 'conditions': [ |
| 213 ['branding=="Chrome"', { | 217 ['branding=="Chrome"', { |
| 214 'mac_bundle_resources': [ | 218 'mac_bundle_resources': [ |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 'dependencies': [ | 694 'dependencies': [ |
| 691 'chrome_nacl_win64', | 695 'chrome_nacl_win64', |
| 692 ], | 696 ], |
| 693 }], | 697 }], |
| 694 ], | 698 ], |
| 695 }, | 699 }, |
| 696 ], | 700 ], |
| 697 }], | 701 }], |
| 698 ], | 702 ], |
| 699 } | 703 } |
| OLD | NEW |