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

Commit 9cdca9a6 authored by Jiyong Park's avatar Jiyong Park
Browse files

Remove obsolete configs from fs_config.cpp 

The removed lines are for configuring directories or files in the
flattened APEXes. Since flattened APEX no longer exists, these lines are
obsolete, and thus removing.

Ownership and mode of files/dirs in APEXes are configured via the
canned_fs_config files specific to the APEXes.

Bug: 402962730
Test: build the tethering APEX, check the owner ahd mode of the
for-system directory in it.

Change-Id: I58e9b67f5cedd8233e02b4d2f4d9c277d6f64f8c
parent e9560e72

libcutils/fs_config.cpp

+0 −12
Original line number Diff line number Diff line
@@ -72,20 +72,14 @@ static const struct fs_path_config android_dirs[] = { 
    { 00771, AID_SYSTEM,       AID_SYSTEM,       0, "data" },

    { 00755, AID_ROOT,         AID_SYSTEM,       0, "mnt" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "product/bin" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "product/apex/*/bin" },

    { 00777, AID_ROOT,         AID_ROOT,         0, "sdcard" },

    { 00751, AID_ROOT,         AID_SDCARD_R,     0, "storage" },

    { 00750, AID_CLAT,         AID_SYSTEM,       0, "system/apex/com.android.tethering/bin/for-system" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "system/bin" },

    { 00755, AID_ROOT,         AID_ROOT,         0, "system/etc/ppp" },

    { 00755, AID_ROOT,         AID_SHELL,        0, "system/vendor" },

    { 00750, AID_ROOT,         AID_SHELL,        0, "system/xbin" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "system/apex/*/bin" },

    { 00750, AID_CLAT,         AID_SYSTEM,       0, "system_ext/apex/com.android.tethering/bin/for-system" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/bin" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/apex/*/bin" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "vendor/bin" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "vendor/apex/*/bin" },

    { 00755, AID_ROOT,         AID_SHELL,        0, "vendor" },

    {},

        // clang-format on
@@ -182,8 +176,6 @@ static const struct fs_path_config android_files[] = { 


    // the following files have enhanced capabilities and ARE included

    // in user builds.

    { 06755, AID_CLAT,      AID_CLAT,      0, "system/apex/com.android.tethering/bin/for-system/clatd" },

    { 06755, AID_CLAT,      AID_CLAT,      0, "system_ext/apex/com.android.tethering/bin/for-system/clatd" },

    { 00700, AID_SYSTEM,    AID_SHELL,     CAP_MASK_LONG(CAP_BLOCK_SUSPEND),

                                              "system/bin/inputflinger" },

    { 00750, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) |
@@ -214,23 +206,19 @@ static const struct fs_path_config android_files[] = { 
    { 00644, AID_ROOT,      AID_ROOT,      0, "odm/app/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "odm/priv-app/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "product/bin/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "product/apex/*bin/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "product/framework/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "product/app/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "product/priv-app/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/xbin/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/apex/*/bin/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "system/framework/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "system/app/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "system/priv-app/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system_ext/bin/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system_ext/apex/*/bin/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "system_ext/framework/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "system_ext/app/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "system_ext/priv-app/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "vendor/bin/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "vendor/apex/*bin/*" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "vendor/xbin/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "vendor/framework/*" },

    { 00644, AID_ROOT,      AID_ROOT,      0, "vendor/app/*" },