Merge "Default to compiling lite protos"
This commit is contained in:
commit
05491b4861
1 changed files with 2 additions and 2 deletions
|
@ -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",
|
||||||
|
|
Loading…
Reference in a new issue