Merge "Add sepolicy prebuilt API dirs to soong config" am: 1d7209b820
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984570 Change-Id: Ifc0ae37046368f91913231ccaca4b864638c42fe
This commit is contained in:
commit
37575bcc6d
2 changed files with 15 additions and 0 deletions
|
@ -1530,6 +1530,18 @@ func (c *deviceConfig) BoardProductPrivatePrebuiltDirs() []string {
|
|||
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 {
|
||||
return c.config.productVariables.DirectedVendorSnapshot
|
||||
}
|
||||
|
|
|
@ -364,6 +364,9 @@ type productVariables struct {
|
|||
PlatformSepolicyVersion *string `json:",omitempty"`
|
||||
TotSepolicyVersion *string `json:",omitempty"`
|
||||
|
||||
SystemExtSepolicyPrebuiltApiDir *string `json:",omitempty"`
|
||||
ProductSepolicyPrebuiltApiDir *string `json:",omitempty"`
|
||||
|
||||
PlatformSepolicyCompatVersions []string `json:",omitempty"`
|
||||
|
||||
VendorVars map[string]map[string]string `json:",omitempty"`
|
||||
|
|
Loading…
Reference in a new issue