Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0a713ac authored by Jingwen Chen's avatar Jingwen Chen Committed by Gerrit Code Review
Browse files

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

parents f5b2a5fe 222ff4d1

cmd/soong_build/bazel_overlay.go

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ func createRuleShims(packages []*bpdoc.Package) (map[string]RuleShim, error) { 


		// 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

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ func createPackageFixtures() []*bpdoc.Package { 
		},

		bpdoc.Property{

			Name: "string_list_prop",

			Type: "list of strings",

			Type: "list of string",

		},

		bpdoc.Property{

			Name: "nested_prop",