Revert of Roll internal Google Play Services (Chromium part)

build/android/play_services/preprocess.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.
 
 '''Prepares the Google Play services split client libraries before usage by
 Chrome's build system.
 
 We need to preprocess Google Play services before using it in Chrome
@@ skipping 49 matching lines @@
 
 from datetime import datetime
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
 import devil_chromium
 from devil.utils import cmd_helper
 from play_services import utils
 from pylib.utils import argparse_utils
 
 
+M2_PKG_PATH = os.path.join('com', 'google', 'android', 'gms')
+
+
 def main():
   parser = argparse.ArgumentParser(description=(
       "Prepares the Google Play services split client libraries before usage "
       "by Chrome's build system. See the script's documentation for more a "
       "detailed help."))
   argparse_utils.CustomHelpAction.EnableFor(parser)
   required_args = parser.add_argument_group('required named arguments')
   required_args.add_argument('-r',
                              '--repository',
                              help=('the Google Play services repository '
@@ skipping 78 matching lines @@
   return out_paths
 
 
 def _MakeWritable(dir_path):
   for root, dirs, files in os.walk(dir_path):
     for path in itertools.chain(dirs, files):
       st = os.stat(os.path.join(root, path))
       os.chmod(os.path.join(root, path), st.st_mode | stat.S_IWUSR)
 
 
-# E.g. turn "base_1p" into "base"
-def _RemovePartySuffix(client):
-  return client[:-3] if client[-3:] == '_1p' else client
-
-
 def _ImportFromAars(config, tmp_paths, repo):
   for client in config.clients:
-    client_name = _RemovePartySuffix(client)
-    aar_name = 'client_' + client + '.aar'
-    aar_path = os.path.join(repo, client_name, aar_name)
+    aar_name = '%s-%s.aar' % (client, config.sdk_version)
+    aar_path = os.path.join(repo, M2_PKG_PATH, client,
+                            config.sdk_version, aar_name)
     aar_out_path = os.path.join(tmp_paths['imported_clients'], client)
     _ExtractAll(aar_path, aar_out_path)
 
     client_jar_path = os.path.join(aar_out_path, 'classes.jar')
     _ExtractAll(client_jar_path, tmp_paths['extracted_jars'])
 
 
 def _ImportFromExtractedRepo(config, tmp_paths, repo):
   # Import the clients
   try:
@@ skipping 10 matching lines @@
 def _GenerateCombinedJar(tmp_paths):
   out_file_name = tmp_paths['combined_jar']
   working_dir = tmp_paths['extracted_jars']
   cmd_helper.Call(['jar', '-cf', out_file_name, '-C', working_dir, '.'])
 
 
 def _ProcessResources(config, tmp_paths, repo):
   LOCALIZED_VALUES_BASE_NAME = 'values-'
   locale_whitelist = set(config.locale_whitelist)
 
-  # The directory structure here is:
-  # <imported_clients temp dir>/<client name>_1p/res/<res type>/<res file>.xml
-  for client_dir in os.listdir(tmp_paths['imported_clients']):
-    client_prefix = _RemovePartySuffix(client_dir) + '_'
+  glob_pattern = os.path.join(tmp_paths['imported_clients'], '*', 'res', '*')
+  for res_dir in glob.glob(glob_pattern):
+    dir_name = os.path.basename(res_dir)
 
-    res_path = os.path.join(tmp_paths['imported_clients'], client_dir, 'res')
-    if not os.path.isdir(res_path):
+    if dir_name.startswith('drawable'):
+      shutil.rmtree(res_dir)
       continue
-    for res_type in os.listdir(res_path):
-      res_type_path = os.path.join(res_path, res_type)
 
-      if res_type.startswith('drawable'):
-        shutil.rmtree(res_type_path)
-        continue
-
-      if res_type.startswith(LOCALIZED_VALUES_BASE_NAME):
-        dir_locale = res_type[len(LOCALIZED_VALUES_BASE_NAME):]
-        if dir_locale not in locale_whitelist:
-          shutil.rmtree(res_type_path)
-          continue
-
-      if res_type.startswith('values'):
-        # Beginning with v3, resource file names are not necessarily unique, and
-        # would overwrite each other when merged at build time. Prefix each
-        # "values" resource file with its client name.
-        for res_file in os.listdir(res_type_path):
-          os.rename(os.path.join(res_type_path, res_file),
-                    os.path.join(res_type_path, client_prefix + res_file))
+    if dir_name.startswith(LOCALIZED_VALUES_BASE_NAME):
+      dir_locale = dir_name[len(LOCALIZED_VALUES_BASE_NAME):]
+      if dir_locale not in locale_whitelist:
+        shutil.rmtree(res_dir)
 
   # Reimport files from the whitelist.
   for res_path in config.resource_whitelist:
     for whitelisted_file in glob.glob(os.path.join(repo, res_path)):
       resolved_file = os.path.relpath(whitelisted_file, repo)
       rebased_res = os.path.join(tmp_paths['imported_clients'], resolved_file)
 
       if not os.path.exists(os.path.dirname(rebased_res)):
         os.makedirs(os.path.dirname(rebased_res))
 
@@ skipping 37 matching lines @@
 
   config.UpdateVersionNumber(play_services_full_version)
 
 
 def _ExtractAll(zip_path, out_path):
   with zipfile.ZipFile(zip_path, 'r') as zip_file:
     zip_file.extractall(out_path)
 
 if __name__ == '__main__':
   sys.exit(main())