diff --git a/org.ifaa.android.manager/Android.bp b/org.ifaa.android.manager/Android.bp
new file mode 100644
index 0000000..a77c477
--- /dev/null
+++ b/org.ifaa.android.manager/Android.bp
@@ -0,0 +1,27 @@
+/*
+* Copyright (C) 2017-2019 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.
+*/
+
+java_library {
+    name: "org.ifaa.android.manager",
+    installable: true,
+    srcs: [
+        "src/**/*.java",
+        "src/**/I*.aidl",
+    ],
+    aidl: {
+        local_include_dirs: ["src"],
+    },
+}
diff --git a/org.ifaa.android.manager/Android.mk b/org.ifaa.android.manager/Android.mk
deleted file mode 100644
index 913fb81..0000000
--- a/org.ifaa.android.manager/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2017-2018 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src) \
-    $(call all-Iaidl-files-under, src)
-
-LOCAL_AIDL_INCLUDES := \
-    $(call all-Iaidl-files-under, src)
-
-LOCAL_MODULE := org.ifaa.android.manager
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-include $(BUILD_JAVA_LIBRARY)