diff --git a/services/Android.bp b/services/Android.bp
index bca34f55fddd0..5019bb173cd5b 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -118,9 +118,6 @@ droidstubs {
         " --hide ReferencesHidden" +
         " --hide DeprecationMismatch" +
         " --hide HiddenTypedefConstant",
-    libs: [
-        "framework-all",
-    ],
     visibility: ["//visibility:private"],
     check_api: {
         current: {
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 616b6b005f89f..248c117d2e03a 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -28,7 +28,7 @@ java_sdk_library {
         ":framework_native_aidl",
     ],
     libs: [
-        "framework-all",
+        "framework",
         "app-compat-annotations",
         "unsupportedappusage",
     ],