Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a0694a authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Fix api versions xml file handling in droidstubs 

Api levels annotations flags should respect the stubs type, but the
everything api versions xml file was being passed to the metalava
invocation for both everything and exportable metalava invocation.

This change fixes such issue by setting api versions xml file (passed to
metalava as --apply-api-levels argument) to respect the stubs type.

Test: m nothing --no-skip-soong-tests
Bug: 319162970
Change-Id: If7155b3701b32fb4cd81dc918648b449de090201
parent 1f4475ce

java/droidstubs.go

+8 −2
Original line number Diff line number Diff line
@@ -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 {

				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))