diff options
| author | Tom Cherry <tomcherry@google.com> | 2018-08-01 13:41:12 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2018-08-02 12:25:58 -0700 |
| commit | 40acb379cdac2e71b888bfa22bdcb409aa2753b1 (patch) | |
| tree | 6b13aec6b13ffb7ee635e94d5f4294233070a9d6 /init/subcontext.cpp | |
| parent | 081b710b2ee7f726f1bef282333c397006b6b37f (diff) | |
| download | system_core-40acb379cdac2e71b888bfa22bdcb409aa2753b1.tar.gz system_core-40acb379cdac2e71b888bfa22bdcb409aa2753b1.tar.bz2 system_core-40acb379cdac2e71b888bfa22bdcb409aa2753b1.zip | |
Move watchdogd out of init
We're moving past a world where static executables are needed,
including watchdogd, so treat this like any other executable and place
it in /system/bin.
Bug: 73660730
Test: watchdogd still runs
Change-Id: I1f7508fd55dce6e9ee72a6ab7a085011a76c0053
Diffstat (limited to 'init/subcontext.cpp')
| -rw-r--r-- | init/subcontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/subcontext.cpp b/init/subcontext.cpp index ee7251328..c2a21d45c 100644 --- a/init/subcontext.cpp +++ b/init/subcontext.cpp @@ -30,6 +30,7 @@ #include "util.h" #if defined(__ANDROID__) +#include <android/api-level.h> #include "property_service.h" #include "selinux.h" #else @@ -355,7 +356,7 @@ static std::vector<Subcontext> subcontexts; static bool shutting_down; std::vector<Subcontext>* InitializeSubcontexts() { - if (SelinuxHasVendorInit()) { + if (SelinuxGetVendorAndroidVersion() >= __ANDROID_API_P__) { for (const auto& [path_prefix, secontext] : paths_and_secontexts) { subcontexts.emplace_back(path_prefix, secontext); } |