Index: build/java_aidl.gypi |
diff --git a/build/java_aidl.gypi b/build/java_aidl.gypi |
index 8b022a5344b54c53764318f77d7ccbd1bfabdd88..bb8f2b8cdd8afbc2a10ef61567626917cbad323a 100644 |
--- a/build/java_aidl.gypi |
+++ b/build/java_aidl.gypi |
@@ -43,11 +43,13 @@ |
'variables': { |
'aidl_import_include%': '', |
'additional_aidl_arguments': [], |
+ 'additional_aidl_input_paths': [], |
}, |
'conditions': [ |
['"<(aidl_import_include)"!=""', { |
'variables': { |
- 'additional_aidl_arguments': [ '-I<(aidl_import_include)' ] |
+ 'additional_aidl_arguments': [ '-I<(aidl_import_include)' ], |
+ 'additional_aidl_input_paths': [ '<!@(find <(aidl_import_include) -name "*.java")', ] |
} |
}], |
], |
@@ -58,6 +60,7 @@ |
'inputs': [ |
'<(android_sdk)/framework.aidl', |
'<(aidl_interface_file)', |
+ '<@(additional_aidl_input_paths)', |
], |
'outputs': [ |
'<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java', |