Merge "Use lint database from api_versions_public"

This commit is contained in:
Anton Hansson
2022-05-11 08:11:45 +00:00
committed by Gerrit Code Review

View File

@@ -524,10 +524,10 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) {
return return
} }
frameworkDocStubs := findModuleOrErr(ctx, "framework-doc-stubs") apiVersionsDb := findModuleOrErr(ctx, "api_versions_public")
if frameworkDocStubs == nil { if apiVersionsDb == nil {
if !ctx.Config().AllowMissingDependencies() { if !ctx.Config().AllowMissingDependencies() {
ctx.Errorf("lint: missing framework-doc-stubs") ctx.Errorf("lint: missing module api_versions_public")
} }
return return
} }
@@ -556,7 +556,7 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: android.CpIfChanged, 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"), Output: copiedAPIVersionsXmlPath(ctx, "api_versions.xml"),
}) })