Use androidx.window from prebuilt.

Use androidx.window prebuilt for consistency.

Bug: 223114509
Test: m -j

Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3
This commit is contained in:
Diego Vela
2022-04-07 13:18:03 -07:00
committed by Tsung-Mao Fang
parent b18b106300
commit 668aea9b55
3 changed files with 2 additions and 11 deletions

View File

@@ -56,6 +56,7 @@ android_library {
"androidx.cardview_cardview", "androidx.cardview_cardview",
"androidx.preference_preference", "androidx.preference_preference",
"androidx.recyclerview_recyclerview", "androidx.recyclerview_recyclerview",
"androidx.window_window",
"com.google.android.material_material", "com.google.android.material_material",
"setupcompat", "setupcompat",
"setupdesign", "setupdesign",
@@ -75,7 +76,6 @@ android_library {
"android.hardware.dumpstate-V1.1-java", "android.hardware.dumpstate-V1.1-java",
"lottie", "lottie",
"WifiTrackerLib", "WifiTrackerLib",
"windowExtLib",
"SettingsLibActivityEmbedding", "SettingsLibActivityEmbedding",
], ],
@@ -105,10 +105,6 @@ android_app {
], ],
static_libs: ["Settings-core"], static_libs: ["Settings-core"],
uses_libs: ["org.apache.http.legacy"], uses_libs: ["org.apache.http.legacy"],
optional_uses_libs: [
"androidx.window.extensions",
"androidx.window.sidecar",
],
resource_dirs: [], resource_dirs: [],
optimize: { optimize: {
proguard_flags_files: ["proguard.flags"], proguard_flags_files: ["proguard.flags"],
@@ -120,11 +116,6 @@ android_library_import {
aars: ["libs/contextualcards.aar"], aars: ["libs/contextualcards.aar"],
} }
android_library_import {
name: "windowExtLib",
aars: ["libs/window_ext_lib.aar"],
}
filegroup { filegroup {
name: "Settings_proguard_flags", name: "Settings_proguard_flags",
srcs: ["proguard.flags"], srcs: ["proguard.flags"],

Binary file not shown.

View File

@@ -34,6 +34,7 @@ android_app {
"androidx.cardview_cardview", "androidx.cardview_cardview",
"androidx.preference_preference", "androidx.preference_preference",
"androidx.recyclerview_recyclerview", "androidx.recyclerview_recyclerview",
"androidx.window_window",
"com.google.android.material_material", "com.google.android.material_material",
"setupcompat", "setupcompat",
"setupdesign", "setupdesign",
@@ -50,7 +51,6 @@ android_app {
"contextualcards", "contextualcards",
"settings-logtags", "settings-logtags",
"zxing-core-1.7", "zxing-core-1.7",
"windowExtLib",
], ],
aaptflags: ["--extra-packages com.android.settings"], aaptflags: ["--extra-packages com.android.settings"],