diff --git a/Android.bp b/Android.bp
index 6e3799b74cd60..9ca815ddb00e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -425,6 +425,7 @@ java_library {
     name: "framework-minus-apex",
     defaults: ["framework-defaults"],
     srcs: [":framework-non-updatable-sources"],
+    libs: ["app-compat-annotations"],
     installable: true,
     javac_shard_size: 150,
     required: [
@@ -463,6 +464,7 @@ java_library {
     defaults: ["framework-defaults"],
     srcs: [":framework-all-sources"],
     installable: false,
+    libs: ["app-compat-annotations"],
     plugins: [
         "unsupportedappusage-annotation-processor",
         "compat-changeid-annotation-processor",
@@ -502,6 +504,7 @@ java_library {
 java_library {
     name: "framework-atb-backward-compatibility",
     installable: true,
+    libs: ["app-compat-annotations"],
     srcs: [
         "core/java/android/content/pm/AndroidTestBaseUpdater.java",
     ],
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 770de09382fe3..c6bc1068da399 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -91,6 +91,7 @@ java_library_static {
         "android.hardware.light-V2.0-java",
         "android.hardware.power-V1.0-java",
         "android.hardware.tv.cec-V1.0-java",
+        "app-compat-annotations",
     ],
 
     required: [
diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp
index 91c05a858ce49..bffa44e868a7c 100644
--- a/services/devicepolicy/Android.bp
+++ b/services/devicepolicy/Android.bp
@@ -4,6 +4,7 @@ java_library_static {
 
     libs: [
         "services.core",
+        "app-compat-annotations",
     ],
 
     plugins: [
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 0b5d4460612de..aa4174ad40f45 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -27,7 +27,10 @@ java_sdk_library {
         ":framework-core-sources-for-test-mock",
         ":framework_native_aidl",
     ],
-    libs: ["framework-all"],
+    libs: [
+        "framework-all",
+        "app-compat-annotations",
+    ],
 
     api_packages: [
         "android.test.mock",