Add content_shell_apk target (and a bunch of its dependencies)

build/android/gyp/process_resources.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Process Android resources to generate R.java, and prepare for packaging.
 
 This will crunch images and generate v14 compatible resources
 (see generate_v14_compatible_resources.py).
@@ skipping 137 matching lines @@
     for root, _, files in os.walk(d):
       for f in files:
         archive_path = os.path.join(os.path.relpath(root, d), f)
         path = os.path.join(root, f)
         files_to_zip[archive_path] = path
   with zipfile.ZipFile(zip_path, 'w') as outzip:
     for archive_path, path in files_to_zip.iteritems():
       outzip.write(path, archive_path)
 
 
+def CombineZips(zip_files, output_path):
+  # When packaging resources, if the top-level directories in the zip file are
+  # of the form 0, 1, ..., then each subdirectory will be passed to aapt as a
+  # resources directory. While some resources just clobber others (image files,
+  # etc), other resources (particularly .xml files) need to be more
+  # intelligently merged. That merging is left up to aapt.
+  with zipfile.ZipFile(output_path, 'w') as outzip:
+    for i, z in enumerate(zip_files):
+      with zipfile.ZipFile(z, 'r') as inzip:
+        for name in inzip.namelist():
+          new_name = '%d/%s' % (i, name)
+          outzip.writestr(new_name, inzip.read(name))
+
+
 def main():
   args = build_utils.ExpandFileArgs(sys.argv[1:])
 
   options = ParseArgs(args)
   android_jar = os.path.join(options.android_sdk, 'android.jar')
   aapt = os.path.join(options.android_sdk_tools, 'aapt')
 
   input_files = []
 
   with build_utils.TempDir() as temp_dir:
@@ skipping 73 matching lines @@
       zip_resource_dirs.append(crunch_dir)
       aapt_cmd = [aapt,
                   'crunch',
                   '-C', crunch_dir,
                   '-S', d]
       build_utils.CheckOutput(aapt_cmd, fail_func=DidCrunchFail)
 
     ZipResources(zip_resource_dirs, options.resource_zip_out)
 
     if options.all_resources_zip_out:
-      ZipResources(
-          zip_resource_dirs + dep_subdirs, options.all_resources_zip_out)
+      CombineZips([options.resource_zip_out] + dep_zips,
+                  options.all_resources_zip_out)
 
     if options.R_dir:
       build_utils.DeleteDirectory(options.R_dir)
       shutil.copytree(gen_dir, options.R_dir)
     else:
       build_utils.ZipDir(options.srcjar_out, gen_dir)
 
   if options.depfile:
     input_files += build_utils.GetPythonDependencies()
     build_utils.WriteDepfile(options.depfile, input_files)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   main()