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

Commit 8207190e authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'nougat-display-release-type-instead-of-keys' into 'v1-nougat' 

display release type instead of keys

See merge request !17
parents aa5ef1ee 537d8d5a

core/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -123,7 +123,14 @@ BUILD_KEYS := test-keys 
else

BUILD_KEYS := dev-keys

endif

BUILD_VERSION_TAGS += $(BUILD_KEYS)



ifndef RELEASE_TYPE

  BUILD_DISPLAY_KEYS := $(BUILD_KEYS)

else

  BUILD_DISPLAY_KEYS := $(RELEASE_TYPE)-keys

endif



BUILD_VERSION_TAGS += $(BUILD_DISPLAY_KEYS)

BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))



# If the final fingerprint should be different than what was used by the build system,
@@ -188,9 +195,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user) 


  # Dev. branches should have DISPLAY_BUILD_NUMBER set

  ifeq "true" "$(DISPLAY_BUILD_NUMBER)"

    BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS)

    BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_DISPLAY_KEYS)

  else

    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS)

    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_DISPLAY_KEYS)

  endif

else

  # Non-user builds should show detailed build information