commit 668aea9b559ca22468a16de5b6789495e929ac91
author Diego Vela <diegovela@google.com> Thu Apr 07 13:18:03 2022 -0700
committer Tsung-Mao Fang <tmfang@google.com> Thu Apr 14 09:55:36 2022 +0000
tree 65fc510905bc5b5b033bb8935aa4ed0e02e67334
parent b18b1063001087f756efa980d1e52a94ade0c2c0

Use androidx.window from prebuilt.

Use androidx.window prebuilt for consistency.

Bug: 223114509
Test: m -j

Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3

Android.bp

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"],