commit b0a713acf918d87137cb8cfe7de77d47c111f483
author Jingwen Chen <jingwen@google.com> Fri Nov 06 00:04:04 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 06 00:04:04 2020 +0000
tree b91a2357360bf1048cbe1a28b3d5395b45c97136
parent f5b2a5feb7d0db58d762a1f780517870bfc7e6ce
parent 222ff4d18617b2dd0702d2fe247ceec5ca728f9f

Merge "bazel overlay: fix regression to "list of string" bpdocs type."

cmd/soong_build/bazel_overlay.go

diff --git a/cmd/soong_build/bazel_overlay.go b/cmd/soong_build/bazel_overlay.go
index cdc5775..fc1b492 100644
--- a/cmd/soong_build/bazel_overlay.go
+++ b/cmd/soong_build/bazel_overlay.go
@@ -370,7 +370,7 @@
 
 		// Canonicalize and normalize module property types to Bazel attribute types
 		starlarkAttrType := prop.Type
-		if starlarkAttrType == "list of strings" {
+		if starlarkAttrType == "list of string" {
 			starlarkAttrType = "string_list"
 		} else if starlarkAttrType == "int64" {
 			starlarkAttrType = "int"

cmd/soong_build/bazel_overlay_test.go

diff --git a/cmd/soong_build/bazel_overlay_test.go b/cmd/soong_build/bazel_overlay_test.go
index de060bb..548888e 100644
--- a/cmd/soong_build/bazel_overlay_test.go
+++ b/cmd/soong_build/bazel_overlay_test.go
@@ -277,7 +277,7 @@
 		},
 		bpdoc.Property{
 			Name: "string_list_prop",
-			Type: "list of strings",
+			Type: "list of string",
 		},
 		bpdoc.Property{
 			Name: "nested_prop",