summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2017-05-25 13:18:40 -0500
committerandroid-build-merger2017-05-25 13:18:40 -0500
commit3e9223f46092b9929022a730ce6e1dcb0c5b20bd (patch)
treed0788736ff72588d140572cd98c11bd761389df5 /libcutils/fs_config.cpp
parenta06e0e067e04441da38b1b217f3b94d5981fd0cb (diff)
parent22cdddecbaae7fab0e347426c5e0ca4a12d3958f (diff)
downloadplatform-system-core-3e9223f46092b9929022a730ce6e1dcb0c5b20bd.tar.gz
platform-system-core-3e9223f46092b9929022a730ce6e1dcb0c5b20bd.tar.xz
platform-system-core-3e9223f46092b9929022a730ce6e1dcb0c5b20bd.zip
Merge "Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/"" am: f9259b59e8 am: b2f12e42ca
am: 22cdddecba Change-Id: I6e41d84c76a0d1f31e54d5422638817905f202f4
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 5defb69c0..221dea268 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -134,10 +134,9 @@ static const struct fs_path_config android_files[] = {
134 { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" }, 134 { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" },
135 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" }, 135 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" },
136 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" }, 136 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" },
137 { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy 137 { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" },
138 { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" }, 138 { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" },
139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/prop.build" }, 139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" },
140 { 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/prop.default" },
141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, 140 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },
142 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 }, 141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 },
143 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 }, 142 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 },
@@ -149,8 +148,7 @@ static const struct fs_path_config android_files[] = {
149 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/install-recovery.sh" }, 148 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/install-recovery.sh" },
150 { 00700, AID_ROOT, AID_ROOT, 0, "system/bin/secilc" }, 149 { 00700, AID_ROOT, AID_ROOT, 0, "system/bin/secilc" },
151 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" }, 150 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" },
152 { 00600, AID_ROOT, AID_ROOT, 0, "system/build.prop" }, // legacy 151 { 00600, AID_ROOT, AID_ROOT, 0, "system/build.prop" },
153 { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.build" },
154 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_dir + 1 }, 152 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_dir + 1 },
155 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_file + 1 }, 153 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_file + 1 },
156 { 00440, AID_ROOT, AID_SHELL, 0, "system/etc/init.goldfish.rc" }, 154 { 00440, AID_ROOT, AID_SHELL, 0, "system/etc/init.goldfish.rc" },
@@ -159,9 +157,8 @@ static const struct fs_path_config android_files[] = {
159 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, 157 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" },
160 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, 158 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" },
161 { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" }, 159 { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" },
162 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, // legacy 160 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" },
163 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/etc/prop.build" }, 161 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" },
164 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/etc/prop.default" },
165 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 }, 162 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 },
166 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_file + 1 }, 163 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_file + 1 },
167 164