StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filter srcjars out of srcFiles am: b0ef30ab4a am: 5da98c1c34

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751182

Change-Id: I2bba227d8994d0da177829e19613a1f6134b0c6c
This commit is contained in:
Colin Cross
2021-06-30 18:12:47 +00:00
committed by Automerger Merge Worker
parent b648bc755c 5da98c1c34
commit 2b8c5cd365
1 changed files with 1 additions and 0 deletions
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)