StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix api versions xml file handling in droidstubs" into main

Browse Source
This commit is contained in:
Jihoon Kang
2024-02-02 02:31:17 +00:00
committed by Gerrit Code Review
parent b370adbdcc d9a0694ac3
commit c240996829
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/droidstubs.go
View File

@@ -537,11 +537,17 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a
var apiVersions android.Path var apiVersions android.Path
if proptools.Bool(d.properties.Api_levels_annotations_enabled) { if proptools.Bool(d.properties.Api_levels_annotations_enabled) {
d.apiLevelsGenerationFlags(ctx, cmd, stubsType, apiVersionsXml) d.apiLevelsGenerationFlags(ctx, cmd, stubsType, apiVersionsXml)
apiVersions = d.everythingArtifacts.apiVersionsXml apiVersions = apiVersionsXml
} else { } else {
ctx.VisitDirectDepsWithTag(metalavaAPILevelsModuleTag, func(m android.Module) { ctx.VisitDirectDepsWithTag(metalavaAPILevelsModuleTag, func(m android.Module) {
if s, ok := m.(*Droidstubs); ok { 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 { } else {
ctx.PropertyErrorf("api_levels_module", ctx.PropertyErrorf("api_levels_module",
"module %q is not a droidstubs module", ctx.OtherModuleName(m)) "module %q is not a droidstubs module", ctx.OtherModuleName(m))