summaryrefslogtreecommitdiffstats
path: root/win8/metro_driver
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 09:01:51 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 09:01:51 +0000
commit1ebd27de13659e30680e7ee530e550a95b6d12ef (patch)
tree67ff85a45aa726e42f10e37e141fb105a9d68d8b /win8/metro_driver
parent111b242e947493ee23297029bcbabe3725869b53 (diff)
downloadchromium_src-1ebd27de13659e30680e7ee530e550a95b6d12ef.zip
chromium_src-1ebd27de13659e30680e7ee530e550a95b6d12ef.tar.gz
chromium_src-1ebd27de13659e30680e7ee530e550a95b6d12ef.tar.bz2
Revert 193992 "Lets try this again."
The XP bots are still red, and it's still whining about URL.DLL > Lets try this again. > > Revert 193983 "Revert 193968 "Roll the DEPS for google-url."" > > > Revert 193968 "Roll the DEPS for google-url." > > > > > Roll the DEPS for google-url. > > > > > > And update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp. > > > > > > This also changes googleurl.gyp to reference the files under url/, so that we > > > don't break the Blink tree. > > > > > > BUG=229660 > > > R=brettw@chromium.org > > > TBR=brettw@chromium.org > > > > > > Review URL: https://chromiumcodereview.appspot.com/14089011 > > > > TBR=tfarina@chromium.org > > Review URL: https://codereview.chromium.org/14028012 > > TBR=michaeln@google.com > Review URL: https://codereview.chromium.org/14109014 TBR=michaeln@google.com Review URL: https://codereview.chromium.org/14263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver')
-rw-r--r--win8/metro_driver/metro_driver.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index c73311e..f1f9892 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -52,7 +52,7 @@
'type': 'shared_library',
'dependencies': [
'../../base/base.gyp:base',
- '../../url/url.gyp:url',
+ '../../build/temp_gyp/googleurl.gyp:googleurl',
'../../chrome/common_constants.gyp:common_constants',
'../../crypto/crypto.gyp:crypto',
'../../google_update/google_update.gyp:google_update',