From a1448e072e00f6b3e6bfa2ffcd544996db48cd30 Mon Sep 17 00:00:00 2001 From: Ikjoon Jang Date: Thu, 8 Feb 2024 02:51:08 +0000 Subject: [PATCH] Revert "Remove unused ToTSepolicyVersion" Revert submission 2952245-vfrc_as_tot_sepolicy Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=mainline_modules_arm64-mainline-userdebug&lkgb=11421838&lkbb=11421957&fkbb=11421841, b/324335916 Reverted changes: /q/submissionid:2952245-vfrc_as_tot_sepolicy Bug: 324335916 Change-Id: I803ccc4c2d1e96f9e36b9d91eebc3e18e50b238f --- android/config.go | 4 ++++ android/variable.go | 1 + 2 files changed, 5 insertions(+) diff --git a/android/config.go b/android/config.go index b162cfb54..d94a86f71 100644 --- a/android/config.go +++ b/android/config.go @@ -1706,6 +1706,10 @@ func (c *deviceConfig) PlatformSepolicyVersion() string { return String(c.config.productVariables.PlatformSepolicyVersion) } +func (c *deviceConfig) TotSepolicyVersion() string { + return String(c.config.productVariables.TotSepolicyVersion) +} + func (c *deviceConfig) PlatformSepolicyCompatVersions() []string { return c.config.productVariables.PlatformSepolicyCompatVersions } diff --git a/android/variable.go b/android/variable.go index 758967e23..a4917c54c 100644 --- a/android/variable.go +++ b/android/variable.go @@ -383,6 +383,7 @@ type ProductVariables struct { BoardSepolicyVers *string `json:",omitempty"` PlatformSepolicyVersion *string `json:",omitempty"` + TotSepolicyVersion *string `json:",omitempty"` SystemExtSepolicyPrebuiltApiDir *string `json:",omitempty"` ProductSepolicyPrebuiltApiDir *string `json:",omitempty"`