Merge "java_sdk_library_import: Delegate OutputFiles to impl library if needed"
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 031848e..cd8e875 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -2231,7 +2231,15 @@
var _ hiddenAPIModule = (*SdkLibraryImport)(nil)
func (module *SdkLibraryImport) OutputFiles(tag string) (android.Paths, error) {
- return module.commonOutputFiles(tag)
+ paths, err := module.commonOutputFiles(tag)
+ if paths != nil || err != nil {
+ return paths, err
+ }
+ if module.implLibraryModule != nil {
+ return module.implLibraryModule.OutputFiles(tag)
+ } else {
+ return nil, nil
+ }
}
func (module *SdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {