Cleanup gms update/preprocess scripts, roll android_tools

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 library to
 and from a Google Cloud storage.
 '''
 
@@ skipping 133 matching lines @@
   if that has not been done before.
   '''
 
   if not os.path.isdir(args.sdk_root):
     logging.debug('Did not find the Android SDK root directory at "%s".',
                   args.sdk_root)
     if not args.force:
       logging.info('Skipping, not on an android checkout.')
       return 0
 
-  paths = PlayServicesPaths(args.sdk_root)
+  config = utils.ConfigParser(args.config)
+  paths = PlayServicesPaths(args.sdk_root, config.version_xml_path)
 
   if os.path.isdir(paths.package) and not os.access(paths.package, os.W_OK):
     logging.error('Failed updating the Google Play Services library. '
                   'The location is not writable. Please remove the '
                   'directory (%s) and try again.', paths.package)
     return -2
 
   new_lib_zip_sha1 = os.path.join(SHA1_DIRECTORY, ZIP_FILE_NAME + '.sha1')
 
   logging.debug('Comparing zip hashes: %s and %s', new_lib_zip_sha1,
                 paths.lib_zip_sha1)
   if utils.FileEquals(new_lib_zip_sha1, paths.lib_zip_sha1) and not args.force:
     logging.info('Skipping, the Google Play services library is up to date.')
     return 0
 
-  config = utils.ConfigParser(args.config)
   bucket_path = _VerifyBucketPathFormat(args.bucket,
                                         config.version_number,
                                         args.dry_run)
 
   tmp_root = tempfile.mkdtemp()
   try:
     # setup the destination directory
     if not os.path.isdir(paths.package):
       os.makedirs(paths.package)
 
@@ skipping 72 matching lines @@
   storage bucket.
 
   By default, a local commit will be made at the end of the operation.
   '''
 
   # This should function should not run on bots and could fail for many user
   # and setup related reasons. Also, exceptions here are not caught, so we
   # disable breakpad to avoid spamming the logs.
   breakpad.IS_ENABLED = False
 
-  paths = PlayServicesPaths(args.sdk_root)
+  config = utils.ConfigParser(args.config)
+  paths = PlayServicesPaths(args.sdk_root, config.version_xml_path)
 
   if not args.skip_git and utils.IsRepoDirty(constants.DIR_SOURCE_ROOT):
     logging.error('The repo is dirty. Please commit or stash your changes.')
     return -1
 
-  config = utils.ConfigParser(args.config)
-
   new_version_number = utils.GetVersionNumberFromLibraryResources(
       paths.version_xml)
   logging.debug('comparing versions: new=%d, old=%s',
                 new_version_number, config.version_number)
   if new_version_number <= config.version_number and not args.force:
     logging.info('The checked in version of the library is already the latest '
                  'one. No update is needed. Please rerun with --force to skip '
                  'this check.')
     return 0
 
@@ skipping 185 matching lines @@
       check if an update is necessary.
    6. lib: Contains the library itself: jar and resources. This is what is
       downloaded from the cloud storage.
    7. version_xml: File that contains the exact Google Play services library
       version, the one that we track. The version looks like 811500, is used in
       the code and the on-device APK, as opposed to the SDK package version
       which looks like 27.0.0 and is used only by the Android SDK manager.
 
   '''
 
-  def __init__(self, sdk_root):
+  def __init__(self, sdk_root, version_xml_path):
     relative_package = os.path.join('extras', 'google', 'google_play_services')
     relative_lib = os.path.join(relative_package, 'libproject',
                                 'google-play-services_lib')
     self.sdk_root = sdk_root
 
     self.package = os.path.join(sdk_root, relative_package)
     self.lib_zip_sha1 = os.path.join(self.package, ZIP_FILE_NAME + '.sha1')
     self.license = os.path.join(self.package, LICENSE_FILE_NAME)
     self.source_prop = os.path.join(self.package, 'source.properties')
 
     self.lib = os.path.join(sdk_root, relative_lib)
-    self.version_xml = os.path.join(self.lib, 'res', 'values', 'version.xml')
+    self.version_xml = os.path.join(self.lib, version_xml_path)
 
 
 class DummyGsutil(download_from_google_storage.Gsutil):
   '''
   Class that replaces Gsutil to use a local directory instead of an online
   bucket. It relies on the fact that Gsutil commands are very similar to shell
   ones, so for the ones used here (ls, cp), it works to just use them with a
   local directory.
   '''
 
   def __init__(self):
     super(DummyGsutil, self).__init__(
         download_from_google_storage.GSUTIL_DEFAULT_PATH)
 
   def call(self, *args):
     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(sys.argv[1:]))