Merge "healthd: *charger_test links to a.h.health@2.x statically." am: c7facae95a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1920840 Change-Id: I9ad1a0b8ce08e4de19a7281b7943c877c9bbbf86
This commit is contained in:
commit
51f11baa5b
|
@ -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: [
|
||||
|
|
Loading…
Reference in New Issue