Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e819d2b3 authored by Kweku Adams's avatar Kweku Adams Committed by android-build-merger
Browse files

Merge "Fixing protoOutParams concatenation." 

am: eacf1a6e

Change-Id: Iac5729bd16b484946de389fa9ce84f8cfe793ddd
parents faf45ded eacf1a6e

cc/proto.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -115,7 +115,7 @@ func protoFlags(ctx ModuleContext, flags Flags, p *android.ProtoProperties) Flag 
	flags.protoFlags = android.ProtoFlags(ctx, p)

	flags.protoFlags = android.ProtoFlags(ctx, p)





	if proptools.String(p.Proto.Type) == "lite" {

	if proptools.String(p.Proto.Type) == "lite" {

		flags.protoOutParams = []string{"lite"}

		flags.protoOutParams = append(flags.protoOutParams, "lite")

	}

	}





	return flags

	return flags

cc/util.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ func flagsToBuilderFlags(in Flags) builderFlags { 
		cppFlags:       strings.Join(in.CppFlags, " "),

		cppFlags:       strings.Join(in.CppFlags, " "),

		yaccFlags:      strings.Join(in.YaccFlags, " "),

		yaccFlags:      strings.Join(in.YaccFlags, " "),

		protoFlags:     strings.Join(in.protoFlags, " "),

		protoFlags:     strings.Join(in.protoFlags, " "),

		protoOutParams: strings.Join(in.protoOutParams, ":"),

		protoOutParams: strings.Join(in.protoOutParams, ","),

		aidlFlags:      strings.Join(in.aidlFlags, " "),

		aidlFlags:      strings.Join(in.aidlFlags, " "),

		rsFlags:        strings.Join(in.rsFlags, " "),

		rsFlags:        strings.Join(in.rsFlags, " "),

		ldFlags:        strings.Join(in.LdFlags, " "),

		ldFlags:        strings.Join(in.LdFlags, " "),