From 67cf60e7c5bf29db9dec52c575d0250568371a18 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 9 May 2022 09:36:22 +0000 Subject: [PATCH] Use lint database from api_versions_public These two databases are (nearly) identical but the latter is generated in a much more efficient way. The diffs are very minor and it's not clear to me which versions is more correct than the other, though I'm fairly confident they don't matter. https://paste.googleplex.com/5567994005553152 Bug: 187398174 Test: diff api-versions.xml Change-Id: I0fa35d4067bc06936b4a31bda0bca7fd41f26aae --- java/lint.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/lint.go b/java/lint.go index f7da1d1c9..22c9ec49f 100644 --- a/java/lint.go +++ b/java/lint.go @@ -524,10 +524,10 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) { return } - frameworkDocStubs := findModuleOrErr(ctx, "framework-doc-stubs") - if frameworkDocStubs == nil { + apiVersionsDb := findModuleOrErr(ctx, "api_versions_public") + if apiVersionsDb == nil { if !ctx.Config().AllowMissingDependencies() { - ctx.Errorf("lint: missing framework-doc-stubs") + ctx.Errorf("lint: missing module api_versions_public") } return } @@ -556,7 +556,7 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) { ctx.Build(pctx, android.BuildParams{ Rule: android.CpIfChanged, - Input: android.OutputFileForModule(ctx, frameworkDocStubs, ".api_versions.xml"), + Input: android.OutputFileForModule(ctx, apiVersionsDb, ".api_versions.xml"), Output: copiedAPIVersionsXmlPath(ctx, "api_versions.xml"), })