commit 8d5d707e5c4c24ff7f0bf3e84a94519f1a264bd2
author Erik Kline <ek@google.com> Mon May 30 02:41:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 30 02:41:03 2016 +0000
tree 17669198992afe8ca424c79f38af25fc004b4e3f
parent b966be0ae565290642f2bc1a9c3e1f975e8e11d2
parent 0d66c0e67e8f61e1258a05064264cf9aeb5b334a

Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40
am: b927c6c39d

* commit 'b927c6c39d5f43b0bd68c3f85f5bf3786f081378':
  Add /vendor/xbin to the list of directories of executables

Change-Id: I491fd8ec7cfa611ee63ac51c657d70636ed392c2

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 0abfcbf..840ac86 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -149,7 +149,9 @@
     { 00755, AID_ROOT,      AID_ROOT,      0, "system/lib64/valgrind/*" },
     { 00755, AID_ROOT,      AID_SHELL,     0, "system/xbin/*" },
     { 00755, AID_ROOT,      AID_SHELL,     0, "system/vendor/bin/*" },
+    { 00755, AID_ROOT,      AID_SHELL,     0, "system/vendor/xbin/*" },
     { 00755, AID_ROOT,      AID_SHELL,     0, "vendor/bin/*" },
+    { 00755, AID_ROOT,      AID_SHELL,     0, "vendor/xbin/*" },
     { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/*" },
     { 00755, AID_ROOT,      AID_ROOT,      0, "bin/*" },
     { 00750, AID_ROOT,      AID_SHELL,     0, "init*" },