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

Commit b381c601 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Android (Google) Code Review
Browse files

Merge "Use RELEASE_PLATFORM_SDK_VERSION_FULL instead of... 

Merge "Use RELEASE_PLATFORM_SDK_VERSION_FULL instead of RELEASE_PLATFORM_SDK_MINOR_VERSION" into main
parents 9d0dd420 e506e5de

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ $(call add_json_bool, DisplayBuildNumber, $(filter true,$(DISPLAY 
$(call add_json_str,  Platform_display_version_name,     $(PLATFORM_DISPLAY_VERSION))

$(call add_json_str,  Platform_version_name,             $(PLATFORM_VERSION))

$(call add_json_val,  Platform_sdk_version,              $(PLATFORM_SDK_VERSION))

$(call add_json_val,  Platform_sdk_version_full,         $(PLATFORM_SDK_VERSION_FULL))

$(call add_json_str,  Platform_sdk_codename,             $(PLATFORM_VERSION_CODENAME))

$(call add_json_bool, Platform_sdk_final,                $(filter REL,$(PLATFORM_VERSION_CODENAME)))

$(call add_json_val,  Platform_sdk_extension_version,    $(PLATFORM_SDK_EXTENSION_VERSION))

core/sysprop.mk

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ define generate-common-build-props 
    echo "ro.$(1).build.version.release=$(PLATFORM_VERSION_LAST_STABLE)" >> $(2);\

    echo "ro.$(1).build.version.release_or_codename=$(PLATFORM_VERSION)" >> $(2);\

    echo "ro.$(1).build.version.sdk=$(PLATFORM_SDK_VERSION)" >> $(2);\

    echo "ro.$(1).build.version.sdk_minor=$(PLATFORM_SDK_MINOR_VERSION)" >> $(2);\

    echo "ro.$(1).build.version.sdk_full=$(PLATFORM_SDK_VERSION_FULL)" >> $(2);\



endef

core/version_util.mk

+12 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#     PLATFORM_VERSION

#     PLATFORM_DISPLAY_VERSION

#     PLATFORM_SDK_VERSION

#     PLATFORM_SDK_VERSION_FULL

#     PLATFORM_SDK_EXTENSION_VERSION

#     PLATFORM_BASE_SDK_EXTENSION_VERSION

#     PLATFORM_VERSION_CODENAME
@@ -62,11 +63,18 @@ endif 
PLATFORM_SDK_VERSION := $(RELEASE_PLATFORM_SDK_VERSION)

.KATI_READONLY := PLATFORM_SDK_VERSION



ifdef PLATFORM_SDK_MINOR_VERSION

  $(error Do not set PLATFORM_SDK_MINOR_VERSION directly. Use RELEASE_PLATFORM_SDK_MINOR_VERSION. value: $(PLATFORM_SDK_MINOR_VERSION))

ifdef PLATFORM_SDK_VERSION_FULL

  $(error Do not set PLATFORM_SDK_VERSION_FULL directly. Use RELEASE_PLATFORM_SDK_VERSION_FULL. value: $(PLATFORM_SDK_VERSION_FULL))

endif

PLATFORM_SDK_MINOR_VERSION := $(RELEASE_PLATFORM_SDK_MINOR_VERSION)

.KATI_READONLY := PLATFORM_SDK_MINOR_VERSION

ifeq ($(RELEASE_PLATFORM_SDK_VERSION_FULL),)

  PLATFORM_SDK_VERSION_FULL := "$(PLATFORM_SDK_VERSION).0"

else

  ifneq ($(RELEASE_PLATFORM_SDK_VERSION),$(word 1,$(subst ., ,$(RELEASE_PLATFORM_SDK_VERSION_FULL))))

    $(error if RELEASE_PLATFORM_SDK_VERSION_FULL ($(RELEASE_PLATFORM_SDK_VERSION_FULL)) is set, its major version must match RELEASE_PLATFORM_SDK_VERSION ($(RELEASE_PLATFORM_SDK_VERSION)))

  endif

  PLATFORM_SDK_VERSION_FULL := "$(RELEASE_PLATFORM_SDK_VERSION_FULL)"

endif

.KATI_READONLY := PLATFORM_SDK_VERSION_FULL



ifdef PLATFORM_SDK_EXTENSION_VERSION

  $(error Do not set PLATFORM_SDK_EXTENSION_VERSION directly. Use RELEASE_PLATFORM_SDK_EXTENSION_VERSION. value: $(PLATFORM_SDK_EXTENSION_VERSION))