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

Commit f5ca5c4b authored by Geremy Condra's avatar Geremy Condra Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add support for signed boot images.""

parents 2987048f ac880493

core/Makefile

+4 −6
Original line number Diff line number Diff line
@@ -473,17 +473,16 @@ bootimage-nodeps: $(MKEXT2IMG) 
	$(hide) $(MKEXT2BOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET)



else # TARGET_BOOTIMAGE_USE_EXT2 != true

$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER)



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)

	$(call pretty,"Target boot image: $@")

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(BOOT_SIGNER) /boot $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY) $@

	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE))



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG) $(BOOT_SIGNER)

bootimage-nodeps: $(MKBOOTIMG)

	@echo "make $@: ignoring dependencies"

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET)

	$(BOOT_SIGNER) /boot $(INSTALLED_BOOTIMAGE_TARGET) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY) $(INSTALLED_BOOTIMAGE_TARGET)

	$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))



endif # TARGET_BOOTIMAGE_USE_EXT2
@@ -1192,8 +1191,7 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
	  $(HOST_OUT_EXECUTABLES)/syspatch_host \

	  $(HOST_OUT_EXECUTABLES)/build_verity_tree \

	  $(HOST_OUT_EXECUTABLES)/verity_signer \

	  $(HOST_OUT_EXECUTABLES)/append2simg \

	  $(HOST_OUT_EXECUTABLES)/boot_signer

	  $(HOST_OUT_EXECUTABLES)/append2simg



OTATOOLS := $(DISTTOOLS) \

	  $(HOST_OUT_EXECUTABLES)/aapt

core/config.mk

+0 −1
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ RMTYPEDEFS := $(HOST_OUT_EXECUTABLES)/rmtypedefs 
APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg

VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer



# ACP is always for the build OS, not for the host OS

ACP := $(BUILD_OUT_EXECUTABLES)/acp$(BUILD_EXECUTABLE_SUFFIX)