summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Freni2018-05-25 10:07:19 -0500
committerDario Freni2018-07-26 11:27:28 -0500
commit361371009902150d332cb23575f5833a57cf0ef0 (patch)
tree7975ec21d6a7554d8c379ebfe7b716395b465182 /libcutils/fs_config.cpp
parent28fb130cbbd7c01ef706d5b6a5a9877b290f275c (diff)
downloadplatform-system-core-361371009902150d332cb23575f5833a57cf0ef0.tar.gz
platform-system-core-361371009902150d332cb23575f5833a57cf0ef0.tar.xz
platform-system-core-361371009902150d332cb23575f5833a57cf0ef0.zip
Add support for /product-services partition.
This CL is largely and adaptation of Ie996def20e25dc1afe0c74af2096af844934b2dc Bug: 80741439 Test: Successfully built product-services.img with one module in it, and flashed on device. Also successfully built image with /system/product-services and no dedicated /product-services partition. Change-Id: I1046dfe19bf874da929c9131b76a1f85422fbb80 Merged-In: I1046dfe19bf874da929c9131b76a1f85422fbb80
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 267b7b356..48def6f95 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -130,7 +130,7 @@ static const char* conf[][2] = {
130// Vendor entries should be done via a vendor or device specific config.fs. 130// Vendor entries should be done via a vendor or device specific config.fs.
131// See https://source.android.com/devices/tech/config/filesystem#using-file-system-capabilities 131// See https://source.android.com/devices/tech/config/filesystem#using-file-system-capabilities
132static const struct fs_path_config android_files[] = { 132static const struct fs_path_config android_files[] = {
133 // clang-format off 133 // clang-format off
134 { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app/*" }, 134 { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app/*" },
135 { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app-ephemeral/*" }, 135 { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app-ephemeral/*" },
136 { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app-private/*" }, 136 { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app-private/*" },
@@ -149,6 +149,7 @@ static const struct fs_path_config android_files[] = {
149 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 }, 149 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 },
150 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_file + 1 }, 150 { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_file + 1 },
151 { 00600, AID_ROOT, AID_ROOT, 0, "product/build.prop" }, 151 { 00600, AID_ROOT, AID_ROOT, 0, "product/build.prop" },
152 { 00600, AID_ROOT, AID_ROOT, 0, "product-services/build.prop" },
152 { 00750, AID_ROOT, AID_SHELL, 0, "sbin/fs_mgr" }, 153 { 00750, AID_ROOT, AID_SHELL, 0, "sbin/fs_mgr" },
153 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" }, 154 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" },
154 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" }, 155 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" },
@@ -200,7 +201,7 @@ static const struct fs_path_config android_files[] = {
200 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/bin/*" }, 201 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/bin/*" },
201 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/xbin/*" }, 202 { 00755, AID_ROOT, AID_SHELL, 0, "vendor/xbin/*" },
202 { 00644, AID_ROOT, AID_ROOT, 0, 0 }, 203 { 00644, AID_ROOT, AID_ROOT, 0, 0 },
203 // clang-format on 204 // clang-format on
204}; 205};
205#ifndef __ANDROID_VNDK__ 206#ifndef __ANDROID_VNDK__
206auto __for_testing_only__android_files = android_files; 207auto __for_testing_only__android_files = android_files;