Chromium Code Reviews| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 'common/extensions/api/api.gyp:chrome_api', | 146 'common/extensions/api/api.gyp:chrome_api', |
| 147 ], | 147 ], |
| 148 'export_dependent_settings': [ | 148 'export_dependent_settings': [ |
| 149 'common/extensions/api/api.gyp:chrome_api', | 149 'common/extensions/api/api.gyp:chrome_api', |
| 150 ], | 150 ], |
| 151 'sources': [ | 151 'sources': [ |
| 152 '<@(chrome_utility_extensions_sources)', | 152 '<@(chrome_utility_extensions_sources)', |
| 153 '<@(chrome_utility_shared_media_sources)', | 153 '<@(chrome_utility_shared_media_sources)', |
| 154 ], | 154 ], |
| 155 'conditions': [ | 155 'conditions': [ |
| 156 ['OS=="win"', { | |
|
scottmg
2015/02/24 22:06:16
What does this have to do with enable_extensions==
jschuh
2015/02/25 18:07:44
Nothing. I put it in the wrong place because I was
| |
| 157 'link_settings': { | |
| 158 'msvs_settings': { | |
| 159 'VCLinkerTool': { | |
| 160 'DelayLoadDLLs': [ | |
| 161 # Prevent this from loading in the renderer process. | |
|
scottmg
2015/02/24 22:08:03
also please add a link to the appcontainer bug her
| |
| 162 'wininet.dll', | |
| 163 ], | |
| 164 }, | |
| 165 }, | |
| 166 }, | |
| 167 }], | |
| 156 ['OS=="win" or OS=="mac"', { | 168 ['OS=="win" or OS=="mac"', { |
| 157 'dependencies': [ | 169 'dependencies': [ |
| 158 '../components/components.gyp:wifi_component', | 170 '../components/components.gyp:wifi_component', |
| 159 ], | 171 ], |
| 160 'sources': [ | 172 'sources': [ |
| 161 '<@(chrome_utility_win_mac_media_gallery_sources)', | 173 '<@(chrome_utility_win_mac_media_gallery_sources)', |
| 162 ], | 174 ], |
| 163 }, { # OS!="win" and OS!="mac" | 175 }, { # OS!="win" and OS!="mac" |
| 164 'sources': [ | 176 'sources': [ |
| 165 'utility/image_writer/image_writer_stub.cc', | 177 'utility/image_writer/image_writer_stub.cc', |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 186 }], | 198 }], |
| 187 ['safe_browsing==1', { | 199 ['safe_browsing==1', { |
| 188 'defines': [ 'FULL_SAFE_BROWSING' ], | 200 'defines': [ 'FULL_SAFE_BROWSING' ], |
| 189 }], | 201 }], |
| 190 ], | 202 ], |
| 191 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 203 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 192 'msvs_disabled_warnings': [ 4267, ], | 204 'msvs_disabled_warnings': [ 4267, ], |
| 193 }, | 205 }, |
| 194 ], | 206 ], |
| 195 } | 207 } |
| OLD | NEW |