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

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

Merge "Remove obsolete configs from fs_config.cpp" into main am: 30b0fbe9 am: a12ce4a1 

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



Change-Id: Ia19617a5039104470bbbc966c5047e3d460a2a13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 065377b2 a12ce4a1

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/*" },