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

Commit c46a7613 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4d am:... 

Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4d am: 52feb83b am: 22687301 am: b5086b62

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1354545

Change-Id: I63fbc11c089adf3292f68026a18437503e8c7f40
parents b8b55d07 b5086b62

fs_mgr/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -149,6 +149,14 @@ cc_library_static { 
        darwin: {

            enabled: false,

        },

        vendor: {

            cflags: [

                // Skipping entries in fstab should only be done in a system

                // process as the config file is in /system_ext.

                // Remove the op from the vendor variant.

                "-DNO_SKIP_MOUNT",

            ],

        },

    },

    export_include_dirs: ["include_fstab"],

    header_libs: [

fs_mgr/fs_mgr_fstab.cpp

+6 −0
Original line number Diff line number Diff line
@@ -691,7 +691,9 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) { 
        TransformFstabForDsu(fstab, Split(lp_names, ","));

    }



#ifndef NO_SKIP_MOUNT

    SkipMountingPartitions(fstab);

#endif

    EnableMandatoryFlags(fstab);



    return true;
@@ -721,11 +723,14 @@ bool ReadFstabFromDt(Fstab* fstab, bool log) { 
        return false;

    }



#ifndef NO_SKIP_MOUNT

    SkipMountingPartitions(fstab);

#endif



    return true;

}



#ifndef NO_SKIP_MOUNT

// For GSI to skip mounting /product and /system_ext, until there are well-defined interfaces

// between them and /system. Otherwise, the GSI flashed on /system might not be able to work with

// device-specific /product and /system_ext. skip_mount.cfg belongs to system_ext partition because
@@ -757,6 +762,7 @@ bool SkipMountingPartitions(Fstab* fstab) { 


    return true;

}

#endif



// Loads the fstab file and combines with fstab entries passed in from device tree.

bool ReadDefaultFstab(Fstab* fstab) {