Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aa95890 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 405af078 a20a875f

android/config.go

+4 −4
Original line number Diff line number Diff line
@@ -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 {

android/variable.go

+2 −2
Original line number Diff line number Diff line
@@ -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"`