From 52b1e4cf06dbb16b6144a4eb3590aed1d6108284 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 9 Oct 2017 15:32:57 -0700 Subject: [PATCH] Fix doubled generated source files 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 --- java/java.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/java/java.go b/java/java.go index bab77c5a6..fde88e90f 100644 --- a/java/java.go +++ b/java/java.go @@ -28,7 +28,6 @@ import ( "github.com/google/blueprint/proptools" "android/soong/android" - "android/soong/genrule" "android/soong/java/config" ) @@ -437,12 +436,6 @@ func (j *Module) compile(ctx android.ModuleContext) { 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...) var jars android.Paths