WebUI: Split unpack_pak functionality to its own GN action.

chrome/browser/resources/vulcanize_gn.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 import argparse
 import itertools
 import os
 import platform
 import re
@@ skipping 52 matching lines @@
     ('chrome://resources/html/', _HTML_RESOURCES_PATH),
     ('chrome://resources/js/', _JS_RESOURCES_PATH),
     ('chrome://resources/polymer/v1_0/', _POLYMER_PATH)
 ]
 
 
 _VULCANIZE_REDIRECT_ARGS = list(itertools.chain.from_iterable(map(
     lambda m: ['--redirect', '"%s|%s"' % (m[0], m[1])], _URL_MAPPINGS)))
 
 
-_PAK_UNPACK_FOLDER = 'flattened'
-
-
 def _undo_mapping(mappings, url):
   for (redirect_url, file_path) in mappings:
     if url.startswith(redirect_url):
       return url.replace(redirect_url, file_path + os.sep)
   # TODO(dbeam): can we make this stricter?
   return url
 
 def _request_list_path(out_path, html_out_file):
   return os.path.join(out_path, html_out_file + '_requestlist.txt')
 
@@ skipping 24 matching lines @@
   # Undo the URL mappings applied by vulcanize to get file paths relative to
   # current working directory.
   url_mappings = _URL_MAPPINGS + [
       ('/', os.path.relpath(in_path, _CWD)),
       ('chrome://%s/' % args.host, os.path.relpath(in_path, _CWD)),
   ]
 
   deps = [_undo_mapping(url_mappings, u) for u in request_list]
   deps = map(os.path.normpath, deps)
 
-  # If the input was a .pak file, the generated depfile should not list files
-  # already in the .pak file.
-  if args.input.endswith('.pak'):
-    filter_url = os.path.join(args.out_folder, _PAK_UNPACK_FOLDER)
+  # If the input was a folder holding an unpacked .pak file, the generated
+  # depfile should not list files already in the .pak file.
+  if args.input.endswith('.unpak'):
+    filter_url = args.input
     deps = [d for d in deps if not d.startswith(filter_url)]
 
   with open(os.path.join(_CWD, args.depfile), 'w') as f:
     deps_file_header = os.path.join(args.out_folder, args.html_out_file)
     f.write(deps_file_header + ': ' + ' '.join(deps))
 
 
 def _vulcanize(in_folder, args):
   in_path = os.path.normpath(os.path.join(_CWD, in_folder))
   out_path = os.path.join(_CWD, args.out_folder)
@@ skipping 57 matching lines @@
   parser.add_argument('--out_folder', required=True)
   args = parser.parse_args(argv)
 
   # NOTE(dbeam): on Windows, GN can send dirs/like/this. When joined, you might
   # get dirs/like/this\file.txt. This looks odd to windows. Normalize to right
   # the slashes.
   args.depfile = os.path.normpath(args.depfile)
   args.input = os.path.normpath(args.input)
   args.out_folder = os.path.normpath(args.out_folder)
 
-  vulcanize_input_folder = args.input
-
-  # If a .pak file was specified, unpack that file first and pass the output to
-  # vulcanize.
-  if args.input.endswith('.pak'):
-    import unpack_pak
-    output_folder = os.path.join(args.out_folder, _PAK_UNPACK_FOLDER)
-    unpack_pak.unpack(args.input, output_folder)
-    vulcanize_input_folder = output_folder
-
-  _vulcanize(vulcanize_input_folder, args)
-
-  _update_dep_file(vulcanize_input_folder, args)
+  _vulcanize(args.input, args)
+  _update_dep_file(args.input, args)
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])