summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alice Wang <aliceywang@google.com> 2022-11-22 08:17:41 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-11-22 08:17:41 +0000
commit3cc0776c9a2331ed505bcd9f56b9d0c13c9751e5 (patch)
tree0bf8b7432bf5783ddceda59198e7c01e63dfdeb5
parent46175419f67b316df146242d8d6150c292b8d95b (diff)
parente4b9761be604883c3e0c78bb2eb37e2384381420 (diff)
Merge "[microdroid] Remove servicemanager from microdroid"
-rw-r--r--cmds/servicemanager/Android.bp11
-rw-r--r--cmds/servicemanager/servicemanager.microdroid.rc8
2 files changed, 0 insertions, 19 deletions
diff --git a/cmds/servicemanager/Android.bp b/cmds/servicemanager/Android.bp
index 61f931e0d2..1386660eb6 100644
--- a/cmds/servicemanager/Android.bp
+++ b/cmds/servicemanager/Android.bp
@@ -48,17 +48,6 @@ cc_binary {
}
cc_binary {
- name: "servicemanager.microdroid",
- defaults: ["servicemanager_defaults"],
- init_rc: ["servicemanager.microdroid.rc"],
- srcs: ["main.cpp"],
- bootstrap: true,
- // Prevent this from being installed when running tests in this directory.
- // This is okay because microdorid build rule can bundle this anyway.
- installable: false,
-}
-
-cc_binary {
name: "servicemanager.recovery",
stem: "servicemanager",
recovery: true,
diff --git a/cmds/servicemanager/servicemanager.microdroid.rc b/cmds/servicemanager/servicemanager.microdroid.rc
deleted file mode 100644
index 8819e1e8bf..0000000000
--- a/cmds/servicemanager/servicemanager.microdroid.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-service servicemanager /system/bin/servicemanager.microdroid
- class core
- user system
- group system readproc
- critical
- onrestart setprop servicemanager.ready false
- onrestart restart apexd
- shutdown critical