From fe17f6f0e825b42542b4527c19cdd7b520ca5133 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 28 Mar 2019 19:30:56 -0700 Subject: 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 --- java/java.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'java/java.go') 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 { -- cgit v1.2.3-59-g8ed1b