summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHung-ying Tyan2017-05-24 21:46:10 -0500
committerandroid-build-merger2017-05-24 21:46:10 -0500
commita22e004f57f87da1df0b1d953786f4256f9ad873 (patch)
tree8c3671d73b6e622a3bf38a0d73efff11149b21f1 /libcutils
parent122acf177a68597da9661642755e09470ca6dc0a (diff)
parent0cd0d52147264122734d9fab36418713254685ed (diff)
downloadplatform-system-core-a22e004f57f87da1df0b1d953786f4256f9ad873.tar.gz
platform-system-core-a22e004f57f87da1df0b1d953786f4256f9ad873.tar.xz
platform-system-core-a22e004f57f87da1df0b1d953786f4256f9ad873.zip
Merge "Load {default,build}.prop from /{system,vendor,odm}/etc/" am: a9aa77d259 am: 26c4bcfadd
am: 0cd0d52147 Change-Id: Ide638286886cef323e8bb049f5baf4bbe659c47a
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/fs_config.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 221dea268..5defb69c0 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -134,9 +134,10 @@ 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" }, 137 { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy
138 { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, 138 { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" },
139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, 139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/prop.build" },
140 { 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/prop.default" },
140 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, 141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },
141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 }, 142 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 },
142 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 }, 143 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 },
@@ -148,7 +149,8 @@ static const struct fs_path_config android_files[] = {
148 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/install-recovery.sh" }, 149 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/install-recovery.sh" },
149 { 00700, AID_ROOT, AID_ROOT, 0, "system/bin/secilc" }, 150 { 00700, AID_ROOT, AID_ROOT, 0, "system/bin/secilc" },
150 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" }, 151 { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" },
151 { 00600, AID_ROOT, AID_ROOT, 0, "system/build.prop" }, 152 { 00600, AID_ROOT, AID_ROOT, 0, "system/build.prop" }, // legacy
153 { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.build" },
152 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_dir + 1 }, 154 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_dir + 1 },
153 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_file + 1 }, 155 { 00444, AID_ROOT, AID_ROOT, 0, sys_conf_file + 1 },
154 { 00440, AID_ROOT, AID_SHELL, 0, "system/etc/init.goldfish.rc" }, 156 { 00440, AID_ROOT, AID_SHELL, 0, "system/etc/init.goldfish.rc" },
@@ -157,8 +159,9 @@ static const struct fs_path_config android_files[] = {
157 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, 159 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" },
158 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, 160 { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" },
159 { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" }, 161 { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" },
160 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, 162 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, // legacy
161 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" }, 163 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/etc/prop.build" },
164 { 00600, AID_ROOT, AID_ROOT, 0, "vendor/etc/prop.default" },
162 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 }, 165 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 },
163 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_file + 1 }, 166 { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_file + 1 },
164 167