Merge "Revert^2 "Remove unused ToTSepolicyVersion"" into main am: 47074225df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2960342 Change-Id: I359475c38a38f77e18800f614b3e5e4fa1ab7454 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1742,10 +1742,6 @@ 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
|
||||
}
|
||||
|
@@ -383,7 +383,6 @@ type ProductVariables struct {
|
||||
|
||||
BoardSepolicyVers *string `json:",omitempty"`
|
||||
PlatformSepolicyVersion *string `json:",omitempty"`
|
||||
TotSepolicyVersion *string `json:",omitempty"`
|
||||
|
||||
SystemExtSepolicyPrebuiltApiDir *string `json:",omitempty"`
|
||||
ProductSepolicyPrebuiltApiDir *string `json:",omitempty"`
|
||||
|
Reference in New Issue
Block a user