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

Merge "Use lint database from api_versions_public" am: b82b392423 am: 17094ecba8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092228

Change-Id: Ie5447a6494befbc1ace3f1938181658b2cd79d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Hansson
2022-05-11 20:48:08 +00:00
committed by Automerger Merge Worker
parent f454194692 17094ecba8
commit ddbf242004
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/lint.go
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"),
}) })