Merge "Default to compiling lite protos"

This commit is contained in:
Treehugger Robot 2019-10-28 15:21:02 +00:00 committed by Gerrit Code Review
commit 05491b4861

View file

@ -108,10 +108,10 @@ func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.Pro
case "nano": case "nano":
flags.proto.OutTypeFlag = "--javanano_out" flags.proto.OutTypeFlag = "--javanano_out"
typeToPlugin = "javanano" typeToPlugin = "javanano"
case "lite": case "lite", "":
flags.proto.OutTypeFlag = "--java_out" flags.proto.OutTypeFlag = "--java_out"
flags.proto.OutParams = append(flags.proto.OutParams, "lite") flags.proto.OutParams = append(flags.proto.OutParams, "lite")
case "full", "": case "full":
flags.proto.OutTypeFlag = "--java_out" flags.proto.OutTypeFlag = "--java_out"
default: default:
ctx.PropertyErrorf("proto.type", "unknown proto type %q", ctx.PropertyErrorf("proto.type", "unknown proto type %q",