Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 889dc724ed202eedc6960faec9b62ea48ccd9748..9bfc88fdb5753e39f7911d76e3601d6d0ae67722 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -385,15 +385,15 @@ |
], |
}], |
], |
- 'configurations': { |
- 'Debug_Base': { |
- 'msvs_settings': { |
- 'VCLinkerTool': { |
- 'LinkIncremental': '<(msvs_debug_link_nonincremental)', |
- }, |
- }, |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'conditions': [ |
+ ['incremental_chrome_dll==1', { |
+ 'UseLibraryDependencyInputs': "true", |
+ }], |
+ ], |
}, |
- }, # configurations |
+ }, |
}, { # else: OS != "win" |
'sources!': [ |
'browser/ui/views/ssl_client_certificate_selector_browsertest.cc', |
@@ -798,10 +798,10 @@ |
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
'../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', |
'../v8/tools/gyp/v8.gyp:v8', |
- '../webkit/webkit.gyp:test_shell_test_support', |
# Runtime dependencies |
'../ppapi/ppapi_internal.gyp:ppapi_tests', |
'../third_party/mesa/mesa.gyp:osmesa', |
+ '../webkit/webkit.gyp:test_shell_test_support', |
jam
2012/12/04 16:16:48
btw I don't think this should have moved? i.e. thi
|
], |
'include_dirs': [ |
'..', |
@@ -1587,7 +1587,6 @@ |
'../third_party/icu/icu.gyp:icuuc', |
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
'../v8/tools/gyp/v8.gyp:v8', |
- '../webkit/webkit.gyp:test_shell_test_support', |
# Runtime dependencies |
'../third_party/mesa/mesa.gyp:osmesa', |
], |