Skip to content

Commit c5c1b37

Browse files
rmccaoleary
authored andcommitted
Add BOARD_CUSTOM_BOOTIMG_MK support
This is a combination of 2 commits. This is the 1st commit message: Add BOARD_CUSTOM_BOOTIMG_MK support Simplified version of the previous implementation. Recovery's ramdisk is spun off from the main recovery target again to allow overriding just the image-generation step [mikeioannina]: Squash cm-13.0 changes and adapt to N Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258 This is the commit message StagOS#2: build: Handle custom boot images properly When a pre-built image should be used, it should be stored in the target files zip so that it can be used with external signing processes. Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0 Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad [aleasto] Rewritten for R, where the recovery ramdisk is created via make dependencies, rather than $(call)s [mainey] Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
1 parent ab419ed commit c5c1b37

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

core/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,6 +2301,9 @@ ifneq ($(BOARD_NAND_SPARE_SIZE),)
23012301
$(error MTD device is no longer supported and thus BOARD_NAND_SPARE_SIZE is deprecated.)
23022302
endif
23032303

2304+
ifdef BOARD_CUSTOM_BOOTIMG_MK
2305+
include $(BOARD_CUSTOM_BOOTIMG_MK)
2306+
endif
23042307

23052308
ifdef BOARD_CUSTOM_BOOTIMG_MK
23062309
include $(BOARD_CUSTOM_BOOTIMG_MK)

0 commit comments

Comments
 (0)