commit 18a6e73af147f9c9e204eacd70186ec1637f6c1d
author Victor Chang <vichang@google.com> Mon Dec 18 17:31:14 2023 +0000
committer Victor Chang <vichang@google.com> Mon Dec 18 17:34:33 2023 +0000
tree 4703a16a5d89705cfb66d77d903d8b43207b20c0
parent 36c0b3e34f352a51b7dfb4217fb5cd050d90c2a2

Add com.android.aconfig.annotations to the filegroup used by libcore

aconfig-annotations-lib has a dependency on core_current, but
core_current is using the @FlaggedApi and java_config_library
to flag its APIs.

Use the sources directly to break the circular dependency.
The filegroup is onyl visible to the art/ and libcore/

Bug: 316554963
Test: m droid
Change-Id: Ibf983c2a754249ceb6dbf2a633275f67d6fda666

java/Android.bp

diff --git a/java/Android.bp b/java/Android.bp
index e31f878..cf3aa95 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -84,6 +84,8 @@
         "android/annotation/FlaggedApi.java",
         "android/annotation/SystemApi.java",
         "android/annotation/TestApi.java",
+        // aconfig annotations
+        "com/android/aconfig/annotations/*.java",
     ],
 
     visibility: [