summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-09-13 17:45:52 -0500
committerandroid-build-merger2017-09-13 17:45:52 -0500
commit6818f80dbb19ce30e2ed95bdc13f8c089660f627 (patch)
tree07189ef1f64f6b21b13afe60850092375fab184b /libcutils/fs_config.cpp
parent34abe0cf5cd974c7174c7801b47a6f1ca501c66d (diff)
parent1f666a6be9c9e01ccdf3ac45f6f642e3d513676f (diff)
downloadplatform-system-core-6818f80dbb19ce30e2ed95bdc13f8c089660f627.tar.gz
platform-system-core-6818f80dbb19ce30e2ed95bdc13f8c089660f627.tar.xz
platform-system-core-6818f80dbb19ce30e2ed95bdc13f8c089660f627.zip
Merge changes from topic "b/63736262"
am: 1f666a6be9 Change-Id: I2586aac3d6fe8252ee6728de64fb37102accf0da
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index cc96ff854..7c221990f 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -176,6 +176,8 @@ static const struct fs_path_config android_files[] = {
176 CAP_MASK_LONG(CAP_AUDIT_CONTROL) | 176 CAP_MASK_LONG(CAP_AUDIT_CONTROL) |
177 CAP_MASK_LONG(CAP_SETGID), 177 CAP_MASK_LONG(CAP_SETGID),
178 "system/bin/logd" }, 178 "system/bin/logd" },
179 { 00550, AID_SYSTEM, AID_LOG, CAP_MASK_LONG(CAP_SYSLOG),
180 "system/bin/bootstat" },
179 { 00750, AID_ROOT, AID_SHELL, CAP_MASK_LONG(CAP_SETUID) | 181 { 00750, AID_ROOT, AID_SHELL, CAP_MASK_LONG(CAP_SETUID) |
180 CAP_MASK_LONG(CAP_SETGID), 182 CAP_MASK_LONG(CAP_SETGID),
181 "system/bin/run-as" }, 183 "system/bin/run-as" },