Add more sepolicy variables to soong_config

Bug: 33691272
Test: m selinux_policy on sc-dev
Change-Id: I4a7288d5f4ff99233fbdb56a8fd92da2d6f2ef7d
This commit is contained in:
Inseob Kim
2021-09-15 03:04:53 +00:00
parent 7b32612dc4
commit a10ef270eb
2 changed files with 16 additions and 0 deletions

View File

@@ -1448,6 +1448,10 @@ func (c *deviceConfig) PlatformSepolicyVersion() string {
return String(c.config.productVariables.PlatformSepolicyVersion)
}
func (c *deviceConfig) TotSepolicyVersion() string {
return String(c.config.productVariables.TotSepolicyVersion)
}
func (c *deviceConfig) BoardSepolicyVers() string {
if ver := String(c.config.productVariables.BoardSepolicyVers); ver != "" {
return ver
@@ -1571,6 +1575,14 @@ func (c *deviceConfig) SepolicySplit() bool {
return c.config.productVariables.SepolicySplit
}
func (c *deviceConfig) SepolicyFreezeTestExtraDirs() []string {
return c.config.productVariables.SepolicyFreezeTestExtraDirs
}
func (c *deviceConfig) SepolicyFreezeTestExtraPrebuiltDirs() []string {
return c.config.productVariables.SepolicyFreezeTestExtraPrebuiltDirs
}
// The ConfiguredJarList struct provides methods for handling a list of (apex, jar) pairs.
// Such lists are used in the build system for things like bootclasspath jars or system server jars.
// The apex part is either an apex name, or a special names "platform" or "system_ext". Jar is a

View File

@@ -344,6 +344,7 @@ type productVariables struct {
BoardSepolicyVers *string `json:",omitempty"`
PlatformSepolicyVersion *string `json:",omitempty"`
TotSepolicyVersion *string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"`
@@ -407,6 +408,9 @@ type productVariables struct {
SelinuxIgnoreNeverallows bool `json:",omitempty"`
SepolicySplit bool `json:",omitempty"`
SepolicyFreezeTestExtraDirs []string `json:",omitempty"`
SepolicyFreezeTestExtraPrebuiltDirs []string `json:",omitempty"`
}
func boolPtr(v bool) *bool {