Merge "Remove code about mixed sepolicy build" into main am: 9c14e725e7 am: e06a2b2880 am: 4afb4219a8 am: fb294bd432 am: 9aaed54837

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

Change-Id: I697213198ac692eccc48e5c76748e63a7dc9268a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim
2023-09-01 04:52:52 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 35 deletions

View File

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