diff options
| author | 2022-01-10 03:20:31 +0000 | |
|---|---|---|
| committer | 2022-01-10 03:20:31 +0000 | |
| commit | 5d7c3f2be3b90ec2d9a7d8b0a8c8b9e226ba5d51 (patch) | |
| tree | 24d17b35f1f4bc65f262915f1cbcce619d888ce3 | |
| parent | 9572267fc22d8b87041e8c23bdb1dbdd71a248af (diff) | |
| parent | dd196cca96ff5f2583038d9657a6c452df0b7378 (diff) | |
Merge "Add sepolicy compat versions to soong config" am: bac9e97c50 am: 44e4c47c47 am: aff62cef5e am: dd196cca96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940897
Change-Id: Idb6de161c27a191eca19d515393fc17aed1984e6
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | android/variable.go | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index 0187a8ad5..afc138b1f 100644 --- a/android/config.go +++ b/android/config.go @@ -1469,6 +1469,10 @@ func (c *deviceConfig) TotSepolicyVersion() string { return String(c.config.productVariables.TotSepolicyVersion) } +func (c *deviceConfig) PlatformSepolicyCompatVersions() []string { + return c.config.productVariables.PlatformSepolicyCompatVersions +} + func (c *deviceConfig) BoardSepolicyVers() string { if ver := String(c.config.productVariables.BoardSepolicyVers); ver != "" { return ver diff --git a/android/variable.go b/android/variable.go index 06a563add..8ad30cf06 100644 --- a/android/variable.go +++ b/android/variable.go @@ -364,6 +364,8 @@ type productVariables struct { PlatformSepolicyVersion *string `json:",omitempty"` TotSepolicyVersion *string `json:",omitempty"` + PlatformSepolicyCompatVersions []string `json:",omitempty"` + VendorVars map[string]map[string]string `json:",omitempty"` Ndk_abis *bool `json:",omitempty"` |