diff options
-rw-r--r-- | core/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 5166c3a..20e8d49 100644 --- a/core/Makefile +++ b/core/Makefile @@ -131,13 +131,17 @@ ifeq ($(TARGET_VENDOR_BUILD_ID),) TARGET_VENDOR_BUILD_ID := $(BUILD_ID) endif +ifeq ($(TARGET_VENDOR_PLATFORM_VERSION),) +TARGET_VENDOR_PLATFORM_VERSION := $(PLATFORM_VERSION) +endif + # A human-readable string that descibes this build in detail. -build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(TARGET_VENDOR_BUILD_ID) $(TARGET_VENDOR_RELEASE_BUILD_ID) $(BUILD_VERSION_TAGS) +build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(TARGET_VENDOR_PLATFORM_VERSION) $(TARGET_VENDOR_BUILD_ID) $(TARGET_VENDOR_RELEASE_BUILD_ID) $(BUILD_VERSION_TAGS) $(INSTALLED_BUILD_PROP_TARGET): PRIVATE_BUILD_DESC := $(build_desc) # The string used to uniquely identify this build; used by the OTA server. ifeq (,$(strip $(BUILD_FINGERPRINT))) - BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_VENDOR_PRODUCT_NAME)/$(TARGET_VENDOR_DEVICE_NAME):$(PLATFORM_VERSION)/$(TARGET_VENDOR_BUILD_ID)/$(TARGET_VENDOR_RELEASE_BUILD_ID):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS) + BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_VENDOR_PRODUCT_NAME)/$(TARGET_VENDOR_DEVICE_NAME):$(TARGET_VENDOR_PLATFORM_VERSION)/$(TARGET_VENDOR_BUILD_ID)/$(TARGET_VENDOR_RELEASE_BUILD_ID):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS) endif ifneq ($(words $(BUILD_FINGERPRINT)),1) $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)") @@ -216,7 +220,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( $(PRODUCT_BUILD_PROP_OVERRIDES) \ BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_NUMBER="$(BUILD_NUMBER)" \ - PLATFORM_VERSION="$(PLATFORM_VERSION)" \ + PLATFORM_VERSION="$(TARGET_VENDOR_PLATFORM_VERSION)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \ |