diff options
| author | 2021-06-30 14:25:21 +0000 | |
|---|---|---|
| committer | 2021-06-30 14:25:21 +0000 | |
| commit | 1dfd1039a56d8cb978a5762810ea5904e05ee6db (patch) | |
| tree | 061c59a1e7ecc65b00e59166342ca65d18719331 /java/base.go | |
| parent | e6266e04f5c4f8df1bd92bffa1dd9bc2a71e8afe (diff) | |
| parent | a36c2b830f89f45b8aa13674a384e290629de569 (diff) | |
Merge changes from topic "lint-update-7.1.0"
* changes:
Downgrade new errors from lint 7.1.0-dev to warnings
Filter srcjars out of srcFiles
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 1 |
1 files changed, 1 insertions, 0 deletions
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) |