Snap for 6083172 from a8a3e4ccf97111fe9ba87176a67daf95d0df84a4 to qt-qpr2-release (38aa26fb) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_fstab.cpp

+10 −9

Original line number	Diff line number	Diff line
		@@ -790,14 +790,15 @@ std::set<std::string> GetBootDevices() {

		FstabEntry BuildGsiSystemFstabEntry() {
		// .logical_partition_name is required to look up AVB Hashtree descriptors.
		FstabEntry system = {
		.blk_device = "system_gsi",
		FstabEntry system = {.blk_device = "system_gsi",
		.mount_point = "/system",
		.fs_type = "ext4",
		.flags = MS_RDONLY,
		.fs_options = "barrier=1",
		// could add more keys separated by ':'.
		.avb_keys = "/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey",
		.avb_keys =
		"/avb/q-gsi.avbpubkey:/avb/q-developer-gsi.avbpubkey:"
		"/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey",
		.logical_partition_name = "system"};
		system.fs_mgr_flags.wait = true;
		system.fs_mgr_flags.logical = true;

+15 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,21 @@ endif

		include $(BUILD_PREBUILT)

		#######################################
		# q-developer-gsi.avbpubkey
		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

		include $(BUILD_PREBUILT)

		#######################################
		# r-gsi.avbpubkey
		include $(CLEAR_VARS)

0 → 100644

+1.01 KiB

File added.

No diff preview for this file type.