Merge "Fix AVB key path again."

This commit is contained in:
Yifan Hong 2020-11-16 18:06:53 +00:00 committed by Gerrit Code Review
commit a1ee8cea9d

View file

@ -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
#######################################