diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-13 02:09:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-13 02:09:12 +0000 |
| commit | d3011a00ae3c3d232b778e5139a44e22cb89d587 (patch) | |
| tree | 1e00514239beb80e012935f9aa48cf5d061bc87a /init/service_utils.h | |
| parent | 32ab56890a47c495101d3d1a689703bbbf70a43a (diff) | |
| parent | fa65517cd73ef340e9a2decc59af814ded969daa (diff) | |
Snap for 6586161 from fa65517cd73ef340e9a2decc59af814ded969daa to sc-release
Change-Id: I9f9b7239342c2bb743382b58ae3a498b79d931ff
Diffstat (limited to 'init/service_utils.h')
| -rw-r--r-- | init/service_utils.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init/service_utils.h b/init/service_utils.h index 3f1071e5bf..e74f8c17e6 100644 --- a/init/service_utils.h +++ b/init/service_utils.h @@ -19,12 +19,14 @@ #include <sys/resource.h> #include <sys/types.h> +#include <optional> #include <string> #include <vector> #include <android-base/unique_fd.h> #include <cutils/iosched_policy.h> +#include "mount_namespace.h" #include "result.h" namespace android { @@ -66,7 +68,8 @@ struct NamespaceInfo { // Pair of namespace type, path to name. std::vector<std::pair<int, std::string>> namespaces_to_enter; }; -Result<void> EnterNamespaces(const NamespaceInfo& info, const std::string& name, bool pre_apexd); +Result<void> EnterNamespaces(const NamespaceInfo& info, const std::string& name, + std::optional<MountNamespace> override_mount_namespace); struct ProcessAttributes { std::string console; |