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)