Skip to content

Commit 668aea9

Browse files
supo2coTsung-Mao Fang
authored and
Tsung-Mao Fang
committed
Use androidx.window from prebuilt.
Use androidx.window prebuilt for consistency. Bug: 223114509 Test: m -j Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3
1 parent b18b106 commit 668aea9

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

Android.bp

+1-10
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ android_library {
5656
"androidx.cardview_cardview",
5757
"androidx.preference_preference",
5858
"androidx.recyclerview_recyclerview",
59+
"androidx.window_window",
5960
"com.google.android.material_material",
6061
"setupcompat",
6162
"setupdesign",
@@ -75,7 +76,6 @@ android_library {
7576
"android.hardware.dumpstate-V1.1-java",
7677
"lottie",
7778
"WifiTrackerLib",
78-
"windowExtLib",
7979
"SettingsLibActivityEmbedding",
8080
],
8181

@@ -105,10 +105,6 @@ android_app {
105105
],
106106
static_libs: ["Settings-core"],
107107
uses_libs: ["org.apache.http.legacy"],
108-
optional_uses_libs: [
109-
"androidx.window.extensions",
110-
"androidx.window.sidecar",
111-
],
112108
resource_dirs: [],
113109
optimize: {
114110
proguard_flags_files: ["proguard.flags"],
@@ -120,11 +116,6 @@ android_library_import {
120116
aars: ["libs/contextualcards.aar"],
121117
}
122118

123-
android_library_import {
124-
name: "windowExtLib",
125-
aars: ["libs/window_ext_lib.aar"],
126-
}
127-
128119
filegroup {
129120
name: "Settings_proguard_flags",
130121
srcs: ["proguard.flags"],

libs/window_ext_lib.aar

-159 KB
Binary file not shown.

tests/robotests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ android_app {
3434
"androidx.cardview_cardview",
3535
"androidx.preference_preference",
3636
"androidx.recyclerview_recyclerview",
37+
"androidx.window_window",
3738
"com.google.android.material_material",
3839
"setupcompat",
3940
"setupdesign",
@@ -50,7 +51,6 @@ android_app {
5051
"contextualcards",
5152
"settings-logtags",
5253
"zxing-core-1.7",
53-
"windowExtLib",
5454
],
5555

5656
aaptflags: ["--extra-packages com.android.settings"],

0 commit comments

Comments
 (0)