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

Commit 456c9ebb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "healthd use vintf_fragments" into stage-aosp-master

parents 51b29c99 c4a3421b
Loading
Loading
Loading
Loading
+5 −14
Original line number Original line Diff line number Diff line
@@ -6,11 +6,6 @@ Upgrading from health@1.0 HAL
1. If the device does not have a vendor-specific libhealthd AND does not
1. If the device does not have a vendor-specific libhealthd AND does not
   implement storage-related APIs, just do the following:
   implement storage-related APIs, just do the following:


    1.1 (recommended) To remove healthd from the build,
        PRODUCT_PACKAGES += android.hardware.health@2.0-service.override
        DEVICE_FRAMEWORK_MANIFEST_FILE += \
            system/libhidl/vintfdata/manifest_healthd_exclude.xml
    1.2 To keep healthd in the build,
    PRODUCT_PACKAGES += android.hardware.health@2.0-service
    PRODUCT_PACKAGES += android.hardware.health@2.0-service


   Otherwise, continue to Step 2.
   Otherwise, continue to Step 2.
@@ -53,16 +48,12 @@ cc_binary {


    header_libs: ["libhealthd_headers"],
    header_libs: ["libhealthd_headers"],


    // Uncomment the following to remove healthd from the build.
    overrides: [
    // overrides: [
        "healthd",
    //     "healthd",
    ],
    // ],
}
}


    3.1 (recommended) To remove healthd from the build, keep "overrides"
    3.1 (recommended) To remove healthd from the build, keep "overrides" section.
          section, and include the following in device.mk:
            DEVICE_FRAMEWORK_MANIFEST_FILE += \
                system/libhidl/vintfdata/manifest_healthd_exclude.xml
    3.2 To keep healthd in the build, remove "overrides" section.
    3.2 To keep healthd in the build, remove "overrides" section.


4. Create device/<manufacturer>/<device>/health/android.hardware.health@2.0-service.<device>.rc
4. Create device/<manufacturer>/<device>/health/android.hardware.health@2.0-service.<device>.rc