From 3346338919caef7861860ecef74795e9188817e0 Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Thu, 25 May 2017 19:18:17 +0800 Subject: Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/" This reverts commit 723f1a2b318a455983d21ccf3598885f766bb8c9. Bug: 62075509 --- libcutils/fs_config.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'libcutils') diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index dd1ad3a38..919b65bc3 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -134,10 +134,9 @@ static const struct fs_path_config android_files[] = { { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" }, { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" }, { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" }, - { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy - { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" }, - { 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/prop.build" }, - { 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/prop.default" }, + { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, + { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, + { 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 }, { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 }, @@ -149,8 +148,7 @@ static const struct fs_path_config android_files[] = { { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/install-recovery.sh" }, { 00700, AID_ROOT, AID_ROOT, 0, "system/bin/secilc" }, { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" }, - { 00600, AID_ROOT, AID_ROOT, 0, "system/build.prop" }, // legacy - { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.build" }, + { 00600, AID_ROOT, AID_ROOT, 0, "system/build.prop" }, { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_dir + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_file + 1 }, { 00440, AID_ROOT, AID_SHELL, 0, "system/etc/init.goldfish.rc" }, @@ -159,9 +157,8 @@ 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, "vendor/build.prop" }, // legacy - { 00600, AID_ROOT, AID_ROOT, 0, "vendor/etc/prop.build" }, - { 00600, AID_ROOT, AID_ROOT, 0, "vendor/etc/prop.default" }, + { 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 }, { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_file + 1 }, -- cgit v1.2.3-54-g00ecf