| 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 'conditions': [ | 167 'conditions': [ |
| 168 ['branding=="Chrome"', { | 168 ['branding=="Chrome"', { |
| 169 'files': ['app/theme/google_chrome/product_logo_48.png'] | 169 'files': ['app/theme/google_chrome/product_logo_48.png'] |
| 170 }, { # else: 'branding!="Chrome" | 170 }, { # else: 'branding!="Chrome" |
| 171 'files': ['app/theme/chromium/product_logo_48.png'] | 171 'files': ['app/theme/chromium/product_logo_48.png'] |
| 172 }], | 172 }], |
| 173 ], | 173 ], |
| 174 }, | 174 }, |
| 175 ], | 175 ], |
| 176 }], | 176 }], |
| 177 ['toolkit_uses_gtk == 1', { | |
| 178 'dependencies': [ | |
| 179 # On Linux, link the dependencies (libraries) that make up actua
l | |
| 180 # Chromium functionality directly into the executable. | |
| 181 '<@(chromium_browser_dependencies)', | |
| 182 '<@(chromium_child_dependencies)', | |
| 183 '../content/content.gyp:content_app_both', | |
| 184 # Needed for chrome_main.cc initialization of libraries. | |
| 185 '../build/linux/system.gyp:gtk', | |
| 186 # Needed to use the master_preferences functions | |
| 187 'installer_util', | |
| 188 ], | |
| 189 }, { # else toolkit_uses_gtk == 1 | |
| 190 'dependencies': [ | |
| 191 # On Linux, link the dependencies (libraries) that make up actua
l | |
| 192 # Chromium functionality directly into the executable. | |
| 193 '<@(chromium_browser_dependencies)', | |
| 194 '<@(chromium_child_dependencies)', | |
| 195 '../content/content.gyp:content_app_both', | |
| 196 # Needed for chrome_main.cc initialization of libraries. | |
| 197 '../build/linux/system.gyp:pangocairo', | |
| 198 # Needed to use the master_preferences functions | |
| 199 'installer_util', | |
| 200 ], | |
| 201 }], | |
| 202 # x11 build. Needed for chrome_main.cc initialization of libraries. | 177 # x11 build. Needed for chrome_main.cc initialization of libraries. |
| 203 ['use_x11==1', { | 178 ['use_x11==1', { |
| 204 'dependencies': [ | 179 'dependencies': [ |
| 205 '../build/linux/system.gyp:x11', | 180 '../build/linux/system.gyp:x11', |
| 206 '../build/linux/system.gyp:xext', | 181 '../build/linux/system.gyp:xext', |
| 207 ], | 182 ], |
| 208 }], | 183 }], |
| 209 ], | 184 ], |
| 210 'sources': [ | 185 'sources': [ |
| 211 'app/chrome_dll_resource.h', | 186 'app/chrome_dll_resource.h', |
| 212 'app/chrome_main.cc', | 187 'app/chrome_main.cc', |
| 213 'app/chrome_main_delegate.cc', | 188 'app/chrome_main_delegate.cc', |
| 214 'app/chrome_main_delegate.h', | 189 'app/chrome_main_delegate.h', |
| 215 ], | 190 ], |
| 191 'dependencies': [ |
| 192 # On Linux, link the dependencies (libraries) that make up actual |
| 193 # Chromium functionality directly into the executable. |
| 194 '<@(chromium_browser_dependencies)', |
| 195 '<@(chromium_child_dependencies)', |
| 196 '../content/content.gyp:content_app_both', |
| 197 # Needed for chrome_main.cc initialization of libraries. |
| 198 '../build/linux/system.gyp:pangocairo', |
| 199 # Needed to use the master_preferences functions |
| 200 'installer_util', |
| 201 ], |
| 216 }], | 202 }], |
| 217 ['OS=="mac"', { | 203 ['OS=="mac"', { |
| 218 # 'branding' is a variable defined in common.gypi | 204 # 'branding' is a variable defined in common.gypi |
| 219 # (e.g. "Chromium", "Chrome") | 205 # (e.g. "Chromium", "Chrome") |
| 220 'conditions': [ | 206 'conditions': [ |
| 221 ['branding=="Chrome"', { | 207 ['branding=="Chrome"', { |
| 222 'mac_bundle_resources': [ | 208 'mac_bundle_resources': [ |
| 223 'app/theme/google_chrome/mac/app.icns', | 209 'app/theme/google_chrome/mac/app.icns', |
| 224 'app/theme/google_chrome/mac/document.icns', | 210 'app/theme/google_chrome/mac/document.icns', |
| 225 'browser/ui/cocoa/applescript/scripting.sdef', | 211 'browser/ui/cocoa/applescript/scripting.sdef', |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 700 'dependencies': [ | 686 'dependencies': [ |
| 701 'chrome_nacl_win64', | 687 'chrome_nacl_win64', |
| 702 ], | 688 ], |
| 703 }], | 689 }], |
| 704 ], | 690 ], |
| 705 }, | 691 }, |
| 706 ], | 692 ], |
| 707 }], | 693 }], |
| 708 ], | 694 ], |
| 709 } | 695 } |
| OLD | NEW |