diff options
| -rw-r--r-- | android/config.go | 12 | ||||
| -rw-r--r-- | android/variable.go | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index 3e41fbb4f..971a20cc4 100644 --- a/android/config.go +++ b/android/config.go @@ -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 diff --git a/android/variable.go b/android/variable.go index a308d2b0b..1b6640853 100644 --- a/android/variable.go +++ b/android/variable.go @@ -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 { |