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

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

Merge "healthd: *charger_test links to a.h.health@2.x statically." am: c7facae9 am: 51f11baa 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1920840

Change-Id: I0d62a1ba307d089506931183ef224d4675b394f9
parents a6a59c4a 51f11baa

healthd/Android.bp

+12 −2
Original line number Diff line number Diff line
@@ -216,8 +216,6 @@ cc_defaults { 


    shared_libs: [

        // common

        "android.hardware.health@2.0",

        "android.hardware.health@2.1",

        "libbase",

        "libcutils",

        "libhidlbase",
@@ -255,6 +253,10 @@ cc_binary { 
        "charger.cpp",

        "charger_utils.cpp",

    ],

    shared_libs: [

        "android.hardware.health@2.0",

        "android.hardware.health@2.1",

    ],



    target: {

        recovery: {
@@ -280,6 +282,11 @@ cc_test { 
    name: "charger_test",

    defaults: ["charger_defaults"],

    srcs: ["charger_test.cpp"],

    static_libs: [

        "android.hardware.health@1.0",

        "android.hardware.health@2.0",

        "android.hardware.health@2.1",

    ],

}



cc_test {
@@ -290,6 +297,9 @@ cc_test { 
        "healthd_mode_charger_test.cpp"

    ],

    static_libs: [

        "android.hardware.health@1.0",

        "android.hardware.health@2.0",

        "android.hardware.health@2.1",

        "libgmock",

    ],

    test_suites: [