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

Support soong config value variables on Configurable properties

Browse Source 
Configurable properties were previously not having their %s's
substituted with the actual value.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: Id317e58a1fd878db5452d5d0a5df588021bcdcdb
This commit is contained in:
Cole Faust
2024-05-22 14:30:16 -07:00
parent a642853510
commit 5f29706843
2 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
android/soongconfig/modules.go
View File

@@ -733,11 +733,18 @@ func (s *valueVariable) printfIntoPropertyRecursive(fieldName []string, propStru
case reflect.Bool:
// Nothing to do
case reflect.Struct:
fieldName = append(fieldName, propStruct.Type().Field(i).Name)
if err := s.printfIntoPropertyRecursive(fieldName, field, configValue); err != nil {
return err
if proptools.IsConfigurable(field.Type()) {
if err := proptools.PrintfIntoConfigurable(field.Interface(), configValue); err != nil {
fieldName = append(fieldName, propStruct.Type().Field(i).Name)
return fmt.Errorf("soong_config_variables.%s.%s: %s", s.variable, strings.Join(fieldName, "."), err)
}
} else {
fieldName = append(fieldName, propStruct.Type().Field(i).Name)
if err := s.printfIntoPropertyRecursive(fieldName, field, configValue); err != nil {
return err
}
fieldName = fieldName[:len(fieldName)-1]
}
fieldName = fieldName[:len(fieldName)-1]
default:
fieldName = append(fieldName, propStruct.Type().Field(i).Name)
return fmt.Errorf("soong_config_variables.%s.%s: unsupported property type %q", s.variable, strings.Join(fieldName, "."), kind)