Enable downloading Google Play services via deps hook

build/android/play_services/update.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 '''
 Script to help uploading and downloading the Google Play services client
 library to and from a Google Cloud storage.
 '''
 
@@ skipping 11 matching lines @@
 from devil.utils import cmd_helper
 from play_services import utils
 from pylib import constants
 
 sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT, 'build'))
 import find_depot_tools  # pylint: disable=import-error,unused-import
 import breakpad
 import download_from_google_storage
 import upload_to_google_storage
 
-sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT, 'tools'))
-import yes_no  # pylint: disable=import-error
-
 
 # Directory where the SHA1 files for the zip and the license are stored
 # It should be managed by git to provided information about new versions.
 SHA1_DIRECTORY = os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'android',
                               'play_services')
 
 # Default bucket used for storing the files.
 GMS_CLOUD_STORAGE = 'chrome-sdk-extras'
 
 # Path to the default configuration file. It exposes the currently installed
@@ skipping 124 matching lines @@
         os.makedirs(paths.package)
 
       # download license file from bucket/{version_number}/license.sha1
       new_license = os.path.join(tmp_root, LICENSE_FILE_NAME)
       old_license = os.path.join(paths.package, LICENSE_FILE_NAME)
 
       license_sha1 = os.path.join(SHA1_DIRECTORY, LICENSE_FILE_NAME + '.sha1')
       _DownloadFromBucket(bucket_path, license_sha1, new_license,
                           args.verbose, args.dry_run)
       if not _CheckLicenseAgreement(new_license, old_license):
-        logging.warning('Your version of the Google Play services library is '
-                        'not up to date. You might run into issues building '
-                        'or running the app. Please run `%s download` to '
-                        'retry downloading it.', __file__)
+        logging.warning(utils.EmphasizeMessage(
+            'Your version of the Google Play services library is not up to '
+            'date. You might run into issues building or running the app. '
+            'Please run `%s download` to retry downloading it.'), __file__)
         return 0
 
     new_lib_zip = os.path.join(tmp_root, LIBRARY_FILE_NAME)
     _DownloadFromBucket(bucket_path, new_lib_zip_sha1, new_lib_zip,
                         args.verbose, args.dry_run)
 
     # We remove only the library itself. Users having a SDK manager installed
     # library before will keep the documentation and samples from it.
     shutil.rmtree(paths.lib, ignore_errors=True)
     os.makedirs(paths.lib)
@@ skipping 192 matching lines @@
   '''
   Checks that the new license is the one already accepted by the user. If it
   isn't, it prompts the user to accept it. Returns whether the expected license
   has been accepted.
   '''
 
   if utils.FileEquals(expected_license_path, actual_license_path):
     return True
 
   with open(expected_license_path) as license_file:
-    print license_file.read().replace('\\n', os.linesep)
+    # The output is buffered when running as part of gclient hooks. We split
+    # the text here and flush is explicitely to avoid having part of it dropped

[jbudorick, 2015/10/28 14:08:25]

nit: explicitly

[dgn, 2015/10/28 16:32:58]

Addressed in https://codereview.chromium.org/1418573010/

+    # out.
+    for license_part in license_file.read().split('\\n'):

[jbudorick, 2015/10/28 14:08:25]

nit: splitlines()

[dgn, 2015/10/28 16:32:58]

Addressed in https://codereview.chromium.org/1418573010/

+      print license_part
+      sys.stdout.flush()
 
-  return yes_no.YesNo('Do you accept the license? [y/n]: ')

[dgn, 2015/10/28 13:54:33]

Didn't work very well from inside the hook runner. It completely messed up the
formatting of the license, and I'm not really sure why. raw_input works as
expected there.

[jbudorick, 2015/10/28 14:08:25]

That's odd. Does that still happen when printing line-by-line?

[dgn, 2015/10/28 14:27:13]

Yes. In both cases it outputs something like:

```
Lorem ipsum dolor sit amet, consectetur adipisicing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua. 

       Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat.                        
       

Duis aute irure dolor in reprehenderit in voluptate velit
esse cillum dolore eu fugiat nulla pariatur.

                                            Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia
deserunt mollit anim id est laborum.
```

(after a new line the column counter does not go back to column 0)

[jbudorick, 2015/10/28 14:28:53]

yikes, that seems like a bug.

+  # Need to put the prompt on a separate line otherwise the gclient hook buffer
+  # only prints it after we received an input.
+  print 'Do you accept the license? [y/n]: '
+  sys.stdout.flush()
+  return raw_input('> ') in ('Y', 'y')
 
 
 def _VerifyBucketPathFormat(bucket_name, version_number, is_dry_run):
   '''
   Formats and checks the download/upload path depending on whether we are
   running in dry run mode or not. Returns a supposedly safe path to use with
   Gsutil.
   '''
 
   if is_dry_run:
@@ skipping 28 matching lines @@
     logging.debug('Calling command "%s"', str(args))
     return cmd_helper.GetCmdStatusOutputAndError(args)
 
   def check_call(self, *args):
     logging.debug('Calling command "%s"', str(args))
     return cmd_helper.GetCmdStatusOutputAndError(args)
 
 
 if __name__ == '__main__':
   sys.exit(Main())