commit e3e4a5f2d81068474fbd0a9907a8d1e85c20a310
author Liz Kammer <eakammer@google.com> Mon May 10 11:39:53 2021 -0400
committer Liz Kammer <eakammer@google.com> Mon May 24 14:32:38 2021 -0400
tree 2f8d8f0e68525a53b66a3bf9e4c28de0e66fbc70
parent 6fd7b3fee9fdf80126da91dbbb78e5d0d662402b

Handle arch/os-specific product variables

Bug: 183595873
Test: go test bp2build tests
Change-Id: I36e93ae1eb2943555dd304d5bdf62d995e77b437

bp2build/configurability.go

diff --git a/bp2build/configurability.go b/bp2build/configurability.go
index 3cdc994..9869c5d 100644
--- a/bp2build/configurability.go
+++ b/bp2build/configurability.go
@@ -34,7 +34,7 @@
 		selectValues = append(selectValues, osSelects)
 	}
 
-	for _, pv := range list.ProductValues {
+	for _, pv := range list.SortedProductVariables() {
 		s := make(selects)
 		if len(pv.Values) > 0 {
 			s[pv.SelectKey()] = reflect.ValueOf(pv.Values)