Use androidx.window from prebuilt.
Use androidx.window prebuilt for consistency.
Bug: 223114509
Test: m -j
Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3
diff --git a/Android.bp b/Android.bp
index dd26dda..619a390 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,6 +56,7 @@
"androidx.cardview_cardview",
"androidx.preference_preference",
"androidx.recyclerview_recyclerview",
+ "androidx.window_window",
"com.google.android.material_material",
"setupcompat",
"setupdesign",
@@ -75,7 +76,6 @@
"android.hardware.dumpstate-V1.1-java",
"lottie",
"WifiTrackerLib",
- "windowExtLib",
"SettingsLibActivityEmbedding",
],
@@ -105,10 +105,6 @@
],
static_libs: ["Settings-core"],
uses_libs: ["org.apache.http.legacy"],
- optional_uses_libs: [
- "androidx.window.extensions",
- "androidx.window.sidecar",
- ],
resource_dirs: [],
optimize: {
proguard_flags_files: ["proguard.flags"],
@@ -120,11 +116,6 @@
aars: ["libs/contextualcards.aar"],
}
-android_library_import {
- name: "windowExtLib",
- aars: ["libs/window_ext_lib.aar"],
-}
-
filegroup {
name: "Settings_proguard_flags",
srcs: ["proguard.flags"],
diff --git a/libs/window_ext_lib.aar b/libs/window_ext_lib.aar
deleted file mode 100644
index d34afbd..0000000
--- a/libs/window_ext_lib.aar
+++ /dev/null
Binary files differ
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index ee0a7d8..5891ca3 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -34,6 +34,7 @@
"androidx.cardview_cardview",
"androidx.preference_preference",
"androidx.recyclerview_recyclerview",
+ "androidx.window_window",
"com.google.android.material_material",
"setupcompat",
"setupdesign",
@@ -50,7 +51,6 @@
"contextualcards",
"settings-logtags",
"zxing-core-1.7",
- "windowExtLib",
],
aaptflags: ["--extra-packages com.android.settings"],