Add content_shell_apk target (and a bunch of its dependencies)

build/android/gyp/package_resources.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.
 
 # pylint: disable=C0301
 """Package resources into an apk.
 
 See https://android.googlesource.com/platform/tools/base/+/master/legacy/ant-tasks/src/main/java/com/android/ant/AaptExecTask.java
@@ skipping 70 matching lines @@
     build_utils.MakeDirectory(dst_dir)
     for src_file_name in os.listdir(src_dir):
       if not src_file_name.endswith('.png'):
         continue
       src_file = os.path.join(src_dir, src_file_name)
       dst_file = os.path.join(dst_dir, src_file_name)
       assert not os.path.lexists(dst_file)
       shutil.move(src_file, dst_file)
 
 
+def PrepareExtractedZip(d):
+  res_dirs = []
+  subdirs = [os.path.join(d, s) for s in os.listdir(d)]
+  subdirs = sorted([s for s in subdirs if os.path.isdir(s)])
+  if subdirs and os.path.basename(subdirs[0]) == '0':

[newt (away), 2014/09/02 23:41:30]

I'd explain what's going on here (the two possible directory formats) in a
comment.

[cjhopman, 2014/09/04 01:14:58]

Done.

+    res_dirs = subdirs
+  else:
+    res_dirs = [d]
+  package_command = []
+  for d in res_dirs:
+    MoveImagesToNonMdpiFolders(d)
+    package_command += ['-S', d]
+  return package_command
+
+
 def main():
   options = ParseArgs()
   android_jar = os.path.join(options.android_sdk, 'android.jar')
   aapt = os.path.join(options.android_sdk_tools, 'aapt')
 
   with build_utils.TempDir() as temp_dir:
     package_command = [aapt,
                        'package',
                        '--version-code', options.version_code,
                        '--version-name', options.version_name,
@@ skipping 12 matching lines @@
 
     if os.path.exists(options.asset_dir):
       package_command += ['-A', options.asset_dir]
 
     dep_zips = build_utils.ParseGypList(options.resource_zips)
     for z in dep_zips:
       subdir = os.path.join(temp_dir, os.path.basename(z))
       if os.path.exists(subdir):
         raise Exception('Resource zip name conflict: ' + os.path.basename(z))
       build_utils.ExtractAll(z, path=subdir)
-      MoveImagesToNonMdpiFolders(subdir)
-      package_command += ['-S', subdir]
+      package_command += PrepareExtractedZip(subdir)
 
     if 'Debug' in options.configuration_name:
       package_command += ['--debug-mode']
 
     build_utils.CheckOutput(
         package_command, print_stdout=False, print_stderr=False)
 
     if options.depfile:
       build_utils.WriteDepfile(
           options.depfile,
           build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   main()