Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8355c152 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 795a9f99

apex/apex.go

+2 −0
Original line number Diff line number Diff line
@@ -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 {

java/app_import.go

+4 −0
Original line number Diff line number Diff line
@@ -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