Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9771)

Unified Diff: chrome/chrome_tests.gypi

Issue 11434098: incremental link for interactive_ui_tests on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for ios Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_prefs_unittest.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
],
« no previous file with comments | « chrome/browser/plugins/plugin_prefs_unittest.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698