From d580242a14718c8300cd646b9ea91c617b6cc6e4 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Wed, 27 Oct 2021 19:02:14 +0900 Subject: [PATCH] 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 --- staticlibs/Android.bp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index 4fc93ce7a2..6a56889caf 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -42,9 +42,8 @@ java_library { // 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 @@ java_library { ], libs: [ "androidx.annotation_annotation", + "framework-annotations-lib", ], } @@ -201,13 +201,16 @@ java_library { 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", ],