diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5ca9f02
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,80 @@
+//
+// Copyright (C) 2021 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.
+//
+
+
+filegroup {
+    name: "ThemePicker_srcs",
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
+}
+
+filegroup {
+    name: "ThemePicker_Manifest",
+    srcs: [
+        "AndroidManifest.xml",
+    ],
+}
+
+genrule {
+    name: "ThemePicker_res",
+    tools: ["soong_zip"],
+    srcs: [
+        "res/**/*"
+    ],
+    out: ["ThemePicker_res.zip"],
+    cmd: "INPUTS=($(in)) && "
+        + "RES_DIR=$$(dirname $$(dirname $${INPUTS[0]})) && "
+        + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR && "
+        + "cp $(out) ."
+}
+
+//
+// Build app code.
+//
+android_app {
+    name: "ThemePicker",
+
+    static_libs: [
+        "wallpaper-common-deps",
+        "styleprotoslite",
+        "SystemUI-statsd",
+    ],
+
+    srcs: [
+        ":WallpaperPicker2_srcs",
+        ":ThemePicker_srcs",
+        "src_override/**/*.java",
+        "src_override/**/*.kt",
+    ],
+
+    use_embedded_native_libs: true,
+
+    resource_zips: [":WallpaperPicker2_res", ":ThemePicker_res"],
+
+    optimize: {
+        enabled: false,
+    },
+
+    certificate: "",
+
+    privileged: true,
+    system_ext_specific: true,
+    platform_apis: true,
+    manifest: "AndroidManifest.xml",
+    overrides: ["WallpaperPicker2"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 64f452a..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2018 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)
-WALLPAPER_PATH := ../WallpaperPicker2
-
-#
-# Build rule for ThemePicker app.
-#
-include $(CLEAR_VARS)
-LOCAL_USE_AAPT2 := true
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
-LOCAL_STATIC_JAVA_LIBRARIES := styleprotoslite SystemUI-statsd SystemUISharedLib
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_PACKAGE_NAME := ThemePicker
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := WallpaperPicker2
-
-ifneq (,$(wildcard frameworks/base))
-  LOCAL_PRIVATE_PLATFORM_APIS := true
-else
-  LOCAL_SDK_VERSION := system_current
-  LOCAL_STATIC_JAVA_LIBRARIES += libSharedWallpaper
-endif
-
-LOCAL_SRC_FILES := $(call all-java-files-under, $(WALLPAPER_PATH)/src) \
-    $(call all-java-files-under, src) \
-    $(call all-java-files-under, src_override)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_MANIFEST_FILE := AndroidManifest.xml
-
-include $(BUILD_PACKAGE)
-
-
-# ==================================================
-include $(call all-makefiles-under,$(LOCAL_PATH))