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

Commit ea17a45c authored by Anton Hansson's avatar Anton Hansson
Browse files

Use merged annotations zip for lint 

The framework-doc-stubs annotations.zip is no longer the correct
zip to use after b/187397779. It doesn't contain the module annotations.

Test: presubmit
Change-Id: I50e0bcc026c97886a31256e2387632c19d4b287f
parent 4bf0080b

java/lint.go

+9 −1
Original line number Diff line number Diff line
@@ -532,6 +532,14 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) { 
		return

	}



	sdkAnnotations := findModuleOrErr(ctx, "sdk-annotations.zip")

	if sdkAnnotations == nil {

		if !ctx.Config().AllowMissingDependencies() {

			ctx.Errorf("lint: missing module sdk-annotations.zip")

		}

		return

	}



	filteredDb := findModuleOrErr(ctx, "api-versions-xml-public-filtered")

	if filteredDb == nil {

		if !ctx.Config().AllowMissingDependencies() {
@@ -542,7 +550,7 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) { 


	ctx.Build(pctx, android.BuildParams{

		Rule:   android.CpIfChanged,

		Input:  android.OutputFileForModule(ctx, frameworkDocStubs, ".annotations.zip"),

		Input:  android.OutputFileForModule(ctx, sdkAnnotations, ""),

		Output: copiedAnnotationsZipPath(ctx),

	})