Snap for 8656240 from 5b227f34514299a5f833fe49f97984aa2225e550 to tm-release (6c651e79) · Commits · e / os / android_system_core

fs_mgr/tests/vts_fs_test.cpp

+9 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ TEST(fs, ErofsSupported) {
		std::string fs;
		ASSERT_TRUE(android::base::ReadFileToString("/proc/filesystems", &fs));
		EXPECT_THAT(fs, ::testing::HasSubstr("\terofs\n"));

		ASSERT_EQ(access("/sys/fs/erofs", F_OK), 0);
		}

		TEST(fs, PartitionTypes) {
		@@ -94,7 +96,13 @@ TEST(fs, PartitionTypes) {
		}

		if (entry.flags & MS_RDONLY) {
		EXPECT_EQ(entry.fs_type, "erofs") << entry.mount_point;
		std::vector<std::string> allowed = {"erofs", "ext4"};
		if (vsr_level == __ANDROID_API_T__) {
		allowed.emplace_back("f2fs");
		}

		EXPECT_NE(std::find(allowed.begin(), allowed.end(), entry.fs_type), allowed.end())
		<< entry.mount_point;
		} else {
		EXPECT_NE(entry.fs_type, "ext4") << entry.mount_point;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,10 @@ cc_library {
		min_sdk_version: "apex_inherit",

		afdo: true,

		header_abi_checker: {
		diff_flags: ["-allow-adding-removing-weak-symbols"],
		},
		}

		cc_library {