Merge "Expose selinux variables to Soong." am: c5934c55c7

am: 368e0ab5a2

Change-Id: I2377ca5f20e8c7c7ffb6ef856f4081b03b66fe85

2 files changed, 21 insertions, 0 deletions

diff --git a/android/config.go b/android/config.go
index 40ba8c17..7ab5f563 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 6ec8a500..f1aa36ec 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -224,6 +224,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"`
 }