StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs"

Browse Source 
am: 542d60062f

Change-Id: Iff889ec4ffa03870386b374ea8976b0ebc9bc916
This commit is contained in:
Tri Vo
2018-05-22 16:02:19 -07:00
committed by android-build-merger
parent b29737b3f3 542d60062f
commit 01f63e2954
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -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 {

4
android/variable.go
View File

@@ -212,8 +212,8 @@ type productVariables struct {
BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"`
BoardPlatPublicSepolicyDir string `json:",omitempty"`
BoardPlatPrivateSepolicyDir string `json:",omitempty"`
BoardPlatPublicSepolicyDirs []string `json:",omitempty"`
BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"`
}