diff --git a/init/mount_namespace.cpp b/init/mount_namespace.cpp index 593e5ae85..bce1cc3de 100644 --- a/init/mount_namespace.cpp +++ b/init/mount_namespace.cpp @@ -82,11 +82,6 @@ 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() { diff --git a/init/subcontext.cpp b/init/subcontext.cpp index fa48beab3..6eaa80fad 100644 --- a/init/subcontext.cpp +++ b/init/subcontext.cpp @@ -44,6 +44,7 @@ #endif using android::base::GetExecutablePath; +using android::base::GetProperty; using android::base::Join; using android::base::Socketpair; using android::base::Split; @@ -337,6 +338,11 @@ Result> Subcontext::ExpandArgs(const std::vector= __ANDROID_API_P__) { subcontext.reset( new Subcontext(std::vector{"/vendor", "/odm"}, kVendorContext)); diff --git a/init/util.cpp b/init/util.cpp index 9f7bfdb5b..d1e518b57 100644 --- a/init/util.cpp +++ b/init/util.cpp @@ -757,5 +757,10 @@ void SetDefaultMountNamespaceReady() { is_default_mount_namespace_ready = true; } +bool IsMicrodroid() { + static bool is_microdroid = android::base::GetProperty("ro.hardware", "") == "microdroid"; + return is_microdroid; +} + } // namespace init } // namespace android diff --git a/init/util.h b/init/util.h index daba85247..bf5367531 100644 --- a/init/util.h +++ b/init/util.h @@ -103,5 +103,7 @@ bool IsRecoveryMode(); bool IsDefaultMountNamespaceReady(); void SetDefaultMountNamespaceReady(); + +bool IsMicrodroid(); } // namespace init } // namespace android