diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..b899e44
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,22 @@
+android_app {
+    name: "TouchGestures",
+
+    // Include SettingsLib and it's dependencies
+    defaults: ["SettingsLibDefaults"],
+
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+    static_libs: ["VendorSupport-preference"],
+
+    manifest: "AndroidManifest.xml",
+
+    platform_apis: true,
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    optimize: {
+        enabled: false,
+    },
+    privileged: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e2f6a29..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_USE_AAPT2 := true
-
-LOCAL_PACKAGE_NAME := TouchGestures
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    VendorSupport-preference
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_DEX_PREOPT := false
-
-include frameworks/base/packages/SettingsLib/common.mk
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))