diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-05-03 15:26:07 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-05-18 15:56:54 -0700 |
| commit | 2cf243528f582d251aee13d26127a8fd53ec3dd4 (patch) | |
| tree | 4ccb880041c5e90a5bed8e926ed29aefa4dd183e /libcutils | |
| parent | fa39110a8f946df724d9cbee43566b83e4ee713b (diff) | |
| download | core-2cf243528f582d251aee13d26127a8fd53ec3dd4.tar.gz core-2cf243528f582d251aee13d26127a8fd53ec3dd4.tar.bz2 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')
| -rw-r--r-- | libcutils/fs_config.cpp | 18 |
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[] = { { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 }, - { 00600, AID_ROOT, AID_ROOT, 0, "system/odm/build.prop" }, - { 00600, AID_ROOT, AID_ROOT, 0, "system/odm/default.prop" }, - { 00444, AID_ROOT, AID_ROOT, 0, "system/odm/etc/fs_config_dirs" }, - { 00444, AID_ROOT, AID_ROOT, 0, "system/odm/etc/fs_config_files" }, { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_file + 1 }, - { 00444, AID_ROOT, AID_ROOT, 0, "system/oem/etc/fs_config_dirs" }, - { 00444, AID_ROOT, AID_ROOT, 0, "system/oem/etc/fs_config_files" }, { 00750, AID_ROOT, AID_SHELL, 0, "sbin/fs_mgr" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" }, @@ -163,10 +157,6 @@ static const struct fs_path_config android_files[] = { { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" }, - { 00600, AID_ROOT, AID_ROOT, 0, "system/vendor/build.prop" }, - { 00600, AID_ROOT, AID_ROOT, 0, "system/vendor/default.prop" }, - { 00444, AID_ROOT, AID_ROOT, 0, "system/vendor/etc/fs_config_dirs" }, - { 00444, AID_ROOT, AID_ROOT, 0, "system/vendor/etc/fs_config_files" }, { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" }, { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 }, @@ -202,17 +192,11 @@ static const struct fs_path_config android_files[] = { // Support RT scheduling in Bluetooth { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) | CAP_MASK_LONG(CAP_SYS_NICE), - "system/vendor/bin/hw/android.hardware.bluetooth@1.0-service" }, - { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) | - CAP_MASK_LONG(CAP_SYS_NICE), "vendor/bin/hw/android.hardware.bluetooth@1.0-service" }, // Support wifi_hal_legacy administering a network interface. { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) | CAP_MASK_LONG(CAP_NET_RAW), - "system/vendor/bin/hw/android.hardware.wifi@1.0-service" }, - { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) | - CAP_MASK_LONG(CAP_NET_RAW), "vendor/bin/hw/android.hardware.wifi@1.0-service" }, // A non-privileged zygote that spawns isolated processes for web rendering. @@ -233,8 +217,6 @@ static const struct fs_path_config android_files[] = { { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" }, { 00755, AID_ROOT, AID_ROOT, 0, "system/lib/valgrind/*" }, { 00755, AID_ROOT, AID_ROOT, 0, "system/lib64/valgrind/*" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/vendor/bin/*" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/vendor/xbin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor/xbin/*" }, |