Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45224146 authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d5147 

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



Change-Id: I1ca8eeb8b673300129ac45cba722f8d97cbfcf17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0d26421 596d5147

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -445,6 +445,8 @@ _product_single_value_vars += PRODUCT_CHECK_VENDOR_SEAPP_VIOLATIONS 


_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

_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -372,6 +372,8 @@ $(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse) 
  $(call add_json_bool, CopyImagesForTargetFilesZip, $(filter true,$(COPY_IMAGES_FOR_TARGET_FILES_ZIP)))

$(call end_json_map)



$(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))



$(call json_end)



$(file >$(SOONG_VARIABLES).tmp,$(json_contents))

target/product/mainline_sdk.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ 
PRODUCT_NAME := mainline_sdk

PRODUCT_BRAND := Android

PRODUCT_DEVICE := mainline_sdk



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

target/product/sdk_arm64.mk

+2 −0
Original line number Diff line number Diff line
@@ -22,3 +22,5 @@ TARGET_SUPPORTS_64_BIT_APPS := true 
PRODUCT_NAME := sdk_arm64

PRODUCT_BRAND := Android

PRODUCT_DEVICE := mainline_arm64



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

target/product/sdk_phone_arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -63,4 +63,4 @@ PRODUCT_MODEL := Android SDK built for arm64 
# library name, so the check fails.

PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true