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

Commit 745c6d70 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Refactor: Move GSI AVB keys selection logic to common code." am: f536731e am: e49b06ec 

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

Change-Id: I8716ebbf7d9962de9c5c50908991506689ad990b
parents 8b04bfab e49b06ec

rootdir/avb/Android.mk

+14 −30
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

  my_gsi_avb_keys_path := $(TARGET_RAMDISK_OUT)/avb

endif



#######################################

# q-gsi.avbpubkey

include $(CLEAR_VARS)
@@ -7,11 +13,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := q-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)
@@ -22,11 +24,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := q-developer-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)
@@ -37,11 +35,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := r-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)
@@ -52,11 +46,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := r-developer-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)
@@ -67,11 +57,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := s-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)
@@ -82,10 +68,8 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := s-developer-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)



my_gsi_avb_keys_path :=