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
-correpsonding bucket in google storage with that name, and it will be downloaded
-to android_tools/sdk/extras/.
+The script expects arguments that specify zips file in the google storage
+bucket named: <dir in SDK extras>_<package name>_<version>.zip. The file will
+be extracted in the android_tools/sdk/extras directory.
 """
 
 import os
+import shutil
 import subprocess
 import sys
+import zipfile
 
 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 clean_and_extract(zip_file):
+  # Extract the directory name and package name from zip file name. The format
+  # of the zip file is <dir in sdk/extras>_<package_name>_<version>.zip.
+  dir_name = zip_file[:zip_file.index('_')]
+  package_name = zip_file[zip_file.index('_')+1:zip_file.rindex('_')]
+  local_dir = '%s/%s/%s' % (SDK_EXTRAS_PATH, dir_name, package_name)
+  if os.path.exists(local_dir):
+    shutil.rmtree(local_dir)
+  local_zip = '%s/%s' % (SDK_EXTRAS_PATH, zip_file)
+  with zipfile.ZipFile(local_zip) as z:
+    z.extractall(path=SDK_EXTRAS_PATH)
 
-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])
-  # If successfully read bucket, then this must be a bot with permissions
-  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
-    if not success:
-      return 1
-  return 0
+  if not os.path.exists(GSUTIL_PATH) or not os.path.exists(SDK_EXTRAS_PATH):
+    # This is not a buildbot checkout.
+    return 0
+  success = True
+  for arg in args[1:]:
+    local_zip = '%s/%s' % (SDK_EXTRAS_PATH, arg)
+    if not os.path.exists(local_zip):
+      # Package zip is named <folder>_<package_name>_<version>.zip.
+      package_zip = '%s/%s' % (SDK_EXTRAS_BUCKET, arg)
+      rc = subprocess.check_call([GSUTIL_PATH, '--force-version', '4.7', 'cp',

[cjhopman, 2015/01/06 19:14:23]

don't need to manually check returncode

[nyquist, 2015/01/06 19:14:55]

Do you need an except CalledProcessError here, to ensure the other things in 
the loop continue, and that you clean and extract the right thing?
(https://docs.python.org/2/library/subprocess.html#subprocess.check_call)

[cjhopman, 2015/01/06 19:16:42]

I'd just let it go uncaught personally.

[navabi, 2015/01/06 19:25:25]

If the zip file does not exist and we are unable to copy it from google storage,
I'm not sure what we would extract, and since we will need the packages to build
on Android, I'll let it go uncaught.

When we add new packages and zips we may consider changing this.

+                                  package_zip, local_zip])
+      if rc:
+        success = False
+        continue
+    # Always clean dir and extract zip to ensure correct contents.
+    clean_and_extract(arg)
+  if not success:
+    return 1
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))