[Android] Allow Java libraries to access resources from dependencies.

build/java.gypi

 # 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Java in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my-package_java',
@@ skipping 70 matching lines @@
       'variables': {
         'res_dir': '<(java_in_dir)/res',
         'res_crunched_dir': '<(intermediate_dir)/res_crunched',
         'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'],
         'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
         'R_dir': '<(intermediate_dir)/java_R',
         'R_text_file': '<(R_dir)/R.txt',
         'R_stamp': '<(intermediate_dir)/resources.stamp',
         'generated_src_dirs': ['<(R_dir)'],
         'additional_input_paths': ['<(R_stamp)'],
+        'additional_res_dirs': [],
       },
       'all_dependent_settings': {
         'variables': {
           # Dependent jars include this target's R.java file via
           # generated_R_dirs and additional_R_files.
           'generated_R_dirs': ['<(R_dir)'],
           'additional_input_paths': ['<(R_stamp)'],
 
           # Dependent APKs include this target's resources via
           # additional_res_dirs, additional_res_packages, and
@@ skipping 25 matching lines @@
           ],
         }],
       ],
       'actions': [
         # Generate R.java and crunch image resources.
         {
           'action_name': 'process_resources',
           'message': 'processing resources for <(_target_name)',
           'variables': {
             'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml',
+            # Include the depedencies' res dirs so that references to

[cjhopman, 2013/03/27 00:54:04]

nit: s/depedencies/dependencies

[newt (away), 2013/03/27 01:20:13]

Done.

+            # resources in dependencies can be resolved.
+            'all_res_dirs': ['<@(res_input_dirs)', '>@(additional_res_dirs)'],
           },
           'inputs': [
             '<(DEPTH)/build/android/pylib/build_utils.py',
             '<(DEPTH)/build/android/process_resources.py',
             '>@(resource_input_paths)',

[cjhopman, 2013/03/27 00:54:04]

Does anything need to be added to the inputs to ensure this is rebuilt when a
dependencies resources change?

[newt (away), 2013/03/27 01:20:13]

Done.

           ],
           'outputs': [
             '<(R_stamp)',
           ],
           'action': [
             '<(DEPTH)/build/android/process_resources.py',
             '--android-sdk', '<(android_sdk)',
             '--android-sdk-tools', '<(android_sdk_tools)',
             '--R-dir', '<(R_dir)',
-            '--res-dirs', '<(res_input_dirs)',
+            '--res-dirs', '>(all_res_dirs)',
             '--crunch-input-dir', '>(res_dir)',
             '--crunch-output-dir', '<(res_crunched_dir)',
             '--android-manifest', '<(android_manifest)',
             '--non-constant-id',
             '--custom-package', '<(R_package)',
             '--stamp', '<(R_stamp)',
 
             # Add hash of inputs to the command line, so if inputs change
             # (e.g. if a resource if removed), the command will be re-run.
             # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
@@ skipping 52 matching lines @@
         '--classes-dir=<(classes_dir)',
         '--jar-path=<(jar_path)',
         '--excluded-classes=<(excluded_classes)',
 
         # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
         '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
       ]
     },
   ],
 }