Merge "libhidltransport: not in recovery" am: cff26ef9dc am: 75c1be3b56
am: 00e036e1c5

Change-Id: If34ceddd4e6510a78d72d370a2061104ed9f4471
diff --git a/Android.bp b/Android.bp
index 7476db5..76dc28f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -110,7 +110,6 @@
 // on libhidlbase instead.
 cc_library {
     name: "libhidltransport",
-    recovery_available: true,
     vendor_available: true,
     vndk: {
         enabled: true,
diff --git a/transport/Android.bp b/transport/Android.bp
index f1b086e..324dbde 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -22,12 +22,14 @@
         "libbase",
         "liblog",
         "libutils",
-        "libhwbinder",
         "libcutils",
     ],
     export_shared_lib_headers: [
         "libutils",
     ],
+    static_libs: [
+        "libhwbinder-impl-internal",
+    ],
 
     target: {
         android: {