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

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

Merge "flattened apex: fix /apex/com.android.tethering/bin/for-system{,/clatd}... 

Merge "flattened apex: fix /apex/com.android.tethering/bin/for-system{,/clatd} mode" am: db01225c am: b986bd3a am: 7aea4bfe

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



Change-Id: Ibbdd24f012eff1673375c44ca7095f2c0e644fba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d319ac36 7aea4bfe

libcutils/fs_config.cpp

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static const struct fs_path_config android_dirs[] = { 
    { 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_ROOT,         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" },
@@ -194,6 +195,7 @@ 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" },

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

                                              "system/bin/inputflinger" },

    { 00750, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) |