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

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

Browse Source 
am: ecc0efa02a

Change-Id: If8d23db1dca013aa4ee90daf6c2fee828e0e1a15
This commit is contained in:
Yu Shan
2019-02-20 12:10:14 -08:00
committed by android-build-merger
parent 089d22dec0 ecc0efa02a
commit 7b7d4dd061
1 changed files with 13 additions and 1 deletions
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":
lib = "libprotobuf-c-nano-enable_malloc"
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:
ctx.PropertyErrorf("proto.type", "unknown proto type %q",
String(p.Proto.Type))
@@ -142,7 +154,7 @@ func protoFlags(ctx ModuleContext, flags Flags, p *android.ProtoProperties) Flag
var plugin string
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.protoOptionsFile = true
flags.protoOutTypeFlag = "--nanopb_out"