tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "init: no bootstrap mount namespace for microdroid" am: 3bf878786c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1781199

Change-Id: I504ebe5c6d6f4f5b4269072322dcebe9754fc306
This commit is contained in:
Jooyung Han 2021-07-30 18:26:54 +00:00 committed by Automerger Merge Worker
commit 26c6fdd16b
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
init/mount_namespace.cpp
View file

@ -82,6 +82,21 @@ static bool IsApexUpdatable() {
return updatable;
}
static bool IsMicrodroid() {
static bool is_microdroid = android::base::GetProperty("ro.hardware", "") == "microdroid";
return is_microdroid;
}
// In case we have two sets of APEXes (non-updatable, updatable), we need two separate mount
// namespaces.
static bool NeedsTwoMountNamespaces() {
if (!IsApexUpdatable()) return false;
if (IsRecoveryMode()) return false;
// In microdroid, there's only one set of APEXes in built-in directories include block devices.
if (IsMicrodroid()) return false;
return true;
}
#ifdef ACTIVATE_FLATTENED_APEX
static Result<void> MountDir(const std::string& path, const std::string& mount_path) {
@ -260,7 +275,7 @@ bool SetupMountNamespaces() {
// number of essential APEXes (e.g. com.android.runtime) are activated.
// In the namespace for post-apexd processes, all APEXes are activated.
bool success = true;
if (IsApexUpdatable() && !IsRecoveryMode()) {
if (NeedsTwoMountNamespaces()) {
// Creating a new namespace by cloning, saving, and switching back to
// the original namespace.
if (unshare(CLONE_NEWNS) == -1) {