From 35a5143aee8e6c353ed24993e2242bfe609f6900 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Sun, 25 Mar 2018 20:00:00 -0700 Subject: [PATCH] Expose selinux variables to Soong. Bug: 33691272 Test: manual Change-Id: I4a568fb25a36331afb2ca51c3d8a676c3aba09e1 --- android/config.go | 16 ++++++++++++++++ android/variable.go | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/android/config.go b/android/config.go index 40ba8c177..7ab5f5634 100644 --- a/android/config.go +++ b/android/config.go @@ -799,6 +799,22 @@ func (c *deviceConfig) PgoAdditionalProfileDirs() []string { return c.config.productVariables.PgoAdditionalProfileDirs } +func (c *deviceConfig) VendorSepolicyDirs() []string { + return c.config.productVariables.BoardVendorSepolicyDirs +} + +func (c *deviceConfig) OdmSepolicyDirs() []string { + return c.config.productVariables.BoardOdmSepolicyDirs +} + +func (c *deviceConfig) PlatPublicSepolicyDir() string { + return c.config.productVariables.BoardPlatPublicSepolicyDir +} + +func (c *deviceConfig) PlatPrivateSepolicyDir() string { + return c.config.productVariables.BoardPlatPrivateSepolicyDir +} + func (c *config) IntegerOverflowDisabledForPath(path string) bool { if c.productVariables.IntegerOverflowExcludePaths == nil { return false diff --git a/android/variable.go b/android/variable.go index 205790333..ce2cb232c 100644 --- a/android/variable.go +++ b/android/variable.go @@ -209,6 +209,11 @@ type productVariables struct { PgoAdditionalProfileDirs []string `json:",omitempty"` + BoardVendorSepolicyDirs []string `json:",omitempty"` + BoardOdmSepolicyDirs []string `json:",omitempty"` + BoardPlatPublicSepolicyDir string `json:",omitempty"` + BoardPlatPrivateSepolicyDir string `json:",omitempty"` + VendorVars map[string]map[string]string `json:",omitempty"` }