Snap for 11914274 from 19ce29359630d351cd43a2f3dc7ef73ed34353b8 to 24Q3-release (2985e823) · Commits · e / os / android_system_core

fs_mgr/fs_mgr.cpp

+13 −0

Original line number	Diff line number	Diff line
		@@ -1656,6 +1656,19 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
		continue;
		}
		}
		if (userdata_mounted) {
		Fstab mounted_fstab;
		if (!ReadFstabFromFile("/proc/mounts", &mounted_fstab)) {
		LOG(ERROR) << "Could't load fstab from /proc/mounts , unable to set ro.fstype.data . "
		"init.rc actions depending on this prop would not run, boot might fail.";
		} else {
		for (const auto& entry : mounted_fstab) {
		if (entry.mount_point == "/data") {
		android::base::SetProperty("ro.fstype.data", entry.fs_type);
		}
		}
		}
		}

		set_type_property(encryptable);

+4 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ soong_config_module_type {
		config_namespace: "ANDROID",
		bool_variables: [
		"PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT",
		"release_write_appcompat_override_system_properties",
		],
		properties: [
		"cflags",
		@@ -159,6 +160,9 @@ libinit_cc_defaults {
		"-DINSTALL_DEBUG_POLICY_TO_SYSTEM_EXT=1",
		],
		},
		release_write_appcompat_override_system_properties: {
		cflags: ["-DWRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES"],
		}
		},
		static_libs: [
		"libavb",

+2 −0

Original line number	Diff line number	Diff line
		@@ -1323,12 +1323,14 @@ void CreateSerializedPropertyInfo() {
		}
		selinux_android_restorecon(PROP_TREE_FILE, 0);

		#ifdef WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES
		mkdir(APPCOMPAT_OVERRIDE_PROP_FOLDERNAME, S_IRWXU \| S_IXGRP \| S_IXOTH);
		if (!WriteStringToFile(serialized_contexts, APPCOMPAT_OVERRIDE_PROP_TREE_FILE, 0444, 0, 0,
		false)) {
		PLOG(ERROR) << "Unable to write appcompat override property infos to file";
		}
		selinux_android_restorecon(APPCOMPAT_OVERRIDE_PROP_TREE_FILE, 0);
		#endif
		}

		static void ExportKernelBootProps() {