| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 'type': 'shared_library', | 75 'type': 'shared_library', |
| 76 'variables': { | 76 'variables': { |
| 77 'enable_wexit_time_destructors': 1, | 77 'enable_wexit_time_destructors': 1, |
| 78 }, | 78 }, |
| 79 'dependencies': [ | 79 'dependencies': [ |
| 80 '<@(chromium_browser_dependencies)', | 80 '<@(chromium_browser_dependencies)', |
| 81 '../components/components.gyp:policy', | 81 '../components/components.gyp:policy', |
| 82 '../content/content.gyp:content_app_browser', | 82 '../content/content.gyp:content_app_browser', |
| 83 ], | 83 ], |
| 84 'conditions': [ | 84 'conditions': [ |
| 85 ['OS=="win"', { |
| 86 'dependencies': [ |
| 87 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf', |
| 88 ], |
| 89 }], |
| 85 ['use_aura==1', { | 90 ['use_aura==1', { |
| 86 'dependencies': [ | 91 'dependencies': [ |
| 87 '../ui/compositor/compositor.gyp:compositor', | 92 '../ui/compositor/compositor.gyp:compositor', |
| 88 ], | 93 ], |
| 89 }], | 94 }], |
| 90 ['OS=="win" and target_arch=="ia32" and MSVS_VERSION!="2013"', { | 95 ['OS=="win" and target_arch=="ia32" and MSVS_VERSION!="2013"', { |
| 91 # TODO(scottmg): The assembler is very broken in VS2013 and | 96 # TODO(scottmg): The assembler is very broken in VS2013 and |
| 92 # crashes on the generated .asm file, so disable this for now. | 97 # crashes on the generated .asm file, so disable this for now. |
| 93 # This should be revisited after a VS2013 update. See | 98 # This should be revisited after a VS2013 update. See |
| 94 # http://crbug.com/288948. | 99 # http://crbug.com/288948. |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 ], | 357 ], |
| 353 'defines': [ | 358 'defines': [ |
| 354 'CHROME_MULTIPLE_DLL_CHILD', | 359 'CHROME_MULTIPLE_DLL_CHILD', |
| 355 ], | 360 ], |
| 356 'sources': [ | 361 'sources': [ |
| 357 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', | 362 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', |
| 358 'app/chrome_main.cc', | 363 'app/chrome_main.cc', |
| 359 'app/chrome_main_delegate.cc', | 364 'app/chrome_main_delegate.cc', |
| 360 'app/chrome_main_delegate.h', | 365 'app/chrome_main_delegate.h', |
| 361 ], | 366 ], |
| 367 'conditions': [ |
| 368 ['OS=="win"', { |
| 369 'dependencies': [ |
| 370 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf', |
| 371 ], |
| 372 }], |
| 373 ], |
| 362 }, # target chrome_child_dll | 374 }, # target chrome_child_dll |
| 363 ], | 375 ], |
| 364 }], | 376 }], |
| 365 ], | 377 ], |
| 366 } | 378 } |
| OLD | NEW |