commit ba7a9c5e4ad7f71127bc42bdeef3e6e47d840a62
author Liz Kammer <eakammer@google.com> Wed May 26 08:45:30 2021 -0400
committer Liz Kammer <eakammer@google.com> Thu May 27 13:57:01 2021 -0400
tree c7d566d19f944425583a0c82cdd8a175bf2a67e2
parent f6840284b6f335ca9aafd5ac60b241c4759e5640

Handle product vars *flags props in cc* modules

Test: build/bazel/ci/bp2build.sh
Bug: 188497994
Change-Id: Ifb379e370075d6a7bc55b82d79c210c31ef377e9

bazel/properties.go

diff --git a/bazel/properties.go b/bazel/properties.go
index b9d6ead..4cae21e 100644
--- a/bazel/properties.go
+++ b/bazel/properties.go
@@ -993,6 +993,6 @@
 // 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
 }