diff options
| -rw-r--r-- | android/soongconfig/modules.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/soongconfig/modules.go b/android/soongconfig/modules.go index 5a6917ed0..9f3f804ef 100644 --- a/android/soongconfig/modules.go +++ b/android/soongconfig/modules.go @@ -541,12 +541,15 @@ func (s *valueVariable) initializeProperties(v reflect.Value, typ reflect.Type) } func (s *valueVariable) PropertiesToApply(config SoongConfig, values reflect.Value) (interface{}, error) { - if !config.IsSet(s.variable) { + if !config.IsSet(s.variable) || !values.IsValid() { return nil, nil } configValue := config.String(s.variable) propStruct := values.Elem().Elem() + if !propStruct.IsValid() { + return nil, nil + } for i := 0; i < propStruct.NumField(); i++ { field := propStruct.Field(i) kind := field.Kind() |