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

Commit beead2b6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8652434 from 32fb667c to tm-qpr1-release 

Change-Id: Icf9888882d046847872cdcfecec60501b25d78eb
parents 01c4805e 32fb667c

fs_mgr/tests/vts_fs_test.cpp

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

        }

libutils/Android.bp

+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 {