diff --git a/Android.bp b/Android.bp
index 0377beb..c4071e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,9 +65,7 @@ cc_library_static {
     defaults: ["vold_default_flags"],
 
     srcs: [
-        "binder/android/os/IVold.aidl",
-        "binder/android/os/IVoldListener.aidl",
-        "binder/android/os/IVoldTaskListener.aidl",
+        ":vold_aidl",
     ],
     shared_libs: [
         "libbinder",
@@ -209,4 +207,13 @@ cc_binary {
     ],
 }
 
+filegroup {
+    name: "vold_aidl",
+    srcs: [
+        "binder/android/os/IVold.aidl",
+        "binder/android/os/IVoldListener.aidl",
+        "binder/android/os/IVoldTaskListener.aidl",
+    ],
+}
+
 subdirs = ["tests"]