Index: build/java.gypi |
diff --git a/build/java.gypi b/build/java.gypi |
index 1ab72c20b7f706d81981e8885fbf0ae258a984e4..7a4b7a3348a50619188a798de171e61e1c2670f0 100644 |
--- a/build/java.gypi |
+++ b/build/java.gypi |
@@ -88,6 +88,7 @@ |
'R_stamp': '<(intermediate_dir)/resources.stamp', |
'generated_src_dirs': ['<(R_dir)'], |
'additional_input_paths': ['<(R_stamp)'], |
+ 'additional_res_dirs': [], |
}, |
'all_dependent_settings': { |
'variables': { |
@@ -133,6 +134,18 @@ |
'message': 'processing resources for <(_target_name)', |
'variables': { |
'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml', |
+ 'all_res_dirs': ['<@(res_input_dirs)'], |
+ # Work around a gyp bug where late-expanding an empty list results |
+ # in one element -- an empty string -- instead of zero elements. |
+ # TODO(newt): Remove this condition once |
+ # https://code.google.com/p/gyp/issues/detail?id=328 is fixed. |
cjhopman
2013/03/27 00:37:50
Could this bug be due to the fact that all_res_dir
|
+ 'conditions': [ |
+ ['additional_res_dirs!=[]', { |
+ # Include the depedencies' res dirs so that references to |
+ # resources in dependencies can be resolved. |
+ 'all_res_dirs': ['>@(additional_res_dirs)'], |
+ }], |
+ ], |
}, |
'inputs': [ |
'<(DEPTH)/build/android/pylib/build_utils.py', |
@@ -147,7 +160,7 @@ |
'--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)', |