Merge "Fix check-boot-jars when a boot jar is provided by prebuilt" am: 0e63a8e761 am: ac2a42054f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1341756

Change-Id: Ife514f78e7aea0b8ed05f74c21d3ce95054796cc
This commit is contained in:
Anton Hansson
2020-06-17 20:02:20 +00:00
committed by Automerger Merge Worker
4 changed files with 31 additions and 4 deletions

View File

@@ -2009,6 +2009,26 @@ func (module *SdkLibraryImport) Stem() string {
return module.BaseModuleName()
}
var _ ApexDependency = (*SdkLibraryImport)(nil)
// to satisfy java.ApexDependency interface
func (module *SdkLibraryImport) HeaderJars() android.Paths {
if module.implLibraryModule == nil {
return nil
} else {
return module.implLibraryModule.HeaderJars()
}
}
// to satisfy java.ApexDependency interface
func (module *SdkLibraryImport) ImplementationAndResourcesJars() android.Paths {
if module.implLibraryModule == nil {
return nil
} else {
return module.implLibraryModule.ImplementationAndResourcesJars()
}
}
//
// java_sdk_library_xml
//