commit 54e74058d81735388164d7ee9ef3b330c46662d5
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 07 22:57:13 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 07 22:57:13 2016 +0000
tree d8eac9a00f1d921daf6965b289486f1556f025f9
parent 2d732243dff5c2879d3c63d364cee438ec8bb6a2
parent 7096f545421407a9186f76f701bbb4a2113758d9

Merge "Cleanup error messages from HidlInstrumentor."

Android.bp

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",
     ],