diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 0c4e40f..5afa54d 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -12,6 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+filegroup {
+    name: "libcarpowermanager_aidl",
+    srcs: [
+        "src/android/car/ICar.aidl",
+        "src/android/car/hardware/power/ICarPower.aidl",
+        "src/android/car/hardware/power/ICarPowerStateListener.aidl",
+    ],
+    path: "src",
+}
+
 cc_library {
     name: "libcarpowermanager",
 
@@ -40,9 +50,7 @@
     ],
 
     srcs: [
-        "src/android/car/ICar.aidl",
-        "src/android/car/hardware/power/ICarPower.aidl",
-        "src/android/car/hardware/power/ICarPowerStateListener.aidl",
+        ":libcarpowermanager_aidl",
         "native/CarPowerManager/CarPowerManager.cpp",
     ],
 }