commit cc18f2fed4b195f85283e3ecc8c093b8a99d282c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 01 07:17:18 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 01 07:17:18 2024 +0000
tree 6f48fd400a559f8b31754ff2fb6787310113b64a
parent 174ec640f0f5643df17e2a6d73a189bec88400d8
parent 587b0bc872f98aa08b4c641c69981e47c85947e3

Merge "Restrict use of framework-annotations" into main am: 9962460830 am: 587b0bc872

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3285752

Change-Id: Iffcd7ee41fd8aae3f4faa63b4ca4521b56c3ff46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 8c01585..3c23670 100644
--- a/Android.bp
+++ b/Android.bp
@@ -600,8 +600,6 @@
 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",

services/net/Android.bp

diff --git a/services/net/Android.bp b/services/net/Android.bp
index 927146d..62748e8 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -31,7 +31,6 @@
 filegroup {
     name: "services-tethering-shared-srcs",
     srcs: [
-        ":framework-annotations",
         "java/android/net/util/NetworkConstants.java",
     ],
     visibility: [