StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default to compiling lite protos

Browse Source 
Soong was incorrectly defaulting to compiling for full protos but
using the lite runtime.  Switch to compiling lite protos by default.

Fixes: 119714316
Test: m checkbuild
Change-Id: I0832b854f01f2acb10682e68ce7cc68753ca9dda
This commit is contained in:
Colin Cross
2019-10-25 18:24:13 -07:00
parent 7d6b21c265
commit 0f97adae5f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/proto.go
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",