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

Commit b8db0461 authored by Cole Faust's avatar Cole Faust
Browse files

Create the build fingerprint file during product config 

So that soong-only builds still get the fingerprint file.

Bug: 382524110
Test: Presubmits
Change-Id: Ic1f13d0fe8e434da9710d72c7ea7aebe6321e677
parent 82cb48b8

core/config.mk

+55 −0
Original line number Diff line number Diff line
@@ -1333,3 +1333,58 @@ ifeq (false,$(SYSTEM_OPTIMIZE_JAVA)) 
$(error SYSTEM_OPTIMIZE_JAVA must be enabled when FULL_SYSTEM_OPTIMIZE_JAVA is enabled)

endif

endif



# -----------------------------------------------------------------

# Define fingerprint, thumbprint, and version tags for the current build

#

# BUILD_VERSION_TAGS is a comma-separated list of tags chosen by the device

# implementer that further distinguishes the build. It's basically defined

# by the device implementer. Here, we are adding a mandatory tag that

# identifies the signing config of the build.

BUILD_VERSION_TAGS := $(BUILD_VERSION_TAGS)

ifeq ($(TARGET_BUILD_TYPE),debug)

  BUILD_VERSION_TAGS += debug

endif

# The "test-keys" tag marks builds signed with the old test keys,

# which are available in the SDK.  "dev-keys" marks builds signed with

# non-default dev keys (usually private keys from a vendor directory).

# Both of these tags will be removed and replaced with "release-keys"

# when the target-files is signed in a post-build step.

ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)

BUILD_KEYS := test-keys

else

BUILD_KEYS := dev-keys

endif

BUILD_VERSION_TAGS += $(BUILD_KEYS)

BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))



# BUILD_FINGERPRINT is used used to uniquely identify the combined build and

# product; used by the OTA server.

ifeq (,$(strip $(BUILD_FINGERPRINT)))

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

endif



BUILD_FINGERPRINT_FILE := $(PRODUCT_OUT)/build_fingerprint.txt

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) >$(BUILD_FINGERPRINT_FILE).tmp && (if ! cmp -s $(BUILD_FINGERPRINT_FILE).tmp $(BUILD_FINGERPRINT_FILE); then mv $(BUILD_FINGERPRINT_FILE).tmp $(BUILD_FINGERPRINT_FILE); else rm $(BUILD_FINGERPRINT_FILE).tmp; fi) && grep " " $(BUILD_FINGERPRINT_FILE)))

  $(error BUILD_FINGERPRINT cannot contain spaces: "$(file <$(BUILD_FINGERPRINT_FILE))")

endif

BUILD_FINGERPRINT_FROM_FILE := $$(cat $(BUILD_FINGERPRINT_FILE))

# unset it for safety.

BUILD_FINGERPRINT :=



# BUILD_THUMBPRINT is used to uniquely identify the system build; used by the

# OTA server. This purposefully excludes any product-specific variables.

ifeq (,$(strip $(BUILD_THUMBPRINT)))

  BUILD_THUMBPRINT := $(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER_FROM_FILE):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

endif



BUILD_THUMBPRINT_FILE := $(PRODUCT_OUT)/build_thumbprint.txt

ifeq ($(strip $(HAS_BUILD_NUMBER)),true)

$(BUILD_THUMBPRINT_FILE): $(BUILD_NUMBER_FILE)

endif

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_THUMBPRINT) >$(BUILD_THUMBPRINT_FILE) && grep " " $(BUILD_THUMBPRINT_FILE)))

  $(error BUILD_THUMBPRINT cannot contain spaces: "$(file <$(BUILD_THUMBPRINT_FILE))")

endif

# unset it for safety.

BUILD_THUMBPRINT_FILE :=

BUILD_THUMBPRINT :=

core/sysprop.mk

+0 −55
Original line number Diff line number Diff line
@@ -160,61 +160,6 @@ endif 
$(call declare-1p-target,$(2))

endef



# -----------------------------------------------------------------

# Define fingerprint, thumbprint, and version tags for the current build

#

# BUILD_VERSION_TAGS is a comma-separated list of tags chosen by the device

# implementer that further distinguishes the build. It's basically defined

# by the device implementer. Here, we are adding a mandatory tag that

# identifies the signing config of the build.

BUILD_VERSION_TAGS := $(BUILD_VERSION_TAGS)

ifeq ($(TARGET_BUILD_TYPE),debug)

  BUILD_VERSION_TAGS += debug

endif

# The "test-keys" tag marks builds signed with the old test keys,

# which are available in the SDK.  "dev-keys" marks builds signed with

# non-default dev keys (usually private keys from a vendor directory).

# Both of these tags will be removed and replaced with "release-keys"

# when the target-files is signed in a post-build step.

ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)

BUILD_KEYS := test-keys

else

BUILD_KEYS := dev-keys

endif

BUILD_VERSION_TAGS += $(BUILD_KEYS)

BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))



# BUILD_FINGERPRINT is used used to uniquely identify the combined build and

# product; used by the OTA server.

ifeq (,$(strip $(BUILD_FINGERPRINT)))

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

endif



BUILD_FINGERPRINT_FILE := $(PRODUCT_OUT)/build_fingerprint.txt

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) >$(BUILD_FINGERPRINT_FILE).tmp && (if ! cmp -s $(BUILD_FINGERPRINT_FILE).tmp $(BUILD_FINGERPRINT_FILE); then mv $(BUILD_FINGERPRINT_FILE).tmp $(BUILD_FINGERPRINT_FILE); else rm $(BUILD_FINGERPRINT_FILE).tmp; fi) && grep " " $(BUILD_FINGERPRINT_FILE)))

  $(error BUILD_FINGERPRINT cannot contain spaces: "$(file <$(BUILD_FINGERPRINT_FILE))")

endif

BUILD_FINGERPRINT_FROM_FILE := $$(cat $(BUILD_FINGERPRINT_FILE))

# unset it for safety.

BUILD_FINGERPRINT :=



# BUILD_THUMBPRINT is used to uniquely identify the system build; used by the

# OTA server. This purposefully excludes any product-specific variables.

ifeq (,$(strip $(BUILD_THUMBPRINT)))

  BUILD_THUMBPRINT := $(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER_FROM_FILE):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

endif



BUILD_THUMBPRINT_FILE := $(PRODUCT_OUT)/build_thumbprint.txt

ifeq ($(strip $(HAS_BUILD_NUMBER)),true)

$(BUILD_THUMBPRINT_FILE): $(BUILD_NUMBER_FILE)

endif

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_THUMBPRINT) >$(BUILD_THUMBPRINT_FILE) && grep " " $(BUILD_THUMBPRINT_FILE)))

  $(error BUILD_THUMBPRINT cannot contain spaces: "$(file <$(BUILD_THUMBPRINT_FILE))")

endif

# unset it for safety.

BUILD_THUMBPRINT_FILE :=

BUILD_THUMBPRINT :=



KNOWN_OEM_THUMBPRINT_PROPERTIES := \

    ro.product.brand \

    ro.product.name \