From e8d6edc6e714826c8136bd9600e0442793da97a0 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Fri, 27 Sep 2024 18:34:37 +0000 Subject: Restrict use of framework-annotations This filegroup target should only be used when the raw srcs are needed. Module targets can use `framework-annotations-lib` as a libs reference, if necessary. Otherwise, the annotations are bundled directly with the framework. This refactor is in anticipation of bundling keep rules with the framework-annotations-lib target, instead of defining global keep rules. Bug: 275175207 Test: m Flag: EXEMPT refactor Change-Id: Id3d224ae725981151cdfe3d877d4ca152285842c --- Android.bp | 2 -- services/net/Android.bp | 1 - 2 files changed, 3 deletions(-) diff --git a/Android.bp b/Android.bp index 72f675905aa3..cb02acfd2fba 100644 --- a/Android.bp +++ b/Android.bp @@ -597,8 +597,6 @@ filegroup { filegroup { name: "framework-networkstack-shared-srcs", srcs: [ - // TODO: remove these annotations as soon as we can use andoid.support.annotations.* - ":framework-annotations", ":modules-utils-preconditions-srcs", "core/java/android/util/IndentingPrintWriter.java", "core/java/android/util/LocalLog.java", diff --git a/services/net/Android.bp b/services/net/Android.bp index 927146db0a24..62748e8641f2 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -31,7 +31,6 @@ java_library_static { filegroup { name: "services-tethering-shared-srcs", srcs: [ - ":framework-annotations", "java/android/net/util/NetworkConstants.java", ], visibility: [ -- cgit v1.2.3-59-g8ed1b