Merge "Add aconfig-annotations-lib-sdk-none module" into main

1 files changed, 17 insertions, 0 deletions

diff --git a/java/Android.bp b/java/Android.bp
index 8db32f3..d1835f5 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -77,6 +77,23 @@ java_library {
     ],
 }
 
+// Identical to aconfig-annotations-lib, but sdk_version is none.
+// Used for core modules where setting sdk_version of the dependencies as
+// core_current leads to circular dependencies
+java_library {
+    name: "aconfig-annotations-lib-sdk-none",
+    srcs: [
+        "com/android/aconfig/annotations/*.java",
+    ],
+    sdk_version: "none",
+    system_modules: "core-all-system-modules",
+    host_supported: true,
+    visibility: [
+        "//visibility:public",
+    ],
+    patch_module: "java.base",
+}
+
 filegroup {
     name: "framework-api-annotations",
     srcs: [