| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 ] | 237 ] |
| 238 }], | 238 }], |
| 239 ['chrome_multiple_dll==1', { | 239 ['chrome_multiple_dll==1', { |
| 240 'defines': [ | 240 'defines': [ |
| 241 'CHROME_MULTIPLE_DLL_BROWSER', | 241 'CHROME_MULTIPLE_DLL_BROWSER', |
| 242 ], | 242 ], |
| 243 }, { | 243 }, { |
| 244 'dependencies': [ | 244 'dependencies': [ |
| 245 '<@(chromium_child_dependencies)', | 245 '<@(chromium_child_dependencies)', |
| 246 '../content/content.gyp:content_app_both', | 246 '../content/content.gyp:content_app_both', |
| 247 '../content/content.gyp:content_worker', | |
| 248 ], | 247 ], |
| 249 'dependencies!': [ | 248 'dependencies!': [ |
| 250 '../content/content.gyp:content_app_browser', | 249 '../content/content.gyp:content_app_browser', |
| 251 ], | 250 ], |
| 252 }], | 251 }], |
| 253 ['cld_version==0 or cld_version==1', { | 252 ['cld_version==0 or cld_version==1', { |
| 254 'dependencies': [ | 253 'dependencies': [ |
| 255 '../third_party/cld/cld.gyp:cld', | 254 '../third_party/cld/cld.gyp:cld', |
| 256 ], | 255 ], |
| 257 }], | 256 }], |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 { | 331 { |
| 333 'target_name': 'chrome_child_dll', | 332 'target_name': 'chrome_child_dll', |
| 334 'type': 'shared_library', | 333 'type': 'shared_library', |
| 335 'product_name': 'chrome_child', | 334 'product_name': 'chrome_child', |
| 336 'variables': { | 335 'variables': { |
| 337 'enable_wexit_time_destructors': 1, | 336 'enable_wexit_time_destructors': 1, |
| 338 }, | 337 }, |
| 339 'dependencies': [ | 338 'dependencies': [ |
| 340 '<@(chromium_child_dependencies)', | 339 '<@(chromium_child_dependencies)', |
| 341 '../content/content.gyp:content_app_child', | 340 '../content/content.gyp:content_app_child', |
| 342 '../content/content.gyp:content_worker', | |
| 343 'chrome_version_resources', | 341 'chrome_version_resources', |
| 344 'policy_path_parser', | 342 'policy_path_parser', |
| 345 ], | 343 ], |
| 346 'defines': [ | 344 'defines': [ |
| 347 'CHROME_MULTIPLE_DLL_CHILD', | 345 'CHROME_MULTIPLE_DLL_CHILD', |
| 348 ], | 346 ], |
| 349 'sources': [ | 347 'sources': [ |
| 350 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', | 348 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', |
| 351 'app/chrome_main.cc', | 349 'app/chrome_main.cc', |
| 352 'app/chrome_main_delegate.cc', | 350 'app/chrome_main_delegate.cc', |
| (...skipping 20 matching lines...) Expand all Loading... |
| 373 }, | 371 }, |
| 374 }], | 372 }], |
| 375 ] | 373 ] |
| 376 }], | 374 }], |
| 377 ], | 375 ], |
| 378 }, # target chrome_child_dll | 376 }, # target chrome_child_dll |
| 379 ], | 377 ], |
| 380 }], | 378 }], |
| 381 ], | 379 ], |
| 382 } | 380 } |
| OLD | NEW |