Merge "Remove RELEASE_EXPOSE_FLAGGED_API and PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API export" into main am: 0ac2d7fb7a

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

Change-Id: Ib24751f30a951da6ceb3fb93f104c710e49356ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-01-17 00:59:37 +00:00 committed by Automerger Merge Worker
commit 51aab38cd3
4 changed files with 0 additions and 8 deletions

View file

@ -446,7 +446,6 @@ _product_single_value_vars += PRODUCT_CHECK_DEV_TYPE_VIOLATIONS
_product_list_vars += PRODUCT_AFDO_PROFILES
_product_single_value_vars += PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API
_product_single_value_vars += PRODUCT_SCUDO_ALLOCATION_RING_BUFFER_SIZE
_product_list_vars += PRODUCT_RELEASE_CONFIG_MAPS

View file

@ -47,7 +47,6 @@ $(call add_json_str, Platform_version_last_stable, $(PLATFORM_VERSION_LAST
$(call add_json_str, Platform_version_known_codenames, $(PLATFORM_VERSION_KNOWN_CODENAMES))
$(call add_json_bool, Release_aidl_use_unfrozen, $(RELEASE_AIDL_USE_UNFROZEN))
$(call add_json_bool, Release_expose_flagged_api, $(RELEASE_EXPOSE_FLAGGED_API))
$(call add_json_str, Platform_min_supported_target_sdk_version, $(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION))
@ -396,8 +395,6 @@ $(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse)
$(call add_json_list, ProductPackages, $(sort $(PRODUCT_PACKAGES)))
$(call end_json_map)
$(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))
$(call add_json_bool, BuildFromSourceStub, $(findstring true,$(PRODUCT_BUILD_FROM_SOURCE_STUB) $(BUILD_FROM_SOURCE_STUB)))
$(call json_end)

View file

@ -17,6 +17,4 @@ PRODUCT_NAME := mainline_sdk
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_sdk
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
PRODUCT_BUILD_FROM_SOURCE_STUB := true

View file

@ -29,6 +29,4 @@ PRODUCT_NAME := sdk
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
PRODUCT_BUILD_FROM_SOURCE_STUB := true