diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index fe05064..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,3 +0,0 @@
-subdirs = [
-    "libhidl",
-]
diff --git a/libhidl/Android.bp b/libhidl/Android.bp
deleted file mode 100644
index ff3ce3c..0000000
--- a/libhidl/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-cc_library_shared {
-    name: "android.hidl.base@1.0",
-    vendor_available: true,
-    shared_libs: [
-        "libhidltransport",
-    ],
-    export_shared_lib_headers: [
-        "libhidltransport",
-    ],
-}
diff --git a/libhidl/Android.mk b/libhidl/Android.mk
new file mode 100644
index 0000000..2d5af1a
--- /dev/null
+++ b/libhidl/Android.mk
@@ -0,0 +1,29 @@
+#
+# 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_SRC_FILES := \
+
+LOCAL_SHARED_LIBRARIES := \
+    libhidltransport
+
+LOCAL_C_INCLUDES := \
+
+LOCAL_MODULE := android.hidl.base@1.0
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+
+include $(BUILD_SHARED_LIBRARY)