Merge changes from topic "revert-2755310-HIIDCMFNIU" into main am: 4aa82a13db am: 12663c872e am: dbfe6b66dc

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

Change-Id: I0ebe53baaeda38335204c210076d35c568f3cd2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maxim Siniavine 2023-09-28 04:03:35 +00:00 committed by Automerger Merge Worker
commit 8f08662dee
2 changed files with 0 additions and 6 deletions

View file

@ -2084,7 +2084,3 @@ func (c *deviceConfig) CheckVendorSeappViolations() bool {
func (c *deviceConfig) NextReleaseHideFlaggedApi() bool {
return Bool(c.config.productVariables.NextReleaseHideFlaggedApi)
}
func (c *deviceConfig) ReleaseExposeFlaggedApi() bool {
return Bool(c.config.productVariables.ReleaseExposeFlaggedApi)
}

View file

@ -490,8 +490,6 @@ type ProductVariables struct {
PartitionVarsForBazelMigrationOnlyDoNotUse PartitionVariables `json:",omitempty"`
NextReleaseHideFlaggedApi *bool `json:",omitempty"`
ReleaseExposeFlaggedApi *bool `json:",omitempty"`
}
type PartitionVariables struct {