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

Merge "Add sepolicy prebuilt API dirs to soong config"

Browse Source
This commit is contained in:
Treehugger Robot
2022-02-17 01:26:04 +00:00
committed by Gerrit Code Review
parent e4c400bef5 1a0afcc05b
commit 1d7209b820
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/config.go
View File

@@ -1530,6 +1530,18 @@ func (c *deviceConfig) BoardProductPrivatePrebuiltDirs() []string {
return c.config.productVariables.BoardProductPrivatePrebuiltDirs return c.config.productVariables.BoardProductPrivatePrebuiltDirs
} }
func (c *deviceConfig) SystemExtSepolicyPrebuiltApiDir() string {
return String(c.config.productVariables.SystemExtSepolicyPrebuiltApiDir)
}
func (c *deviceConfig) ProductSepolicyPrebuiltApiDir() string {
return String(c.config.productVariables.ProductSepolicyPrebuiltApiDir)
}
func (c *deviceConfig) IsPartnerTrebleSepolicyTestEnabled() bool {
return c.SystemExtSepolicyPrebuiltApiDir() != "" || c.ProductSepolicyPrebuiltApiDir() != ""
}
func (c *deviceConfig) DirectedVendorSnapshot() bool { func (c *deviceConfig) DirectedVendorSnapshot() bool {
return c.config.productVariables.DirectedVendorSnapshot return c.config.productVariables.DirectedVendorSnapshot
} }

3
android/variable.go
View File

@@ -364,6 +364,9 @@ type productVariables struct {
PlatformSepolicyVersion *string `json:",omitempty"` PlatformSepolicyVersion *string `json:",omitempty"`
TotSepolicyVersion *string `json:",omitempty"` TotSepolicyVersion *string `json:",omitempty"`
SystemExtSepolicyPrebuiltApiDir *string `json:",omitempty"`
ProductSepolicyPrebuiltApiDir *string `json:",omitempty"`
PlatformSepolicyCompatVersions []string `json:",omitempty"` PlatformSepolicyCompatVersions []string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"` VendorVars map[string]map[string]string `json:",omitempty"`