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

Merge "Revert "Remove unused ToTSepolicyVersion"" into main am: 62e3c24757

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

Change-Id: Ic4502d052195cd48c6a41fdba6abd47325fb9810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ikjoon Jang
2024-02-08 04:50:47 +00:00
committed by Automerger Merge Worker
parent ca4c122503 62e3c24757
commit 492a76e1c5
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1736,6 +1736,10 @@ func (c *deviceConfig) PlatformSepolicyVersion() string {
return String(c.config.productVariables.PlatformSepolicyVersion) return String(c.config.productVariables.PlatformSepolicyVersion)
} }
func (c *deviceConfig) TotSepolicyVersion() string {
return String(c.config.productVariables.TotSepolicyVersion)
}
func (c *deviceConfig) PlatformSepolicyCompatVersions() []string { func (c *deviceConfig) PlatformSepolicyCompatVersions() []string {
return c.config.productVariables.PlatformSepolicyCompatVersions return c.config.productVariables.PlatformSepolicyCompatVersions
} }

1
android/variable.go
View File

@@ -383,6 +383,7 @@ type ProductVariables struct {
BoardSepolicyVers *string `json:",omitempty"` BoardSepolicyVers *string `json:",omitempty"`
PlatformSepolicyVersion *string `json:",omitempty"` PlatformSepolicyVersion *string `json:",omitempty"`
TotSepolicyVersion *string `json:",omitempty"`
SystemExtSepolicyPrebuiltApiDir *string `json:",omitempty"` SystemExtSepolicyPrebuiltApiDir *string `json:",omitempty"`
ProductSepolicyPrebuiltApiDir *string `json:",omitempty"` ProductSepolicyPrebuiltApiDir *string `json:",omitempty"`