From 1e613d24f12aa6acb01861105c3b57d2e44135b3 Mon Sep 17 00:00:00 2001 From: kellyhung Date: Mon, 29 Jul 2024 12:56:51 +0000 Subject: Add product variable SelinuxIgnoreNeverallows for sepolicy This topic also fix build fail on git_main on seahawk-next-userdebug(b/371922616) Bug: 350881031 Test: Presubmits Change-Id: I7dbfadde100d833994f3d0429e358ff10d26fc6e --- android/module.go | 2 ++ android/variable.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/android/module.go b/android/module.go index 44f7583a2..142cffa99 100644 --- a/android/module.go +++ b/android/module.go @@ -2348,6 +2348,8 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu case "use_debug_art": // TODO(b/234351700): Remove once ART does not have separated debug APEX return proptools.ConfigurableValueBool(ctx.Config().UseDebugArt()) + case "selinux_ignore_neverallows": + return proptools.ConfigurableValueBool(ctx.Config().SelinuxIgnoreNeverallows()) default: // TODO(b/323382414): Might add these on a case-by-case basis ctx.OtherModulePropertyErrorf(m, property, fmt.Sprintf("TODO(b/323382414): Product variable %q is not yet supported in selects", variable)) diff --git a/android/variable.go b/android/variable.go index 417ba8978..248e1e853 100644 --- a/android/variable.go +++ b/android/variable.go @@ -193,6 +193,9 @@ type variableProperties struct { Required []string Vintf_fragment_modules []string } + SelinuxIgnoreNeverallows struct { + Required []string + } } `android:"arch_variant"` } -- cgit v1.2.3-59-g8ed1b