Use gn_helpers to [se]serialize GN lists.

build/android/gyp/jinja_template.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.
 
 """Renders one or more template files using the Jinja template engine."""
 
 import codecs
 import argparse
@@ skipping 61 matching lines @@
       output_filename = os.path.join(temp_dir, relpath)
       parent_dir = os.path.dirname(output_filename)
       build_utils.MakeDirectory(parent_dir)
       _ProcessFile(processor, input_filename, output_filename)
 
     build_utils.ZipDir(outputs_zip, temp_dir)
 
 
 def _ParseVariables(variables_arg, error_func):
   variables = {}
-  for v in build_utils.ParseGypList(variables_arg):
+  for v in build_utils.ParseGnList(variables_arg):
     if '=' not in v:
       error_func('--variables argument must contain "=": ' + v)
     name, _, value = v.partition('=')
     variables[name] = value
   return variables
 
 
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--inputs', required=True,
                       help='The template files to process.')
   parser.add_argument('--output', help='The output file to generate. Valid '
                       'only if there is a single input.')
   parser.add_argument('--outputs-zip', help='A zip file for the processed '
                       'templates. Required if there are multiple inputs.')
   parser.add_argument('--inputs-base-dir', help='A common ancestor directory '
                       'of the inputs. Each output\'s path in the output zip '
                       'will match the relative path from INPUTS_BASE_DIR to '
                       'the input. Required if --output-zip is given.')
   parser.add_argument('--loader-base-dir', help='Base path used by the '
                       'template loader. Must be a common ancestor directory of '
                       'the inputs. Defaults to DIR_SOURCE_ROOT.',
                       default=host_paths.DIR_SOURCE_ROOT)
   parser.add_argument('--variables', help='Variables to be made available in '
                       'the template processing environment, as a GYP list '
                       '(e.g. --variables "channel=beta mstone=39")', default='')
   build_utils.AddDepfileOption(parser)
   options = parser.parse_args()
 
-  inputs = build_utils.ParseGypList(options.inputs)
+  inputs = build_utils.ParseGnList(options.inputs)
 
   if (options.output is None) == (options.outputs_zip is None):
     parser.error('Exactly one of --output and --output-zip must be given')
   if options.output and len(inputs) != 1:
     parser.error('--output cannot be used with multiple inputs')
   if options.outputs_zip and not options.inputs_base_dir:
     parser.error('--inputs-base-dir must be given when --output-zip is used')
 
   variables = _ParseVariables(options.variables, parser.error)
   processor = JinjaProcessor(options.loader_base_dir, variables=variables)
 
   if options.output:
     _ProcessFile(processor, inputs[0], options.output)
   else:
     _ProcessFiles(processor, inputs, options.inputs_base_dir,
                   options.outputs_zip)
 
   if options.depfile:
     deps = processor.GetLoadedTemplates() + build_utils.GetPythonDependencies()
     build_utils.WriteDepfile(options.depfile, deps)
 
 
 if __name__ == '__main__':
   main()