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

Commit 4009999f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6258405 from 99651b01 to qt-qpr3-release 

Change-Id: I7eb71966befe0ad93e73a2341cabb13c3252b37b
parents 4726babc 99651b01

fs_mgr/fs_mgr_fstab.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

rootdir/avb/Android.mk

+30 −0
Original line number Diff line number Diff line
@@ -45,6 +45,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)

rootdir/avb/r-developer-gsi.avbpubkey

0 → 100644
+1.01 KiB

File added.

No diff preview for this file type.

View file

rootdir/avb/s-developer-gsi.avbpubkey

0 → 100644
+1.01 KiB

File added.

No diff preview for this file type.

View file