diff --git a/build/Android.bp b/build/Android.bp
index 7e5cbefda..65a5cadb4 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -35,6 +35,17 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_library_static {
+    name: "metalava_android_stubs_current",
+    srcs: [
+        ":metalava-api-stubs-docs",
+    ],
+    libs: [
+        "stub-annotations",
+    ],
+    defaults: ["framework-stubs-default"],
+}
+
 java_system_modules {
     name: "android_stubs_current_system_modules",
     libs: ["android_stubs_current"],
@@ -48,6 +59,17 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_library_static {
+    name: "metalava_android_system_stubs_current",
+    srcs: [
+        ":metalava-system-api-stubs-docs",
+    ],
+    libs: [
+        "stub-annotations",
+    ],
+    defaults: ["framework-stubs-default"],
+}
+
 java_system_modules {
     name: "android_system_stubs_current_system_modules",
     libs: ["android_system_stubs_current"],
@@ -61,6 +83,17 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_library_static {
+    name: "metalava_android_test_stubs_current",
+    srcs: [
+        ":metalava-test-api-stubs-docs",
+    ],
+    libs: [
+        "stub-annotations",
+    ],
+    defaults: ["framework-stubs-default"],
+}
+
 java_system_modules {
     name: "android_test_stubs_current_system_modules",
     libs: ["android_test_stubs_current"],