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

Add sepolicy prebuilt directories to soong_config

Browse Source 
These are used when we build vendor sepolicy against old plat sepolicy.

Bug: 33691272
Test: build
Change-Id: Ia4fea509a2e122f24d1669a0908c4b3d2bb3b32c
This commit is contained in:
Inseob Kim
2021-12-15 22:48:14 +09:00
parent cde46d7d98
commit 0f46e7ca88
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/config.go
View File

@@ -1485,6 +1485,22 @@ func (c *deviceConfig) BoardReqdMaskPolicy() []string {
return c.config.productVariables.BoardReqdMaskPolicy 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 { func (c *deviceConfig) DirectedVendorSnapshot() bool {
return c.config.productVariables.DirectedVendorSnapshot return c.config.productVariables.DirectedVendorSnapshot
} }

18
android/variable.go
View File

@@ -344,13 +344,17 @@ type productVariables struct {
RecoverySnapshotDirsIncluded []string `json:",omitempty"` RecoverySnapshotDirsIncluded []string `json:",omitempty"`
HostFakeSnapshotEnabled bool `json:",omitempty"` HostFakeSnapshotEnabled bool `json:",omitempty"`
BoardVendorSepolicyDirs []string `json:",omitempty"` BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"` BoardOdmSepolicyDirs []string `json:",omitempty"`
BoardReqdMaskPolicy []string `json:",omitempty"` BoardReqdMaskPolicy []string `json:",omitempty"`
BoardPlatVendorPolicy []string `json:",omitempty"` BoardPlatVendorPolicy []string `json:",omitempty"`
SystemExtPublicSepolicyDirs []string `json:",omitempty"` BoardSystemExtPublicPrebuiltDirs []string `json:",omitempty"`
SystemExtPrivateSepolicyDirs []string `json:",omitempty"` BoardSystemExtPrivatePrebuiltDirs []string `json:",omitempty"`
BoardSepolicyM4Defs []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"`