Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main

This commit is contained in:
Jihoon Kang 2023-09-26 17:49:25 +00:00 committed by Gerrit Code Review
commit 596d514744
10 changed files with 19 additions and 1 deletions

View file

@ -445,6 +445,8 @@ _product_single_value_vars += PRODUCT_CHECK_VENDOR_SEAPP_VIOLATIONS
_product_list_vars += PRODUCT_AFDO_PROFILES _product_list_vars += PRODUCT_AFDO_PROFILES
_product_single_value_vars += PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API
.KATI_READONLY := _product_single_value_vars _product_list_vars .KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

View file

@ -372,6 +372,8 @@ $(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse)
$(call add_json_bool, CopyImagesForTargetFilesZip, $(filter true,$(COPY_IMAGES_FOR_TARGET_FILES_ZIP))) $(call add_json_bool, CopyImagesForTargetFilesZip, $(filter true,$(COPY_IMAGES_FOR_TARGET_FILES_ZIP)))
$(call end_json_map) $(call end_json_map)
$(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))
$(call json_end) $(call json_end)
$(file >$(SOONG_VARIABLES).tmp,$(json_contents)) $(file >$(SOONG_VARIABLES).tmp,$(json_contents))

View file

@ -16,3 +16,5 @@
PRODUCT_NAME := mainline_sdk PRODUCT_NAME := mainline_sdk
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_sdk PRODUCT_DEVICE := mainline_sdk
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

View file

@ -22,3 +22,5 @@ TARGET_SUPPORTS_64_BIT_APPS := true
PRODUCT_NAME := sdk_arm64 PRODUCT_NAME := sdk_arm64
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_arm64 PRODUCT_DEVICE := mainline_arm64
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

View file

@ -63,4 +63,4 @@ PRODUCT_MODEL := Android SDK built for arm64
# library name, so the check fails. # library name, so the check fails.
PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

View file

@ -62,3 +62,5 @@ PRODUCT_MODEL := Android SDK built for arm
# RadioConfigLib), which makes it impossible to translate their module names to # RadioConfigLib), which makes it impossible to translate their module names to
# library name, so the check fails. # library name, so the check fails.
PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

View file

@ -57,3 +57,5 @@ PRODUCT_MODEL := Android SDK built for x86
# RadioConfigLib), which makes it impossible to translate their module names to # RadioConfigLib), which makes it impossible to translate their module names to
# library name, so the check fails. # library name, so the check fails.
PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

View file

@ -58,3 +58,5 @@ PRODUCT_MODEL := Android SDK built for x86_64
# RadioConfigLib), which makes it impossible to translate their module names to # RadioConfigLib), which makes it impossible to translate their module names to
# library name, so the check fails. # library name, so the check fails.
PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

View file

@ -22,3 +22,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
PRODUCT_NAME := sdk_x86_64 PRODUCT_NAME := sdk_x86_64
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86 PRODUCT_DEVICE := mainline_x86
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

View file

@ -25,3 +25,5 @@ TARGET_SUPPORTS_64_BIT_APPS := true
PRODUCT_NAME := sdk_x86_64 PRODUCT_NAME := sdk_x86_64
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86_64 PRODUCT_DEVICE := mainline_x86_64
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true