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

Commit aa069668 authored by Dmitrii Merkurev's avatar Dmitrii Merkurev Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893 am: 9f2bf543 am: fd02c766

Original change: https://android-review.googlesource.com/c/platform/build/+/2875335



Change-Id: Iac8bba0df1f95b6aa7f8978097b422d19bfcb85f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4b26532 fd02c766

core/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -5626,7 +5626,12 @@ endif # build_otatools_package 
FASTBOOT_INFO_VERSION = 1



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):

	rm -f $@

	$(call pretty,"Target fastboot-info.txt: $@")
@@ -5685,6 +5690,7 @@ endif 
ifeq ($(BOARD_USES_METADATA_PARTITION),true)

	$(hide) echo "if-wipe erase metadata" >> $@

endif

endif



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

#  misc_info.txt