commit b785f5b82ef2efa62ca9d7288cfff64c178080b0
author Colin Cross <ccross@android.com> Fri Nov 04 15:02:42 2016 -0700
committer Colin Cross <ccross@android.com> Fri Nov 04 22:49:15 2016 -0700
tree a84adca8a68ac17f76d047b48c65ac19c2aa8b0f
parent ded9852531c7c538477b0763f7a85b03171f4e9d

Support genrules with multiple tools

To allow genrules with more than one tool, rename the tool property to
tools and make it an array, replace $tool with $(location <label>),
and use $() for other variables for consistency.

Bug: 31948427
Test: compare build.ninja
Change-Id: I3d714f70a2af0dc60faeee10e09b6ed166601f1d

audio/2.0/Android.bp

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

audio/common/2.0/Android.bp

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

audio/effect/2.0/Android.bp

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