From af05017b7533f6f84b04fcce1b85cb1a1d2efe51 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 15 Nov 2017 23:01:59 -0800 Subject: 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 --- java/java.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'java/java.go') 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...) -- cgit v1.2.3-59-g8ed1b