diff --git a/automotive/vehicle/2.1/Android.bp b/automotive/vehicle/2.1/Android.bp
index 12bb4ed..dcf395c 100644
--- a/automotive/vehicle/2.1/Android.bp
+++ b/automotive/vehicle/2.1/Android.bp
@@ -13,8 +13,7 @@
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1",
     srcs: [
-        "types.hal",
-        "IVehicle.hal",
+        ":android.hardware.automotive.vehicle@2.1_hal",
     ],
     out: [
         "android/hardware/automotive/vehicle/2.1/types.cpp",
@@ -27,8 +26,7 @@
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1",
     srcs: [
-        "types.hal",
-        "IVehicle.hal",
+        ":android.hardware.automotive.vehicle@2.1_hal",
     ],
     out: [
         "android/hardware/automotive/vehicle/2.1/types.h",