StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use merged annotations zip for lint

Browse Source 
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
This commit is contained in:
Anton Hansson
2022-05-09 09:42:17 +00:00
parent 4bf0080b25
commit ea17a45c26
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/lint.go
View File

@@ -532,6 +532,14 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) {
return 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") filteredDb := findModuleOrErr(ctx, "api-versions-xml-public-filtered")
if filteredDb == nil { if filteredDb == nil {
if !ctx.Config().AllowMissingDependencies() { if !ctx.Config().AllowMissingDependencies() {
@@ -542,7 +550,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, ".annotations.zip"), Input: android.OutputFileForModule(ctx, sdkAnnotations, ""),
Output: copiedAnnotationsZipPath(ctx), Output: copiedAnnotationsZipPath(ctx),
}) })