9 files changed, 14 insertions, 14 deletions
diff --git a/PermissionController/tests/inprocess/Android.bp b/PermissionController/tests/inprocess/Android.bp
index 7227e41ad..217571ac1 100644
--- a/PermissionController/tests/inprocess/Android.bp
+++ b/PermissionController/tests/inprocess/Android.bp
@@ -37,8 +37,8 @@ android_test {
     srcs: ["src/**/*.kt"],
 
     libs: [
-        "android.test.base",
-        "android.test.runner",
+        "android.test.base.stubs.system",
+        "android.test.runner.stubs.system",
     ],
 
     static_libs: [
diff --git a/PermissionController/tests/mocking/Android.bp b/PermissionController/tests/mocking/Android.bp
index 3d425f5f8..4e22f1c59 100644
--- a/PermissionController/tests/mocking/Android.bp
+++ b/PermissionController/tests/mocking/Android.bp
@@ -42,8 +42,8 @@ android_test {
     ],
 
     libs: [
-        "android.test.base",
-        "android.test.runner",
+        "android.test.base.stubs.system",
+        "android.test.runner.stubs.system",
         "safety-center-annotations",
     ],
 
diff --git a/PermissionController/tests/outofprocess/Android.bp b/PermissionController/tests/outofprocess/Android.bp
index 83bb65d6b..be0fa90ff 100644
--- a/PermissionController/tests/outofprocess/Android.bp
+++ b/PermissionController/tests/outofprocess/Android.bp
@@ -37,8 +37,8 @@ android_test {
     ],
 
     libs: [
-        "android.test.base",
-        "android.test.runner",
+        "android.test.base.stubs.system",
+        "android.test.runner.stubs.system",
     ],
 
     static_libs: [
diff --git a/PermissionController/tests/permissionui/Android.bp b/PermissionController/tests/permissionui/Android.bp
index 6aa0dc45c..66ab75e07 100644
--- a/PermissionController/tests/permissionui/Android.bp
+++ b/PermissionController/tests/permissionui/Android.bp
@@ -38,8 +38,8 @@ android_test {
         "src/**/*.kt",
     ],
     libs: [
-        "android.test.base",
-        "android.test.runner",
+        "android.test.base.stubs.test",
+        "android.test.runner.stubs.test",
     ],
 
     static_libs: [
diff --git a/SafetyCenter/Config/Android.bp b/SafetyCenter/Config/Android.bp
index a8d275226..32df3165e 100644
--- a/SafetyCenter/Config/Android.bp
+++ b/SafetyCenter/Config/Android.bp
@@ -35,7 +35,7 @@ java_library {
     libs: [
         "androidx.annotation_annotation",
         "framework-annotations-lib",
-        "framework-permission-s",
+        "framework-permission-s.impl",
         "safety-center-annotations",
     ],
     static_libs: [
diff --git a/flags/Android.bp b/flags/Android.bp
index 457aa4f91..34619cd95 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -33,7 +33,7 @@ java_aconfig_library {
     sdk_version: "module_current",
     min_sdk_version: "30",
     installable: false,
-    libs: ["framework-configinfrastructure"],
+    libs: ["framework-configinfrastructure.stubs.module_lib"],
     visibility: [
         "//packages/modules/Permission:__subpackages__",
     ],
diff --git a/service/Android.bp b/service/Android.bp
index d80fa4f0d..6f851c4d2 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -82,7 +82,7 @@ java_sdk_library {
     ],
     libs: [
         "androidx.annotation_annotation",
-        "framework-configinfrastructure",
+        "framework-configinfrastructure.stubs.module_lib",
         // TODO(b/177884622): Short term solution to prevent service-permission from seeing hidden
         //  APIs in framework-permission, as we don't actually have any dependency in it.
         //"framework-permission",
diff --git a/tests/cts/permission/Android.bp b/tests/cts/permission/Android.bp
index 8364a065b..e4fbb81b6 100644
--- a/tests/cts/permission/Android.bp
+++ b/tests/cts/permission/Android.bp
@@ -67,8 +67,8 @@ android_test {
     ],
     sdk_version: "test_current",
     libs: [
-        "android.test.runner",
-        "android.test.base",
+        "android.test.runner.stubs.test",
+        "android.test.base.stubs.test",
     ],
     data: [
         ":AppThatDefinesUndefinedPermissionGroupElement",
diff --git a/tests/cts/permissionpolicy/Android.bp b/tests/cts/permissionpolicy/Android.bp
index 8f3c42b0e..7fac4d16a 100644
--- a/tests/cts/permissionpolicy/Android.bp
+++ b/tests/cts/permissionpolicy/Android.bp
@@ -26,7 +26,7 @@ android_test {
         "cts",
         "general-tests",
     ],
-    libs: ["android.test.base"],
+    libs: ["android.test.base.stubs.test"],
     static_libs: [
         "androidx.test.core",
         "compatibility-device-util-axt",