From 5d83d87ee62ddfe9cc6a6c669b114cb181be3f52 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 12 Nov 2020 15:45:47 -0800 Subject: [PATCH] Fix AVB key path again. If device specifies moving AVB keys to vendor ramdisk, but doesn't have a dedicated recovery partition, install to vendor-ramdisk/first_stage_ramdisk. Test: manual Bug: 156098440 Change-Id: I05a8731236996dda0d1ab3c09828f7dac46f4ac7 --- rootdir/avb/Android.mk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index 9892ae7d4..5cb66d2f4 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -1,11 +1,17 @@ LOCAL_PATH:= $(call my-dir) -ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) - my_gsi_avb_keys_path := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb -else ifeq ($(BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT),true) - my_gsi_avb_keys_path := $(TARGET_VENDOR_RAMDISK_OUT)/avb +ifeq ($(BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT),true) # AVB keys are install to vendor ramdisk + ifeq ($(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT),true) # no dedicated recovery partition + my_gsi_avb_keys_path := $(TARGET_VENDOR_RAMDISK_OUT)/first_stage_ramdisk/avb + else # device has a dedicated recovery partition + my_gsi_avb_keys_path := $(TARGET_VENDOR_RAMDISK_OUT)/avb + endif else - my_gsi_avb_keys_path := $(TARGET_RAMDISK_OUT)/avb + ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) # no dedicated recovery partition + my_gsi_avb_keys_path := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb + else # device has a dedicated recovery partition + my_gsi_avb_keys_path := $(TARGET_RAMDISK_OUT)/avb + endif endif #######################################