diff options
| author | 2024-10-01 07:01:32 +0000 | |
|---|---|---|
| committer | 2024-10-01 07:01:32 +0000 | |
| commit | 587b0bc872f98aa08b4c641c69981e47c85947e3 (patch) | |
| tree | 1ae5f77c566de389380c5958b5c4c7f0ac22e36b | |
| parent | 2daffc10b1f0af4a9584ecd7d37ab1a34c5ce915 (diff) | |
| parent | 9962460830cf6e48b6d2bb0842edb0c4a6741a61 (diff) | |
Merge "Restrict use of framework-annotations" into main am: 9962460830
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3285752
Change-Id: I703554792ff9f0b3bf45f0f36ff4102e893148d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | services/net/Android.bp | 1 |
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: [ |