From c0659799fd163e49bc1843d472623fe6b77c68eb Mon Sep 17 00:00:00 2001 From: "dglazkov@chromium.org" Date: Tue, 3 Apr 2012 23:04:21 +0000 Subject: [PATCH] Unreviewed, rolling out r113087. http://trac.webkit.org/changeset/113087 https://bugs.webkit.org/show_bug.cgi?id=83068 Breaks Windows builds in other unpredictable ways. * WebKit.gyp: Removed the hack. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113103 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/chromium/ChangeLog | 10 ++++++++++ Source/WebKit/chromium/WebKit.gyp | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index 7e59e44..b263b4b 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,13 @@ +2012-04-03 Dimitri Glazkov + + Unreviewed, rolling out r113087. + http://trac.webkit.org/changeset/113087 + https://bugs.webkit.org/show_bug.cgi?id=83068 + + Breaks Windows builds in other unpredictable ways. + + * WebKit.gyp: Removed the hack. + 2012-04-03 W. James MacLean [chromium] Switch touchpad fling curve physics to absolute (not scaled) curve. diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp index f90d06d..e02a23c 100644 --- a/Source/WebKit/chromium/WebKit.gyp +++ b/Source/WebKit/chromium/WebKit.gyp @@ -747,7 +747,11 @@ ], 'msvs_settings': { 'VCLinkerTool': { - 'UseLibraryDependencyInputs': "true", + 'conditions': [ + ['incremental_chrome_dll==1', { + 'UseLibraryDependencyInputs': "true", + }], + ], }, }, }], -- 2.7.4