aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2023-12-18 17:31:14 +0000
committerVictor Chang <vichang@google.com>2023-12-18 17:34:33 +0000
commit18a6e73af147f9c9e204eacd70186ec1637f6c1d (patch)
tree4703a16a5d89705cfb66d77d903d8b43207b20c0
parent36c0b3e34f352a51b7dfb4217fb5cd050d90c2a2 (diff)
downloadmodules-utils-18a6e73af147f9c9e204eacd70186ec1637f6c1d.tar.gz
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
-rw-r--r--java/Android.bp2
1 files changed, 2 insertions, 0 deletions
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 @@ filegroup {
"android/annotation/FlaggedApi.java",
"android/annotation/SystemApi.java",
"android/annotation/TestApi.java",
+ // aconfig annotations
+ "com/android/aconfig/annotations/*.java",
],
visibility: [