diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/droidstubs.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go index 6ef2afe0e..dc3a0ec19 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -537,11 +537,17 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a var apiVersions android.Path if proptools.Bool(d.properties.Api_levels_annotations_enabled) { d.apiLevelsGenerationFlags(ctx, cmd, stubsType, apiVersionsXml) - apiVersions = d.everythingArtifacts.apiVersionsXml + apiVersions = apiVersionsXml } else { ctx.VisitDirectDepsWithTag(metalavaAPILevelsModuleTag, func(m android.Module) { if s, ok := m.(*Droidstubs); ok { - apiVersions = s.everythingArtifacts.apiVersionsXml + if stubsType == Everything { + apiVersions = s.everythingArtifacts.apiVersionsXml + } else if stubsType == Exportable { + apiVersions = s.exportableArtifacts.apiVersionsXml + } else { + ctx.ModuleErrorf("%s stubs type does not generate api-versions.xml file", stubsType.String()) + } } else { ctx.PropertyErrorf("api_levels_module", "module %q is not a droidstubs module", ctx.OtherModuleName(m)) |