Merge "Fix AVB key path again."

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)

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

  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

#######################################

# q-gsi.avbpubkey