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

Commit c4f9f4c2 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

libcutils: fs_config: sort dirs 

Sort android_dirs[] first by requirements, grouping, specificity and
finally by alphanumeric order.

Test: full build and install smoke test and inspection
Bug: 36071012
Change-Id: Iff579600b05d7b2a0b9fc7d9e9d897e0bb69aebd
parent f5ee213a

libcutils/fs_config.c

+28 −28
Original line number Diff line number Diff line
@@ -81,11 +81,11 @@ static const struct fs_path_config android_dirs[] = { 
    { 00771, AID_SYSTEM,       AID_SYSTEM,       0, "data/data" },

    { 00771, AID_SHELL,        AID_SHELL,        0, "data/local/tmp" },

    { 00771, AID_SHELL,        AID_SHELL,        0, "data/local" },

    { 01771, AID_SYSTEM, AID_MISC,   0, "data/misc" },

    { 00770, AID_DHCP,         AID_DHCP,         0, "data/misc/dhcp" },

    { 00771, AID_SHARED_RELRO, AID_SHARED_RELRO, 0, "data/misc/shared_relro" },

    { 00775, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media" },

    { 01771, AID_SYSTEM,       AID_MISC,         0, "data/misc" },

    { 00775, AID_MEDIA_RW,     AID_MEDIA_RW,     0, "data/media/Music" },

    { 00775, AID_MEDIA_RW,     AID_MEDIA_RW,     0, "data/media" },

    { 00750, AID_ROOT,         AID_SHELL,        0, "data/nativetest" },

    { 00750, AID_ROOT,         AID_SHELL,        0, "data/nativetest64" },

    { 00775, AID_ROOT,         AID_ROOT,         0, "data/preloads" },
@@ -93,13 +93,13 @@ static const struct fs_path_config android_dirs[] = { 
    { 00755, AID_ROOT,         AID_SYSTEM,       0, "mnt" },

    { 00755, AID_ROOT,         AID_ROOT,         0, "root" },

    { 00750, AID_ROOT,         AID_SHELL,        0, "sbin" },

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

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

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

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

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

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

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

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

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

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

    /* clang-format on */

};