diff options
| author | Colin Cross <ccross@android.com> | 2016-11-04 15:02:42 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-11-07 10:54:59 -0800 |
| commit | 8f084e00d6cac7bd0b9f32bb391908114db1e2db (patch) | |
| tree | aaf60cde64edfe96ff7688d1d74c405fc852c193 /wifi | |
| parent | 37c96a54e5f5f5a1a613dfd2e3b72fb02c6969d1 (diff) | |
| download | android_hardware_interfaces-8f084e00d6cac7bd0b9f32bb391908114db1e2db.tar.gz android_hardware_interfaces-8f084e00d6cac7bd0b9f32bb391908114db1e2db.tar.bz2 android_hardware_interfaces-8f084e00d6cac7bd0b9f32bb391908114db1e2db.zip | |
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
(cherry picked from commit b785f5b82ef2efa62ca9d7288cfff64c178080b0)
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/1.0/Android.bp | 8 | ||||
| -rw-r--r-- | wifi/supplicant/1.0/Android.bp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp index 7453fe7bf..b7309310b 100644 --- a/wifi/1.0/Android.bp +++ b/wifi/1.0/Android.bp @@ -2,8 +2,8 @@ genrule { name: "android.hardware.wifi@1.0_genc++", - tool: "hidl-gen", - cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi@1.0", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi@1.0", srcs: [ "types.hal", "IWifi.hal", @@ -34,8 +34,8 @@ genrule { genrule { name: "android.hardware.wifi@1.0_genc++_headers", - tool: "hidl-gen", - cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi@1.0", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi@1.0", srcs: [ "types.hal", "IWifi.hal", diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp index d4247d22e..08c6f9ac4 100644 --- a/wifi/supplicant/1.0/Android.bp +++ b/wifi/supplicant/1.0/Android.bp @@ -2,8 +2,8 @@ genrule { name: "android.hardware.wifi.supplicant@1.0_genc++", - tool: "hidl-gen", - cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0", srcs: [ "types.hal", "ISupplicant.hal", @@ -38,8 +38,8 @@ genrule { genrule { name: "android.hardware.wifi.supplicant@1.0_genc++_headers", - tool: "hidl-gen", - cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0", srcs: [ "types.hal", "ISupplicant.hal", |