Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae4550ec authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f11 am: 552c2d1c am: 400a979b 

Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: Ib3921c70e5ba472126c9579d0ec3db3111a04635
parents f6007f31 400a979b

core/sysprop.mk

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B 
	        BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \

	        BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT="$(BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT)" \

	        PLATFORM_VERSION="$(PLATFORM_VERSION)" \

	        PLATFORM_DISPLAY_VERSION="$(PLATFORM_DISPLAY_VERSION)" \

	        PLATFORM_VERSION_LAST_STABLE="$(PLATFORM_VERSION_LAST_STABLE)" \

	        PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \

	        PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \

core/version_defaults.mk

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#

# Guarantees that the following are defined:

#     PLATFORM_VERSION

#     PLATFORM_DISPLAY_VERSION

#     PLATFORM_SDK_VERSION

#     PLATFORM_VERSION_CODENAME

#     DEFAULT_APP_TARGET_SDK
@@ -54,6 +55,11 @@ PLATFORM_VERSION_LAST_STABLE := 12 
# release build.  If this is a final release build, it is simply "REL".

PLATFORM_VERSION_CODENAME.TP1A := Tiramisu



# This is the user-visible version.  In a final release build it should

# be empty to use PLATFORM_VERSION as the user-visible version.  For

# a preview release it can be set to a user-friendly value like `12 Preview 1`

PLATFORM_DISPLAY_VERSION :=



ifndef PLATFORM_SDK_VERSION

  # This is the canonical definition of the SDK version, which defines

  # the set of APIs and functionality available in the platform.  It

core/version_util.mk

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ ifndef PLATFORM_VERSION 
endif

.KATI_READONLY := PLATFORM_VERSION



ifndef PLATFORM_DISPLAY_VERSION

  PLATFORM_DISPLAY_VERSION := $(PLATFORM_VERSION)

endif

.KATI_READONLY := PLATFORM_DISPLAY_VERSION



ifeq (REL,$(PLATFORM_VERSION_CODENAME))

  PLATFORM_PREVIEW_SDK_VERSION := 0

tools/buildinfo.sh

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES" 
echo "ro.build.version.known_codenames=$PLATFORM_VERSION_KNOWN_CODENAMES"

echo "ro.build.version.release=$PLATFORM_VERSION_LAST_STABLE"

echo "ro.build.version.release_or_codename=$PLATFORM_VERSION"

echo "ro.build.version.release_or_preview_display=$PLATFORM_DISPLAY_VERSION"

echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"

echo "ro.build.version.base_os=$PLATFORM_BASE_OS"

echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"