Merge "healthd: *charger_test links to a.h.health@2.x statically."
This commit is contained in:
commit
c7facae95a
|
@ -216,8 +216,6 @@ cc_defaults {
|
||||||
|
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
// common
|
// common
|
||||||
"android.hardware.health@2.0",
|
|
||||||
"android.hardware.health@2.1",
|
|
||||||
"libbase",
|
"libbase",
|
||||||
"libcutils",
|
"libcutils",
|
||||||
"libhidlbase",
|
"libhidlbase",
|
||||||
|
@ -255,6 +253,10 @@ cc_binary {
|
||||||
"charger.cpp",
|
"charger.cpp",
|
||||||
"charger_utils.cpp",
|
"charger_utils.cpp",
|
||||||
],
|
],
|
||||||
|
shared_libs: [
|
||||||
|
"android.hardware.health@2.0",
|
||||||
|
"android.hardware.health@2.1",
|
||||||
|
],
|
||||||
|
|
||||||
target: {
|
target: {
|
||||||
recovery: {
|
recovery: {
|
||||||
|
@ -280,6 +282,11 @@ cc_test {
|
||||||
name: "charger_test",
|
name: "charger_test",
|
||||||
defaults: ["charger_defaults"],
|
defaults: ["charger_defaults"],
|
||||||
srcs: ["charger_test.cpp"],
|
srcs: ["charger_test.cpp"],
|
||||||
|
static_libs: [
|
||||||
|
"android.hardware.health@1.0",
|
||||||
|
"android.hardware.health@2.0",
|
||||||
|
"android.hardware.health@2.1",
|
||||||
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
cc_test {
|
cc_test {
|
||||||
|
@ -290,6 +297,9 @@ cc_test {
|
||||||
"healthd_mode_charger_test.cpp"
|
"healthd_mode_charger_test.cpp"
|
||||||
],
|
],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
|
"android.hardware.health@1.0",
|
||||||
|
"android.hardware.health@2.0",
|
||||||
|
"android.hardware.health@2.1",
|
||||||
"libgmock",
|
"libgmock",
|
||||||
],
|
],
|
||||||
test_suites: [
|
test_suites: [
|
||||||
|
|
Loading…
Reference in New Issue