StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove code about mixed sepolicy build" into main

Browse Source
This commit is contained in:
Inseob Kim
2023-09-01 01:06:29 +00:00
committed by Gerrit Code Review
parent a4fc68a355 6077b2342c
commit 9c14e725e7
2 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android/config.go
View File

@@ -1792,30 +1792,6 @@ func (c *deviceConfig) BoardSepolicyVers() string {
return c.PlatformSepolicyVersion() return c.PlatformSepolicyVersion()
} }
func (c *deviceConfig) BoardPlatVendorPolicy() []string {
return c.config.productVariables.BoardPlatVendorPolicy
}
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) SystemExtSepolicyPrebuiltApiDir() string { func (c *deviceConfig) SystemExtSepolicyPrebuiltApiDir() string {
return String(c.config.productVariables.SystemExtSepolicyPrebuiltApiDir) return String(c.config.productVariables.SystemExtSepolicyPrebuiltApiDir)
} }

16
android/variable.go
View File

@@ -372,17 +372,11 @@ type ProductVariables struct {
MultitreeUpdateMeta bool `json:",omitempty"` MultitreeUpdateMeta bool `json:",omitempty"`
BoardVendorSepolicyDirs []string `json:",omitempty"` BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"` BoardOdmSepolicyDirs []string `json:",omitempty"`
BoardReqdMaskPolicy []string `json:",omitempty"` SystemExtPublicSepolicyDirs []string `json:",omitempty"`
BoardPlatVendorPolicy []string `json:",omitempty"` SystemExtPrivateSepolicyDirs []string `json:",omitempty"`
BoardSystemExtPublicPrebuiltDirs []string `json:",omitempty"` BoardSepolicyM4Defs []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"`
BoardSepolicyVers *string `json:",omitempty"` BoardSepolicyVers *string `json:",omitempty"`
PlatformSepolicyVersion *string `json:",omitempty"` PlatformSepolicyVersion *string `json:",omitempty"`