diff options
| author | 2019-03-28 19:30:56 -0700 | |
|---|---|---|
| committer | 2019-04-02 16:38:55 +0000 | |
| commit | fe17f6f0e825b42542b4527c19cdd7b520ca5133 (patch) | |
| tree | 496b65489ee342024f22129edd4ad98e21ac1f33 /java/java.go | |
| parent | 19878da6a062ef474a1c905f48b1efb986862050 (diff) | |
Add support for protoc plugins
Add a proto.plugin property to allow specifying a custom protoc
plugin to generate the code.
Fixes: 70706119
Test: m am StreamingProtoTest
Change-Id: I1ecdd346284b42bbcc8297019d98d2cd564eb94c
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index beee1a5b5..0417dee82 100644 --- a/java/java.go +++ b/java/java.go @@ -481,6 +481,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { {Mutator: "arch", Variation: ctx.Config().BuildOsCommonVariant}, }, pluginTag, j.properties.Plugins...) + android.ProtoDeps(ctx, &j.protoProperties) if j.hasSrcExt(".proto") { protoDeps(ctx, &j.protoProperties) } @@ -768,12 +769,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { deps.classpath = append(deps.classpath, dep.Srcs()...) deps.staticJars = append(deps.staticJars, dep.Srcs()...) deps.staticHeaderJars = append(deps.staticHeaderJars, dep.Srcs()...) - case android.DefaultsDepTag, android.SourceDepTag: - // Nothing to do - case publicApiFileTag, systemApiFileTag, testApiFileTag: - // Nothing to do - default: - ctx.ModuleErrorf("dependency on genrule %q may only be in srcs, libs, or static_libs", otherName) } default: switch tag { |