Merge "libhidltransport users user libhidlbase" into qt-dev
am: a27c627f51
Change-Id: I379a04a52e60260e0a73dc7720d3e315038a52ff
This commit is contained in:
commit
0dc5f389f9
4 changed files with 5 additions and 2 deletions
|
@ -25,6 +25,7 @@ cc_test {
|
||||||
// TODO(b/64437680): Assume these libs are always available on the device.
|
// TODO(b/64437680): Assume these libs are always available on the device.
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"libfmq",
|
"libfmq",
|
||||||
|
"libhidlbase",
|
||||||
"libhidltransport",
|
"libhidltransport",
|
||||||
"libsync",
|
"libsync",
|
||||||
],
|
],
|
||||||
|
|
|
@ -22,6 +22,7 @@ cc_test {
|
||||||
// TODO(b/64437680): Assume these libs are always available on the device.
|
// TODO(b/64437680): Assume these libs are always available on the device.
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"libfmq",
|
"libfmq",
|
||||||
|
"libhidlbase",
|
||||||
"libhidltransport",
|
"libhidltransport",
|
||||||
"libsync",
|
"libsync",
|
||||||
],
|
],
|
||||||
|
|
|
@ -20,7 +20,8 @@ cc_test {
|
||||||
srcs: ["VtsHalHealthStorageV1_0TargetTest.cpp"],
|
srcs: ["VtsHalHealthStorageV1_0TargetTest.cpp"],
|
||||||
static_libs: ["android.hardware.health.storage@1.0"],
|
static_libs: ["android.hardware.health.storage@1.0"],
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"libhidltransport"
|
"libhidlbase",
|
||||||
|
"libhidltransport",
|
||||||
],
|
],
|
||||||
test_suites: ["general-tests"],
|
test_suites: ["general-tests"],
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,11 +155,11 @@ LOCAL_SRC_FILES := \
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
libgmock \
|
libgmock \
|
||||||
libgtest \
|
libgtest \
|
||||||
libhidlbase \
|
|
||||||
android.hardware.wifi@1.0-service-lib
|
android.hardware.wifi@1.0-service-lib
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
libbase \
|
libbase \
|
||||||
libcutils \
|
libcutils \
|
||||||
|
libhidlbase \
|
||||||
libhidltransport \
|
libhidltransport \
|
||||||
liblog \
|
liblog \
|
||||||
libnl \
|
libnl \
|
||||||
|
|
Loading…
Reference in a new issue