openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Collect lint reports from apps in apexes 

Lint reports were only being collected from jars in apexes, not
apps.

Bug: 188772607
Test: mainline_modules_arm64 build
Change-Id: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
Merged-In: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
(cherry picked from commit 8355c1524fbb1d6b7b7a25a13f66feffb1aa7214)
This commit is contained in:
Colin Cross 2021-08-10 19:24:07 -07:00
parent fe1d6c535c
commit 192221b55e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@ -1522,6 +1522,7 @@ type androidApp interface {
JacocoReportClassesFile() android.Path JacocoReportClassesFile() android.Path
Certificate() java.Certificate Certificate() java.Certificate
BaseModuleName() string BaseModuleName() string
LintDepSets() java.LintDepSets
} }
var _ androidApp = (*java.AndroidApp)(nil) var _ androidApp = (*java.AndroidApp)(nil)
@ -1536,6 +1537,7 @@ func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp androidApp) apexF
fileToCopy := aapp.OutputFile() fileToCopy := aapp.OutputFile()
af := newApexFile(ctx, fileToCopy, aapp.BaseModuleName(), dirInApex, app, aapp) af := newApexFile(ctx, fileToCopy, aapp.BaseModuleName(), dirInApex, app, aapp)
af.jacocoReportClassesFile = aapp.JacocoReportClassesFile() af.jacocoReportClassesFile = aapp.JacocoReportClassesFile()
af.lintDepSets = aapp.LintDepSets()
af.certificate = aapp.Certificate() af.certificate = aapp.Certificate()
if app, ok := aapp.(interface { if app, ok := aapp.(interface {

4
java/app_import.go
View File

@ -402,6 +402,10 @@ func (a *AndroidAppImport) MinSdkVersion(ctx android.EarlyModuleContext) android
return android.SdkSpecPrivate return android.SdkSpecPrivate
} }
func (a *AndroidAppImport) LintDepSets() LintDepSets {
return LintDepSets{}
}
var _ android.ApexModule = (*AndroidAppImport)(nil) var _ android.ApexModule = (*AndroidAppImport)(nil)
// Implements android.ApexModule // Implements android.ApexModule