diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-11 23:02:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-11 23:02:14 +0000 |
| commit | 13a828764c4ac968d8e5245c939b790db27c739d (patch) | |
| tree | 0e56021e373e2d43fdba73b8b17c998e96632180 /cc | |
| parent | 195f53c0f22ce02aab25f87b96720aca3c56c88c (diff) | |
| parent | 62158b433d476ceb91a5ad067363f74e28cf376b (diff) | |
| download | build_soong-13a828764c4ac968d8e5245c939b790db27c739d.tar.gz build_soong-13a828764c4ac968d8e5245c939b790db27c739d.tar.bz2 build_soong-13a828764c4ac968d8e5245c939b790db27c739d.zip | |
Merge "Fixing protoOutParams concatenation." into pi-dev
Diffstat (limited to 'cc')
| -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, " "), |