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

Remove code about mixed sepolicy build

Browse Source 
There is no one actively using mixed sepolicy build, and it made
sepolicy codes too complicated. As we are deprecating mixed build,
removing such code for cleanup.

Bug: 298305798
Test: boot cuttlefish
Change-Id: Icb5071eb1378f8ed83568e4445d7b4d33e29bc46
This commit is contained in:
Inseob Kim
2023-08-31 16:49:59 +09:00
parent 37aa33fcb1
commit 6077b2342c
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)
} }

6
android/variable.go
View File

@@ -374,12 +374,6 @@ type ProductVariables struct {
BoardVendorSepolicyDirs []string `json:",omitempty"` BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"` 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"` SystemExtPublicSepolicyDirs []string `json:",omitempty"`
SystemExtPrivateSepolicyDirs []string `json:",omitempty"` SystemExtPrivateSepolicyDirs []string `json:",omitempty"`
BoardSepolicyM4Defs []string `json:",omitempty"` BoardSepolicyM4Defs []string `json:",omitempty"`