Fix check-boot-jars when a boot jar is provided by prebuilt
Previously, when a boot jar was provided by a java_sdk_library_import module the check-boot-jars check failed because the file it depended on was not available. In an incremental build the build failed due to the file in the out directory not having a rule to generate it. That was because the module was named prebuilt_<module>.<apex> instead of <module>.<apex>. This was fixed by simply removing prebuilt_ prefix from the name if it was present. After fixing that the check-boot-jars still did not work properly because it was expecting a jar file containing .class files but instead was given a jar file containing .dex files which meant the check did not work properly. This was fixed by defining a new ApexDependency interface for use by the apex/apex.go code to use instead of java.Dependency for generating the androidmk entries. The *SdkLibraryImport type then implemented those, by delegating to the implementation library. Bug: 158304459 Bug: 159112414 Test: m check-boot-jars m checkbuild manual inspection of the .jar file used by check-boot-jars to ensure it contained .class files and not .dex files. Change-Id: I545c5c9072dd472337d2f9b4dfdf08f53c981662
This commit is contained in:
@@ -1999,6 +1999,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
|
||||
//
|
||||
|
Reference in New Issue
Block a user