From 68af924f54840c0d80454bf8015817b2d7c82824 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 17 May 2023 09:15:59 +0000
Subject: [PATCH] Don't add build ID to version name

There is no clear reason why this should be done, and there is evidence
of it causing confusion & minor problems.

Bug: 186432595
Test: m nothing & grep AppsDefaultVersionName out/soong/soong.variables
Change-Id: I46243b4cfb3b23f2229bc1275c6ee96c1cee01d3
---
 core/config.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index e272389514..f5037649b7 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1230,16 +1230,7 @@ RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcomp
 RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20
 RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13
 
-# Add BUILD_NUMBER to apps default version name if it's unbundled build.
-ifdef TARGET_BUILD_APPS
-TARGET_BUILD_WITH_APPS_VERSION_NAME := true
-endif
-
-ifdef TARGET_BUILD_WITH_APPS_VERSION_NAME
-APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)
-else
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)
-endif
 
 # ANDROID_WARNING_ALLOWED_PROJECTS is generated by build/soong.
 define find_warning_allowed_projects