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

Commit ad6921e8 authored by David Hacker's avatar David Hacker Committed by dhacker29
Browse files

Overide define INSTALLED_BOOTLOADER_MODULE If board has locked 

bootloader.

Motorola devices with locked bootloaders do not hava a target
for bootloader and build fails with acp: file 'out/target/
product/xxx/bootloader' does not exist

Change-Id: I1857fff061d5aeed76e6e8797c11dc33c09078fd
parent 40d8267b

core/Makefile

+8 −6
Original line number Diff line number Diff line
@@ -1155,6 +1155,7 @@ endif 
ifdef INSTALLED_KERNEL_TARGET

	$(hide) $(ACP) $(INSTALLED_KERNEL_TARGET) $(zip_root)/BOOT/kernel

endif

ifneq ($(strip $(BOARD_HAS_LOCKED_BOOTLOADER)), true)

	ifdef INSTALLED_RAMDISK_TARGET

		$(hide) $(ACP) $(INSTALLED_RAMDISK_TARGET) $(zip_root)/BOOT/ramdisk.img

	endif
@@ -1162,6 +1163,7 @@ ifdef INSTALLED_BOOTLOADER_MODULE 
		$(hide) $(ACP) \

			$(INSTALLED_BOOTLOADER_MODULE) $(zip_root)/BOOT/bootloader

	endif

endif

ifdef INSTALLED_2NDBOOTLOADER_TARGET

	$(hide) $(ACP) \

		$(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/BOOT/second

target/board/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true) 
    INSTALLED_2NDBOOTLOADER_TARGET :=

  endif

else

  ifneq ($(strip $(BOARD_HAS_LOCKED_BOOTLOADER)), true)

    INSTALLED_BOOTLOADER_MODULE :=

    INSTALLED_2NDBOOTLOADER_TARGET :=

  endif

endif	# TARGET_NO_BOOTLOADER



ifneq ($(strip $(TARGET_NO_KERNEL)),true)