Revert "java_sdk_library: Improve consistency with ..._import"

This reverts commit dce3fe78f0.

Reason for revert: Broke presubmit: b/157231582

Change-Id: I638e0e090f3242ed5a9a3134cbe380e872411247
This commit is contained in:
Remi NGUYEN VAN
2020-05-25 01:56:32 +00:00
parent 58e4165b60
commit 2ee93a5de9
3 changed files with 24 additions and 81 deletions

View File

@@ -350,16 +350,11 @@ type ApiFilePath interface {
ApiFilePath() android.Path
}
type ApiStubsSrcProvider interface {
StubsSrcJar() android.Path
}
// Provider of information about API stubs, used by java_sdk_library.
type ApiStubsProvider interface {
ApiFilePath
RemovedApiFilePath() android.Path
ApiStubsSrcProvider
StubsSrcJar() android.Path
}
//
@@ -1920,10 +1915,6 @@ func (p *PrebuiltStubsSources) OutputFiles(tag string) (android.Paths, error) {
}
}
func (d *PrebuiltStubsSources) StubsSrcJar() android.Path {
return d.stubsSrcJar
}
func (p *PrebuiltStubsSources) GenerateAndroidBuildActions(ctx android.ModuleContext) {
p.stubsSrcJar = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"stubs.srcjar")