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 "bazel overlay: fix regression to "list of string" bpdocs type."

This commit is contained in:
Jingwen Chen 2020-11-06 00:04:04 +00:00 committed by Gerrit Code Review
parent f5b2a5feb7 222ff4d186
commit b0a713acf9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/soong_build/bazel_overlay.go
View File

@ -370,7 +370,7 @@ func createRuleShims(packages []*bpdoc.Package) (map[string]RuleShim, error) {
// Canonicalize and normalize module property types to Bazel attribute types // Canonicalize and normalize module property types to Bazel attribute types
starlarkAttrType := prop.Type starlarkAttrType := prop.Type
if starlarkAttrType == "list of strings" { if starlarkAttrType == "list of string" {
starlarkAttrType = "string_list" starlarkAttrType = "string_list"
} else if starlarkAttrType == "int64" { } else if starlarkAttrType == "int64" {
starlarkAttrType = "int" starlarkAttrType = "int"

2
cmd/soong_build/bazel_overlay_test.go
View File

@ -277,7 +277,7 @@ func createPackageFixtures() []*bpdoc.Package {
}, },
bpdoc.Property{ bpdoc.Property{
Name: "string_list_prop", Name: "string_list_prop",
Type: "list of strings", Type: "list of string",
}, },
bpdoc.Property{ bpdoc.Property{
Name: "nested_prop", Name: "nested_prop",