Get Proguard flags from GMS clients (upstream 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 builds
@@ skipping 42 matching lines @@
                              '--repository',
                              help=('the Google Play services repository '
                                    'location'),
                              required=True,
                              metavar='FILE')
   required_args.add_argument('-o',
                              '--out-dir',
                              help='the output directory',
                              required=True,
                              metavar='FILE')
+  required_args.add_argument('-g',
+                             '--gni-out-file',
+                             help='the GN output file',
+                             required=True,
+                             metavar='FILE')
   required_args.add_argument('-c',
                              '--config-file',
                              help='the config file path',
                              required=True,
                              metavar='FILE')
   parser.add_argument('--config-help',
                       action='custom_help',
                       custom_help_text=utils.ConfigParser.__doc__,
                       help='show the configuration file format help')
 
   args = parser.parse_args()
 
   return ProcessGooglePlayServices(args.repository,
                                    args.out_dir,
+                                   args.gni_out_file,
                                    args.config_file)
 
 
-def ProcessGooglePlayServices(repo, out_dir, config_path):
+def ProcessGooglePlayServices(repo, out_dir, gni_out_file, config_path):
   config = utils.ConfigParser(config_path)
 
   tmp_root = tempfile.mkdtemp()
   try:
     tmp_paths = _SetupTempDir(tmp_root)
     _ImportFromExtractedRepo(config, tmp_paths, repo)
     _ProcessResources(config, tmp_paths, repo)
     _CopyToOutput(tmp_paths, out_dir)
+    _EnumerateProguardFiles(gni_out_file, out_dir)
     _UpdateVersionInConfig(config, tmp_paths)
   finally:
     shutil.rmtree(tmp_root)
 
   return 0
 
 
 def _SetupTempDir(tmp_root):
   tmp_paths = {
       'root': tmp_root,
@@ skipping 81 matching lines @@
         shutil.copy(os.path.join(repo, whitelisted_file), rebased_res)
       finally:
         _MakeWritable(rebased_res)
 
 
 def _CopyToOutput(tmp_paths, out_dir):
   shutil.rmtree(out_dir, ignore_errors=True)
   shutil.copytree(tmp_paths['imported_clients'], out_dir)
 
 
+gni_template = '''\

[jbudorick, 2017/04/19 18:42:26]

nits: _GNI_TEMPLATE + use textwrap.dedent + indent the lines below

Using a format string here is a nice change, though.

[paulmiller, 2017/04/19 21:28:10]

Thanks, I didn't know about dedent. But if I can indent it, then I might as well
make it a local variable.

Aside, it seems odd to use the ALL_CAPS style in a language that doesn't support
constants.

[jbudorick, 2017/04/19 21:29:46]

heh, it's at least a reminder to people working in the code that it is
conceptually, if not logically, a constant.

+# Copyright 2017 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.
+
+# This file generated by {script}
+gms_proguard_configs = [
+{body}
+]
+'''
+
+# Write a GN file containing a list of each GMS client's proguard file (if any).
+def _EnumerateProguardFiles(gni_path, out_dir):
+  gni_dir = os.path.dirname(gni_path)
+
+  gni_lines = []
+  for client_dir in os.listdir(out_dir):
+    proguard_path = os.path.join(
+        out_dir, client_dir, 'proguard.txt')
+    if os.path.exists(os.path.dirname(proguard_path)):
+      relative = os.path.relpath(proguard_path, gni_dir)

[jbudorick, 2017/04/19 18:42:26]

I'm a bit concerned about the case in which out_dir isn't a descendent of
gni_dir. GN style typically favors src/-rooted paths to relative paths that go
up the directory tree (i.e., '//foo/bar/baz' vs '../bar/baz')

[paulmiller, 2017/04/19 21:28:10]

I'll make the paths absolute, then.

+      gni_lines.append('  "' + relative + '",')

[jbudorick, 2017/04/19 18:42:26]

nit: instead of the string appends, do
  gni_lines.append('  "%s",' % relative)

[paulmiller, 2017/04/19 21:28:10]

Done.

+  gni_lines.sort()
+
+  gni_text = gni_template.format(
+      script=os.path.relpath(sys.argv[0], gni_dir),
+      body='\n'.join(gni_lines))
+
+  with open(gni_path, 'w') as gni_file:
+    gni_file.write(gni_text)
+
+
 def _UpdateVersionInConfig(config, tmp_paths):
   version_xml_path = os.path.join(tmp_paths['imported_clients'],
                                   config.version_xml_path)
   play_services_full_version = utils.GetVersionNumberFromLibraryResources(
       version_xml_path)
   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())