diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp
index ff2414c..b762cc1 100644
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -2,8 +2,8 @@
 
 genrule {
     name: "android.hardware.light@2.0_genc++",
-    tool: "hidl-gen",
-    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.light@2.0",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.light@2.0",
     srcs: [
         "types.hal",
         "ILight.hal",
@@ -16,8 +16,8 @@
 
 genrule {
     name: "android.hardware.light@2.0_genc++_headers",
-    tool: "hidl-gen",
-    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.light@2.0",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.light@2.0",
     srcs: [
         "types.hal",
         "ILight.hal",