diff --git a/android/config.go b/android/config.go index 89467d8db..4e59ced6f 100644 --- a/android/config.go +++ b/android/config.go @@ -1360,6 +1360,18 @@ func (c *deviceConfig) BoardMoveRecoveryResourcesToVendorBoot() bool { return Bool(c.config.productVariables.BoardMoveRecoveryResourcesToVendorBoot) } +func (c *deviceConfig) PlatformSepolicyVersion() string { + return String(c.config.productVariables.PlatformSepolicyVersion) +} + +func (c *deviceConfig) BoardSepolicyVers() string { + return String(c.config.productVariables.BoardSepolicyVers) +} + +func (c *deviceConfig) BoardReqdMaskPolicy() []string { + return c.config.productVariables.BoardReqdMaskPolicy +} + // 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 753ddd7f7..fd7708ecd 100644 --- a/android/variable.go +++ b/android/variable.go @@ -311,10 +311,14 @@ type productVariables struct { BoardVendorSepolicyDirs []string `json:",omitempty"` BoardOdmSepolicyDirs []string `json:",omitempty"` + BoardReqdMaskPolicy []string `json:",omitempty"` SystemExtPublicSepolicyDirs []string `json:",omitempty"` SystemExtPrivateSepolicyDirs []string `json:",omitempty"` BoardSepolicyM4Defs []string `json:",omitempty"` + BoardSepolicyVers *string `json:",omitempty"` + PlatformSepolicyVersion *string `json:",omitempty"` + VendorVars map[string]map[string]string `json:",omitempty"` Ndk_abis *bool `json:",omitempty"`