From 762d93691104ddf5bee55763278d610a400d9a26 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 12 Oct 2020 12:48:25 -0700 Subject: [PATCH] Move GSI AVB keys to vendor_boot if BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT If BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT is set, move GSI AVB keys to vendor_boot. The existence of these keys are device-specific, and should not exist in the generic boot image. Test: manual Bug: 156098440 Change-Id: Iabe002a9f1ecd2fdf109beed98db6edd3f092399 --- rootdir/avb/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index 3978593ec..9892ae7d4 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -2,6 +2,8 @@ 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 else my_gsi_avb_keys_path := $(TARGET_RAMDISK_OUT)/avb endif