Fix handling of resources

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 46 matching lines @@
   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')
+  # TODO(cjhopman): Actually use --extra-r-text-files. We currently include all
+  # the resources in all R.java files for a particular apk.
   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(
       '--all-resources-zip-out',
       help='Path for output of all resources. This includes resources in '
       'dependencies.')
@@ skipping 15 matching lines @@
       'resource_zip_out',
       )
   build_utils.CheckOptions(options, parser, required=required_options)
 
   if (options.R_dir is None) == (options.srcjar_out is None):
     raise Exception('Exactly one of --R-dir or --srcjar-out must be specified.')
 
   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'
-                    'should have the same length')
-
+def CreateExtraRJavaFiles(r_dir, extra_packages):
   java_files = build_utils.FindInDirectory(r_dir, "R.java")
   if len(java_files) != 1:
     return
   r_java_file = java_files[0]
   r_java_contents = open(r_java_file).read()
 
   for package in extra_packages:
     package_r_java_dir = os.path.join(r_dir, *package.split('.'))
     build_utils.MakeDirectory(package_r_java_dir)
     package_r_java_path = os.path.join(package_r_java_dir, 'R.java')
@@ skipping 111 matching lines @@
       package_command.append('--non-constant-id')
     if options.custom_package:
       package_command += ['--custom-package', options.custom_package]
     if options.proguard_file:
       package_command += ['-G', options.proguard_file]
     build_utils.CheckOutput(package_command, print_stderr=False)
 
     if options.extra_res_packages:
       CreateExtraRJavaFiles(
           gen_dir,
-          build_utils.ParseGypList(options.extra_res_packages),
-          build_utils.ParseGypList(options.extra_r_text_files))
+          build_utils.ParseGypList(options.extra_res_packages))
 
     # This is the list of directories with resources to put in the final .zip
     # file. The order of these is important so that crunched/v14 resources
     # override the normal ones.
     zip_resource_dirs = input_resource_dirs + [v14_dir]
 
     base_crunch_dir = os.path.join(temp_dir, 'crunch')
 
     # Crunch image resources. This shrinks png files and is necessary for
     # 9-patch images to display correctly. 'aapt crunch' accepts only a single
@@ skipping 23 matching lines @@
   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()