diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..bcabaad
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,48 @@
+// Copyright (C) 2016 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_shared {
+    name: "libhidl",
+    shared_libs: [
+        "libbase",
+        "liblog",
+        "libutils",
+        "libhwbinder",
+        "libcutils",
+    ],
+    export_shared_lib_headers: [
+        "libbase",
+        "libutils",
+    ],
+    local_include_dirs: ["include"],
+    export_include_dirs: ["include"],
+
+    clang: true,
+    sanitize: {
+        misc_undefined: ["integer"],
+    },
+    srcs: [
+        "HidlSupport.cpp",
+        "IServiceManager.cpp",
+        "MQDescriptor.cpp",
+        "Static.cpp",
+        "Status.cpp",
+    ],
+
+    product_variables: {
+        debuggable: {
+            cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"],
+        },
+    },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index c4f7bd3..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 2016 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.
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libhidl
-LOCAL_SHARED_LIBRARIES := libbase liblog libutils libhwbinder libcutils
-LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbase libutils
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-
-LOCAL_CLANG := true
-LOCAL_SANITIZE := integer
-LOCAL_SRC_FILES := \
-	HidlSupport.cpp 	\
-	IServiceManager.cpp	\
-	MQDescriptor.cpp        \
-	Static.cpp 		\
-	Status.cpp
-
-ifeq ($(TARGET_BUILD_VARIANT),user)
-   LOCAL_CFLAGS += -DLIBHIDL_TARGET_BUILD_VARIANT_USER
-endif
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_MULTILIB := both
-include $(BUILD_SHARED_LIBRARY)
diff --git a/HidlSupport.cpp b/HidlSupport.cpp
index 37d4b9f..5307770 100644
--- a/HidlSupport.cpp
+++ b/HidlSupport.cpp
@@ -16,7 +16,7 @@
 
 #include <hidl/HidlSupport.h>
 
-#ifndef DLIBHIDL_TARGET_BUILD_VARIANT_USER
+#ifdef LIBHIDL_TARGET_DEBUGGABLE
 #include <android-base/logging.h>
 #include <cutils/properties.h>
 #include <regex>
@@ -127,7 +127,7 @@
 void registerInstrumentationCallbacks(
         const std::string &profilerPrefix,
         std::vector<InstrumentationCallback> *instrumentationCallbacks) {
-#ifndef DLIBHIDL_TARGET_BUILD_VARIANT_USER
+#ifdef LIBHIDL_TARGET_DEBUGGABLE
     std::vector<std::string> instrumentationLibPaths;
     instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_SYSTEM);
     instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_VENDOR);
@@ -180,12 +180,11 @@
 bool isInstrumentationLib(
         const std::string &profiler_prefix,
         const dirent *file) {
-#ifndef DLIBHIDL_TARGET_BUILD_VARIANT_USER
+#ifdef LIBHIDL_TARGET_DEBUGGABLE
     if (file->d_type != DT_REG) return false;
     std::cmatch cm;
     std::regex e("^" + profiler_prefix + "(.*).profiler.so$");
     if (std::regex_match(file->d_name, cm, e)) return true;
-#else
 #endif
     return false;
 }