summaryrefslogtreecommitdiffstats
path: root/init/init.cpp
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2018-08-01 13:41:12 -0700
committerTom Cherry <tomcherry@google.com>2018-08-02 12:25:58 -0700
commit40acb379cdac2e71b888bfa22bdcb409aa2753b1 (patch)
tree6b13aec6b13ffb7ee635e94d5f4294233070a9d6 /init/init.cpp
parent081b710b2ee7f726f1bef282333c397006b6b37f (diff)
downloadsystem_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/init.cpp')
-rw-r--r--init/init.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/init/init.cpp b/init/init.cpp
index 73194bdd9..a93d31665 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -58,7 +58,6 @@
#include "sigchld_handler.h"
#include "ueventd.h"
#include "util.h"
-#include "watchdogd.h"
using namespace std::chrono_literals;
using namespace std::string_literals;
@@ -617,10 +616,6 @@ int main(int argc, char** argv) {
return ueventd_main(argc, argv);
}
- if (!strcmp(basename(argv[0]), "watchdogd")) {
- return watchdogd_main(argc, argv);
- }
-
if (argc > 1 && !strcmp(argv[1], "subcontext")) {
android::base::InitLogging(argv, &android::base::KernelLogger);
const BuiltinFunctionMap function_map;