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" am: 542d60062f

Browse Source 
am: 01f63e2954

Change-Id: If6b1ce0b6d30c0d663b1cb644b900e77b435c998
This commit is contained in:
Tri Vo
2018-05-22 16:06:57 -07:00
committed by android-build-merger
parent f881351d53 01f63e2954
commit ec3a768767
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 return c.config.productVariables.BoardOdmSepolicyDirs
} }
func (c *deviceConfig) PlatPublicSepolicyDir() string { func (c *deviceConfig) PlatPublicSepolicyDirs() []string {
return c.config.productVariables.BoardPlatPublicSepolicyDir return c.config.productVariables.BoardPlatPublicSepolicyDirs
} }
func (c *deviceConfig) PlatPrivateSepolicyDir() string { func (c *deviceConfig) PlatPrivateSepolicyDirs() []string {
return c.config.productVariables.BoardPlatPrivateSepolicyDir return c.config.productVariables.BoardPlatPrivateSepolicyDirs
} }
func (c *config) IntegerOverflowDisabledForPath(path string) bool { func (c *config) IntegerOverflowDisabledForPath(path string) bool {

8
android/variable.go
View File

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