diff --git a/device.mk b/device.mk
index 445977c..44275e7 100755
--- a/device.mk
+++ b/device.mk
@@ -63,7 +63,7 @@
 PRODUCT_STATIC_BOOT_CONTROL_HAL := \
     bootctrl.msmnile \
     libcutils \
-    libgptutils \
+    libgptutils.asus_msmnile.recovery \
     libz
 
 # Camera
diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
new file mode 100644
index 0000000..a7aeecd
--- /dev/null
+++ b/gpt-utils/Android.bp
@@ -0,0 +1,39 @@
+//
+// Copyright (C) 2018 The Android Open Source 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.
+//
+
+
+cc_library {
+    name: "libgptutils.asus_msmnile",
+    vendor: true,
+    recovery_available: true,
+    shared_libs: [
+        "libcutils",
+        "liblog",
+        "libz",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    srcs: [
+        "gpt-utils.cpp",
+    ],
+    owner: "qti",
+    header_libs: [
+        "device_kernel_headers",
+    ],
+    export_include_dirs: ["."],
+}
diff --git a/gpt-utils/Android.mk b/gpt-utils/Android.mk
deleted file mode 100644
index a9b3176..0000000
--- a/gpt-utils/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := bootable/recovery \
-                    generated_kernel_headers
-LOCAL_SRC_FILES := gpt-utils.cpp sparse_crc32.cpp
-LOCAL_HEADER_LIBRARIES := generated_kernel_headers
-LOCAL_MODULE := libgptutils
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := bootable/recovery \
-                    generated_kernel_headers
-LOCAL_SRC_FILES := gpt-utils.cpp sparse_crc32.cpp
-LOCAL_HEADER_LIBRARIES := generated_kernel_headers
-LOCAL_SHARED_LIBRARIES += liblog libcutils
-LOCAL_MODULE := libgptutils
-LOCAL_COPY_HEADERS_TO := gpt-utils/inc
-LOCAL_COPY_HEADERS := gpt-utils.h
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_SHARED_LIBRARY)