diff options
| author | Colin Cross <ccross@android.com> | 2015-04-28 13:28:51 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-29 14:59:07 -0700 |
| commit | 0607cf7daa908bc5a9299bd761fdd3cd2a59191a (patch) | |
| tree | c4a3b5c29fdbd2eddffc459a915d8ffd1b44ccc1 /java | |
| parent | d350ecd1023ca0352c71d866b3ab4e5de62e8506 (diff) | |
| download | build_soong-0607cf7daa908bc5a9299bd761fdd3cd2a59191a.tar.gz build_soong-0607cf7daa908bc5a9299bd761fdd3cd2a59191a.tar.bz2 build_soong-0607cf7daa908bc5a9299bd761fdd3cd2a59191a.zip | |
java: add genrule support to java builds
Add support for source files generated by genrule or gensrcs to
java builds.
Change-Id: I39762b2ab65fa4cf92724300edc4ba995845ce92
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 292e258f..d9aad3c9 100644 --- a/java/java.go +++ b/java/java.go @@ -27,6 +27,7 @@ import ( "github.com/google/blueprint/pathtools" "android/soong/common" + "android/soong/genrule" ) // TODO: @@ -243,8 +244,6 @@ func (j *javaBase) collectDeps(ctx common.AndroidModuleContext) (classpath []str } } } - } else { - ctx.ModuleErrorf("unknown dependency module type for %q", otherName) } }) @@ -294,6 +293,12 @@ func (j *javaBase) GenerateJavaBuildActions(ctx common.AndroidModuleContext) { srcFiles = j.genSources(ctx, srcFiles, flags) + ctx.VisitDirectDeps(func(module blueprint.Module) { + if gen, ok := module.(genrule.SourceFileGenerator); ok { + srcFiles = append(srcFiles, gen.GeneratedSourceFiles()...) + } + }) + srcFileLists = append(srcFileLists, j.ExtraSrcLists...) if len(srcFiles) > 0 { |