From 7c282854f3148515deee26a70ff289f20a4fb62f Mon Sep 17 00:00:00 2001 From: Lance Chang Date: Mon, 10 Jun 2024 22:27:42 -0700 Subject: [PATCH] Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product variable This change allows unbundled app builds to embed the build number in the version name by defining PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER, so that APK files from a build can be easily identified. Ignore-AOSP-First: changes in topics with internal-only projects Test: manual build Bug: 340311907 Change-Id: If7feda5eec2bc1e54a90b4adae1bd6da19e3ea45 --- core/config.mk | 4 ++-- core/product.mk | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/config.mk b/core/config.mk index 949ea54e91..4bb9a42943 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 diff --git a/core/product.mk b/core/product.mk index 7908e1dcfe..d469c0e737 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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)