OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'chrome_utility_sources': [ | 7 'chrome_utility_sources': [ |
8 'utility/chrome_content_utility_client.cc', | 8 'utility/chrome_content_utility_client.cc', |
9 'utility/chrome_content_utility_client.h', | 9 'utility/chrome_content_utility_client.h', |
10 'utility/chrome_content_utility_ipc_whitelist.cc', | 10 'utility/chrome_content_utility_ipc_whitelist.cc', |
(...skipping 26 matching lines...) Expand all Loading... | |
37 'utility/image_writer/image_writer_handler.cc', | 37 'utility/image_writer/image_writer_handler.cc', |
38 'utility/image_writer/image_writer_handler.h', | 38 'utility/image_writer/image_writer_handler.h', |
39 'utility/image_writer/image_writer_mac.cc', | 39 'utility/image_writer/image_writer_mac.cc', |
40 'utility/image_writer/image_writer_win.cc', | 40 'utility/image_writer/image_writer_win.cc', |
41 ], | 41 ], |
42 'chrome_utility_importer_sources': [ | 42 'chrome_utility_importer_sources': [ |
43 'utility/importer/bookmark_html_reader.cc', | 43 'utility/importer/bookmark_html_reader.cc', |
44 'utility/importer/bookmark_html_reader.h', | 44 'utility/importer/bookmark_html_reader.h', |
45 'utility/importer/bookmarks_file_importer.cc', | 45 'utility/importer/bookmarks_file_importer.cc', |
46 'utility/importer/bookmarks_file_importer.h', | 46 'utility/importer/bookmarks_file_importer.h', |
47 'utility/importer/edge_database_reader_win.cc', | |
48 'utility/importer/edge_database_reader_win.h', | |
49 'utility/importer/edge_importer_win.cc', | |
50 'utility/importer/edge_importer_win.h', | |
47 'utility/importer/external_process_importer_bridge.cc', | 51 'utility/importer/external_process_importer_bridge.cc', |
48 'utility/importer/external_process_importer_bridge.h', | 52 'utility/importer/external_process_importer_bridge.h', |
49 'utility/importer/favicon_reencode.cc', | 53 'utility/importer/favicon_reencode.cc', |
50 'utility/importer/favicon_reencode.h', | 54 'utility/importer/favicon_reencode.h', |
51 'utility/importer/firefox_importer.cc', | 55 'utility/importer/firefox_importer.cc', |
52 'utility/importer/firefox_importer.h', | 56 'utility/importer/firefox_importer.h', |
53 'utility/importer/ie_importer_win.cc', | 57 'utility/importer/ie_importer_win.cc', |
54 'utility/importer/ie_importer_win.h', | 58 'utility/importer/ie_importer_win.h', |
55 'utility/importer/importer.cc', | 59 'utility/importer/importer.cc', |
56 'utility/importer/importer.h', | 60 'utility/importer/importer.h', |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
137 ], | 141 ], |
138 'conditions': [ | 142 'conditions': [ |
139 ['OS=="win"', { | 143 ['OS=="win"', { |
140 'link_settings': { | 144 'link_settings': { |
141 'msvs_settings': { | 145 'msvs_settings': { |
142 'VCLinkerTool': { | 146 'VCLinkerTool': { |
143 'DelayLoadDLLs': [ | 147 'DelayLoadDLLs': [ |
144 # Prevent wininet from loading in the renderer. | 148 # Prevent wininet from loading in the renderer. |
145 # http://crbug.com/460679 | 149 # http://crbug.com/460679 |
146 'wininet.dll', | 150 'wininet.dll', |
151 'esent.dll', | |
147 ], | 152 ], |
153 'AdditionalDependencies': [ | |
154 'esent.lib', | |
Nico
2015/12/02 22:08:31
(why isn't this needed for wininet.dll?)
| |
155 ] | |
Nico
2015/12/02 22:08:31
add , after ]
| |
148 }, | 156 }, |
149 }, | 157 }, |
150 }, | 158 }, |
151 }], | 159 }], |
152 ['OS!="android"', { | 160 ['OS!="android"', { |
153 'dependencies': [ | 161 'dependencies': [ |
154 'common_mojo_bindings', | 162 'common_mojo_bindings', |
155 '../net/net.gyp:net_utility_services', | 163 '../net/net.gyp:net_utility_services', |
156 ], | 164 ], |
157 'sources': [ | 165 'sources': [ |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
223 }, | 231 }, |
224 }], | 232 }], |
225 ], | 233 ], |
226 }], | 234 }], |
227 ], | 235 ], |
228 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 236 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
229 'msvs_disabled_warnings': [ 4267, ], | 237 'msvs_disabled_warnings': [ 4267, ], |
230 }, | 238 }, |
231 ], | 239 ], |
232 } | 240 } |
OLD | NEW |