|
@@ -2046,13 +2046,6 @@ func (j *Module) DexJarInstallPath() android.Path {
|
|
|
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 {
|
|
|
if j.implementationAndResourcesJar == nil {
|
|
|
return nil
|
|
@@ -2069,17 +2062,6 @@ func (j *Module) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {
|
|
|
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)
|
|
|
|
|
|
func (j *Module) logtags() android.Paths {
|
|
@@ -3046,17 +3028,6 @@ func (j *Import) HeaderJars() android.Paths {
|
|
|
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 {
|
|
|
if j.combinedClasspathFile == nil {
|
|
|
return nil
|
|
@@ -3072,22 +3043,10 @@ func (j *Import) DexJarInstallPath() android.Path {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func (j *Import) AidlIncludeDirs() android.Paths {
|
|
|
- return j.exportAidlIncludeDirs
|
|
|
-}
|
|
|
-
|
|
|
func (j *Import) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {
|
|
|
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)
|
|
|
|
|
|
// Implements android.ApexModule
|