diff --git a/Android.bp b/Android.bp
index f7d69e1..223839b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,8 +18,8 @@
 
 genrule {
     name: "android.hidl.manager@1.0_genc++",
-    tool: "hidl-gen",
-    cmd: "$tool -o $genDir -Lc++ -randroid.hidl:system/libhidl android.hidl.manager@1.0",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl android.hidl.manager@1.0",
     srcs: [
         "manager/1.0/IServiceManager.hal",
     ],
@@ -30,8 +30,8 @@
 
 genrule {
     name: "android.hidl.manager@1.0_genc++_headers",
-    tool: "hidl-gen",
-    cmd: "$tool -o $genDir -Lc++ -randroid.hidl:system/libhidl android.hidl.manager@1.0",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl android.hidl.manager@1.0",
     srcs: [
         "manager/1.0/IServiceManager.hal",
     ],