Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23d873e9 authored by Alice Wang's avatar Alice Wang Committed by Automerger Merge Worker
Browse files

Merge "[microdroid] Remove servicemanager from microdroid" am: 3cc0776c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2310511



Change-Id: I7e0e05ef5c1b75fbd5bf9e5c5905f557be564a75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11c9dd9b 3cc0776c

cmds/servicemanager/Android.bp

+0 −11
Original line number Diff line number Diff line
@@ -47,17 +47,6 @@ cc_binary { 
    bootstrap: true,

}



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",

cmds/servicemanager/servicemanager.microdroid.rc

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
service servicemanager /system/bin/servicemanager.microdroid

    class core

    user system

    group system readproc

    critical

    onrestart setprop servicemanager.ready false

    onrestart restart apexd

    shutdown critical