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 588 matching lines @@
           'dependencies': [
             'activity_type_ids_java',
             'app_banner_metrics_ids_java',
             'chrome_resources.gyp:chrome_strings',
             'chrome_strings_grd',
             'chrome_version_java',
             'document_tab_model_info_proto_java',
             'profile_account_management_metrics_java',
             'content_setting_java',
             'content_settings_type_java',
+            '<(google_play_services_library_target)',

[nyquist, 2015/01/22 01:21:43]

I would have liked it better if this was a proxy target instead of a variable
referring to a specific name. How it is now makes it confusing for how to add a
dependency on Google Play Services.

[aberent, 2015/01/22 16:28:55]

Done.

             'page_info_connection_type_java',
             'profile_sync_service_model_type_selection_java',
             'resource_id_java',
             'toolbar_model_security_levels_java',
             'tab_load_status_java',
             '../base/base.gyp:base',
             '../components/components.gyp:bookmarks_java',
             '../components/components.gyp:dom_distiller_core_java',
             '../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_v7_mediarouter_javalib',

[aberent, 2015/01/21 23:56:27]

Noticed this after uploading. Accidental leak from my next task (upstreaming
Cast). I will remove it in the next patch for this CL.

[aberent, 2015/01/22 16:28:55]

Done.

             '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
             '../third_party/libaddressinput/libaddressinput.gyp:android_addressinput_widget',
             '../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
@@ skipping 38 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'
+      'variables': {
+        'google_play_services_library_target%': '../third_party/android_tools/android_tools.gyp:google_play_services_javalib',

[nyquist, 2015/01/22 01:23:38]

I believe that the extras folder is only downloaded automatically on the bots.
Should this CL also come with instructions if the library can not be found?
I believe the plan was to make that part of install-build-deps-android.sh and/or
add it to the documentation.

[aberent, 2015/01/22 16:28:55]

It has been added to install-build-deps-android.sh. I have included this
information in
a comment in android_tools.gyp; do you think it is needed here as well?

+      }}, #variables
     ],  # 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'
 }