| 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 'conditions': [ | 5 'conditions': [ |
| 6 ['OS=="mac" or OS=="win"', { | 6 ['OS=="mac" or OS=="win"', { |
| 7 'targets': [ | 7 'targets': [ |
| 8 { | 8 { |
| 9 'target_name': 'chrome_dll', | 9 'target_name': 'chrome_dll', |
| 10 'type': 'none', | 10 'type': 'none', |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 'product_name': 'chrome', | 100 'product_name': 'chrome', |
| 101 'dependencies': [ | 101 'dependencies': [ |
| 102 # On Windows, link the dependencies (libraries) that make | 102 # On Windows, link the dependencies (libraries) that make |
| 103 # up actual Chromium functionality into this .dll. | 103 # up actual Chromium functionality into this .dll. |
| 104 'chrome_dll_pdb_workaround', | 104 'chrome_dll_pdb_workaround', |
| 105 'chrome_version_resources', | 105 'chrome_version_resources', |
| 106 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', | 106 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', |
| 107 '../crypto/crypto.gyp:crypto', | 107 '../crypto/crypto.gyp:crypto', |
| 108 '../printing/printing.gyp:printing', | 108 '../printing/printing.gyp:printing', |
| 109 '../net/net.gyp:net_resources', | 109 '../net/net.gyp:net_resources', |
| 110 '../third_party/cld/cld.gyp:cld', | |
| 111 '../ui/views/views.gyp:views', | 110 '../ui/views/views.gyp:views', |
| 112 '../webkit/webkit_resources.gyp:webkit_resources', | 111 '../webkit/webkit_resources.gyp:webkit_resources', |
| 113 ], | 112 ], |
| 114 'sources': [ | 113 'sources': [ |
| 115 'app/chrome_command_ids.h', | 114 'app/chrome_command_ids.h', |
| 116 'app/chrome_dll.rc', | 115 'app/chrome_dll.rc', |
| 117 'app/chrome_dll_resource.h', | 116 'app/chrome_dll_resource.h', |
| 118 'app/chrome_main.cc', | 117 'app/chrome_main.cc', |
| 119 'app/chrome_main_delegate.cc', | 118 'app/chrome_main_delegate.cc', |
| 120 'app/chrome_main_delegate.h', | 119 'app/chrome_main_delegate.h', |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 }, { | 225 }, { |
| 227 'dependencies': [ | 226 'dependencies': [ |
| 228 '<@(chromium_child_dependencies)', | 227 '<@(chromium_child_dependencies)', |
| 229 '../content/content.gyp:content_app_both', | 228 '../content/content.gyp:content_app_both', |
| 230 '../content/content.gyp:content_worker', | 229 '../content/content.gyp:content_worker', |
| 231 ], | 230 ], |
| 232 'dependencies!': [ | 231 'dependencies!': [ |
| 233 '../content/content.gyp:content_app_browser', | 232 '../content/content.gyp:content_app_browser', |
| 234 ], | 233 ], |
| 235 }], | 234 }], |
| 235 ['cld_version==0 or cld_version==1', { |
| 236 'dependencies': [ |
| 237 '../third_party/cld/cld.gyp:cld', |
| 238 ], |
| 239 }], |
| 240 ['cld_version==0 or cld_version==2', { |
| 241 'dependencies': [ |
| 242 '../third_party/cld_2/cld_2.gyp:cld_2', |
| 243 ], |
| 244 }], |
| 236 ['OS=="mac" and component!="shared_library"', { | 245 ['OS=="mac" and component!="shared_library"', { |
| 237 'includes': [ 'chrome_dll_bundle.gypi' ], | 246 'includes': [ 'chrome_dll_bundle.gypi' ], |
| 238 }], | 247 }], |
| 239 ['OS=="mac" and component=="shared_library"', { | 248 ['OS=="mac" and component=="shared_library"', { |
| 240 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, | 249 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, |
| 241 }], | 250 }], |
| 242 ['OS=="mac"', { | 251 ['OS=="mac"', { |
| 243 'xcode_settings': { | 252 'xcode_settings': { |
| 244 # Define the order of symbols within the framework. This | 253 # Define the order of symbols within the framework. This |
| 245 # sets -order_file. | 254 # sets -order_file. |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', | 365 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', |
| 357 'app/chrome_main.cc', | 366 'app/chrome_main.cc', |
| 358 'app/chrome_main_delegate.cc', | 367 'app/chrome_main_delegate.cc', |
| 359 'app/chrome_main_delegate.h', | 368 'app/chrome_main_delegate.h', |
| 360 ], | 369 ], |
| 361 }, # target chrome_child_dll | 370 }, # target chrome_child_dll |
| 362 ], | 371 ], |
| 363 }], | 372 }], |
| 364 ], | 373 ], |
| 365 } | 374 } |
| OLD | NEW |