From f544fe3db9a0c0206ae1222481451581babf7162 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Sun, 20 May 2018 14:34:48 -0700 Subject: [PATCH] Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs After https://android-review.googlesource.com/688488 BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR can now specify multiple directories. Bug: n/a Test: build sepolicy Change-Id: I838c76736a3f1bd8759e24739cf82fea33a531b4 --- android/config.go | 8 ++++---- android/variable.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/config.go b/android/config.go index 7f2a3aca2..bc3d4f5e6 100644 --- a/android/config.go +++ b/android/config.go @@ -811,12 +811,12 @@ func (c *deviceConfig) OdmSepolicyDirs() []string { return c.config.productVariables.BoardOdmSepolicyDirs } -func (c *deviceConfig) PlatPublicSepolicyDir() string { - return c.config.productVariables.BoardPlatPublicSepolicyDir +func (c *deviceConfig) PlatPublicSepolicyDirs() []string { + return c.config.productVariables.BoardPlatPublicSepolicyDirs } -func (c *deviceConfig) PlatPrivateSepolicyDir() string { - return c.config.productVariables.BoardPlatPrivateSepolicyDir +func (c *deviceConfig) PlatPrivateSepolicyDirs() []string { + return c.config.productVariables.BoardPlatPrivateSepolicyDirs } func (c *config) IntegerOverflowDisabledForPath(path string) bool { diff --git a/android/variable.go b/android/variable.go index 6599ca365..af414cbe4 100644 --- a/android/variable.go +++ b/android/variable.go @@ -210,10 +210,10 @@ type productVariables struct { PgoAdditionalProfileDirs []string `json:",omitempty"` - BoardVendorSepolicyDirs []string `json:",omitempty"` - BoardOdmSepolicyDirs []string `json:",omitempty"` - BoardPlatPublicSepolicyDir string `json:",omitempty"` - BoardPlatPrivateSepolicyDir string `json:",omitempty"` + BoardVendorSepolicyDirs []string `json:",omitempty"` + BoardOdmSepolicyDirs []string `json:",omitempty"` + BoardPlatPublicSepolicyDirs []string `json:",omitempty"` + BoardPlatPrivateSepolicyDirs []string `json:",omitempty"` VendorVars map[string]map[string]string `json:",omitempty"` }