diff options
| author | 2021-01-06 05:07:05 +0000 | |
|---|---|---|
| committer | 2021-01-06 05:07:05 +0000 | |
| commit | 4a6d53d6cd5e4d5fcbfd3977de0c59635bc8f8da (patch) | |
| tree | 2839c810a6e4d0f3ebc7165b1c318439386b8f01 | |
| parent | 0d96ed8d5b0153eb5186d86bbf66678cf9c12756 (diff) | |
| parent | 16ebd5a0062580bbba2c8b25f4ec53a1fd8f771c (diff) | |
Merge "Support building mixed versions of sepolicy"
| -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 89964a6bb..58372ec89 100644 --- a/android/config.go +++ b/android/config.go @@ -1364,6 +1364,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 3310e5fd2..1455fc216 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"` |