commit 7128d38da5e44a4af786c086a7e944cffad02965
author Liz Kammer <eakammer@google.com> Thu May 12 11:42:33 2022 -0400
committer Liz Kammer <eakammer@google.com> Mon Jun 27 17:20:17 2022 -0400
tree ffee6879ee332a7ba4122afec6517162afbab1ba
parent 061d3528016b0729d85db324a3c124d9c5734c37

Remove alternative stl names in bp2build

Test: bp2build.sh
Change-Id: Ie2bdac79306f9a5b50331f808f00187e172e46ab

cc/bp2build.go

diff --git a/cc/bp2build.go b/cc/bp2build.go
index d891007..fa30d09 100644
--- a/cc/bp2build.go
+++ b/cc/bp2build.go
@@ -376,7 +376,8 @@
 				return
 			}
 			if ca.stl == nil {
-				ca.stl = stlProps.Stl
+				stl := deduplicateStlInput(*stlProps.Stl)
+				ca.stl = &stl
 			} else if ca.stl != stlProps.Stl {
 				ctx.ModuleErrorf("Unsupported conversion: module with different stl for different variants: %s and %s", *ca.stl, stlProps.Stl)
 			}