commit 14096bd924e79d07022e8c6d3db728bf8302fd40
author Yifan Hong <elsk@google.com> Tue Oct 20 01:51:11 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 20 01:51:11 2020 +0000
tree 4dda0180dbfbb4565eb4bc3b5ac45e64319fe5de
parent f70d801d4be2915d34c6407c741ed1d9ed0e98fc
parent 762d93691104ddf5bee55763278d610a400d9a26

Merge "Move GSI AVB keys to vendor_boot if BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT"

rootdir/avb/Android.mk

diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk
index 3978593..9892ae7 100644
--- a/rootdir/avb/Android.mk
+++ b/rootdir/avb/Android.mk
@@ -2,6 +2,8 @@
 
 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