commit bba8b2fbc0b4351111e22eea15e4a623f2042be2
author Muhammad Qureshi <muhammadq@google.com> Tue Mar 12 04:43:41 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 12 04:43:41 2024 +0000
tree 1d84856021047d2883ca30a08b0adff8b5b99062
parent 00d45926ec8c8e799658d4ab4c7b7a24be9581d2
parent a2cd95e1fb68215d1800d937ab7aa5807d09bca7

Merge "Add android annotation dependency for @RequiresApi in generated code." into main am: a91603262e am: a2cd95e1fb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2987013

Change-Id: I46c9cf4a697cd44d07b20e62178911c34a0baf90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

apex/jobscheduler/service/Android.bp

diff --git a/apex/jobscheduler/service/Android.bp b/apex/jobscheduler/service/Android.bp
index 0104ee1..ace56d4 100644
--- a/apex/jobscheduler/service/Android.bp
+++ b/apex/jobscheduler/service/Android.bp
@@ -20,6 +20,7 @@
     ],
 
     libs: [
+        "androidx.annotation_annotation",
         "app-compat-annotations",
         "error_prone_annotations",
         "framework",

core/java/Android.bp

diff --git a/core/java/Android.bp b/core/java/Android.bp
index ab1c9a4..4f96206 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -167,6 +167,9 @@
         "com/android/internal/logging/UiEventLoggerImpl.java",
         ":statslog-framework-java-gen",
     ],
+    libs: [
+        "androidx.annotation_annotation",
+    ],
     static_libs: ["modules-utils-uieventlogger-interface"],
 }