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

Commit f20c233b authored by Artur Satayev's avatar Artur Satayev Committed by Automerger Merge Worker
Browse files

Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e1 am: 206f0239 

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

Change-Id: Ie7320298cd0c1fa511e2174e13fe4f34fe1e8ac5
parents 0171332b 206f0239

core/sysprop.mk

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

	        PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \

	        PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \

	        PLATFORM_VERSION_KNOWN_CODENAMES="$(PLATFORM_VERSION_KNOWN_CODENAMES)" \

	        PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION="$(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION)" \

	        BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

	        $(if $(OEM_THUMBPRINT_PROPERTIES),BUILD_THUMBPRINT="$(BUILD_THUMBPRINT_FROM_FILE)") \

core/version_defaults.mk

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ PLATFORM_SDK_EXTENSION_VERSION := 1 
PLATFORM_BASE_SDK_EXTENSION_VERSION := 1

.KATI_READONLY := PLATFORM_BASE_SDK_EXTENSION_VERSION



# This is are all known codenames starting from Q.

PLATFORM_VERSION_KNOWN_CODENAMES := Q R S Sv2 Tiramisu

# Convert from space separated list to comma separated

PLATFORM_VERSION_KNOWN_CODENAMES := \

  $(call normalize-comma-list,$(PLATFORM_VERSION_KNOWN_CODENAMES))

.KATI_READONLY := PLATFORM_VERSION_KNOWN_CODENAMES



ifndef PLATFORM_SECURITY_PATCH

    #  Used to indicate the security patch that has been applied to the device.

    #  It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin.

core/version_util.mk

+9 −0
Original line number Diff line number Diff line
@@ -90,6 +90,15 @@ endif 
  PLATFORM_VERSION_CODENAME \

  PLATFORM_VERSION_ALL_CODENAMES



ifneq (REL,$(PLATFORM_VERSION_CODENAME))

  codenames := \

    $(subst $(comma),$(space),$(strip $(PLATFORM_VERSION_KNOWN_CODENAMES)))

  ifeq ($(filter $(PLATFORM_VERSION_CODENAME),$(codenames)),)

    $(error '$(PLATFORM_VERSION_CODENAME)' is not in '$(codenames)'. \

        Add PLATFORM_VERSION_CODENAME to PLATFORM_VERSION_KNOWN_CODENAMES)

  endif

endif



ifndef PLATFORM_VERSION

  ifeq (REL,$(PLATFORM_VERSION_CODENAME))

      PLATFORM_VERSION := $(PLATFORM_VERSION_LAST_STABLE)

tools/buildinfo.sh

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION" 
echo "ro.build.version.preview_sdk_fingerprint=$PLATFORM_PREVIEW_SDK_FINGERPRINT"

echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME"

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.security_patch=$PLATFORM_SECURITY_PATCH"