Handle product vars *flags props in cc* modules

Test: build/bazel/ci/bp2build.sh
Bug: 188497994
Change-Id: Ifb379e370075d6a7bc55b82d79c210c31ef377e9
This commit is contained in:
Liz Kammer
2021-05-26 08:45:30 -04:00
parent f6840284b6
commit ba7a9c5e4a
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
}