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

Commit 00fa8e7d authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "fs_config: add bin paths of flattened apexes" am: 529ace17 

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

Change-Id: Ibf3fa90572503c4a8d3054d09c37648bd9c4075d
parents ec0ffbcf 529ace17

libcutils/fs_config.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -80,6 +80,7 @@ static const struct fs_path_config android_dirs[] = { 
    { 00771, AID_SYSTEM,       AID_SYSTEM,       0, "data" },

    { 00771, AID_SYSTEM,       AID_SYSTEM,       0, "data" },

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

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

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

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

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

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

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

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

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

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

    { 00751, AID_ROOT,         AID_SHELL,        0, "system/bin" },
@@ -90,6 +91,7 @@ static const struct fs_path_config android_dirs[] = { 
    { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/bin" },

    { 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, "system_ext/apex/*/bin" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "vendor/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" },

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

    { 00755, AID_ROOT,         AID_ROOT,         0, 0 },

    { 00755, AID_ROOT,         AID_ROOT,         0, 0 },

        // clang-format on

        // clang-format on
@@ -210,12 +212,14 @@ static const struct fs_path_config android_files[] = { 
    { 00750, AID_ROOT,      AID_SHELL,     0, "init*" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "init*" },

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    { 00644, AID_ROOT,      AID_ROOT,      0, 0 },

    { 00644, AID_ROOT,      AID_ROOT,      0, 0 },

        // clang-format on

        // clang-format on