openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Clear remains of java.Dependency interface."

This commit is contained in:
Jaewoong Jung 2021-03-05 21:11:15 +00:00 committed by Gerrit Code Review
parent b48f9aefea 62751102a9
commit 083e6cd267
3 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
java/aar.go
View File

@ -805,14 +805,6 @@ func (a *AARImport) HeaderJars() android.Paths {
return android.Paths{a.classpathFile} return android.Paths{a.classpathFile}
} }
func (a *AARImport) ImplementationJars() android.Paths {
return android.Paths{a.classpathFile}
}
func (a *AARImport) ResourceJars() android.Paths {
return nil
}
func (a *AARImport) ImplementationAndResourcesJars() android.Paths { func (a *AARImport) ImplementationAndResourcesJars() android.Paths {
return android.Paths{a.classpathFile} return android.Paths{a.classpathFile}
} }
@ -825,22 +817,10 @@ func (a *AARImport) DexJarInstallPath() android.Path {
return nil return nil
} }
func (a *AARImport) AidlIncludeDirs() android.Paths {
return nil
}
func (a *AARImport) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap { func (a *AARImport) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {
return nil return nil
} }
func (d *AARImport) ExportedPlugins() (android.Paths, []string, bool) {
return nil, nil, false
}
func (a *AARImport) SrcJarArgs() ([]string, android.Paths) {
return nil, nil
}
var _ android.ApexModule = (*AARImport)(nil) var _ android.ApexModule = (*AARImport)(nil)
// Implements android.ApexModule // Implements android.ApexModule

16
java/device_host_converter.go
View File

@ -146,14 +146,6 @@ func (d *DeviceHostConverter) HeaderJars() android.Paths {
return d.headerJars return d.headerJars
} }
func (d *DeviceHostConverter) ImplementationJars() android.Paths {
return d.implementationJars
}
func (d *DeviceHostConverter) ResourceJars() android.Paths {
return d.resourceJars
}
func (d *DeviceHostConverter) ImplementationAndResourcesJars() android.Paths { func (d *DeviceHostConverter) ImplementationAndResourcesJars() android.Paths {
return d.implementationAndResourceJars return d.implementationAndResourceJars
} }
@ -174,14 +166,6 @@ func (d *DeviceHostConverter) ClassLoaderContexts() dexpreopt.ClassLoaderContext
return nil return nil
} }
func (d *DeviceHostConverter) ExportedPlugins() (android.Paths, []string, bool) {
return nil, nil, false
}
func (d *DeviceHostConverter) SrcJarArgs() ([]string, android.Paths) {
return d.srcJarArgs, d.srcJarDeps
}
func (d *DeviceHostConverter) JacocoReportClassesFile() android.Path { func (d *DeviceHostConverter) JacocoReportClassesFile() android.Path {
return nil return nil
} }

41
java/java.go
View File

@ -2046,13 +2046,6 @@ func (j *Module) DexJarInstallPath() android.Path {
return j.installFile return j.installFile
} }
func (j *Module) ResourceJars() android.Paths {
if j.resourceJar == nil {
return nil
}
return android.Paths{j.resourceJar}
}
func (j *Module) ImplementationAndResourcesJars() android.Paths { func (j *Module) ImplementationAndResourcesJars() android.Paths {
if j.implementationAndResourcesJar == nil { if j.implementationAndResourcesJar == nil {
return nil return nil
@ -2069,17 +2062,6 @@ func (j *Module) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {
return j.classLoaderContexts return j.classLoaderContexts
} }
// ExportedPlugins returns the list of jars needed to run the exported plugins, the list of
// classes for the plugins, and a boolean for whether turbine needs to be disabled due to plugins
// that generate APIs.
func (j *Module) ExportedPlugins() (android.Paths, []string, bool) {
return j.exportedPluginJars, j.exportedPluginClasses, j.exportedDisableTurbine
}
func (j *Module) SrcJarArgs() ([]string, android.Paths) {
return j.srcJarArgs, j.srcJarDeps
}
var _ logtagsProducer = (*Module)(nil) var _ logtagsProducer = (*Module)(nil)
func (j *Module) logtags() android.Paths { func (j *Module) logtags() android.Paths {
@ -3046,17 +3028,6 @@ func (j *Import) HeaderJars() android.Paths {
return android.Paths{j.combinedClasspathFile} return android.Paths{j.combinedClasspathFile}
} }
func (j *Import) ImplementationJars() android.Paths {
if j.combinedClasspathFile == nil {
return nil
}
return android.Paths{j.combinedClasspathFile}
}
func (j *Import) ResourceJars() android.Paths {
return nil
}
func (j *Import) ImplementationAndResourcesJars() android.Paths { func (j *Import) ImplementationAndResourcesJars() android.Paths {
if j.combinedClasspathFile == nil { if j.combinedClasspathFile == nil {
return nil return nil
@ -3072,22 +3043,10 @@ func (j *Import) DexJarInstallPath() android.Path {
return nil return nil
} }
func (j *Import) AidlIncludeDirs() android.Paths {
return j.exportAidlIncludeDirs
}
func (j *Import) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap { func (j *Import) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {
return j.classLoaderContexts return j.classLoaderContexts
} }
func (j *Import) ExportedPlugins() (android.Paths, []string, bool) {
return nil, nil, false
}
func (j *Import) SrcJarArgs() ([]string, android.Paths) {
return nil, nil
}
var _ android.ApexModule = (*Import)(nil) var _ android.ApexModule = (*Import)(nil)
// Implements android.ApexModule // Implements android.ApexModule