diff options
| author | 2020-10-20 22:26:15 +0000 | |
|---|---|---|
| committer | 2020-10-20 22:26:15 +0000 | |
| commit | 9873891bd0190cbae0943e48cae22a3fd2a55e07 (patch) | |
| tree | f8aad840f517e5b69131de433a825362ebb1014c | |
| parent | ec952237e2dd9901a84364355d469fb3d3165dba (diff) | |
| parent | ef7a971ded1126b7a65927076a1e303639ad1e8c (diff) | |
Merge "Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot"
| -rw-r--r-- | core/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index af492289da..9471148229 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1825,9 +1825,13 @@ endif # e) We include the recovery ACPIO image within recovery - not needing the resource file as we # do bsdiff because boot and recovery will contain different number of entries # (BOARD_INCLUDE_RECOVERY_ACPIO = true). +# f) We build a single image that contains vendor_boot and recovery both - no recovery image to +# install +# (BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT = true). ifeq (,$(filter true, $(BOARD_USES_FULL_RECOVERY_IMAGE) $(BOARD_USES_RECOVERY_AS_BOOT) \ - $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO))) + $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO) \ + $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))) # Named '.dat' so we don't attempt to use imgdiff for patching it. RECOVERY_RESOURCE_ZIP := $(TARGET_OUT_VENDOR)/etc/recovery-resource.dat ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_RESOURCE_ZIP) |