diff --git a/boot/Android.bp b/boot/Android.bp
index 8f6e5915bc25f..844dd64ce8d72 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -71,4 +71,21 @@ platform_bootclasspath {
             "hiddenapi/hiddenapi-unsupported-packages.txt",
         ],
     },
+
+    dists: [
+        {
+            targets: ["droidcore"],
+            tag: "hiddenapi-flags.csv",
+        },
+        {
+            targets: ["droidcore"],
+            tag: "hiddenapi-index.csv",
+        },
+        {
+            targets: ["droidcore"],
+            tag: "hiddenapi-metadata.csv",
+            // Legacy name
+            dest: "hiddenapi-unsupported.csv",
+        },
+    ],
 }