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

Fix doubled generated source files

Browse Source 
Generated source files were being included twice, once manually
and once by ctx.ExpandSources.  Remove the manual one.

Bug: 67364649
Test: TestGeneratedSources in later patch
Change-Id: Ia6760b01a34a96767a914bdcb911a39fa6683300
This commit is contained in:
Colin Cross
2017-10-09 15:32:57 -07:00
parent 05a39cbacc
commit 52b1e4cf06
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java.go
View File

@@ -28,7 +28,6 @@ import (
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
"android/soong/android" "android/soong/android"
"android/soong/genrule"
"android/soong/java/config" "android/soong/java/config"
) )
@@ -437,12 +436,6 @@ func (j *Module) compile(ctx android.ModuleContext) {
srcFileLists = append(srcFileLists, deps.srcFileLists...) srcFileLists = append(srcFileLists, deps.srcFileLists...)
ctx.VisitDirectDeps(func(module blueprint.Module) {
if gen, ok := module.(genrule.SourceFileGenerator); ok {
srcFiles = append(srcFiles, gen.GeneratedSourceFiles()...)
}
})
srcFileLists = append(srcFileLists, j.ExtraSrcLists...) srcFileLists = append(srcFileLists, j.ExtraSrcLists...)
var jars android.Paths var jars android.Paths