StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: negate the condition for is-vendor-board-qcom

Browse Source 
Bug: 193540681
Test: internal
Change-Id: Ia4087574f7cbcd5282687234892314c9a5fcc174
This commit is contained in:
Sasha Smundak
2021-11-04 17:57:39 -07:00
parent 925942127a
commit 4f1f118a8d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mk2rbc/mk2rbc.go
View File

@@ -1167,10 +1167,12 @@ func (ctx *parseContext) parseCheckFunctionCallResult(directive *mkparser.Direct
return ctx.newBadExpr(directive, return ctx.newBadExpr(directive,
fmt.Sprintf("the result of %s can be compared only to empty", x.name)), true fmt.Sprintf("the result of %s can be compared only to empty", x.name)), true
} }
// if the expression is ifneq (,$(call is-vendor-board-platform,...)), negate==true,
// so we should set inExpr.isNot to false
return &inExpr{ return &inExpr{
expr: &variableRefExpr{ctx.addVariable("TARGET_BOARD_PLATFORM"), false}, expr: &variableRefExpr{ctx.addVariable("TARGET_BOARD_PLATFORM"), false},
list: &variableRefExpr{ctx.addVariable("QCOM_BOARD_PLATFORMS"), true}, list: &variableRefExpr{ctx.addVariable("QCOM_BOARD_PLATFORMS"), true},
isNot: negate, isNot: !negate,
}, true }, true
default: default:
return ctx.newBadExpr(directive, "Unknown function in ifeq: %s", x.name), true return ctx.newBadExpr(directive, "Unknown function in ifeq: %s", x.name), true

2
mk2rbc/mk2rbc_test.go
View File

@@ -579,7 +579,7 @@ def init(g, handle):
pass pass
elif not rblf.board_platform_is(g, "copper"): elif not rblf.board_platform_is(g, "copper"):
pass pass
elif g.get("TARGET_BOARD_PLATFORM", "") not in g["QCOM_BOARD_PLATFORMS"]: elif g.get("TARGET_BOARD_PLATFORM", "") in g["QCOM_BOARD_PLATFORMS"]:
pass pass
`, `,
}, },