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

Commit 1778546f authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge "Add sepolicy prebuilt directories to soong_config"

parents 2e2ec057 0f46e7ca

android/config.go

+16 −0
Original line number Diff line number Diff line
@@ -1476,6 +1476,22 @@ func (c *deviceConfig) BoardReqdMaskPolicy() []string { 
	return c.config.productVariables.BoardReqdMaskPolicy

}



func (c *deviceConfig) BoardSystemExtPublicPrebuiltDirs() []string {

	return c.config.productVariables.BoardSystemExtPublicPrebuiltDirs

}



func (c *deviceConfig) BoardSystemExtPrivatePrebuiltDirs() []string {

	return c.config.productVariables.BoardSystemExtPrivatePrebuiltDirs

}



func (c *deviceConfig) BoardProductPublicPrebuiltDirs() []string {

	return c.config.productVariables.BoardProductPublicPrebuiltDirs

}



func (c *deviceConfig) BoardProductPrivatePrebuiltDirs() []string {

	return c.config.productVariables.BoardProductPrivatePrebuiltDirs

}



func (c *deviceConfig) DirectedVendorSnapshot() bool {

	return c.config.productVariables.DirectedVendorSnapshot

}

android/variable.go

+11 −7
Original line number Diff line number Diff line
@@ -348,6 +348,10 @@ type productVariables struct { 
	BoardOdmSepolicyDirs              []string `json:",omitempty"`

	BoardReqdMaskPolicy               []string `json:",omitempty"`

	BoardPlatVendorPolicy             []string `json:",omitempty"`

	BoardSystemExtPublicPrebuiltDirs  []string `json:",omitempty"`

	BoardSystemExtPrivatePrebuiltDirs []string `json:",omitempty"`

	BoardProductPublicPrebuiltDirs    []string `json:",omitempty"`

	BoardProductPrivatePrebuiltDirs   []string `json:",omitempty"`

	SystemExtPublicSepolicyDirs       []string `json:",omitempty"`

	SystemExtPrivateSepolicyDirs      []string `json:",omitempty"`

	BoardSepolicyM4Defs               []string `json:",omitempty"`