diff options
| author | 2021-11-18 05:01:37 +0000 | |
|---|---|---|
| committer | 2021-11-18 05:01:37 +0000 | |
| commit | c9212ec27c9417962b667f718ddcd77ca6f9abb4 (patch) | |
| tree | 51a6e04fcd34358408f10ab18507ce834214c919 | |
| parent | df4e15562865096cf3e7137167b91782ae2a9b9d (diff) | |
| parent | f364c8d8f6d68d0d964ecc6916f20696e7df2d4e (diff) | |
Merge "servicemanager: make recovery_available." am: f364c8d8f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1891077
Change-Id: I92f1eecda76dacf9e24d975db574a13ada557244
| -rw-r--r-- | cmds/servicemanager/Android.bp | 9 | ||||
| -rw-r--r-- | cmds/servicemanager/main.cpp | 4 | ||||
| -rw-r--r-- | cmds/servicemanager/servicemanager.recovery.rc | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/cmds/servicemanager/Android.bp b/cmds/servicemanager/Android.bp index 3ebdeee7aa..80c0548fca 100644 --- a/cmds/servicemanager/Android.bp +++ b/cmds/servicemanager/Android.bp @@ -47,6 +47,15 @@ cc_binary { } cc_binary { + name: "servicemanager.recovery", + stem: "servicemanager", + recovery: true, + defaults: ["servicemanager_defaults"], + init_rc: ["servicemanager.recovery.rc"], + srcs: ["main.cpp"], +} + +cc_binary { name: "vndservicemanager", defaults: ["servicemanager_defaults"], init_rc: ["vndservicemanager.rc"], diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp index 8c1beaca20..2fb9c2bc9a 100644 --- a/cmds/servicemanager/main.cpp +++ b/cmds/servicemanager/main.cpp @@ -111,6 +111,10 @@ private: }; int main(int argc, char** argv) { +#ifdef __ANDROID_RECOVERY__ + android::base::InitLogging(argv, android::base::KernelLogger); +#endif + if (argc > 2) { LOG(FATAL) << "usage: " << argv[0] << " [binder driver]"; } diff --git a/cmds/servicemanager/servicemanager.recovery.rc b/cmds/servicemanager/servicemanager.recovery.rc new file mode 100644 index 0000000000..067faf9c8f --- /dev/null +++ b/cmds/servicemanager/servicemanager.recovery.rc @@ -0,0 +1,4 @@ +service servicemanager /system/bin/servicemanager + disabled + group system readproc + seclabel u:r:servicemanager:s0 |