From 8355c1524fbb1d6b7b7a25a13f66feffb1aa7214 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 10 Aug 2021 19:24:07 -0700
Subject: [PATCH] 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
---
 apex/apex.go       | 2 ++
 java/app_import.go | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/apex/apex.go b/apex/apex.go
index e525aff5c..add506fbf 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -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 {
diff --git a/java/app_import.go b/java/app_import.go
index 5a87b074b..b5a608412 100644
--- a/java/app_import.go
+++ b/java/app_import.go
@@ -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