From b0ef30ab4abf2dcd90f6901fafff0d7a52cf09e1 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 29 Jun 2021 10:42:00 -0700
Subject: [PATCH] Filter srcjars out of srcFiles

srcFiles is passed to Lint, and given it both the srcjars and the
expanded sources from the srcjars confuses it about which files are
generated.  Remove srcjars from srcFiles after handling them.

Bug: 192245952
Test: m lint-check
Change-Id: Ic57d1c623f4cac7cd79f1342bac4b51bd2535ac3
---
 java/base.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/base.go b/java/base.go
index 77f6fc6d6..6b8119619 100644
--- a/java/base.go
+++ b/java/base.go
@@ -870,6 +870,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
 	if aaptSrcJar != nil {
 		srcJars = append(srcJars, aaptSrcJar)
 	}
+	srcFiles = srcFiles.FilterOutByExt(".srcjar")
 
 	if j.properties.Jarjar_rules != nil {
 		j.expandJarjarRules = android.PathForModuleSrc(ctx, *j.properties.Jarjar_rules)