Make Chrome for Android dependent on Google Play Services

chrome/chrome.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 608 matching lines @@
             '../components/components.gyp:gcm_driver_java',
             '../components/components.gyp:invalidation_java',
             '../components/components.gyp:navigation_interception_java',
             '../components/components.gyp:variations_java',
             '../components/components.gyp:web_contents_delegate_android_java',
             '../content/content.gyp:content_java',
             '../printing/printing.gyp:printing_java',
             '../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': {
             'java_in_dir': '../chrome/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.chrome',
             'R_package_relpath': 'org/chromium/chrome',
             # Include xml string files generated from generated_resources.grd
             'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
             'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'],
@@ skipping 36 matching lines @@
           'target_name': 'page_info_connection_type_java',
           'type': 'none',
           'variables': {
             'source_file': 'browser/ui/android/website_settings_popup_android.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
       ], # 'targets'
       'includes': [
         'chrome_android.gypi',
-      ]}, # 'includes'
+      ]}, #includes
     ],  # OS=="android"
     ['configuration_policy==1 and OS!="android" and OS!="ios"', {
       'includes': [ 'policy.gypi', ],
     }],
     ['enable_extensions==1', {
       'includes': [
         'chrome_browser_extensions.gypi',
       ],
     }],
     ['enable_print_preview==1', {
@@ skipping 81 matching lines @@
                 'service/service_utility_process_host.cc',
                 'service/service_utility_process_host.h',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }