tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove partial javastream proto support

Browse source 
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
This commit is contained in:
Colin Cross 2017-11-16 21:33:38 -08:00
parent af05017b75
commit d243091381
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/proto.go
View file

@ -63,10 +63,6 @@ func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) {
ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-micro") ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-micro")
case "nano": case "nano":
ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-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", "": case "lite", "":
ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-lite") ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-lite")
case "full": case "full":
@ -87,8 +83,6 @@ func protoFlags(ctx android.ModuleContext, p *android.ProtoProperties, flags jav
flags.protoOutFlag = "--javamicro_out" flags.protoOutFlag = "--javamicro_out"
case "nano": case "nano":
flags.protoOutFlag = "--javanano_out" flags.protoOutFlag = "--javanano_out"
case "stream":
flags.protoOutFlag = "--javastream_out"
case "lite", "full", "": case "lite", "full", "":
flags.protoOutFlag = "--java_out" flags.protoOutFlag = "--java_out"
default: default: