tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "lint-update-7.1.0"

Browse source 
* changes:
  Downgrade new errors from lint 7.1.0-dev to warnings
  Filter srcjars out of srcFiles
This commit is contained in:
Colin Cross 2021-06-30 14:25:21 +00:00 committed by Gerrit Code Review
commit 1dfd1039a5
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
java/base.go
View file

@ -870,6 +870,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
if aaptSrcJar != nil { if aaptSrcJar != nil {
srcJars = append(srcJars, aaptSrcJar) srcJars = append(srcJars, aaptSrcJar)
} }
srcFiles = srcFiles.FilterOutByExt(".srcjar")
if j.properties.Jarjar_rules != nil { if j.properties.Jarjar_rules != nil {
j.expandJarjarRules = android.PathForModuleSrc(ctx, *j.properties.Jarjar_rules) j.expandJarjarRules = android.PathForModuleSrc(ctx, *j.properties.Jarjar_rules)

4
java/lint_defaults.txt
View file

@ -78,3 +78,7 @@
--disable_check HardcodedDebugMode --disable_check HardcodedDebugMode
--warning_check QueryAllPackagesPermission --warning_check QueryAllPackagesPermission
--warning_check CoarseFineLocation
--warning_check IntentFilterExportedReceiver
--warning_check RemoteViewLayout