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

Merge "Add 16bit and 32bit nanopb library."

This commit is contained in:
Yu Shan 2019-02-20 18:23:29 +00:00 committed by Gerrit Code Review
parent a592e3eae9 76dd005e68
commit ecc0efa02a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cc/proto.go
View File

@ -112,6 +112,18 @@ func protoDeps(ctx BaseModuleContext, deps Deps, p *android.ProtoProperties, sta
case "nanopb-c-enable_malloc": case "nanopb-c-enable_malloc":
lib = "libprotobuf-c-nano-enable_malloc" lib = "libprotobuf-c-nano-enable_malloc"
static = true static = true
case "nanopb-c-16bit":
lib = "libprotobuf-c-nano-16bit"
static = true
case "nanopb-c-enable_malloc-16bit":
lib = "libprotobuf-c-nano-enable_malloc-16bit"
static = true
case "nanopb-c-32bit":
lib = "libprotobuf-c-nano-32bit"
static = true
case "nanopb-c-enable_malloc-32bit":
lib = "libprotobuf-c-nano-enable_malloc-32bit"
static = true
default: default:
ctx.PropertyErrorf("proto.type", "unknown proto type %q", ctx.PropertyErrorf("proto.type", "unknown proto type %q",
String(p.Proto.Type)) String(p.Proto.Type))
@ -142,7 +154,7 @@ func protoFlags(ctx ModuleContext, flags Flags, p *android.ProtoProperties) Flag
var plugin string var plugin string
switch String(p.Proto.Type) { switch String(p.Proto.Type) {
case "nanopb-c", "nanopb-c-enable_malloc": case "nanopb-c", "nanopb-c-enable_malloc", "nanopb-c-16bit", "nanopb-c-enable_malloc-16bit", "nanopb-c-32bit", "nanopb-c-enable_malloc-32bit":
flags.protoC = true flags.protoC = true
flags.protoOptionsFile = true flags.protoOptionsFile = true
flags.protoOutTypeFlag = "--nanopb_out" flags.protoOutTypeFlag = "--nanopb_out"