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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 ] | 73 ] |
74 }, | 74 }, |
75 { | 75 { |
76 'target_name': 'chrome_main_dll', | 76 'target_name': 'chrome_main_dll', |
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 '../content/content.gyp:content_app_browser', |
83 'app/policy/cloud_policy_codegen.gyp:policy', | 84 'app/policy/cloud_policy_codegen.gyp:policy', |
84 ], | 85 ], |
85 'conditions': [ | 86 'conditions': [ |
86 ['use_aura==1', { | 87 ['use_aura==1', { |
87 'dependencies': [ | 88 'dependencies': [ |
88 '../ui/compositor/compositor.gyp:compositor', | 89 '../ui/compositor/compositor.gyp:compositor', |
89 ], | 90 ], |
90 }], | 91 }], |
91 ['OS=="win" and target_arch=="ia32"', { | 92 ['OS=="win" and target_arch=="ia32"', { |
92 # Add a dependency to custom import library for user32 delay | 93 # Add a dependency to custom import library for user32 delay |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', | 362 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', |
362 'app/chrome_main.cc', | 363 'app/chrome_main.cc', |
363 'app/chrome_main_delegate.cc', | 364 'app/chrome_main_delegate.cc', |
364 'app/chrome_main_delegate.h', | 365 'app/chrome_main_delegate.h', |
365 ], | 366 ], |
366 }, # target chrome_child_dll | 367 }, # target chrome_child_dll |
367 ], | 368 ], |
368 }], | 369 }], |
369 ], | 370 ], |
370 } | 371 } |
OLD | NEW |