Always download google_play_services zip package instead of rsync.

build/download_sdk_extras.py

 #!/usr/bin/env python
 # Copyright 2014 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 download sdk/extras packages on the bots from google storage.
 
 The script expects an argument that specifies the packet name in the following
 format: <dir_in_sdk_extras>_<package_name>_<version>. There will be a

[cjhopman, 2014/12/31 00:39:29]

The expected argument is slightly different now

[navabi, 2015/01/06 00:32:09]

Done.

 correpsonding bucket in google storage with that name, and it will be downloaded
 to android_tools/sdk/extras/.
 """
 
 import os
 import subprocess
 import sys
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'android'))
 from pylib import constants
 
 GSUTIL_PATH = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
     os.pardir, os.pardir, os.pardir, os.pardir, 'depot_tools', 'gsutil.py')
 SDK_EXTRAS_BUCKET = 'gs://chrome-sdk-extras'
 SDK_EXTRAS_PATH = os.path.join(constants.ANDROID_SDK_ROOT, 'extras')
 
 
 def GetCmdOutputAndStatus(cmd_lst):
   process = subprocess.Popen(cmd_lst, stdout=subprocess.PIPE)
   stdout, _ = process.communicate()
   return stdout, process.returncode
 
 def is_android_buildbot_checkout():
   if not os.path.exists(GSUTIL_PATH) or not os.path.exists(SDK_EXTRAS_PATH):
     return False
-  stdout, rc = GetCmdOutputAndStatus([GSUTIL_PATH, 'ls', SDK_EXTRAS_BUCKET])
+  _, rc = GetCmdOutputAndStatus([GSUTIL_PATH, 'ls', SDK_EXTRAS_BUCKET])
   # If successfully read bucket, then this must be a bot with permissions

[hinoka, 2014/12/31 00:32:55]

Not always.  Sometimes its possible to download a file (object permissions) but
not list the bucket (bucket permissions, which are separate).  The best way to
ensure there is correct permissions is just to try to download the desired file
and check the error code (or run a "stat" on the file)

[navabi, 2014/12/31 00:37:59]

Acknowledged. I'll fix this.

   return not rc
 
 def main(args):
   if is_android_buildbot_checkout():
     success = True
     for arg in args[1:]:
-      # Package is named <folder>_<package_name>_<version>
-      first_underscore = arg.find('_')
-      last_underscore = arg.rfind('_')
-      folder = arg[0:first_underscore]
-      package = arg[first_underscore+1:last_underscore]
-      # Package bucket is <SDK_EXTRAS_BUCKET>/<folder>_<package_name>_<version>
-      # and in that bucket will be the directory <folder>/<package_name> to cp.
-      package_bucket = '%s/%s/%s/%s' % (SDK_EXTRAS_BUCKET, arg, folder, package)
-      package_dir = '%s/%s/%s' % (SDK_EXTRAS_PATH, folder, package)
-      if not os.path.exists(package_dir):
-        os.makedirs(package_dir)
-      # rsync is only supported by gsutil version 4.x
-      cmd_lst = [GSUTIL_PATH, '--force-version', '4.6', '-m', 'rsync', '-r',
-                 '-d', package_bucket, package_dir]
-      stdout, rc = GetCmdOutputAndStatus(cmd_lst)
-      success = (rc == 0) and success
+      # Package zip is named <folder>_<package_name>_<version>.zip. Unzipping

[hinoka, 2014/12/31 00:32:55]

We shouldn't re-download the zip if we have all the right files already.

[navabi, 2014/12/31 00:37:59]

How do we check if the files contain the same contents? It is not enough that we
have the same files, as we may have different versions. Thus, we will need to
actually check the contents. That is what took rsync so long.

[cjhopman, 2014/12/31 00:41:50]

Can we assume that the version number actually works? i.e. if it's the same
version number, don't download it.

[nyquist, 2014/12/31 00:42:43]

How about using 'gsutil hash' or 'gsutil stat' like we discussed before, but do
that just on the zip-file?

+      # will create dir <SDK_EXTRAS_BUCKET>/<folder>/<package_name>/*.
+      package_zip = '%s/%s' % (SDK_EXTRAS_BUCKET, arg)
+      local_path = '%s/' % SDK_EXTRAS_PATH

[cjhopman, 2014/12/31 00:41:50]

Could there be stuff in local_path from previous runs? Should local_path be
cleared out first?

+      cmd_lst = [GSUTIL_PATH, 'cp', package_zip, local_path]
+      _, rc = GetCmdOutputAndStatus(cmd_lst)

[cjhopman, 2014/12/31 00:39:29]

How about:

subprocess.check_output(cmd_lst)

or, if you aren't intentionally suppressing the output:

subprocess.check_call(cmd_lst)

same below.

+      if not rc:
+        zip_file = '%s/%s' % (SDK_EXTRAS_PATH, arg)
+        cmd_lst = ['unzip', '-u', zip_file, '-d', local_path]
+        _, rc = GetCmdOutputAndStatus(cmd_lst)
+        success = (rc == 0) and success
+      else:
+        success = False
     if not success:
       return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))