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

java_sdk_library_import: Delegate OutputFiles to impl library if needed

Browse Source 
Bug: 230846030
Test: m nothing
      # Cherry pick into build with prebuilts enabled to verify.
Change-Id: I5ac9b1cdd2fc61efbc988e84556202ff6cd57146
This commit is contained in:
Paul Duffin
2022-04-29 14:21:25 +01:00
parent 2fe7af01af
commit 1e940d5b44
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

@@ -2224,7 +2224,15 @@ func (module *SdkLibraryImport) UniqueApexVariations() bool {
} }
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) {