diff options
| author | Geremy Condra <gcondra@google.com> | 2014-07-10 21:29:24 +0000 |
|---|---|---|
| committer | Geremy Condra <gcondra@google.com> | 2014-07-10 21:29:24 +0000 |
| commit | ac880493e2c854cc0eedc3887631832950919408 (patch) | |
| tree | c46978ba76811991e46d0d1f0e5306b125126a39 | |
| parent | 7e2c5ed84f59c4f19e2baa02733e85006292156e (diff) | |
| download | build-ac880493e2c854cc0eedc3887631832950919408.zip build-ac880493e2c854cc0eedc3887631832950919408.tar.gz build-ac880493e2c854cc0eedc3887631832950919408.tar.bz2 | |
Revert "Add support for signed boot images."
This reverts commit 7e2c5ed84f59c4f19e2baa02733e85006292156e.
Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
| -rw-r--r-- | core/Makefile | 10 | ||||
| -rw-r--r-- | core/config.mk | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index 5c7fac5..12d4915 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 diff --git a/core/config.mk b/core/config.mk index 0e612a7..c4d088d 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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) |