StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "java_sdk_library_import: Delegate OutputFiles to impl library if needed"

Browse Source
This commit is contained in:
Treehugger Robot
2022-04-29 17:27:23 +00:00
committed by Gerrit Code Review
parent f485a95d3a 1e940d5b44
commit 9c60cc4f22
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/sdk_library.go
View File

@@ -2231,7 +2231,15 @@ func (module *SdkLibraryImport) MinSdkVersion(ctx android.EarlyModuleContext) an
var _ hiddenAPIModule = (*SdkLibraryImport)(nil) var _ hiddenAPIModule = (*SdkLibraryImport)(nil)
func (module *SdkLibraryImport) OutputFiles(tag string) (android.Paths, error) { 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) { func (module *SdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {