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

Commit d1673fa2 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: make recovery_available." am: f364c8d8 am: c9212ec2... 

Merge "servicemanager: make recovery_available." am: f364c8d8 am: c9212ec2 am: 83aa6dab am: 3a5c775d

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

Change-Id: Ie1497f1bd80c30ff90ee15ba959ef7e120e3dd53
parents e23937a7 3a5c775d

cmds/servicemanager/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -46,6 +46,15 @@ cc_binary { 
    srcs: ["main.cpp"],

}



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

cmds/servicemanager/main.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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]";

    }

cmds/servicemanager/servicemanager.recovery.rc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
service servicemanager /system/bin/servicemanager

    disabled

    group system readproc

    seclabel u:r:servicemanager:s0