diff options
| author | Kweku Adams <kwekua@google.com> | 2018-04-05 17:48:32 -0700 |
|---|---|---|
| committer | Kweku Adams <kwekua@google.com> | 2018-04-09 12:04:49 -0700 |
| commit | 62158b433d476ceb91a5ad067363f74e28cf376b (patch) | |
| tree | aeb394bf087b663450ce10d822bc3d92e628087d | |
| parent | d95159cb33afbf252084975bf17a44ecaef42840 (diff) | |
| download | build_soong-62158b433d476ceb91a5ad067363f74e28cf376b.tar.gz build_soong-62158b433d476ceb91a5ad067363f74e28cf376b.tar.bz2 build_soong-62158b433d476ceb91a5ad067363f74e28cf376b.zip | |
Fixing protoOutParams concatenation.
ParseGeneratorParameter delimits based on commas, not colons:
external/protobuf/src/google/protobuf/compiler/code_generator.cc
Bug: 72570104
Test: flash device with new build
Change-Id: I00042782a718d288ca6b0cb78f856d0fb223a926
(cherry picked from commit fb5b31ce9675e1acbba2d6eb0c0739195515fb85)
| -rw-r--r-- | cc/proto.go | 2 | ||||
| -rw-r--r-- | cc/util.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cc/proto.go b/cc/proto.go index c53dcf40..42bb5369 100644 --- a/cc/proto.go +++ b/cc/proto.go @@ -115,7 +115,7 @@ func protoFlags(ctx ModuleContext, flags Flags, p *android.ProtoProperties) Flag flags.protoFlags = android.ProtoFlags(ctx, p) if proptools.String(p.Proto.Type) == "lite" { - flags.protoOutParams = []string{"lite"} + flags.protoOutParams = append(flags.protoOutParams, "lite") } return flags @@ -67,7 +67,7 @@ func flagsToBuilderFlags(in Flags) builderFlags { cppFlags: strings.Join(in.CppFlags, " "), yaccFlags: strings.Join(in.YaccFlags, " "), protoFlags: strings.Join(in.protoFlags, " "), - protoOutParams: strings.Join(in.protoOutParams, ":"), + protoOutParams: strings.Join(in.protoOutParams, ","), aidlFlags: strings.Join(in.aidlFlags, " "), rsFlags: strings.Join(in.rsFlags, " "), ldFlags: strings.Join(in.LdFlags, " "), |