From eec0d8137e27b6347a0e496ba17bb1aa80ee018d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 6 Dec 2021 16:23:51 -0800 Subject: [PATCH] Fix filter-out being negated in rbc product configuration Bug: 201700692 Test: go test Change-Id: I3245e33dc88dd2e456a24780c8cc20ed605d67a6 --- mk2rbc/mk2rbc.go | 4 +--- mk2rbc/mk2rbc_test.go | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mk2rbc/mk2rbc.go b/mk2rbc/mk2rbc.go index 15e5963ea..cade4d20f 100644 --- a/mk2rbc/mk2rbc.go +++ b/mk2rbc/mk2rbc.go @@ -1111,10 +1111,8 @@ func (ctx *parseContext) parseCompareSpecialCases(directive *mkparser.Directive, } switch call.name { - case "filter": + case "filter", "filter-out": return ctx.parseCompareFilterFuncResult(directive, call, value, isEq), true - case "filter-out": - return ctx.parseCompareFilterFuncResult(directive, call, value, !isEq), true case "wildcard": return ctx.parseCompareWildcardFuncResult(directive, call, value, !isEq), true case "findstring": diff --git a/mk2rbc/mk2rbc_test.go b/mk2rbc/mk2rbc_test.go index dfdf274ef..fa33e75d5 100644 --- a/mk2rbc/mk2rbc_test.go +++ b/mk2rbc/mk2rbc_test.go @@ -390,6 +390,8 @@ endif ifeq (,$(filter barbet coral%,$(TARGET_PRODUCT))) else ifneq (,$(filter barbet%,$(TARGET_PRODUCT))) endif +ifeq (,$(filter-out sunfish_kasan, $(TARGET_PRODUCT))) +endif `, expected: `load("//build/make/core:product_config.rbc", "rblf") @@ -409,6 +411,8 @@ def init(g, handle): pass elif rblf.filter("barbet%", g["TARGET_PRODUCT"]): pass + if not rblf.filter_out("sunfish_kasan", g["TARGET_PRODUCT"]): + pass `, }, {