diff --git a/Android.bp b/Android.bp
index 7476db5..9541575 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,8 +112,4 @@
     name: "libhidltransport",
     recovery_available: true,
     vendor_available: true,
-    vndk: {
-        enabled: true,
-        support_system_process: 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: {