summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jared Duke <jdduke@google.com> 2024-09-27 18:34:37 +0000
committer Jared Duke <jdduke@google.com> 2024-09-27 23:05:36 +0000
commite8d6edc6e714826c8136bd9600e0442793da97a0 (patch)
tree8b3d30557aa073c5cbb116e94ed269f8bde53816
parent35bb4587b0f6435dfcdb4b7937506239bbd2c4f6 (diff)
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
-rw-r--r--Android.bp2
-rw-r--r--services/net/Android.bp1
2 files changed, 0 insertions, 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: [