Merge "propertyIndexesWithTag can handle slice of struct" am: 2910183696

Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1601875

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4908415cc4eb454030c0224fb990be6c2b89b443

proptools/proptools.go

@@ -125,3 +125,7 @@ func isStructPtr(t reflect.Type) bool {
 func isSlice(t reflect.Type) bool {
 	return t.Kind() == reflect.Slice
 }
+
+func isSliceOfStruct(t reflect.Type) bool {
+	return isSlice(t) && isStruct(t.Elem())
+}

proptools/tag.go

@@ -56,8 +56,8 @@ func propertyIndexesWithTag(t reflect.Type, key, value string) [][]int {
 	for i := 0; i < t.NumField(); i++ {
 		field := t.Field(i)
 		ft := field.Type
-		if isStruct(ft) || isStructPtr(ft) {
+		if isStruct(ft) || isStructPtr(ft) || isSliceOfStruct(ft) {
-			if ft.Kind() == reflect.Ptr {
+			if ft.Kind() == reflect.Ptr || ft.Kind() == reflect.Slice {
 				ft = ft.Elem()
 			}
 			subIndexes := propertyIndexesWithTag(ft, key, value)

proptools/tag_test.go

@@ -155,6 +155,31 @@ func TestPropertyIndexesWithTag(t *testing.T) {
 			}{},
 			want: [][]int{{0, 0}},
 		},
+		{
+			name: "slice of struct",
+			ps: &struct {
+				Other int
+				Foo   []struct {
+					Other int
+					Bar   string `name:"value"`
+				}
+			}{},
+			want: [][]int{{1, 1}},
+		},
+		{
+			name: "slice^2 of struct",
+			ps: &struct {
+				Other int
+				Foo   []struct {
+					Other int
+					Bar   []struct {
+						Other int
+						Baz   string `name:"value"`
+					}
+				}
+			}{},
+			want: [][]int{{1, 1, 1}},
+		},
 		{
 			name: "nil",
 			ps: (*struct {