Merge "Collect lint reports from apps in apexes" am: 7131982a76

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

Change-Id: Ic1f997e2b98cb2e18f975cbb3869543f94be5312
This commit is contained in:
Colin Cross
2021-08-11 14:30:01 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 0 deletions

View File

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

View File

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