Additional overrides (428c25c7) · Commits · e / os / android_build

core/Makefile

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -127,13 +127,17 @@ ifeq ($(TARGET_VENDOR_RELEASE_BUILD_ID),)
	TARGET_VENDOR_RELEASE_BUILD_ID := $(BUILD_NUMBER)		TARGET_VENDOR_RELEASE_BUILD_ID := $(BUILD_NUMBER)
	endif		endif

			ifeq ($(TARGET_VENDOR_BUILD_ID),)
			TARGET_VENDOR_BUILD_ID := $(BUILD_ID)
			endif

	# A human-readable string that descibes this build in detail.		# A human-readable string that descibes this build in detail.
	build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(TARGET_VENDOR_RELEASE_BUILD_ID) $(BUILD_VERSION_TAGS)		build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(TARGET_VENDOR_BUILD_ID) $(TARGET_VENDOR_RELEASE_BUILD_ID) $(BUILD_VERSION_TAGS)
	$(INSTALLED_BUILD_PROP_TARGET): PRIVATE_BUILD_DESC := $(build_desc)		$(INSTALLED_BUILD_PROP_TARGET): PRIVATE_BUILD_DESC := $(build_desc)

	# The string used to uniquely identify this build; used by the OTA server.		# The string used to uniquely identify this build; used by the OTA server.
	ifeq (,$(strip $(BUILD_FINGERPRINT)))		ifeq (,$(strip $(BUILD_FINGERPRINT)))
	BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_VENDOR_PRODUCT_NAME)/$(TARGET_VENDOR_DEVICE_NAME):$(PLATFORM_VERSION)/$(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):$(PLATFORM_VERSION)/$(TARGET_VENDOR_BUILD_ID)/$(TARGET_VENDOR_RELEASE_BUILD_ID):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
	endif		endif
	ifneq ($(words $(BUILD_FINGERPRINT)),1)		ifneq ($(words $(BUILD_FINGERPRINT)),1)
	$(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")		$(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
	@@ -146,9 +150,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user)

	# Dev. branches should have DISPLAY_BUILD_NUMBER set		# Dev. branches should have DISPLAY_BUILD_NUMBER set
	ifeq "true" "$(DISPLAY_BUILD_NUMBER)"		ifeq "true" "$(DISPLAY_BUILD_NUMBER)"
	BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER)		BUILD_DISPLAY_ID := $(TARGET_VENDOR_BUILD_ID).$(BUILD_NUMBER)
	else		else
	BUILD_DISPLAY_ID := $(BUILD_ID)		BUILD_DISPLAY_ID := $(TARGET_VENDOR_BUILD_ID)
	endif		endif
	else		else
	# Non-user builds should show detailed build information		# Non-user builds should show detailed build information
	@@ -202,7 +206,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(
	PRODUCT_MODEL="$(PRODUCT_MODEL)" \		PRODUCT_MODEL="$(PRODUCT_MODEL)" \
	PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \		PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \
	PRIVATE_BUILD_DESC="$(PRIVATE_BUILD_DESC)" \		PRIVATE_BUILD_DESC="$(PRIVATE_BUILD_DESC)" \
	BUILD_ID="$(BUILD_ID)" \		BUILD_ID="$(TARGET_VENDOR_BUILD_ID)" \
	TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \		TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \
	BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \		BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \
	TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \		TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \