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

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

Change-Id: I51b0213f78192a3a6d8fc92a3e995e2fb16a606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maxim Siniavine
2023-09-28 01:55:28 +00:00
committed by Automerger Merge Worker
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 {