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

Commit 74981602 authored by Yifan Hong's avatar Yifan Hong Committed by Android (Google) Code Review
Browse files

Merge changes from topic "healthd_deprecate2" into pi-dev 

* changes:
  healthd: a.h.health@2.0-service.override removes healthd
  healthd: add healthd.rc
parents 6c985e2a 1cf853fb

healthd/Android.bp

+17 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ cc_library_static { 
    export_header_lib_headers: ["libhealthd_headers"],

}



cc_binary {

    name: "android.hardware.health@2.0-service",

cc_defaults {

    name: "android.hardware.health@2.0-service_defaults",

    init_rc: ["android.hardware.health@2.0-service.rc"],

    vendor: true,

    relative_install_path: "hw",
@@ -54,8 +54,23 @@ cc_binary { 
    ],

}



cc_binary {

    name: "android.hardware.health@2.0-service",

    defaults: ["android.hardware.health@2.0-service_defaults"],

}



cc_binary {

    name: "android.hardware.health@2.0-service.override",

    defaults: ["android.hardware.health@2.0-service_defaults"],



    overrides: [

        "healthd",

    ],

}



cc_binary {

    name: "healthd",

    init_rc: ["healthd.rc"],

    srcs: [

        "HealthServiceHealthd.cpp",

    ],

healthd/healthd.rc

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

    class hal

    critical

    group root system wakelock

rootdir/init.rc

+0 −5
Original line number Diff line number Diff line
@@ -736,11 +736,6 @@ service ueventd /sbin/ueventd 
    seclabel u:r:ueventd:s0

    shutdown critical



service healthd /system/bin/healthd

    class hal

    critical

    group root system wakelock



service console /system/bin/sh

    class core

    console