From d243091381a329fc8d82b2a43a35e5b4ecb82374 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Nov 2017 21:33:38 -0800 Subject: [PATCH] Remove partial javastream proto support javastream proto is rarely used and tricky to support directly in java because it depends on an extra host tool. It can be supported with a genrule, so just remove the partial built-in support. Test: m checkbuild Change-Id: Iffe75e7040cb889ca17fdd85ef3e8e64fc3aa9e9 --- java/proto.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java/proto.go b/java/proto.go index eeb5124d9..17f02a3b2 100644 --- a/java/proto.go +++ b/java/proto.go @@ -63,10 +63,6 @@ func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) { ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-micro") case "nano": ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-nano") - case "stream": - // TODO(ccross): add dependency on protoc-gen-java-stream binary - ctx.PropertyErrorf("proto.type", `"stream" not supported yet`) - // No library for stream protobufs case "lite", "": ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-lite") case "full": @@ -87,8 +83,6 @@ func protoFlags(ctx android.ModuleContext, p *android.ProtoProperties, flags jav flags.protoOutFlag = "--javamicro_out" case "nano": flags.protoOutFlag = "--javanano_out" - case "stream": - flags.protoOutFlag = "--javastream_out" case "lite", "full", "": flags.protoOutFlag = "--java_out" default: