Chromium Code Reviews| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 'dependencies': [ | 117 'dependencies': [ |
| 118 'chrome_user32_delay_imports', | 118 'chrome_user32_delay_imports', |
| 119 ], | 119 ], |
| 120 },], | 120 },], |
| 121 ['OS=="win"', { | 121 ['OS=="win"', { |
| 122 'product_name': 'chrome', | 122 'product_name': 'chrome', |
| 123 'dependencies': [ | 123 'dependencies': [ |
| 124 # On Windows, link the dependencies (libraries) that make | 124 # On Windows, link the dependencies (libraries) that make |
| 125 # up actual Chromium functionality into this .dll. | 125 # up actual Chromium functionality into this .dll. |
| 126 'chrome_version_resources', | 126 'chrome_version_resources', |
| 127 '../base/trace_event/etw_manifest/etw_manifest.gyp:etw_manifest' , | |
| 127 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', | 128 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', |
| 128 '../content/app/resources/content_resources.gyp:content_resource s', | 129 '../content/app/resources/content_resources.gyp:content_resource s', |
| 129 '../crypto/crypto.gyp:crypto', | 130 '../crypto/crypto.gyp:crypto', |
| 130 '../net/net.gyp:net_resources', | 131 '../net/net.gyp:net_resources', |
| 131 '../ui/views/views.gyp:views', | 132 '../ui/views/views.gyp:views', |
| 132 ], | 133 ], |
| 133 'sources': [ | 134 'sources': [ |
| 134 'app/chrome_dll.rc', | 135 'app/chrome_dll.rc', |
| 136 | |
|
scottmg
2015/04/09 23:45:34
no tabs, and remove whitespace at eol
Georges Khalil
2015/04/10 22:29:50
Removed tabs. Cannot fine whitespace at eol, which
| |
| 137 # ETW Manifest. | |
| 138 '<(SHARED_INTERMEDIATE_DIR)/base/trace_event/etw_manifest/chrome _events_win.rc', | |
| 135 | 139 |
| 136 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ', | 140 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ', |
| 137 | 141 |
| 138 # Cursors. | 142 # Cursors. |
| 139 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.r c', | 143 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.r c', |
| 140 ], | 144 ], |
| 141 'include_dirs': [ | 145 'include_dirs': [ |
| 142 '<(DEPTH)/third_party/wtl/include', | 146 '<(DEPTH)/third_party/wtl/include', |
| 143 ], | 147 ], |
| 144 'configurations': { | 148 'configurations': { |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 368 'dependencies': [ | 372 'dependencies': [ |
| 369 '../pdf/pdf.gyp:pdf', | 373 '../pdf/pdf.gyp:pdf', |
| 370 ], | 374 ], |
| 371 }], | 375 }], |
| 372 ], | 376 ], |
| 373 }, # target chrome_child_dll | 377 }, # target chrome_child_dll |
| 374 ], | 378 ], |
| 375 }], | 379 }], |
| 376 ], | 380 ], |
| 377 } | 381 } |
| OLD | NEW |