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

Commit 5471f4ea authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Gerrit Code Review
Browse files

Merge "java/lint: enable lint on non-generated srcjar"

parents 57365891 5c26f818

java/base.go

+3 −2
Original line number Diff line number Diff line
@@ -1020,6 +1020,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
		ctx.PropertyErrorf("common_srcs", "common_srcs must be .kt files")

	}



	nonGeneratedSrcJars := srcFiles.FilterByExt(".srcjar")

	srcFiles = j.genSources(ctx, srcFiles, flags)



	// Collect javac flags only after computing the full set of srcFiles to
@@ -1492,8 +1493,8 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
		}



		j.linter.name = ctx.ModuleName()

		j.linter.srcs = srcFiles

		j.linter.srcJars = srcJars

		j.linter.srcs = append(srcFiles, nonGeneratedSrcJars...)

		j.linter.srcJars, _ = android.FilterPathList(srcJars, nonGeneratedSrcJars)

		j.linter.classpath = append(append(android.Paths(nil), flags.bootClasspath...), flags.classpath...)

		j.linter.classes = j.implementationJarFile

		j.linter.minSdkVersion = lintSDKVersion(j.MinSdkVersion(ctx))