Merge "BF_BUILD_NUMBER should have BUILD_NUMBER" am: c07ff752aa
am: 306ce5c2bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2620172 Change-Id: Ic327692a817e374935350ec3bffa09aadb7f5832 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -174,7 +174,7 @@ ifeq (,$(strip $(BUILD_FINGERPRINT)))
|
|||||||
ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
|
ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
|
||||||
BF_BUILD_NUMBER := $(BUILD_USERNAME)$$($(DATE_FROM_FILE) +%m%d%H%M)
|
BF_BUILD_NUMBER := $(BUILD_USERNAME)$$($(DATE_FROM_FILE) +%m%d%H%M)
|
||||||
else
|
else
|
||||||
BF_BUILD_NUMBER := $$(cat $(SOONG_OUT_DIR)/build_hostname.txt)
|
BF_BUILD_NUMBER := $(BUILD_NUMBER_FROM_FILE)
|
||||||
endif
|
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_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user