summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
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 /chrome/chrome_common.gypi
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 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 010d9e2..236089f 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -32,6 +32,7 @@
'<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/base/base.gyp:base_prefs',
'<(DEPTH)/base/base.gyp:base_static',
+ '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
'<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
@@ -48,7 +49,6 @@
'<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
'<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
'<(DEPTH)/ui/ui.gyp:ui_resources',
- '<(DEPTH)/url/url.gyp:url',
'<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
],
'sources': [