From 74f6313e52f3b2cb3cbe979f2a0ac7c94c2b3588 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 31 Dec 2023 20:54:19 -0500
Subject: [PATCH] Update Android.bp

AOSP build is still broken because of missing datastore libraries. Fix
later.

preference-ktx is replaced with plain preference for AOSP compatibility.
---
 Android.bp              | 1 +
 app-common/build.gradle | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 5394d17..1b4a447 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,7 @@ android_library {
         "androidx.lifecycle_lifecycle-runtime-ktx",
         "androidx.swiperefreshlayout_swiperefreshlayout",
         "com.google.android.material_material",
+        "androidx.preference_preference"
         "kotlinx_coroutines",
     ],
     srcs: [
diff --git a/app-common/build.gradle b/app-common/build.gradle
index 929523f..deaa882 100644
--- a/app-common/build.gradle
+++ b/app-common/build.gradle
@@ -35,7 +35,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.preference:preference-ktx:1.2.1"
+    //noinspection KtxExtensionAvailable
+    implementation "androidx.preference:preference:1.2.1"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.cardview:cardview:1.0.0"