Merge "Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product variable" into main

This commit is contained in:
Lance Chang 2024-06-11 23:27:08 +00:00 committed by Android (Google) Code Review
commit fbc3231fcb
2 changed files with 5 additions and 2 deletions

View file

@ -1193,8 +1193,8 @@ RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13
APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)
# Add BUILD_NUMBER to apps if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined.
ifeq ($(TARGET_BUILD_APPS_WITH_BUILD_NUMBER),true)
# Add BUILD_NUMBER to apps if PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER is defined.
ifeq ($(PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER),true)
APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)
endif

View file

@ -493,6 +493,9 @@ _product_single_value_vars += PRODUCT_16K_DEVELOPER_OPTION
# by this flag.
_product_single_value_vars += PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG
# If set, the default value of the versionName of apps will include the build number.
_product_single_value_vars += PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER
.KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)