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

Commit e49b06ec 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 

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

Change-Id: I37afc08103486a82b1b7be1d2fa40afd5b4cb4a9
parents 90c57d45 f536731e

rootdir/avb/Android.mk

+14 −30
Original line number Original line Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

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

# q-gsi.avbpubkey

include $(CLEAR_VARS)

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

LOCAL_MODULE := q-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif





include $(BUILD_PREBUILT)

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

LOCAL_MODULE := q-developer-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif





include $(BUILD_PREBUILT)

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

LOCAL_MODULE := r-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif





include $(BUILD_PREBUILT)

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

LOCAL_MODULE := r-developer-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif





include $(BUILD_PREBUILT)

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

LOCAL_MODULE := s-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif





include $(BUILD_PREBUILT)

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

LOCAL_MODULE := s-developer-gsi.avbpubkey

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

else

LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb

endif





include $(BUILD_PREBUILT)

include $(BUILD_PREBUILT)



my_gsi_avb_keys_path :=