Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e89f3e22 authored by Paul Duffin's avatar Paul Duffin
Browse files

java_sdk_library_import: Delegate OutputFiles to impl library if needed 

(cherry picked from commit 1e940d5b)

Bug: 230846030
Test: m nothing
      # Cherry pick into build with prebuilts enabled to verify.
Change-Id: I5ac9b1cdd2fc61efbc988e84556202ff6cd57146
parent e42d92f4

java/sdk_library.go

+9 −1
Original line number Diff line number Diff line
@@ -2170,7 +2170,15 @@ func (module *SdkLibraryImport) UniqueApexVariations() bool { 
}



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) {