Revert^2 "Add flagged api hide conditional to droidstubs"
This reverts commit 1180919ddab993c4b0d1da81cd8fa242afc7303a.
Test: go test ./java && m TARGET_PRODUCT=sdk TESTING_TARGET_RELEASE_NEXT=true nothing and inspect ninja command for generating stubs and verify the flag is included && m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_food nothing and inspect ninja command for generating stubs and verify the flag is not included
Bug: 299570421
Change-Id: I4967376c0236bad729398af80fa59b48dbab5f21
diff --git a/android/config.go b/android/config.go
index 8113ed7..ee61b0f 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2088,3 +2088,7 @@
func (c *deviceConfig) ReleaseExposeFlaggedApi() bool {
return Bool(c.config.productVariables.Release_expose_flagged_api)
}
+
+func (c *deviceConfig) HideFlaggedApis() bool {
+ return c.NextReleaseHideFlaggedApi() && !c.ReleaseExposeFlaggedApi()
+}