Merge changes from topic "retry-jsl-stuff" into rvc-dev am: 88ef9fb76e

Change-Id: I84b895c8cfca46cc1e114fdb87fce16127217279
This commit is contained in:
Paul Duffin
2020-05-25 14:53:54 +00:00
committed by Automerger Merge Worker
3 changed files with 395 additions and 78 deletions

View File

@@ -351,11 +351,16 @@ 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
StubsSrcJar() android.Path
ApiStubsSrcProvider
}
//
@@ -1938,6 +1943,10 @@ 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")