openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove partial javastream proto support 

am: d243091381

Change-Id: Ic9909601d35596450c27b2df3d0860f193767229
This commit is contained in:
Colin Cross 2017-11-17 21:37:57 +00:00 committed by android-build-merger
parent 4a5899610d d243091381
commit bfb1ffdfee
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")
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: