Make Chrome for Android dependent on Google Play Services

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 639f2c83561612dba11fea08f49b16ddfe31c823..804e813943cfbf65ef8cf19ff2c879367b3513bf 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -626,6 +626,8 @@
             '../sync/sync.gyp:sync_java',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
+            '../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
+            '../third_party/libaddressinput/libaddressinput.gyp:android_addressinput_widget',

[nyquist, 2015/02/05 22:32:08]

Is this related to this change or is it here by accident?

[aberent, 2015/02/06 20:17:58]

Done. It was there by accident (probably a bad merge).

             '../ui/android/ui_android.gyp:ui_java',
           ],
           'variables': {
@@ -682,7 +684,7 @@
       ], # 'targets'
       'includes': [
         'chrome_android.gypi',
-      ]}, # 'includes'
+      ]}, #includes
     ],  # OS=="android"
     ['configuration_policy==1 and OS!="android" and OS!="ios"', {
       'includes': [ 'policy.gypi', ],