openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Use nil pointers for arch property structs"

This commit is contained in:
Treehugger Robot 2016-08-09 00:08:23 +00:00 committed by Gerrit Code Review
parent cdd4c24ff7 62496a0d2e
commit 142d4fd01d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/arch.go
View File

@ -463,6 +463,7 @@ func InitArchModule(m Module,
for _, properties := range base.generalProperties { for _, properties := range base.generalProperties {
propertiesValue := reflect.ValueOf(properties) propertiesValue := reflect.ValueOf(properties)
t := propertiesValue.Type()
if propertiesValue.Kind() != reflect.Ptr { if propertiesValue.Kind() != reflect.Ptr {
panic(fmt.Errorf("properties must be a pointer to a struct, got %T", panic(fmt.Errorf("properties must be a pointer to a struct, got %T",
propertiesValue.Interface())) propertiesValue.Interface()))
@ -476,7 +477,7 @@ func InitArchModule(m Module,
archProperties := &archProperties{} archProperties := &archProperties{}
forEachInterface(reflect.ValueOf(archProperties), func(v reflect.Value) { forEachInterface(reflect.ValueOf(archProperties), func(v reflect.Value) {
newValue := proptools.CloneEmptyProperties(propertiesValue) newValue := reflect.Zero(t)
v.Set(newValue) v.Set(newValue)
}) })