From cbd6d498d2d83a64c1d8ab1979b51975b2fa8f4f Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 7 Oct 2019 22:46:02 -0700 Subject: [PATCH] Remove the workaround that forces rebuilding recovery patch. The issue has been addressed on releasetools script side, by specifying UUID and AVB salt to get reproducible images [1]. [1] https://android-review.googlesource.com/c/platform/build/+/1135332 Fixes: 134525174 Test: `m dist` with a non-A/B target. `validate_target_files out/dist/target_files.zip` passes. Change-Id: Ida6750291706036c9b0c192d8abcde6d65155287 --- core/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index c9b478e35..53ce138ea 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4433,9 +4433,8 @@ endif # BOARD_SUPER_PARTITION_GROUPS ifeq ($(PRODUCT_VIRTUAL_AB_OTA),true) echo "virtual_ab=true" >> $(zip_root)/META/dynamic_partitions_info.txt endif # PRODUCT_VIRTUAL_AB_OTA - @# TODO(b/134525174): Remove `-r` after addressing the issue with recovery patch generation. - $(hide) PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \ - $(ADD_IMG_TO_TARGET_FILES) -a -r -v -p $(HOST_OUT) $(zip_root) + PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \ + $(ADD_IMG_TO_TARGET_FILES) -a -v -p $(HOST_OUT) $(zip_root) ifeq ($(BUILD_QEMU_IMAGES),true) $(hide) AVBTOOL=$(AVBTOOL) $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH) $(zip_root)/IMAGES/vbmeta.img \ $(zip_root)/IMAGES/system.img $(zip_root)/IMAGES/VerifiedBootParams.textproto