summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 19:23:04 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 19:23:04 +0000
commit173509e01940012228b386bf50c26d42e1586022 (patch)
tree523d90bc858cffd19441f4f2259e49f512c681e2 /ui/ui.gyp
parente217c563ed3adcee9d4fd6135b260e8084c12401 (diff)
downloadchromium_src-173509e01940012228b386bf50c26d42e1586022.zip
chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.gz
chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 771be0b..cf4704a 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -19,13 +19,13 @@
'../base/base.gyp:base_i18n',
'../base/base.gyp:base_static',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/zlib/zlib.gyp:zlib',
- '../url/url.gyp:url',
'base/strings/ui_strings.gyp:ui_strings',
'ui_resources',
],