diff options
| author | Jihoon Kang <jihoonkang@google.com> | 2024-02-14 18:28:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-14 18:28:07 +0000 |
| commit | 0309e87f20e52625d7bdccb1215be869f8c317ef (patch) | |
| tree | 2709fc56f3b381c595a7da7054e4c2403ebdac96 | |
| parent | c6bb6f78020d0dea3f3a4d1f5259457deec99694 (diff) | |
| parent | ffbd55810e145b0c5c684b74eac706fc28f0c676 (diff) | |
| download | modules-utils-0309e87f20e52625d7bdccb1215be869f8c317ef.tar.gz | |
Merge "Add aconfig-annotations-lib-sdk-none module" into main am: ffbd55810e
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2959746
Change-Id: I35c1dfedea734b9fb947dd25dbeea41c6c0dc9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | java/Android.bp | 17 |
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: [ |