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

Commit 7131982a authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Collect lint reports from apps in apexes"

parents 88c5391d 8355c152

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