commit 4203958e68bc2467c46c2dde8d851117d76f8809
author Lance Chang <jinwoong@google.com> Mon Jun 10 17:45:53 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 10 17:45:53 2024 +0000
tree 677ea87915e8b7751000a063dcf806273798d12f
parent 9a3900c7e947713cbdab2f37617e147b9368acc4
parent eda868679481b32556b87024aca735c8de28800b

Merge "Add build number if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined" into main

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 43304d5..949ea54 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1193,6 +1193,11 @@
 
 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)
+  APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)
+endif
+
 # ANDROID_WARNING_ALLOWED_PROJECTS is generated by build/soong.
 define find_warning_allowed_projects
     $(filter $(ANDROID_WARNING_ALLOWED_PROJECTS),$(1)/)