summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-05-03 17:26:07 -0500
committerMark Salyzyn2017-05-18 17:56:54 -0500
commit2cf243528f582d251aee13d26127a8fd53ec3dd4 (patch)
tree4ccb880041c5e90a5bed8e926ed29aefa4dd183e /libcutils/fs_config.cpp
parentfa39110a8f946df724d9cbee43566b83e4ee713b (diff)
downloadplatform-system-core-2cf243528f582d251aee13d26127a8fd53ec3dd4.tar.gz
platform-system-core-2cf243528f582d251aee13d26127a8fd53ec3dd4.tar.xz
platform-system-core-2cf243528f582d251aee13d26127a8fd53ec3dd4.zip
libcutils: fs_config: remove aliases
Covered by the code automatically now. Test: gTest libcutils_test --gtest_filter=fs_config.* Bug: 37703469 Change-Id: Iad6ba65e023845aaea7a181b277a7383c44bd937
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index e08ee707e..919b65bc3 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -139,14 +139,8 @@ static const struct fs_path_config android_files[] = {
139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, 139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" },
140 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, 140 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },
141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 }, 141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 },
142 { 00600, AID_ROOT, AID_ROOT, 0, "system/odm/build.prop" },
143 { 00600, AID_ROOT, AID_ROOT, 0, "system/odm/default.prop" },
144 { 00444, AID_ROOT, AID_ROOT, 0, "system/odm/etc/fs_config_dirs" },
145 { 00444, AID_ROOT, AID_ROOT, 0, "system/odm/etc/fs_config_files" },
146 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 }, 142 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 },
147 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_file + 1 }, 143 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_file + 1 },
148 { 00444, AID_ROOT, AID_ROOT, 0, "system/oem/etc/fs_config_dirs" },
149 { 00444, AID_ROOT, AID_ROOT, 0, "system/oem/etc/fs_config_files" },
150 { 00750, AID_ROOT, AID_SHELL, 0, "sbin/fs_mgr" }, 144 { 00750, AID_ROOT, AID_SHELL, 0, "sbin/fs_mgr" },
151 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" }, 145 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" },
152 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" }, 146 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" },
@@ -163,10 +157,6 @@ static const struct fs_path_config android_files[] = {
163 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, 157 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" },
164 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, 158 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" },
165 { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" }, 159 { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" },
166 { 00600, AID_ROOT, AID_ROOT, 0, "system/vendor/build.prop" },
167 { 00600, AID_ROOT, AID_ROOT, 0, "system/vendor/default.prop" },
168 { 00444, AID_ROOT, AID_ROOT, 0, "system/vendor/etc/fs_config_dirs" },
169 { 00444, AID_ROOT, AID_ROOT, 0, "system/vendor/etc/fs_config_files" },
170 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, 160 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" },
171 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" }, 161 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" },
172 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 }, 162 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 },
@@ -202,17 +192,11 @@ static const struct fs_path_config android_files[] = {
202 // Support RT scheduling in Bluetooth 192 // Support RT scheduling in Bluetooth
203 { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) | 193 { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) |
204 CAP_MASK_LONG(CAP_SYS_NICE), 194 CAP_MASK_LONG(CAP_SYS_NICE),
205 "system/vendor/bin/hw/android.hardware.bluetooth@1.0-service" },
206 { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) |
207 CAP_MASK_LONG(CAP_SYS_NICE),
208 "vendor/bin/hw/android.hardware.bluetooth@1.0-service" }, 195 "vendor/bin/hw/android.hardware.bluetooth@1.0-service" },
209 196
210 // Support wifi_hal_legacy administering a network interface. 197 // Support wifi_hal_legacy administering a network interface.
211 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) | 198 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
212 CAP_MASK_LONG(CAP_NET_RAW), 199 CAP_MASK_LONG(CAP_NET_RAW),
213 "system/vendor/bin/hw/android.hardware.wifi@1.0-service" },
214 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
215 CAP_MASK_LONG(CAP_NET_RAW),
216 "vendor/bin/hw/android.hardware.wifi@1.0-service" }, 200 "vendor/bin/hw/android.hardware.wifi@1.0-service" },
217 201
218 // A non-privileged zygote that spawns isolated processes for web rendering. 202 // A non-privileged zygote that spawns isolated processes for web rendering.
@@ -233,8 +217,6 @@ static const struct fs_path_config android_files[] = {
233 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" }, 217 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" },
234 { 00755, AID_ROOT, AID_ROOT, 0, "system/lib/valgrind/*" }, 218 { 00755, AID_ROOT, AID_ROOT, 0, "system/lib/valgrind/*" },
235 { 00755, AID_ROOT, AID_ROOT, 0, "system/lib64/valgrind/*" }, 219 { 00755, AID_ROOT, AID_ROOT, 0, "system/lib64/valgrind/*" },
236 { 00755, AID_ROOT, AID_SHELL, 0, "system/vendor/bin/*" },
237 { 00755, AID_ROOT, AID_SHELL, 0, "system/vendor/xbin/*" },
238 { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, 220 { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" },
239 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/bin/*" }, 221 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/bin/*" },
240 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/xbin/*" }, 222 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/xbin/*" },