openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Yifan Hong 2020-11-12 15:45:47 -08:00
parent bcf87898d7
commit 5d83d87ee6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rootdir/avb/Android.mk
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
#######################################