Add creation of v14 compatible resources to process_resources.py

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 library resources to generate R.java and crunched images."""
+"""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).
+"""
 
 import optparse
 import os
 import re
 import shlex
 import shutil
 
+import generate_v14_compatible_resources as v14_resources

[newt (away), 2014/06/06 01:37:35]

do you really need to "import as"? :)

[cjhopman, 2014/06/06 01:46:55]

Ha, the other name was just so long. Done.

+
 from util import build_utils
 
 def ParseArgs():
   """Parses command line options.
 
   Returns:
     An options object as from optparse.OptionsParser.parse_args()
   """
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk', help='path to the Android SDK folder')
   parser.add_option('--android-sdk-tools',
                     help='path to the Android SDK build tools folder')
   parser.add_option('--R-dir', help='directory to hold generated R.java')
   parser.add_option('--dependencies-res-dirs',
                     help='directories containing resources to be packaged')
   parser.add_option('--resource-dir',
                     help='directory containing this target\'s resources.')
   parser.add_option('--crunch-output-dir',
                     help='directory to hold crunched resources')
   parser.add_option('--non-constant-id', action='store_true')
   parser.add_option('--custom-package', help='Java package for R.java')
   parser.add_option('--android-manifest', help='AndroidManifest.xml path')
   parser.add_option('--proguard-file',
                     help='Path to proguard.txt generated file')
-  parser.add_option('--stamp', help='File to touch on success')
+
+  parser.add_option('--res-v14-compatibility-dir',
+                    help='output directory into which '
+                         'v14 compatible resources will be generated')
+  parser.add_option(
+      '--v14-verify-only',
+      action='store_true',
+      help='Do not generate v14 resources. Instead, just verify that the '
+      'resources are already compatible with v14, i.e. they don\'t use '
+      'attributes that cause crashes on certain devices.')
 
   parser.add_option(
       '--extra-res-packages',
       help='Additional package names to generate R.java files for')
   parser.add_option(
       '--extra-r-text-files',
       help='For each additional package, the R.txt file should contain a '
       'list of resources to be included in the R.java file in the format '
       'generated by aapt')
 
+  parser.add_option('--stamp', help='File to touch on success')
+
   (options, args) = parser.parse_args()
 
   if args:
     parser.error('No positional arguments should be given.')
 
   # Check that required options have been provided.
   required_options = (
       'android_sdk',
       'android_sdk_tools',
       'android_manifest',
       'dependencies_res_dirs',
       'resource_dir',
       'crunch_output_dir',
       'R_dir',
+      'res_v14_compatibility_dir',
       )
   build_utils.CheckOptions(options, parser, required=required_options)
 
   return options
 
 
 def CreateExtraRJavaFiles(
     r_dir, extra_packages, extra_r_text_files):
   if len(extra_packages) != len(extra_r_text_files):
     raise Exception('--extra-res-packages and --extra-r-text-files'
@@ skipping 61 matching lines @@
 
 
 def main():
   options = ParseArgs()
   android_jar = os.path.join(options.android_sdk, 'android.jar')
   aapt = os.path.join(options.android_sdk_tools, 'aapt')
 
   build_utils.DeleteDirectory(options.R_dir)
   build_utils.MakeDirectory(options.R_dir)
 
+  build_utils.DeleteDirectory(options.res_v14_compatibility_dir)

[newt (away), 2014/06/06 01:37:35]

This directory is deleted and created in generate_v14_compatible_resources.py as
well. One of these is redundant.

[cjhopman, 2014/06/06 01:46:55]

Done.

+  build_utils.MakeDirectory(options.res_v14_compatibility_dir)
+
+  v14_resources.GenerateV14Resources(
+      options.resource_dir,
+      options.res_v14_compatibility_dir,
+      options.v14_verify_only)
+
   # Generate R.java. This R.java contains non-final constants and is used only
   # while compiling the library jar (e.g. chromium_content.jar). When building
   # an apk, a new R.java file with the correct resource -> ID mappings will be
   # generated by merging the resources from all libraries and the main apk
   # project.
   package_command = [aapt,
                      'package',
                      '-m',
                      '-M', options.android_manifest,
                      '--auto-add-overlay',
@@ skipping 30 matching lines @@
   build_utils.CheckOutput(aapt_cmd, fail_func=DidCrunchFail)
 
   MoveImagesToNonMdpiFolders(options.crunch_output_dir)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   main()