StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Allow to override fastboot-info.txt for specific..."

Browse Source 
Revert submission 2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Reason for revert: Some images weren't available in Android.mk

Reverted changes: /q/submissionid:2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Bug: 315866782
Test: confirmed bluejay abtd build has correct fastboot-info.txt

Change-Id: Id75d879119744ab97225e5a551e8d32a1b09a356
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
This commit is contained in:
Dmitrii Merkurev
2023-12-14 02:59:47 +00:00
parent 728fe988d8
commit 901136e9d8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -5626,7 +5626,12 @@ endif # build_otatools_package
FASTBOOT_INFO_VERSION = 1 FASTBOOT_INFO_VERSION = 1
INSTALLED_FASTBOOT_INFO_TARGET := $(PRODUCT_OUT)/fastboot-info.txt INSTALLED_FASTBOOT_INFO_TARGET := $(PRODUCT_OUT)/fastboot-info.txt
ifdef TARGET_BOARD_FASTBOOT_INFO_FILE
$(INSTALLED_FASTBOOT_INFO_TARGET): $(TARGET_BOARD_FASTBOOT_INFO_FILE)
rm -f $@
$(call pretty,"Target fastboot-info.txt: $@")
$(hide) cp $< $@
else
$(INSTALLED_FASTBOOT_INFO_TARGET): $(INSTALLED_FASTBOOT_INFO_TARGET):
rm -f $@ rm -f $@
$(call pretty,"Target fastboot-info.txt: $@") $(call pretty,"Target fastboot-info.txt: $@")
@@ -5685,6 +5690,7 @@ endif
ifeq ($(BOARD_USES_METADATA_PARTITION),true) ifeq ($(BOARD_USES_METADATA_PARTITION),true)
$(hide) echo "if-wipe erase metadata" >> $@ $(hide) echo "if-wipe erase metadata" >> $@
endif endif
endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# misc_info.txt # misc_info.txt