commit 87017a6309e878eb05403867ad35702d444b931c
author Jiaming Liu <jiamingliu@google.com> Tue Apr 04 22:06:17 2023 +0000
committer Jiaming Liu <jiamingliu@google.com> Fri Apr 07 19:50:04 2023 +0000
tree 1985f3a9c829921b28febe6d4a3f067827d02739
parent 2e0f3af103e2200123b339ab531cb10c3303bb1c

Depend on aars in prebuilts/sdk for window extensions

Bug: 276358138
Bug: 264962409
Test: build
Change-Id: I0364f902d664e185762b2b3523032efa0ce5636e

libs/WindowManager/Jetpack/Android.bp

diff --git a/libs/WindowManager/Jetpack/Android.bp b/libs/WindowManager/Jetpack/Android.bp
index a5b192c..abe8f85 100644
--- a/libs/WindowManager/Jetpack/Android.bp
+++ b/libs/WindowManager/Jetpack/Android.bp
@@ -55,20 +55,6 @@
 }
 
 // Extensions
-// NOTE: This module is still under active development and must not
-// be used in production. Use 'androidx.window.sidecar' instead.
-android_library_import {
-    name: "window-extensions",
-    aars: ["window-extensions-release.aar"],
-    sdk_version: "current",
-}
-
-android_library_import {
-    name: "window-extensions-core",
-    aars: ["window-extensions-core-release.aar"],
-    sdk_version: "current",
-}
-
 java_library {
     name: "androidx.window.extensions",
     srcs: [
@@ -77,8 +63,8 @@
         "src/androidx/window/common/**/*.java",
     ],
     static_libs: [
-        "window-extensions",
-        "window-extensions-core",
+        "androidx.window.extensions_extensions-nodeps",
+        "androidx.window.extensions.core_core-nodeps",
     ],
     installable: true,
     sdk_version: "core_platform",