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

Unverified Commit 7385813d authored by Steve Kondik's avatar Steve Kondik Committed by Michael Bestas
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 d058d027

core/Makefile

+14 −4
Original line number Diff line number Diff line
@@ -127,8 +127,18 @@ endif 
BUILD_VERSION_TAGS += $(BUILD_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,

# 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_FROM_FILE) $(BUILD_VERSION_TAGS)

build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER_FROM_FILE) $(BUILD_VERSION_TAGS)

$(intermediate_system_build_prop): PRIVATE_BUILD_DESC := $(build_desc)



# The string used to uniquely identify the combined build and product; used by the OTA server.
@@ -140,7 +150,7 @@ ifeq (,$(strip $(BUILD_FINGERPRINT))) 
  else

    BF_BUILD_NUMBER := $(BUILD_NUMBER)

  endif

  BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

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

endif

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

  $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
@@ -215,9 +225,9 @@ ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES),) 
endif

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

			TARGET_BUILD_FLAVOR="$(TARGET_BUILD_FLAVOR)" \

			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_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \

			PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \