diff --git a/build/Android.bp b/build/Android.bp
index 02dcb2803..7e5cbefda 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -35,6 +35,11 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_system_modules {
+    name: "android_stubs_current_system_modules",
+    libs: ["android_stubs_current"],
+}
+
 java_library_static {
     name: "android_system_stubs_current",
     srcs: [
@@ -43,6 +48,11 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_system_modules {
+    name: "android_system_stubs_current_system_modules",
+    libs: ["android_system_stubs_current"],
+}
+
 java_library_static {
     name: "android_test_stubs_current",
     srcs: [
@@ -50,3 +60,8 @@ java_library_static {
     ],
     defaults: ["framework-stubs-default"],
 }
+
+java_system_modules {
+    name: "android_test_stubs_current_system_modules",
+    libs: ["android_test_stubs_current"],
+}