StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add sepolicy compat versions to soong config" am: bac9e97c50 am: 44e4c47c47

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940897

Change-Id: I703899159e8697f57de160eebd10f9530b592981
This commit is contained in:
Treehugger Robot
2022-01-10 02:45:03 +00:00
committed by Automerger Merge Worker
parent fa67fade6f 44e4c47c47
commit aff62cef5e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1469,6 +1469,10 @@ func (c *deviceConfig) TotSepolicyVersion() string {
return String(c.config.productVariables.TotSepolicyVersion) return String(c.config.productVariables.TotSepolicyVersion)
} }
func (c *deviceConfig) PlatformSepolicyCompatVersions() []string {
return c.config.productVariables.PlatformSepolicyCompatVersions
}
func (c *deviceConfig) BoardSepolicyVers() string { func (c *deviceConfig) BoardSepolicyVers() string {
if ver := String(c.config.productVariables.BoardSepolicyVers); ver != "" { if ver := String(c.config.productVariables.BoardSepolicyVers); ver != "" {
return ver return ver

2
android/variable.go
View File

@@ -364,6 +364,8 @@ type productVariables struct {
PlatformSepolicyVersion *string `json:",omitempty"` PlatformSepolicyVersion *string `json:",omitempty"`
TotSepolicyVersion *string `json:",omitempty"` TotSepolicyVersion *string `json:",omitempty"`
PlatformSepolicyCompatVersions []string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"` VendorVars map[string]map[string]string `json:",omitempty"`
Ndk_abis *bool `json:",omitempty"` Ndk_abis *bool `json:",omitempty"`