Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
(cherry picked from commit b1af85d15523db44d4fa80c78409069ec691ed0a)
diff --git a/Android.mk b/Android.mk
index e37e9fb..0466a1f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,17 +21,17 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-slices-builders \
- android-slices-core \
- android-slices-view \
- android-support-compat \
- android-support-v4 \
- android-support-v13 \
- android-support-v7-appcompat \
- android-support-v7-cardview \
- android-support-v7-preference \
- android-support-v7-recyclerview \
- android-support-v14-preference \
+ androidx.slice_slice-builders \
+ androidx.slice_slice-core \
+ androidx.slice_slice-view \
+ androidx.core_core \
+ androidx.legacy_legacy-support-v4 \
+ androidx.legacy_legacy-support-v13 \
+ androidx.appcompat_appcompat \
+ androidx.cardview_cardview \
+ androidx.preference_preference \
+ androidx.recyclerview_recyclerview \
+ androidx.legacy_legacy-preference-v14 \
LOCAL_JAVA_LIBRARIES := \
bouncycastle \
@@ -39,8 +39,8 @@
ims-common
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-arch-lifecycle-runtime \
- android-arch-lifecycle-extensions \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-extensions \
guava \
jsr305 \
settings-logtags \