branding: Fix versioning props

* Two of them will be used in recovery as well as in some other
  places in the system.

Signed-off-by: Beru Hinode <windowz414@1337.lgbt>

config/branding.mk

@@ -10,6 +10,8 @@ CUSTOM_PLATFORM_VERSION := 13.0
 
 CUSTOM_VERSION := $(CUSTOM_PRODUCT_NAME)_$(CUSTOM_DEVICE)-$(CUSTOM_PLATFORM_VERSION)-$(CUSTOM_BUILD_DATE)-$(CUSTOM_BUILD_TYPE)
 
+CUSTOM_DISPLAY_VERSION := $(CUSTOM_PLATFORM_VERSION)-$(CUSTOM_BUILD_DATE)-$(CUSTOM_BUILD_TYPE)
+
 # Build fingerprint
 ifeq ($(BUILD_FINGERPRINT),)
 BUILD_NUMBER_CUSTOM := $(shell date -u +%H%M)
@@ -20,7 +22,7 @@ ADDITIONAL_SYSTEM_PROPERTIES += \
 
 ADDITIONAL_SYSTEM_PROPERTIES += \
     ro.custom.version=$(CUSTOM_VERSION) \
-    ro.custom.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
+    ro.custom.build.version=$(CUSTOM_PLATFORM_VERSION) \
     ro.custom.display.version=$(CUSTOM_DISPLAY_VERSION) \
     ro.custom.build_date=$(CUSTOM_BUILD_DATE) \
     ro.custom.build_date_utc=$(CUSTOM_BUILD_DATE_UTC) \