Merge "Don't add build ID to version name"

This commit is contained in:
Anton Hansson
2023-05-22 17:43:10 +00:00
committed by Gerrit Code Review

View File

@@ -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_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 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) APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)
endif
# ANDROID_WARNING_ALLOWED_PROJECTS is generated by build/soong. # ANDROID_WARNING_ALLOWED_PROJECTS is generated by build/soong.
define find_warning_allowed_projects define find_warning_allowed_projects