diff --git a/Android.bp b/Android.bp
index cdc66d4..2b34545 100755
--- a/Android.bp
+++ b/Android.bp
@@ -6,3 +6,19 @@ hidl_package_root {
     name: "vendor.qti.hardware.radio.am",
     path: "vendor/oss/qcrilam/interface/am",
 }
+
+android_app {
+    name: "QcRilAm",
+    certificate: "platform",
+
+    proprietary: true,
+
+    srcs: ["src/**/*.java"],
+
+    static_libs: ["vendor.qti.hardware.radio.am-V1.0-java"],
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+    sdk_version: "system_current",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e2ebc8b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := QcRilAm
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_PROPRIETARY_MODULE := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := vendor.qti.hardware.radio.am-V1.0-java
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_SDK_VERSION := system_current
-
-include $(BUILD_PACKAGE)