summaryrefslogtreecommitdiffstats
path: root/cloud_print
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 20:13:18 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 20:13:18 +0000
commit0b31351ef3f852293a41fe71d0c8bcf3d21a9105 (patch)
treea94d34b1320937d1c5bd2ebabaedd4af762c85ac /cloud_print
parent061561df557e6c0e14e4207b3700e398f554351d (diff)
downloadchromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.zip
chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.tar.gz
chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
-rw-r--r--cloud_print/service/service.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 471ce74..5626c28 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -54,11 +54,11 @@
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_static',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/google_apis/google_apis.gyp:google_apis',
'<(DEPTH)/ipc/ipc.gyp:ipc',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/printing/printing.gyp:printing',
+ '<(DEPTH)/url/url.gyp:url',
'service_resources',
],
'conditions': [