diff options
| author | Tri Vo <trong@google.com> | 2018-05-22 16:06:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-22 16:06:57 -0700 |
| commit | ec3a768767f0720c2af82ea0b6a175429647ac4c (patch) | |
| tree | 2120d56f9a2ec07535d668847e920c9c8b9b0903 | |
| parent | f881351d53309100694a081e928727484ed3e2a2 (diff) | |
| parent | 01f63e29548592a6d1d8811755482b27bd4b7db1 (diff) | |
| download | build_soong-ec3a768767f0720c2af82ea0b6a175429647ac4c.tar.gz build_soong-ec3a768767f0720c2af82ea0b6a175429647ac4c.tar.bz2 build_soong-ec3a768767f0720c2af82ea0b6a175429647ac4c.zip | |
Merge "Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs" am: 542d60062f
am: 01f63e2954
Change-Id: If6b1ce0b6d30c0d663b1cb644b900e77b435c998
| -rw-r--r-- | android/config.go | 8 | ||||
| -rw-r--r-- | android/variable.go | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/android/config.go b/android/config.go index 7f2a3aca..bc3d4f5e 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 c82fe347..7bf5a062 100644 --- a/android/variable.go +++ b/android/variable.go @@ -225,10 +225,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"` } |