diff options
| author | 2024-03-12 04:02:13 +0000 | |
|---|---|---|
| committer | 2024-03-12 04:02:13 +0000 | |
| commit | a2cd95e1fb68215d1800d937ab7aa5807d09bca7 (patch) | |
| tree | e43f32c680649c1afe67f19cbcc3def7c298ed74 | |
| parent | d78441c0a56a84cdfff648921678e32e3cc2a32c (diff) | |
| parent | a91603262ef9b364016c3c3aaf779ca8950edaa0 (diff) | |
Merge "Add android annotation dependency for @RequiresApi in generated code." into main am: a91603262e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2987013
Change-Id: Ia6004de50ca169c2478ddee80e302ece7a28df58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apex/jobscheduler/service/Android.bp | 1 | ||||
| -rw-r--r-- | core/java/Android.bp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/apex/jobscheduler/service/Android.bp b/apex/jobscheduler/service/Android.bp index a9a5ad060b39..a654f7a2d974 100644 --- a/apex/jobscheduler/service/Android.bp +++ b/apex/jobscheduler/service/Android.bp @@ -20,6 +20,7 @@ java_library { ], libs: [ + "androidx.annotation_annotation", "app-compat-annotations", "error_prone_annotations", "framework", diff --git a/core/java/Android.bp b/core/java/Android.bp index eba500dd32b4..0147910595e1 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -166,6 +166,9 @@ java_library { "com/android/internal/logging/UiEventLoggerImpl.java", ":statslog-framework-java-gen", ], + libs: [ + "androidx.annotation_annotation", + ], static_libs: ["modules-utils-uieventlogger-interface"], } |