StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert ^2 "Prevent unspecified values in soong_config_st..."

Browse Source 
Revert submission 2262062-colefaust_soong_config_string_variable_2nd_try

Reason for revert: breaks builds, b/255996492 among others
Reverted Changes:
I3e2f59e5f:Fix typo
Id3bcd9a46:Revert ^2 "Prevent unspecified values in soong_con...

Change-Id: Ifa8ebb3993bf2c716c3ec3c9fdbe72ba019e77ad
This commit is contained in:
Brad Hinegardner
2022-10-27 19:01:10 +00:00
committed by Gerrit Code Review
parent 135d987d7c
commit b7b2e12475
2 changed files with 1 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/soongconfig/modules.go
View File

@@ -639,13 +639,9 @@ func (s *stringVariable) initializeProperties(v reflect.Value, typ reflect.Type)
// Extracts an interface from values containing the properties to apply based on config.
// If config does not match a value with a non-nil property set, the default value will be returned.
func (s *stringVariable) PropertiesToApply(config SoongConfig, values reflect.Value) (interface{}, error) {
configValue := config.String(s.variable)
if configValue != "" && !InList(configValue, s.values) {
return nil, fmt.Errorf("Soong config property %q must be one of %v, found %q", s.variable, s.values, configValue)
}
for j, v := range s.values {
f := values.Field(j)
if configValue == v && !f.Elem().IsNil() {
if config.String(s.variable) == v && !f.Elem().IsNil() {
return f.Interface(), nil
}
}
@@ -862,13 +858,3 @@ type emptyInterfaceStruct struct {
}
var emptyInterfaceType = reflect.TypeOf(emptyInterfaceStruct{}).Field(0).Type
// InList checks if the string belongs to the list
func InList(s string, list []string) bool {
for _, s2 := range list {
if s2 == s {
return true
}
}
return false
}