diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-04 00:06:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-04 00:06:21 +0000 |
| commit | 4009999fd36f70d87c4e3a96e901cfecef930b49 (patch) | |
| tree | 15f2b4cba920a26cac8efe80fa77ca701083d7f7 | |
| parent | 4726babc510b4975fd13938fb973188ce6f3b2e3 (diff) | |
| parent | 99651b012bfb45cbb178151366f843ed28307cab (diff) | |
| download | core-4009999fd36f70d87c4e3a96e901cfecef930b49.tar.gz | |
Snap for 6258405 from 99651b012bfb45cbb178151366f843ed28307cab to qt-qpr3-release
Change-Id: I7eb71966befe0ad93e73a2341cabb13c3252b37b
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.cpp | 2 | ||||
| -rw-r--r-- | rootdir/avb/Android.mk | 30 | ||||
| -rw-r--r-- | rootdir/avb/r-developer-gsi.avbpubkey | bin | 0 -> 1032 bytes | |||
| -rw-r--r-- | rootdir/avb/s-developer-gsi.avbpubkey | bin | 0 -> 1032 bytes |
4 files changed, 31 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 1cde70cdc..22b05851a 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -798,7 +798,7 @@ FstabEntry BuildGsiSystemFstabEntry() { // could add more keys separated by ':'. .avb_keys = "/avb/q-gsi.avbpubkey:/avb/q-developer-gsi.avbpubkey:" - "/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey", + "/avb/r-developer-gsi.avbpubkey:/avb/s-developer-gsi.avbpubkey", .logical_partition_name = "system"}; system.fs_mgr_flags.wait = true; system.fs_mgr_flags.logical = true; diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index 80573fb37..f96ffddb3 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -46,6 +46,21 @@ endif include $(BUILD_PREBUILT) ####################################### +# r-developer-gsi.avbpubkey +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 + +include $(BUILD_PREBUILT) + +####################################### # s-gsi.avbpubkey include $(CLEAR_VARS) @@ -59,3 +74,18 @@ LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb endif include $(BUILD_PREBUILT) + +####################################### +# s-developer-gsi.avbpubkey +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 + +include $(BUILD_PREBUILT) diff --git a/rootdir/avb/r-developer-gsi.avbpubkey b/rootdir/avb/r-developer-gsi.avbpubkey Binary files differnew file mode 100644 index 000000000..aac39cc86 --- /dev/null +++ b/rootdir/avb/r-developer-gsi.avbpubkey diff --git a/rootdir/avb/s-developer-gsi.avbpubkey b/rootdir/avb/s-developer-gsi.avbpubkey Binary files differnew file mode 100644 index 000000000..f0a6c11b8 --- /dev/null +++ b/rootdir/avb/s-developer-gsi.avbpubkey |