diff options
| author | 2017-11-15 23:01:59 -0800 | |
|---|---|---|
| committer | 2017-11-17 11:22:08 -0800 | |
| commit | af05017b7533f6f84b04fcce1b85cb1a1d2efe51 (patch) | |
| tree | c7829834ff061f9f6bed3a295e804583c1637af8 /java/java.go | |
| parent | ebe1a51c81f9ab300e55126a8a7e3028c64efcd7 (diff) | |
Add support for .srcjar files from genrules and srcs
Allow srcs to contain .srcjar files, which will be extracted just
before javac. Also allow genrules and generated sources to directly
return .srcjar files.
Test: m checkbuild
Change-Id: Ie4cf60ecb9d2ec63a4c2275221544203b1383597
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 8a9b31f75..b2bd2b0a4 100644 --- a/java/java.go +++ b/java/java.go @@ -550,8 +550,9 @@ func (j *Module) compile(ctx android.ModuleContext) { flags = protoFlags(ctx, &j.protoProperties, flags) } - var srcJars android.Paths - srcFiles, srcJars = j.genSources(ctx, srcFiles, flags) + srcFiles = j.genSources(ctx, srcFiles, flags) + + srcJars := srcFiles.FilterByExt(".srcjar") srcJars = append(srcJars, deps.srcJars...) srcJars = append(srcJars, j.ExtraSrcJars...) |