summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHung-ying Tyan2017-06-28 01:31:08 -0500
committerandroid-build-merger2017-06-28 01:31:08 -0500
commit42388236a45ceef7d2b945bcf0e82580f45436a8 (patch)
tree300768d6b3bf3db649a8231e40bc8c00578b0683 /libcutils/fs_config.cpp
parentb9b132c09a84899d7a11acec5c1bf4963bd68a99 (diff)
parentd334d69b70f4a3639e09753088c6fe7300359c21 (diff)
downloadplatform-system-core-42388236a45ceef7d2b945bcf0e82580f45436a8.tar.gz
platform-system-core-42388236a45ceef7d2b945bcf0e82580f45436a8.tar.xz
platform-system-core-42388236a45ceef7d2b945bcf0e82580f45436a8.zip
Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev
am: d334d69b70 Change-Id: I358c9b60bf20d7852d81006bb37a9efab0dd19ad
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index a1dbd7881..cc96ff854 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -134,7 +134,8 @@ 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, "system/etc/prop.default" },
138 { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, 139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" },
139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, 140 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" },
140 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, 141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },