From a335e1de3618b61cf1e689142c081e4cc980bd08 Mon Sep 17 00:00:00 2001
From: Spandan Das <spandandas@google.com>
Date: Fri, 31 Mar 2023 19:04:43 +0000
Subject: [PATCH] Remove stub-annotations from art stubs system modules

This system module is used to compile conscrypt and icu stubs. These
have migrated to java_sdk_library that set `annotations_enabled: true`
explicitly.

Test: m
Test: TH
Change-Id: I65ceb1fbf0dcdbb3504b69ebce6ca8f0b67e964d
---
 java/core-libraries/Android.bp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp
index b9332dda5..d6c66e5f8 100644
--- a/java/core-libraries/Android.bp
+++ b/java/core-libraries/Android.bp
@@ -307,12 +307,6 @@ java_system_modules {
         // the UnsupportedAppUsage, CorePlatformApi and IntraCoreApi
         // annotations.
         "art.module.api.annotations.for.system.modules",
-
-        // Make nullability annotations available when compiling public stubs.
-        // They are provided as a separate library because while the
-        // annotations are not themselves part of the public API provided by
-        // this module they are used in the stubs.
-        "stub-annotations",
     ],
 }