diff --git a/KeyHandler/Android.bp b/KeyHandler/Android.bp
new file mode 100644
index 0000000..7c8766f
--- /dev/null
+++ b/KeyHandler/Android.bp
@@ -0,0 +1,13 @@
+android_app {
+    name: "KeyHandler",
+
+    srcs: ["src/**/*.java"],
+
+    certificate: "platform",
+    platform_apis: true,
+    system_ext_specific: true,
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+}
diff --git a/KeyHandler/Android.mk b/KeyHandler/Android.mk
deleted file mode 100644
index 8f7b162..0000000
--- a/KeyHandler/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2018 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := KeyHandler
-
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
diff --git a/KeyHandler/proguard.flags b/KeyHandler/proguard.flags
new file mode 100644
index 0000000..55f91d4
--- /dev/null
+++ b/KeyHandler/proguard.flags
@@ -0,0 +1,3 @@
+-keep class org.lineageos.settings.device.* {
+  *;
+}