summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-05-09 16:34:19 -0500
committerSteven Moreland2017-05-09 16:34:19 -0500
commitcb360c60d861eb7a3d4306142d0b53bc4adff681 (patch)
tree9e470cda9dd779bceb378e54330632baf5db5388
parent5ca756ea1f0d629939f0f916ba30252eeed431e5 (diff)
downloadplatform-hardware-interfaces-cb360c60d861eb7a3d4306142d0b53bc4adff681.tar.gz
platform-hardware-interfaces-cb360c60d861eb7a3d4306142d0b53bc4adff681.tar.xz
platform-hardware-interfaces-cb360c60d861eb7a3d4306142d0b53bc4adff681.zip
Update makefiles for c++-sources and c++-headers.
Test: pass Bug: 38174080 Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
-rw-r--r--bluetooth/1.0/Android.bp4
-rw-r--r--boot/1.0/Android.bp4
-rw-r--r--configstore/1.0/Android.bp4
-rw-r--r--ir/1.0/Android.bp4
-rw-r--r--nfc/1.0/Android.bp4
-rw-r--r--radio/1.0/Android.bp4
-rw-r--r--radio/1.1/Android.bp4
-rw-r--r--radio/deprecated/1.0/Android.bp4
-rw-r--r--renderscript/1.0/Android.bp4
-rw-r--r--tests/bar/1.0/Android.bp4
-rw-r--r--tests/baz/1.0/Android.bp4
-rw-r--r--tests/expression/1.0/Android.bp4
-rw-r--r--tests/foo/1.0/Android.bp4
-rw-r--r--tests/hash/1.0/Android.bp4
-rw-r--r--tests/inheritance/1.0/Android.bp4
-rw-r--r--tests/libhwbinder/1.0/Android.bp4
-rw-r--r--tests/memory/1.0/Android.bp4
-rw-r--r--tests/msgq/1.0/Android.bp4
-rw-r--r--tests/pointer/1.0/Android.bp4
-rw-r--r--tests/versioning/1.0/Android.bp4
-rw-r--r--tests/versioning/2.2/Android.bp4
-rw-r--r--tests/versioning/2.3/Android.bp4
-rw-r--r--tests/versioning/2.4/Android.bp4
-rw-r--r--tetheroffload/config/1.0/Android.bp4
-rw-r--r--tetheroffload/control/1.0/Android.bp4
-rw-r--r--wifi/1.0/Android.bp4
-rw-r--r--wifi/supplicant/1.0/Android.bp4
27 files changed, 54 insertions, 54 deletions
diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp
index 2c965ed9..4cc3b503 100644
--- a/bluetooth/1.0/Android.bp
+++ b/bluetooth/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.bluetooth@1.0_genc++", 13 name: "android.hardware.bluetooth@1.0_genc++",
14 tools: ["hidl-gen"], 14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.bluetooth@1.0_hal", 17 ":android.hardware.bluetooth@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.bluetooth@1.0_genc++_headers", 27 name: "android.hardware.bluetooth@1.0_genc++_headers",
28 tools: ["hidl-gen"], 28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.bluetooth@1.0_hal", 31 ":android.hardware.bluetooth@1.0_hal",
32 ], 32 ],
diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp
index 807ae029..d75d6ac6 100644
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.boot@1.0_genc++", 12 name: "android.hardware.boot@1.0_genc++",
13 tools: ["hidl-gen"], 13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.boot@1.0_hal", 16 ":android.hardware.boot@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.boot@1.0_genc++_headers", 25 name: "android.hardware.boot@1.0_genc++_headers",
26 tools: ["hidl-gen"], 26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.boot@1.0_hal", 29 ":android.hardware.boot@1.0_hal",
30 ], 30 ],
diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp
index 4993dc30..db7ec97b 100644
--- a/configstore/1.0/Android.bp
+++ b/configstore/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.configstore@1.0_genc++", 12 name: "android.hardware.configstore@1.0_genc++",
13 tools: ["hidl-gen"], 13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.configstore@1.0_hal", 16 ":android.hardware.configstore@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.configstore@1.0_genc++_headers", 25 name: "android.hardware.configstore@1.0_genc++_headers",
26 tools: ["hidl-gen"], 26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.configstore@1.0_hal", 29 ":android.hardware.configstore@1.0_hal",
30 ], 30 ],
diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp
index 2612bd25..2c530477 100644
--- a/ir/1.0/Android.bp
+++ b/ir/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.ir@1.0_genc++", 12 name: "android.hardware.ir@1.0_genc++",
13 tools: ["hidl-gen"], 13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.ir@1.0_hal", 16 ":android.hardware.ir@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.ir@1.0_genc++_headers", 25 name: "android.hardware.ir@1.0_genc++_headers",
26 tools: ["hidl-gen"], 26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.ir@1.0_hal", 29 ":android.hardware.ir@1.0_hal",
30 ], 30 ],
diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp
index d62e0a39..8faf2a1a 100644
--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.nfc@1.0_genc++", 13 name: "android.hardware.nfc@1.0_genc++",
14 tools: ["hidl-gen"], 14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.nfc@1.0_hal", 17 ":android.hardware.nfc@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.nfc@1.0_genc++_headers", 27 name: "android.hardware.nfc@1.0_genc++_headers",
28 tools: ["hidl-gen"], 28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.nfc@1.0_hal", 31 ":android.hardware.nfc@1.0_hal",
32 ], 32 ],
diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp
index e89a743f..b58d85a6 100644
--- a/radio/1.0/Android.bp
+++ b/radio/1.0/Android.bp
@@ -15,7 +15,7 @@ filegroup {
15genrule { 15genrule {
16 name: "android.hardware.radio@1.0_genc++", 16 name: "android.hardware.radio@1.0_genc++",
17 tools: ["hidl-gen"], 17 tools: ["hidl-gen"],
18 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0", 18 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0",
19 srcs: [ 19 srcs: [
20 ":android.hardware.radio@1.0_hal", 20 ":android.hardware.radio@1.0_hal",
21 ], 21 ],
@@ -32,7 +32,7 @@ genrule {
32genrule { 32genrule {
33 name: "android.hardware.radio@1.0_genc++_headers", 33 name: "android.hardware.radio@1.0_genc++_headers",
34 tools: ["hidl-gen"], 34 tools: ["hidl-gen"],
35 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0", 35 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0",
36 srcs: [ 36 srcs: [
37 ":android.hardware.radio@1.0_hal", 37 ":android.hardware.radio@1.0_hal",
38 ], 38 ],
diff --git a/radio/1.1/Android.bp b/radio/1.1/Android.bp
index 49870048..f5ba178a 100644
--- a/radio/1.1/Android.bp
+++ b/radio/1.1/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.radio@1.1_genc++", 13 name: "android.hardware.radio@1.1_genc++",
14 tools: ["hidl-gen"], 14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1",
16 srcs: [ 16 srcs: [
17 ":android.hardware.radio@1.1_hal", 17 ":android.hardware.radio@1.1_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.radio@1.1_genc++_headers", 27 name: "android.hardware.radio@1.1_genc++_headers",
28 tools: ["hidl-gen"], 28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1",
30 srcs: [ 30 srcs: [
31 ":android.hardware.radio@1.1_hal", 31 ":android.hardware.radio@1.1_hal",
32 ], 32 ],
diff --git a/radio/deprecated/1.0/Android.bp b/radio/deprecated/1.0/Android.bp
index af93ec5c..a812a746 100644
--- a/radio/deprecated/1.0/Android.bp
+++ b/radio/deprecated/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.radio.deprecated@1.0_genc++", 13 name: "android.hardware.radio.deprecated@1.0_genc++",
14 tools: ["hidl-gen"], 14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.radio.deprecated@1.0_hal", 17 ":android.hardware.radio.deprecated@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.radio.deprecated@1.0_genc++_headers", 27 name: "android.hardware.radio.deprecated@1.0_genc++_headers",
28 tools: ["hidl-gen"], 28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.radio.deprecated@1.0_hal", 31 ":android.hardware.radio.deprecated@1.0_hal",
32 ], 32 ],
diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp
index b92b6f6e..a033b414 100644
--- a/renderscript/1.0/Android.bp
+++ b/renderscript/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.renderscript@1.0_genc++", 13 name: "android.hardware.renderscript@1.0_genc++",
14 tools: ["hidl-gen"], 14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.renderscript@1.0_hal", 17 ":android.hardware.renderscript@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.renderscript@1.0_genc++_headers", 27 name: "android.hardware.renderscript@1.0_genc++_headers",
28 tools: ["hidl-gen"], 28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.renderscript@1.0_hal", 31 ":android.hardware.renderscript@1.0_hal",
32 ], 32 ],
diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp
index 8b2111f7..e0dbe981 100644
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@@ -15,7 +15,7 @@ filegroup {
15genrule { 15genrule {
16 name: "android.hardware.tests.bar@1.0_genc++", 16 name: "android.hardware.tests.bar@1.0_genc++",
17 tools: ["hidl-gen"], 17 tools: ["hidl-gen"],
18 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0", 18 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0",
19 srcs: [ 19 srcs: [
20 ":android.hardware.tests.bar@1.0_hal", 20 ":android.hardware.tests.bar@1.0_hal",
21 ], 21 ],
@@ -32,7 +32,7 @@ genrule {
32genrule { 32genrule {
33 name: "android.hardware.tests.bar@1.0_genc++_headers", 33 name: "android.hardware.tests.bar@1.0_genc++_headers",
34 tools: ["hidl-gen"], 34 tools: ["hidl-gen"],
35 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0", 35 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0",
36 srcs: [ 36 srcs: [
37 ":android.hardware.tests.bar@1.0_hal", 37 ":android.hardware.tests.bar@1.0_hal",
38 ], 38 ],
diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp
index 22e1e4bb..cc9e2a48 100644
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@@ -14,7 +14,7 @@ filegroup {
14genrule { 14genrule {
15 name: "android.hardware.tests.baz@1.0_genc++", 15 name: "android.hardware.tests.baz@1.0_genc++",
16 tools: ["hidl-gen"], 16 tools: ["hidl-gen"],
17 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0", 17 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0",
18 srcs: [ 18 srcs: [
19 ":android.hardware.tests.baz@1.0_hal", 19 ":android.hardware.tests.baz@1.0_hal",
20 ], 20 ],
@@ -30,7 +30,7 @@ genrule {
30genrule { 30genrule {
31 name: "android.hardware.tests.baz@1.0_genc++_headers", 31 name: "android.hardware.tests.baz@1.0_genc++_headers",
32 tools: ["hidl-gen"], 32 tools: ["hidl-gen"],
33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0", 33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0",
34 srcs: [ 34 srcs: [
35 ":android.hardware.tests.baz@1.0_hal", 35 ":android.hardware.tests.baz@1.0_hal",
36 ], 36 ],
diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp
index 9b938b1d..8bdad0e7 100644
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.tests.expression@1.0_genc++", 12 name: "android.hardware.tests.expression@1.0_genc++",
13 tools: ["hidl-gen"], 13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.tests.expression@1.0_hal", 16 ":android.hardware.tests.expression@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.tests.expression@1.0_genc++_headers", 25 name: "android.hardware.tests.expression@1.0_genc++_headers",
26 tools: ["hidl-gen"], 26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.tests.expression@1.0_hal", 29 ":android.hardware.tests.expression@1.0_hal",
30 ], 30 ],
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
index da2120f7..54260e9c 100644
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -15,7 +15,7 @@ filegroup {
15genrule { 15genrule {
16 name: "android.hardware.tests.foo@1.0_genc++", 16 name: "android.hardware.tests.foo@1.0_genc++",
17 tools: ["hidl-gen"], 17 tools: ["hidl-gen"],
18 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0", 18 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0",
19 srcs: [ 19 srcs: [
20 ":android.hardware.tests.foo@1.0_hal", 20 ":android.hardware.tests.foo@1.0_hal",
21 ], 21 ],
@@ -32,7 +32,7 @@ genrule {
32genrule { 32genrule {
33 name: "android.hardware.tests.foo@1.0_genc++_headers", 33 name: "android.hardware.tests.foo@1.0_genc++_headers",
34 tools: ["hidl-gen"], 34 tools: ["hidl-gen"],
35 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0", 35 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0",
36 srcs: [ 36 srcs: [
37 ":android.hardware.tests.foo@1.0_hal", 37 ":android.hardware.tests.foo@1.0_hal",
38 ], 38 ],
diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp
index db72039d..c2aa8047 100644
--- a/tests/hash/1.0/Android.bp
+++ b/tests/hash/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.tests.hash@1.0_genc++", 11 name: "android.hardware.tests.hash@1.0_genc++",
12 tools: ["hidl-gen"], 12 tools: ["hidl-gen"],
13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.tests.hash@1.0_hal", 15 ":android.hardware.tests.hash@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.tests.hash@1.0_genc++_headers", 23 name: "android.hardware.tests.hash@1.0_genc++_headers",
24 tools: ["hidl-gen"], 24 tools: ["hidl-gen"],
25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.tests.hash@1.0_hal", 27 ":android.hardware.tests.hash@1.0_hal",
28 ], 28 ],
diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp
index 8569c402..6b99a55f 100644
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@@ -13,7 +13,7 @@ filegroup {
13genrule { 13genrule {
14 name: "android.hardware.tests.inheritance@1.0_genc++", 14 name: "android.hardware.tests.inheritance@1.0_genc++",
15 tools: ["hidl-gen"], 15 tools: ["hidl-gen"],
16 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0", 16 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0",
17 srcs: [ 17 srcs: [
18 ":android.hardware.tests.inheritance@1.0_hal", 18 ":android.hardware.tests.inheritance@1.0_hal",
19 ], 19 ],
@@ -28,7 +28,7 @@ genrule {
28genrule { 28genrule {
29 name: "android.hardware.tests.inheritance@1.0_genc++_headers", 29 name: "android.hardware.tests.inheritance@1.0_genc++_headers",
30 tools: ["hidl-gen"], 30 tools: ["hidl-gen"],
31 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0", 31 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0",
32 srcs: [ 32 srcs: [
33 ":android.hardware.tests.inheritance@1.0_hal", 33 ":android.hardware.tests.inheritance@1.0_hal",
34 ], 34 ],
diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp
index 7f3d1447..9fc19d12 100644
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.tests.libhwbinder@1.0_genc++", 11 name: "android.hardware.tests.libhwbinder@1.0_genc++",
12 tools: ["hidl-gen"], 12 tools: ["hidl-gen"],
13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.tests.libhwbinder@1.0_hal", 15 ":android.hardware.tests.libhwbinder@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.tests.libhwbinder@1.0_genc++_headers", 23 name: "android.hardware.tests.libhwbinder@1.0_genc++_headers",
24 tools: ["hidl-gen"], 24 tools: ["hidl-gen"],
25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.tests.libhwbinder@1.0_hal", 27 ":android.hardware.tests.libhwbinder@1.0_hal",
28 ], 28 ],
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp
index 4d8febf1..ed64f5d2 100644
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.tests.memory@1.0_genc++", 11 name: "android.hardware.tests.memory@1.0_genc++",
12 tools: ["hidl-gen"], 12 tools: ["hidl-gen"],
13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.tests.memory@1.0_hal", 15 ":android.hardware.tests.memory@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.tests.memory@1.0_genc++_headers", 23 name: "android.hardware.tests.memory@1.0_genc++_headers",
24 tools: ["hidl-gen"], 24 tools: ["hidl-gen"],
25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.tests.memory@1.0_hal", 27 ":android.hardware.tests.memory@1.0_hal",
28 ], 28 ],
diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
index e5d3a828..04a64f66 100644
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.tests.msgq@1.0_genc++", 12 name: "android.hardware.tests.msgq@1.0_genc++",
13 tools: ["hidl-gen"], 13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.tests.msgq@1.0_hal", 16 ":android.hardware.tests.msgq@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.tests.msgq@1.0_genc++_headers", 25 name: "android.hardware.tests.msgq@1.0_genc++_headers",
26 tools: ["hidl-gen"], 26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.tests.msgq@1.0_hal", 29 ":android.hardware.tests.msgq@1.0_hal",
30 ], 30 ],
diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp
index d1eafb09..ae0d0c89 100644
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.tests.pointer@1.0_genc++", 12 name: "android.hardware.tests.pointer@1.0_genc++",
13 tools: ["hidl-gen"], 13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.tests.pointer@1.0_hal", 16 ":android.hardware.tests.pointer@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.tests.pointer@1.0_genc++_headers", 25 name: "android.hardware.tests.pointer@1.0_genc++_headers",
26 tools: ["hidl-gen"], 26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.tests.pointer@1.0_hal", 29 ":android.hardware.tests.pointer@1.0_hal",
30 ], 30 ],
diff --git a/tests/versioning/1.0/Android.bp b/tests/versioning/1.0/Android.bp
index 13c1327f..c3e4b576 100644
--- a/tests/versioning/1.0/Android.bp
+++ b/tests/versioning/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.tests.versioning@1.0_genc++", 11 name: "android.hardware.tests.versioning@1.0_genc++",
12 tools: ["hidl-gen"], 12 tools: ["hidl-gen"],
13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.tests.versioning@1.0_hal", 15 ":android.hardware.tests.versioning@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.tests.versioning@1.0_genc++_headers", 23 name: "android.hardware.tests.versioning@1.0_genc++_headers",
24 tools: ["hidl-gen"], 24 tools: ["hidl-gen"],
25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.tests.versioning@1.0_hal", 27 ":android.hardware.tests.versioning@1.0_hal",
28 ], 28 ],
diff --git a/tests/versioning/2.2/Android.bp b/tests/versioning/2.2/Android.bp
index 910f7b44..624a61e1 100644
--- a/tests/versioning/2.2/Android.bp
+++ b/tests/versioning/2.2/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.tests.versioning@2.2_genc++", 12 name: "android.hardware.tests.versioning@2.2_genc++",
13 tools: ["hidl-gen"], 13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",
15 srcs: [ 15 srcs: [
16 ":android.hardware.tests.versioning@2.2_hal", 16 ":android.hardware.tests.versioning@2.2_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.tests.versioning@2.2_genc++_headers", 25 name: "android.hardware.tests.versioning@2.2_genc++_headers",
26 tools: ["hidl-gen"], 26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",
28 srcs: [ 28 srcs: [
29 ":android.hardware.tests.versioning@2.2_hal", 29 ":android.hardware.tests.versioning@2.2_hal",
30 ], 30 ],
diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp
index 6359ebac..247b2ff1 100644
--- a/tests/versioning/2.3/Android.bp
+++ b/tests/versioning/2.3/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.tests.versioning@2.3_genc++", 13 name: "android.hardware.tests.versioning@2.3_genc++",
14 tools: ["hidl-gen"], 14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",
16 srcs: [ 16 srcs: [
17 ":android.hardware.tests.versioning@2.3_hal", 17 ":android.hardware.tests.versioning@2.3_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.tests.versioning@2.3_genc++_headers", 27 name: "android.hardware.tests.versioning@2.3_genc++_headers",
28 tools: ["hidl-gen"], 28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",
30 srcs: [ 30 srcs: [
31 ":android.hardware.tests.versioning@2.3_hal", 31 ":android.hardware.tests.versioning@2.3_hal",
32 ], 32 ],
diff --git a/tests/versioning/2.4/Android.bp b/tests/versioning/2.4/Android.bp
index 67cc318f..ff9ca1ff 100644
--- a/tests/versioning/2.4/Android.bp
+++ b/tests/versioning/2.4/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.tests.versioning@2.4_genc++", 11 name: "android.hardware.tests.versioning@2.4_genc++",
12 tools: ["hidl-gen"], 12 tools: ["hidl-gen"],
13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4",
14 srcs: [ 14 srcs: [
15 ":android.hardware.tests.versioning@2.4_hal", 15 ":android.hardware.tests.versioning@2.4_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.tests.versioning@2.4_genc++_headers", 23 name: "android.hardware.tests.versioning@2.4_genc++_headers",
24 tools: ["hidl-gen"], 24 tools: ["hidl-gen"],
25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4",
26 srcs: [ 26 srcs: [
27 ":android.hardware.tests.versioning@2.4_hal", 27 ":android.hardware.tests.versioning@2.4_hal",
28 ], 28 ],
diff --git a/tetheroffload/config/1.0/Android.bp b/tetheroffload/config/1.0/Android.bp
index 09fc5747..ddf7c223 100644
--- a/tetheroffload/config/1.0/Android.bp
+++ b/tetheroffload/config/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.tetheroffload.config@1.0_genc++", 11 name: "android.hardware.tetheroffload.config@1.0_genc++",
12 tools: ["hidl-gen"], 12 tools: ["hidl-gen"],
13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.tetheroffload.config@1.0_hal", 15 ":android.hardware.tetheroffload.config@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.tetheroffload.config@1.0_genc++_headers", 23 name: "android.hardware.tetheroffload.config@1.0_genc++_headers",
24 tools: ["hidl-gen"], 24 tools: ["hidl-gen"],
25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.tetheroffload.config@1.0_hal", 27 ":android.hardware.tetheroffload.config@1.0_hal",
28 ], 28 ],
diff --git a/tetheroffload/control/1.0/Android.bp b/tetheroffload/control/1.0/Android.bp
index 9361e8b8..6f504460 100644
--- a/tetheroffload/control/1.0/Android.bp
+++ b/tetheroffload/control/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.tetheroffload.control@1.0_genc++", 13 name: "android.hardware.tetheroffload.control@1.0_genc++",
14 tools: ["hidl-gen"], 14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.tetheroffload.control@1.0_hal", 17 ":android.hardware.tetheroffload.control@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.tetheroffload.control@1.0_genc++_headers", 27 name: "android.hardware.tetheroffload.control@1.0_genc++_headers",
28 tools: ["hidl-gen"], 28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.tetheroffload.control@1.0_hal", 31 ":android.hardware.tetheroffload.control@1.0_hal",
32 ], 32 ],
diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp
index 256fad41..3a446086 100644
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -23,7 +23,7 @@ filegroup {
23genrule { 23genrule {
24 name: "android.hardware.wifi@1.0_genc++", 24 name: "android.hardware.wifi@1.0_genc++",
25 tools: ["hidl-gen"], 25 tools: ["hidl-gen"],
26 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", 26 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
27 srcs: [ 27 srcs: [
28 ":android.hardware.wifi@1.0_hal", 28 ":android.hardware.wifi@1.0_hal",
29 ], 29 ],
@@ -48,7 +48,7 @@ genrule {
48genrule { 48genrule {
49 name: "android.hardware.wifi@1.0_genc++_headers", 49 name: "android.hardware.wifi@1.0_genc++_headers",
50 tools: ["hidl-gen"], 50 tools: ["hidl-gen"],
51 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", 51 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
52 srcs: [ 52 srcs: [
53 ":android.hardware.wifi@1.0_hal", 53 ":android.hardware.wifi@1.0_hal",
54 ], 54 ],
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
index bc57cf7d..c692f9a3 100644
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@@ -22,7 +22,7 @@ filegroup {
22genrule { 22genrule {
23 name: "android.hardware.wifi.supplicant@1.0_genc++", 23 name: "android.hardware.wifi.supplicant@1.0_genc++",
24 tools: ["hidl-gen"], 24 tools: ["hidl-gen"],
25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.wifi.supplicant@1.0_hal", 27 ":android.hardware.wifi.supplicant@1.0_hal",
28 ], 28 ],
@@ -46,7 +46,7 @@ genrule {
46genrule { 46genrule {
47 name: "android.hardware.wifi.supplicant@1.0_genc++_headers", 47 name: "android.hardware.wifi.supplicant@1.0_genc++_headers",
48 tools: ["hidl-gen"], 48 tools: ["hidl-gen"],
49 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0", 49 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
50 srcs: [ 50 srcs: [
51 ":android.hardware.wifi.supplicant@1.0_hal", 51 ":android.hardware.wifi.supplicant@1.0_hal",
52 ], 52 ],