commit dfa99b430b75ecd0950e26b5e42c13d5a6b324ca
author Nikita Ioffe <ioffe@google.com> Fri Jun 16 12:49:10 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 16 12:49:10 2023 +0000
tree 071a9be6f8c1b976ec848162c1e6537bfec30095
parent 02deea604821f351e2d9a21f2b2a7572df0dc76e
parent d07edf6648ca63524f96e4fff4832ae5a6d4dde8

Also mount /sys/fs/selinux am: 9971bae91d am: d07edf6648

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23710044

Change-Id: I77de731bad527332cd7d2c8fe65601dbd3a43339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/installd/otapreopt_chroot.cpp

diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp
index 1b7acab..c86993c 100644
--- a/cmds/installd/otapreopt_chroot.cpp
+++ b/cmds/installd/otapreopt_chroot.cpp
@@ -165,7 +165,8 @@
 
     // 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]);