Merge "Handle product vars *flags props in cc* modules"

This commit is contained in:
Treehugger Robot
2021-05-31 08:21:19 +00:00
committed by Gerrit Code Review
5 changed files with 56 additions and 33 deletions

View File

@@ -993,6 +993,6 @@ func TryVariableSubstitutions(slice []string, productVariable string) ([]string,
// TryVariableSubstitution, replace string substitution formatting within s with Starlark
// string.format compatible tag for productVariable.
func TryVariableSubstitution(s string, productVariable string) (string, bool) {
sub := productVariableSubstitutionPattern.ReplaceAllString(s, "{"+productVariable+"}")
sub := productVariableSubstitutionPattern.ReplaceAllString(s, "$("+productVariable+")")
return sub, s != sub
}