Merge "android/: Rename Plat->SystemExt*SepolicyDirs"

This commit is contained in:
Treehugger Robot 2020-10-12 03:49:24 +00:00 committed by Gerrit Code Review
commit 6aa958902a
2 changed files with 6 additions and 6 deletions

View File

@ -1138,12 +1138,12 @@ func (c *deviceConfig) OdmSepolicyDirs() []string {
return c.config.productVariables.BoardOdmSepolicyDirs
}
func (c *deviceConfig) PlatPublicSepolicyDirs() []string {
return c.config.productVariables.BoardPlatPublicSepolicyDirs
func (c *deviceConfig) SystemExtPublicSepolicyDirs() []string {
return c.config.productVariables.SystemExtPublicSepolicyDirs
}
func (c *deviceConfig) PlatPrivateSepolicyDirs() []string {
return c.config.productVariables.BoardPlatPrivateSepolicyDirs
func (c *deviceConfig) SystemExtPrivateSepolicyDirs() []string {
return c.config.productVariables.SystemExtPrivateSepolicyDirs
}
func (c *deviceConfig) SepolicyM4Defs() []string {

View File

@ -304,8 +304,8 @@ type productVariables struct {
BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"`
BoardPlatPublicSepolicyDirs []string `json:",omitempty"`
BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
SystemExtPublicSepolicyDirs []string `json:",omitempty"`
SystemExtPrivateSepolicyDirs []string `json:",omitempty"`
BoardSepolicyM4Defs []string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"`