Merge changes from topic "revert-2755310-HIIDCMFNIU" into main

* changes:
  Revert "Add soong config variable Release_expose_flagged_api"
  Revert "Add flagged api hide conditional to droidstubs"
This commit is contained in:
Maxim Siniavine
2023-09-28 01:08:44 +00:00
committed by Gerrit Code Review
4 changed files with 0 additions and 48 deletions

View File

@@ -2084,11 +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)
}
func (c *deviceConfig) HideFlaggedApis() bool {
return c.NextReleaseHideFlaggedApi() && !c.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 {