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

Commit 7cf0b6c0 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

build: Add support for vendor product and device name 

 * CM's build system assumes some convention-over-configuration which
   we might need to override in order to conform to vendor requirements.
 * Allow overriding of target and product names using these new
   variables. This allows for CM conventions to work, while generating
   the correct fingerprint dynamically without post processing the
   strings.

Change-Id: Ic5913e587400dd38c04aa05de3a7becced77a59e
parent a6273590

core/Makefile

+14 −4
Original line number Diff line number Diff line
@@ -113,13 +113,23 @@ BUILD_VERSION_TAGS += dev-keys 
endif

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,

# we can allow that too.

ifeq ($(TARGET_VENDOR_PRODUCT_NAME),)

TARGET_VENDOR_PRODUCT_NAME := $(TARGET_PRODUCT)

endif



ifeq ($(TARGET_VENDOR_DEVICE_NAME),)

TARGET_VENDOR_DEVICE_NAME := $(TARGET_DEVICE)

endif



# A human-readable string that descibes this build in detail.

build_desc := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER) $(BUILD_VERSION_TAGS)

build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER) $(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_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

  BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_VENDOR_PRODUCT_NAME)/$(TARGET_VENDOR_DEVICE_NAME):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

endif

ifneq ($(words $(BUILD_FINGERPRINT)),1)

  $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
@@ -178,9 +188,9 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
	@echo Target buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \

			TARGET_DEVICE="$(TARGET_DEVICE)" \

			TARGET_DEVICE="$(TARGET_VENDOR_DEVICE_NAME)" \

			CM_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_NAME="$(TARGET_VENDOR_PRODUCT_NAME)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_DEFAULT_LANGUAGE="$(call default-locale-language,$(PRODUCT_LOCALES))" \

			PRODUCT_DEFAULT_REGION="$(call default-locale-region,$(PRODUCT_LOCALES))" \