diff --git a/Android.bp b/Android.bp
index 7ceb727d1890a..8c2d236ec076a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -409,7 +409,6 @@ java_defaults {
         "app-compat-annotations",
         "ext",
         "unsupportedappusage",
-        "framework-updatable-stubs-module_libs_api",
     ],
 
     jarjar_rules: ":framework-jarjar-rules",
@@ -475,6 +474,7 @@ java_library {
         "libcore-platform-compat-config",
         "services-platform-compat-config",
     ],
+    libs: ["framework-updatable-stubs-module_libs_api"],
     static_libs: [
         // If MimeMap ever becomes its own APEX, then this dependency would need to be removed
         // in favor of an API stubs dependency in java_library "framework" below.
@@ -519,6 +519,7 @@ java_library {
     visibility: [
         // DO NOT ADD ANY MORE ENTRIES TO THIS LIST
         "//external/robolectric-shadows:__subpackages__",
+        "//frameworks/base",
         "//frameworks/layoutlib:__subpackages__",
     ],
 }
diff --git a/StubLibraries.bp b/StubLibraries.bp
index e8aa3936d8898..9a52cf69ef3d6 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -71,7 +71,8 @@ stubs_defaults {
 stubs_defaults {
     name: "metalava-non-updatable-api-stubs-default",
     defaults: ["metalava-base-api-stubs-default"],
-    sdk_version: "system_current",
+    sdk_version: "core_platform",
+    libs: ["framework-all"],
 }
 
 /////////////////////////////////////////////////////////////////////