Fix handling of resources

build/android/gyp/write_build_config.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.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 51 matching lines @@
   parser.add_option('--build-config', help='Path to build_config output.')
   parser.add_option(
       '--type',
       help='Type of this target (e.g. android_library).')
   parser.add_option(
       '--possible-deps-configs',
       help='List of paths for dependency\'s build_config files. Some '
       'dependencies may not write build_config files. Missing build_config '
       'files are handled differently based on the type of this target.')
 
-  # android_resources/apk options
+  # android_resources options
   parser.add_option('--srcjar', help='Path to target\'s resources srcjar.')
   parser.add_option('--resources-zip', help='Path to target\'s resources zip.')
+  parser.add_option('--package-name',
+      help='Java package name for these resources.')
+  parser.add_option('--android-manifest', help='Path to android manifest.')
 
   # android_library/apk options
   parser.add_option('--jar-path', help='Path to target\'s jar output.')
   parser.add_option('--dex-path', help='Path to target\'s dex output.')
 
   # apk native library options
   parser.add_option('--native-libs', help='List of top-level native libs.')
   parser.add_option('--readelf-path', help='Path to toolchain\'s readelf.')
 
   options, args = parser.parse_args(argv)
@@ skipping 29 matching lines @@
     raise Exception('Unknown deps: ' + str(unknown_deps))
 
   direct_deps_config_paths = [
       c for c in possible_deps_config_paths if not c in unknown_deps]
   all_deps_config_paths = GetAllDepsConfigsInOrder(direct_deps_config_paths)
 
   direct_deps_configs = [GetDepConfig(p) for p in direct_deps_config_paths]
   all_deps_configs = [GetDepConfig(p) for p in all_deps_config_paths]
 
   direct_library_deps = DepsOfType('android_library', direct_deps_configs)
+  all_library_deps = DepsOfType('android_library', all_deps_configs)
+
+  direct_resources_deps = DepsOfType('android_resources', direct_deps_configs)
   all_resources_deps = DepsOfType('android_resources', all_deps_configs)
-  all_library_deps = DepsOfType('android_library', all_deps_configs)
 
   # Initialize some common config.
   config = {
     'deps_info': {
       'path': options.build_config,
       'type': options.type,
       'deps_configs': direct_deps_config_paths,
     }
   }
   deps_info = config['deps_info']
 
   if options.type in ['android_library', 'android_apk']:
     javac_classpath = [c['jar_path'] for c in direct_library_deps]
     deps_info['resources_deps'] = [c['path'] for c in all_resources_deps]
     deps_info['jar_path'] = options.jar_path
     deps_info['dex_path'] = options.dex_path
     config['javac'] = {
       'classpath': javac_classpath,
     }
+
+  if options.type == 'android_library':
     # Only resources might have srcjars (normal srcjar targets are listed in
     # srcjar_deps). A resource's srcjar contains the R.java file for those
     # resources, and (like Android's default build system) we allow a library to
     # refer to the resources in any of its dependents.
     config['javac']['srcjars'] = [
-        c['srcjar'] for c in all_resources_deps if 'srcjar' in c]
+        c['srcjar'] for c in direct_resources_deps if 'srcjar' in c]
 
-  if options.type == 'android_resources' or options.type == 'android_apk':
+  if options.type == 'android_apk':
+    config['javac']['srcjars'] = []
+
+
+  if options.type == 'android_resources':
     deps_info['resources_zip'] = options.resources_zip
     if options.srcjar:
       deps_info['srcjar'] = options.srcjar
+    if options.package_name:
+      deps_info['package_name'] = options.package_name
 
+  if options.type == 'android_resources' or options.type == 'android_apk':

[newt (away), 2014/09/15 18:44:25]

or "in ['android_resources', 'android_apk']"

     config['resources'] = {}
     config['resources']['dependency_zips'] = [
         c['resources_zip'] for c in all_resources_deps]
+    config['resources']['extra_package_names'] = [
+        c['package_name'] for c in all_resources_deps if 'package_name' in c]
+
 
   if options.type == 'android_apk':
     config['apk_dex'] = {}
     dex_config = config['apk_dex']
     # TODO(cjhopman): proguard version
     dex_deps_files = [c['dex_path'] for c in all_library_deps]
     dex_config['dependency_dex_files'] = dex_deps_files
 
     config['dist_jar'] = {
       'dependency_jars': [
@@ skipping 27 matching lines @@
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         all_deps_config_paths + build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))