tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1274762

Change-Id: I526c9060020befbd16e9856b8da2e66ca816ca79
This commit is contained in:
Treehugger Robot 2020-10-12 04:20:11 +00:00 committed by Automerger Merge Worker
commit ceb7cbf190
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/config.go
View file

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

4
android/variable.go
View file

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