summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_android.gypi
diff options
context:
space:
mode:
authoraberent <aberent@chromium.org>2016-03-24 07:48:55 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-24 14:50:16 +0000
commit66cd00e2e4279f83be7e99935e417b2e2002d8f8 (patch)
tree560179322817c29ed15f22e5cd0598d0e585492d /remoting/remoting_android.gypi
parent3e33c0a4ad9c2a086373f2d47decc4b5c825c055 (diff)
downloadchromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.zip
chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.tar.gz
chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.tar.bz2
Revert of Move ServiceUrls to remoting/host (patchset #4 id:80001 of https://codereview.chromium.org/1817573003/ )
Reason for revert: Breaks downstream Android ToT builds, and hence prevents Chromium changes rolling into downstream Android builds. BUG= 597559 Original issue's description: > Move ServiceUrls to remoting/host > > ServiceUrls was used only in one place in android client and it's > not really useful there. Moved it to the host directory. > > TBR=rogerta@chromium.org > > Committed: https://crrev.com/2a2656a67bd2ce190df4d918f609bdb4449a64fe > Cr-Commit-Position: refs/heads/master@{#382939} TBR=lambroslambrou@chromium.org,rogerta@chromium.org,sergeyu@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1830993002 Cr-Commit-Position: refs/heads/master@{#383060}
Diffstat (limited to 'remoting/remoting_android.gypi')
-rw-r--r--remoting/remoting_android.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index 61d4215..7a79a72 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -38,6 +38,7 @@
'remoting_client',
'remoting_jni_headers',
'remoting_protocol',
+ '../google_apis/google_apis.gyp:google_apis',
'../ui/events/events.gyp:dom_keycode_converter',
'../ui/gfx/gfx.gyp:gfx',
],