Merge "Use lint database from api_versions_public" am: b82b392423
am: 17094ecba8
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:
commit
ddbf242004
1 changed files with 4 additions and 4 deletions
|
@ -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"),
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in a new issue