Remove some usage of the framework-annotations filegroup
We should be using the lib instead.
Unfortunately net-utils-framework-common can't do the
same move just yet because many targets depend on it
that only build against system_current.
Test: builds
Change-Id: I9f70f4cc31e0270cc05ef71ba1803c2d088937d6
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 4fc93ce..6a56889 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -42,9 +42,8 @@
// This library is used by system modules, for which the system health impact of Kotlin
// has not yet been evaluated. Annotations may need jarjar'ing.
// "src_devicecommon/**/*.kt",
- ":framework-annotations",
],
- sdk_version: "system_current",
+ sdk_version: "module_current",
min_sdk_version: "29",
target_sdk_version: "30",
apex_available: [
@@ -69,6 +68,7 @@
],
libs: [
"androidx.annotation_annotation",
+ "framework-annotations-lib",
],
}
@@ -201,13 +201,16 @@
name: "net-utils-services-common",
srcs: [
":net-utils-services-common-srcs",
- ":framework-annotations",
],
- sdk_version: "system_current",
+ sdk_version: "module_current",
min_sdk_version: "30",
static_libs: [
"modules-utils-build_system",
],
+ libs: [
+ "framework-annotations-lib",
+ "framework-connectivity",
+ ],
visibility: [
"//frameworks/base/services/net",
],