diff --git a/device.mk b/device.mk
index b46a134..6d8e04f 100755
--- a/device.mk
+++ b/device.mk
@@ -202,8 +202,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hidl.base@1.0 \
     android.hidl.base@1.0.vendor \
-    android.hidl.manager@1.0 \
-    android.hidl.manager@1.0.vendor \
     libhidltransport \
     libhidltransport.vendor \
     libhwbinder \
diff --git a/libhidl/Android.bp b/libhidl/Android.bp
new file mode 100644
index 0000000..04031e2
--- /dev/null
+++ b/libhidl/Android.bp
@@ -0,0 +1,10 @@
+cc_library_shared {
+    name: "android.hidl.base@1.0",
+    vendor_available: true,
+    shared_libs: [
+        "libhidlbase",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+    ],
+}
\ No newline at end of file
diff --git a/libhidl/Android.mk b/libhidl/Android.mk
deleted file mode 100644
index ffb2187..0000000
--- a/libhidl/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2017 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(CLEAR_VARS)
-LOCAL_SHARED_LIBRARIES := libhidltransport
-LOCAL_MODULE := android.hidl.base@1.0
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SHARED_LIBRARIES := libhidltransport
-LOCAL_MODULE := android.hidl.manager@1.0
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_SHARED_LIBRARY)
-