diff options
| author | Colin Cross <ccross@android.com> | 2017-11-15 23:01:59 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-11-17 11:22:08 -0800 |
| commit | af05017b7533f6f84b04fcce1b85cb1a1d2efe51 (patch) | |
| tree | c7829834ff061f9f6bed3a295e804583c1637af8 /java/gen.go | |
| parent | ebe1a51c81f9ab300e55126a8a7e3028c64efcd7 (diff) | |
| download | android_build_soong-af05017b7533f6f84b04fcce1b85cb1a1d2efe51.tar.gz android_build_soong-af05017b7533f6f84b04fcce1b85cb1a1d2efe51.tar.bz2 android_build_soong-af05017b7533f6f84b04fcce1b85cb1a1d2efe51.zip | |
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/gen.go')
| -rw-r--r-- | java/gen.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/gen.go b/java/gen.go index 8fa199e1..c73a446c 100644 --- a/java/gen.go +++ b/java/gen.go @@ -85,7 +85,7 @@ func genLogtags(ctx android.ModuleContext, logtagsFile android.Path) android.Pat } func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths, - flags javaBuilderFlags) (android.Paths, android.Paths) { + flags javaBuilderFlags) android.Paths { var protoFiles android.Paths outSrcFiles := make(android.Paths, 0, len(srcFiles)) @@ -106,17 +106,15 @@ func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths, } } - var outSrcJars android.Paths - if len(protoFiles) > 0 { - protoSrcJar := android.PathForModuleGen(ctx, "proto.src.jar") + protoSrcJar := android.PathForModuleGen(ctx, "proto.srcjar") genProto(ctx, protoSrcJar, protoFiles, flags.protoFlags, flags.protoOutFlag, "") - outSrcJars = append(outSrcJars, protoSrcJar) + outSrcFiles = append(outSrcFiles, protoSrcJar) } - return outSrcFiles, outSrcJars + return outSrcFiles } func LogtagsSingleton() blueprint.Singleton { |