Merge "libhidltransport users user libhidlbase" into qt-dev

am: a27c627f51

Change-Id: Ic490a59b9eb815303f8796d57064e6d528a368f9

graphics/composer/2.2/vts/functional/Android.bp

@@ -25,6 +25,7 @@ cc_test {
     // TODO(b/64437680): Assume these libs are always available on the device.
     shared_libs: [
         "libfmq",
+        "libhidlbase",
         "libhidltransport",
         "libsync",
     ],

graphics/composer/2.3/vts/functional/Android.bp

@@ -22,6 +22,7 @@ cc_test {
     // TODO(b/64437680): Assume these libs are always available on the device.
     shared_libs: [
         "libfmq",
+        "libhidlbase",
         "libhidltransport",
         "libsync",
     ],

health/storage/1.0/vts/functional/Android.bp

@@ -20,7 +20,8 @@ cc_test {
     srcs: ["VtsHalHealthStorageV1_0TargetTest.cpp"],
     static_libs: ["android.hardware.health.storage@1.0"],
     shared_libs: [
-        "libhidltransport"
+        "libhidlbase",
+        "libhidltransport",
     ],
     test_suites: ["general-tests"],
 }

wifi/1.3/default/Android.mk

@@ -155,11 +155,11 @@ LOCAL_SRC_FILES := \
 LOCAL_STATIC_LIBRARIES := \
     libgmock \
     libgtest \
-    libhidlbase \
     android.hardware.wifi@1.0-service-lib
 LOCAL_SHARED_LIBRARIES := \
     libbase \
     libcutils \
+    libhidlbase \
     libhidltransport \
     liblog \
     libnl \