2 files changed, 51 insertions, 54 deletions
diff --git a/library/Android.bp b/library/Android.bp
new file mode 100644
index 0000000..61cd83a
--- /dev/null
+++ b/library/Android.bp
@@ -0,0 +1,51 @@
+//
+// Build the platform version of setup wizard library.
+//
+
+android_library {
+    name: "setup-wizard-lib",
+
+    libs: ["androidx.annotation_annotation"],
+    manifest: "main/AndroidManifest.xml",
+    resource_dirs: [
+        "main/res",
+        "platform/res",
+    ],
+    sdk_version: "current",
+    srcs: [
+        "main/src/**/*.java",
+        "platform/src/**/*.java",
+    ],
+    min_sdk_version: "23",
+}
+
+//
+// Build gingerbread-compat library, which uses AppCompat support library to provide backwards
+// compatibility back to SDK v9.
+//
+
+android_library {
+    name: "setup-wizard-lib-gingerbread-compat",
+    manifest: "main/AndroidManifest.xml",
+    resource_dirs: [
+        "main/res",
+        "gingerbread/res",
+        "recyclerview/res",
+    ],
+    sdk_version: "current",
+    srcs: [
+        "main/src/**/*.java",
+        "gingerbread/src/**/*.java",
+        "recyclerview/src/**/*.java",
+    ],
+
+    libs: [
+        "androidx.annotation_annotation",
+        "androidx.core_core",
+        "androidx.legacy_legacy-support-core-ui",
+        "androidx.appcompat_appcompat",
+        "androidx.recyclerview_recyclerview",
+    ],
+
+    min_sdk_version: "14",
+}
diff --git a/library/Android.mk b/library/Android.mk
deleted file mode 100644
index 4b828b6..0000000
--- a/library/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-##
-# Build the platform version of setup wizard library.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-LOCAL_JAVA_LIBRARIES := \
-    androidx.annotation_annotation
-LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
-LOCAL_MODULE := setup-wizard-lib
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/main/res \
-    $(LOCAL_PATH)/platform/res
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src)
-LOCAL_MIN_SDK_VERSION := 23
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-##
-# Build gingerbread-compat library, which uses AppCompat support library to provide backwards
-# compatibility back to SDK v9.
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_AAPT2_ONLY := true
-
-LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
-LOCAL_MODULE := setup-wizard-lib-gingerbread-compat
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/main/res \
-    $(LOCAL_PATH)/gingerbread/res \
-    $(LOCAL_PATH)/recyclerview/res
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recyclerview/src)
-
-LOCAL_JAVA_LIBRARIES := \
-    androidx.annotation_annotation
-
-LOCAL_SHARED_ANDROID_LIBRARIES := \
-    androidx.core_core \
-    androidx.legacy_legacy-support-core-ui \
-    androidx.appcompat_appcompat \
-    androidx.recyclerview_recyclerview
-
-LOCAL_MIN_SDK_VERSION := 14
-
-include $(BUILD_STATIC_JAVA_LIBRARY)