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