diff options
| author | 2024-10-10 17:36:53 +0000 | |
|---|---|---|
| committer | 2024-10-10 17:36:53 +0000 | |
| commit | 527f3ad099cbe1cf9a25fa1bb901b16f0d2d2d9b (patch) | |
| tree | 5f497ac0439eb83b031845baa3f627438db2655d | |
| parent | ad663156b4b956e54d0528931a0cae542ffe6a5f (diff) | |
| parent | 1e613d24f12aa6acb01861105c3b57d2e44135b3 (diff) | |
Merge "Add product variable SelinuxIgnoreNeverallows for sepolicy" into main
| -rw-r--r-- | android/module.go | 2 | ||||
| -rw-r--r-- | android/variable.go | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/android/module.go b/android/module.go index 51e7f366c..8415118cb 100644 --- a/android/module.go +++ b/android/module.go @@ -2347,6 +2347,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 5aa74bd7a..4210f6720 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"` } |