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

Merge "Fix filter-out being negated in rbc product configuration"

Browse Source
This commit is contained in:
Treehugger Robot
2021-12-07 20:13:56 +00:00
committed by Gerrit Code Review
parent 58e748d8d4 eec0d8137e
commit 022a5faef3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mk2rbc/mk2rbc.go
View File

@@ -1111,10 +1111,8 @@ func (ctx *parseContext) parseCompareSpecialCases(directive *mkparser.Directive,
} }
switch call.name { switch call.name {
case "filter": case "filter", "filter-out":
return ctx.parseCompareFilterFuncResult(directive, call, value, isEq), true return ctx.parseCompareFilterFuncResult(directive, call, value, isEq), true
case "filter-out":
return ctx.parseCompareFilterFuncResult(directive, call, value, !isEq), true
case "wildcard": case "wildcard":
return ctx.parseCompareWildcardFuncResult(directive, call, value, !isEq), true return ctx.parseCompareWildcardFuncResult(directive, call, value, !isEq), true
case "findstring": case "findstring":

4
mk2rbc/mk2rbc_test.go
View File

@@ -390,6 +390,8 @@ endif
ifeq (,$(filter barbet coral%,$(TARGET_PRODUCT))) ifeq (,$(filter barbet coral%,$(TARGET_PRODUCT)))
else ifneq (,$(filter barbet%,$(TARGET_PRODUCT))) else ifneq (,$(filter barbet%,$(TARGET_PRODUCT)))
endif endif
ifeq (,$(filter-out sunfish_kasan, $(TARGET_PRODUCT)))
endif
`, `,
expected: `load("//build/make/core:product_config.rbc", "rblf") expected: `load("//build/make/core:product_config.rbc", "rblf")
@@ -409,6 +411,8 @@ def init(g, handle):
pass pass
elif rblf.filter("barbet%", g["TARGET_PRODUCT"]): elif rblf.filter("barbet%", g["TARGET_PRODUCT"]):
pass pass
if not rblf.filter_out("sunfish_kasan", g["TARGET_PRODUCT"]):
pass
`, `,
}, },
{ {