Remove javalib special case in createDeapexerModuleIfNeeded

Removes the special case in createDeapexerModuleIfNeeded for handling
java libraries and just get the Import and SdkLibraryImport module
types to implement RequiredFilesFromPrebuiltApex instead.

Bug: 177892522
Test: m nothing
Merged-In: I5cc341b5b4168b8eb196f72273a00d498de6856f
Change-Id: I5cc341b5b4168b8eb196f72273a00d498de6856f
(cherry picked from commit fef5500a76)
This commit is contained in:
Paul Duffin
2021-06-17 14:56:05 +01:00
parent 062838fcca
commit 7db57e0a77
5 changed files with 50 additions and 10 deletions

View File

@@ -2265,6 +2265,13 @@ func (module *SdkLibraryImport) ImplementationAndResourcesJars() android.Paths {
}
}
var _ android.RequiredFilesFromPrebuiltApex = (*SdkLibraryImport)(nil)
func (module *SdkLibraryImport) RequiredFilesFromPrebuiltApex(ctx android.BaseModuleContext) map[string]string {
name := module.BaseModuleName()
return requiredFilesFromPrebuiltApexForImport(name)
}
//
// java_sdk_library_xml
//