Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d83d87e authored by Yifan Hong's avatar Yifan Hong
Browse files

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
parent bcf87898

rootdir/avb/Android.mk

+11 −5
Original line number Diff line number Diff line 
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