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

Commit 370a0ae0 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

versioning: Display the maintenance version 

Set maintenance version to MAINLINE for mainline branch.

Change-Id: I219d5aef297a9bb6cc74dd5916cb620d82d298f4
Ticket: CYNGNOS-1382
parent e5b8b5ad

config/common.mk

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common 


PRODUCT_VERSION_MAJOR = 12

PRODUCT_VERSION_MINOR = 1

PRODUCT_VERSION_MAINTENANCE = 0-RC0

PRODUCT_VERSION_MAINTENANCE = MAINLINE



# Set CM_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat
@@ -330,7 +330,7 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey) 
    else

      TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID)

    endif

    CM_DISPLAY_VERSION=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)

    CM_DISPLAY_VERSION=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(TARGET_VENDOR_RELEASE_BUILD_ID)

  endif

endif

endif