diff options
| author | Yifan Hong <elsk@google.com> | 2020-10-14 18:25:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 18:25:31 +0000 |
| commit | f536731e5ad3c321dba76fc27af29dd212d51a69 (patch) | |
| tree | 50a5fd69e093bbdd12821ecca0becd477a3e7ff3 | |
| parent | 219b3487f89a630bb4065c31c3a21e8528322346 (diff) | |
| parent | d65e4851e2a7436eb21511f2b1c034aa5ecfd0c2 (diff) | |
Merge "Refactor: Move GSI AVB keys selection logic to common code."
| -rw-r--r-- | rootdir/avb/Android.mk | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index f96ffddb3..3978593ec 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -1,5 +1,11 @@ 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 := |