From b0ef30ab4abf2dcd90f6901fafff0d7a52cf09e1 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 29 Jun 2021 10:42:00 -0700 Subject: [PATCH 1/2] 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) From a36c2b830f89f45b8aa13674a384e290629de569 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 24 Jun 2021 11:39:40 -0700 Subject: [PATCH 2/2] Downgrade new errors from lint 7.1.0-dev to warnings Test: m lint-check Change-Id: I442bc160e578b0230204cb083f1a245febb0f785 --- java/lint_defaults.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/lint_defaults.txt b/java/lint_defaults.txt index 2de05b0a0..75de7dc6c 100644 --- a/java/lint_defaults.txt +++ b/java/lint_defaults.txt @@ -78,3 +78,7 @@ --disable_check HardcodedDebugMode --warning_check QueryAllPackagesPermission + +--warning_check CoarseFineLocation +--warning_check IntentFilterExportedReceiver +--warning_check RemoteViewLayout