Chromium Code Reviews| Index: chrome/chrome_tests.gypi |
| =================================================================== |
| --- chrome/chrome_tests.gypi (revision 52745) |
| +++ chrome/chrome_tests.gypi (working copy) |
| @@ -516,8 +516,14 @@ |
| '../views/views.gyp:views', |
|
jvoung - send to chromium...
2010/07/19 18:05:03
should the views also be conditional? It is in nac
Victor Wang
2010/07/19 18:15:45
I don't think so.
|
| # run time dependency |
| '../webkit/webkit.gyp:npapi_test_plugin', |
| - '<(allocator_target)', |
| ], |
| + 'conditions': [ |
| + ['win_use_allocator_shim==1', { |
| + 'dependencies': [ |
| + '<(allocator_target)', |
| + ], |
| + }], |
| + ], |
| 'link_settings': { |
| 'libraries': [ |
| '-lOleAcc.lib', |