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

Commit 87812ab8 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Fix AVB key path again." am: a1ee8cea 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1497639

Change-Id: I2031e6fb58920a2e315f1be8bc2dc618454b29cf
parents 7c05aa34 a1ee8cea

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