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

Merge "Fixing protoOutParams concatenation." am: eacf1a6e85

Browse Source 
am: e819d2b345

Change-Id: I8969a5bf4532c4f71fc353f326b83bf1c563194e
This commit is contained in:
Kweku Adams
2018-04-06 10:05:45 -07:00
committed by android-build-merger
parent e66a2c96dc e819d2b345
commit 74f58c4849
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/proto.go
View File

@@ -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

2
cc/util.go
View File

@@ -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, " "),