summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nikita Ioffe <ioffe@google.com> 2023-06-15 20:45:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-15 20:45:49 +0000
commitd9f4cfecb7842f5ea983845dfefbaa912cd4efa7 (patch)
tree16f7f6e70700f2db8c18aca53e238be6c612c97b
parentd99689856566c996c4d8d40968a0a7d3c13bae3f (diff)
parentf661d44e4ff0c2f33fd234dba7743a0c85c76142 (diff)
Merge "Also mount /sys/fs/selinux" am: d9154a7aa2 am: dd042a2af9 am: f661d44e4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2628122 Change-Id: I53032e36db1b8776727e59fbf5407c7159ff153f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cmds/installd/otapreopt_chroot.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp
index 1b7acabf70..c86993cb06 100644
--- a/cmds/installd/otapreopt_chroot.cpp
+++ b/cmds/installd/otapreopt_chroot.cpp
@@ -165,7 +165,8 @@ static int otapreopt_chroot(const int argc, char **arg) {
// Bind mount necessary directories.
constexpr const char* kBindMounts[] = {
- "/data", "/dev", "/proc", "/sys"
+ "/data", "/dev", "/proc", "/sys",
+ "/sys/fs/selinux" /* Required for apexd which includes libselinux */
};
for (size_t i = 0; i < arraysize(kBindMounts); ++i) {
std::string trg = StringPrintf("/postinstall%s", kBindMounts[i]);