Don't use androidx nodeps modules
The androidx nodeps modules were an internal implementation detail,
they are being removed. Replace the nodeps dependencies with the
non-nodeps versions.
Bug: 326265727
Test: atest SystemUILintCheckerTest
Flag: NONE
Change-Id: Ia30ea9ffce315cf26f058d50b9b9441506d4d240
diff --git a/packages/SystemUI/checks/Android.bp b/packages/SystemUI/checks/Android.bp
index 1f502e3..addcaf4 100644
--- a/packages/SystemUI/checks/Android.bp
+++ b/packages/SystemUI/checks/Android.bp
@@ -39,7 +39,7 @@
srcs: ["tests/**/*.kt"],
data: [
":framework",
- ":androidx.annotation_annotation-nodeps",
+ ":androidx.annotation_annotation",
":kotlinx-coroutines-core",
],
static_libs: [
diff --git a/packages/SystemUI/checks/tests/com/android/internal/systemui/lint/AndroidStubs.kt b/packages/SystemUI/checks/tests/com/android/internal/systemui/lint/AndroidStubs.kt
index edfd59a..e1cca88 100644
--- a/packages/SystemUI/checks/tests/com/android/internal/systemui/lint/AndroidStubs.kt
+++ b/packages/SystemUI/checks/tests/com/android/internal/systemui/lint/AndroidStubs.kt
@@ -22,7 +22,7 @@
internal val libraryNames =
arrayOf(
"framework.jar",
- "androidx.annotation_annotation-nodeps.jar",
+ "androidx.annotation_annotation.jar",
"kotlinx-coroutines-core.jar",
)
