diff options
Diffstat (limited to 'java/lint.go')
| -rw-r--r-- | java/lint.go | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/java/lint.go b/java/lint.go index f09db955d..e276345eb 100644 --- a/java/lint.go +++ b/java/lint.go @@ -525,10 +525,18 @@ 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 + } + + sdkAnnotations := findModuleOrErr(ctx, "sdk-annotations.zip") + if sdkAnnotations == nil { + if !ctx.Config().AllowMissingDependencies() { + ctx.Errorf("lint: missing module sdk-annotations.zip") } return } @@ -543,13 +551,13 @@ 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), }) 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"), }) |