ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Yifan Hong 2020-10-14 18:25:31 +00:00 • committed by Gerrit Code Review
commit f536731e5a
1 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
rootdir/avb/Android.mk
View file

@ -1,5 +1,11 @@
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 :=