summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-05-09 21:51:19 -0500
committerSteven Moreland2017-05-09 21:58:43 -0500
commitbc7112412076c403b4cb0d5c7316f9ef39b7a20d (patch)
tree52b86100501770a224b2679643a8564e20948421
parent71619beef7871e58aa916d740cb7826f63249782 (diff)
downloadplatform-hardware-interfaces-bc7112412076c403b4cb0d5c7316f9ef39b7a20d.tar.gz
platform-hardware-interfaces-bc7112412076c403b4cb0d5c7316f9ef39b7a20d.tar.xz
platform-hardware-interfaces-bc7112412076c403b4cb0d5c7316f9ef39b7a20d.zip
Update makefiles for c++-sources and c++-headers. (2/2)
Test: pass Bug: 38174080 Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
-rw-r--r--audio/2.0/Android.bp4
-rw-r--r--audio/common/2.0/Android.bp4
-rw-r--r--audio/effect/2.0/Android.bp4
-rw-r--r--automotive/evs/1.0/Android.bp4
-rw-r--r--automotive/vehicle/2.0/Android.bp4
-rw-r--r--automotive/vehicle/2.1/Android.bp4
-rw-r--r--biometrics/fingerprint/2.1/Android.bp4
-rw-r--r--broadcastradio/1.0/Android.bp4
-rw-r--r--broadcastradio/1.1/Android.bp4
-rw-r--r--camera/common/1.0/Android.bp4
-rw-r--r--camera/device/1.0/Android.bp4
-rw-r--r--camera/device/3.2/Android.bp4
-rw-r--r--camera/metadata/3.2/Android.bp4
-rw-r--r--camera/provider/2.4/Android.bp4
-rw-r--r--contexthub/1.0/Android.bp4
-rw-r--r--drm/1.0/Android.bp4
-rw-r--r--dumpstate/1.0/Android.bp4
-rw-r--r--gatekeeper/1.0/Android.bp4
-rw-r--r--gnss/1.0/Android.bp4
-rw-r--r--graphics/allocator/2.0/Android.bp4
-rw-r--r--graphics/bufferqueue/1.0/Android.bp4
-rw-r--r--graphics/common/1.0/Android.bp4
-rw-r--r--graphics/composer/2.1/Android.bp4
-rw-r--r--graphics/mapper/2.0/Android.bp4
-rw-r--r--health/1.0/Android.bp4
-rw-r--r--keymaster/3.0/Android.bp4
-rw-r--r--light/2.0/Android.bp4
-rw-r--r--media/1.0/Android.bp4
-rw-r--r--media/omx/1.0/Android.bp4
-rw-r--r--memtrack/1.0/Android.bp4
-rw-r--r--power/1.0/Android.bp4
-rw-r--r--sensors/1.0/Android.bp4
-rw-r--r--soundtrigger/2.0/Android.bp4
-rw-r--r--tests/extension/light/2.0/Android.bp4
-rw-r--r--thermal/1.0/Android.bp4
-rw-r--r--tv/cec/1.0/Android.bp4
-rw-r--r--tv/input/1.0/Android.bp4
-rw-r--r--usb/1.0/Android.bp4
-rw-r--r--vibrator/1.0/Android.bp4
-rw-r--r--vr/1.0/Android.bp4
40 files changed, 80 insertions, 80 deletions
diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp
index 9aa9e2c4..393c1f7b 100644
--- a/audio/2.0/Android.bp
+++ b/audio/2.0/Android.bp
@@ -17,7 +17,7 @@ filegroup {
17genrule { 17genrule {
18 name: "android.hardware.audio@2.0_genc++", 18 name: "android.hardware.audio@2.0_genc++",
19 tools: ["hidl-gen"], 19 tools: ["hidl-gen"],
20 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", 20 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
21 srcs: [ 21 srcs: [
22 ":android.hardware.audio@2.0_hal", 22 ":android.hardware.audio@2.0_hal",
23 ], 23 ],
@@ -36,7 +36,7 @@ genrule {
36genrule { 36genrule {
37 name: "android.hardware.audio@2.0_genc++_headers", 37 name: "android.hardware.audio@2.0_genc++_headers",
38 tools: ["hidl-gen"], 38 tools: ["hidl-gen"],
39 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", 39 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
40 srcs: [ 40 srcs: [
41 ":android.hardware.audio@2.0_hal", 41 ":android.hardware.audio@2.0_hal",
42 ], 42 ],
diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp
index fa80d20d..f198c158 100644
--- a/audio/common/2.0/Android.bp
+++ b/audio/common/2.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.audio.common@2.0_genc++", 11 name: "android.hardware.audio.common@2.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.audio.common@2.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.audio.common@2.0_hal", 15 ":android.hardware.audio.common@2.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.audio.common@2.0_genc++_headers", 23 name: "android.hardware.audio.common@2.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.audio.common@2.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.audio.common@2.0_hal", 27 ":android.hardware.audio.common@2.0_hal",
28 ], 28 ],
diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp
index fea2a335..6cf6ad68 100644
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -24,7 +24,7 @@ filegroup {
24genrule { 24genrule {
25 name: "android.hardware.audio.effect@2.0_genc++", 25 name: "android.hardware.audio.effect@2.0_genc++",
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.audio.effect@2.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.audio.effect@2.0_hal", 29 ":android.hardware.audio.effect@2.0_hal",
30 ], 30 ],
@@ -50,7 +50,7 @@ genrule {
50genrule { 50genrule {
51 name: "android.hardware.audio.effect@2.0_genc++_headers", 51 name: "android.hardware.audio.effect@2.0_genc++_headers",
52 tools: ["hidl-gen"], 52 tools: ["hidl-gen"],
53 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", 53 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
54 srcs: [ 54 srcs: [
55 ":android.hardware.audio.effect@2.0_hal", 55 ":android.hardware.audio.effect@2.0_hal",
56 ], 56 ],
diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp
index a9f094fe..e3752b0b 100644
--- a/automotive/evs/1.0/Android.bp
+++ b/automotive/evs/1.0/Android.bp
@@ -14,7 +14,7 @@ filegroup {
14genrule { 14genrule {
15 name: "android.hardware.automotive.evs@1.0_genc++", 15 name: "android.hardware.automotive.evs@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.automotive.evs@1.0", 17 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
18 srcs: [ 18 srcs: [
19 ":android.hardware.automotive.evs@1.0_hal", 19 ":android.hardware.automotive.evs@1.0_hal",
20 ], 20 ],
@@ -30,7 +30,7 @@ genrule {
30genrule { 30genrule {
31 name: "android.hardware.automotive.evs@1.0_genc++_headers", 31 name: "android.hardware.automotive.evs@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.automotive.evs@1.0", 33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
34 srcs: [ 34 srcs: [
35 ":android.hardware.automotive.evs@1.0_hal", 35 ":android.hardware.automotive.evs@1.0_hal",
36 ], 36 ],
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
index b6fde6e7..ce069d88 100644
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.automotive.vehicle@2.0_genc++", 13 name: "android.hardware.automotive.vehicle@2.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.automotive.vehicle@2.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.automotive.vehicle@2.0_hal", 17 ":android.hardware.automotive.vehicle@2.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.automotive.vehicle@2.0_genc++_headers", 27 name: "android.hardware.automotive.vehicle@2.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.automotive.vehicle@2.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.automotive.vehicle@2.0_hal", 31 ":android.hardware.automotive.vehicle@2.0_hal",
32 ], 32 ],
diff --git a/automotive/vehicle/2.1/Android.bp b/automotive/vehicle/2.1/Android.bp
index 536950a4..184df9b5 100644
--- a/automotive/vehicle/2.1/Android.bp
+++ b/automotive/vehicle/2.1/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.automotive.vehicle@2.1_genc++", 12 name: "android.hardware.automotive.vehicle@2.1_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.automotive.vehicle@2.1", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1",
15 srcs: [ 15 srcs: [
16 ":android.hardware.automotive.vehicle@2.1_hal", 16 ":android.hardware.automotive.vehicle@2.1_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.automotive.vehicle@2.1_genc++_headers", 25 name: "android.hardware.automotive.vehicle@2.1_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.automotive.vehicle@2.1", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1",
28 srcs: [ 28 srcs: [
29 ":android.hardware.automotive.vehicle@2.1_hal", 29 ":android.hardware.automotive.vehicle@2.1_hal",
30 ], 30 ],
diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp
index 9a6e9d89..2f3547cb 100644
--- a/biometrics/fingerprint/2.1/Android.bp
+++ b/biometrics/fingerprint/2.1/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.biometrics.fingerprint@2.1_genc++", 13 name: "android.hardware.biometrics.fingerprint@2.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.biometrics.fingerprint@2.1", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",
16 srcs: [ 16 srcs: [
17 ":android.hardware.biometrics.fingerprint@2.1_hal", 17 ":android.hardware.biometrics.fingerprint@2.1_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.biometrics.fingerprint@2.1_genc++_headers", 27 name: "android.hardware.biometrics.fingerprint@2.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.biometrics.fingerprint@2.1", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",
30 srcs: [ 30 srcs: [
31 ":android.hardware.biometrics.fingerprint@2.1_hal", 31 ":android.hardware.biometrics.fingerprint@2.1_hal",
32 ], 32 ],
diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp
index cbed9f75..3ec489ac 100644
--- a/broadcastradio/1.0/Android.bp
+++ b/broadcastradio/1.0/Android.bp
@@ -14,7 +14,7 @@ filegroup {
14genrule { 14genrule {
15 name: "android.hardware.broadcastradio@1.0_genc++", 15 name: "android.hardware.broadcastradio@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.broadcastradio@1.0", 17 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0",
18 srcs: [ 18 srcs: [
19 ":android.hardware.broadcastradio@1.0_hal", 19 ":android.hardware.broadcastradio@1.0_hal",
20 ], 20 ],
@@ -30,7 +30,7 @@ genrule {
30genrule { 30genrule {
31 name: "android.hardware.broadcastradio@1.0_genc++_headers", 31 name: "android.hardware.broadcastradio@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.broadcastradio@1.0", 33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0",
34 srcs: [ 34 srcs: [
35 ":android.hardware.broadcastradio@1.0_hal", 35 ":android.hardware.broadcastradio@1.0_hal",
36 ], 36 ],
diff --git a/broadcastradio/1.1/Android.bp b/broadcastradio/1.1/Android.bp
index 2c51ca54..e270d68d 100644
--- a/broadcastradio/1.1/Android.bp
+++ b/broadcastradio/1.1/Android.bp
@@ -14,7 +14,7 @@ filegroup {
14genrule { 14genrule {
15 name: "android.hardware.broadcastradio@1.1_genc++", 15 name: "android.hardware.broadcastradio@1.1_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.broadcastradio@1.1", 17 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1",
18 srcs: [ 18 srcs: [
19 ":android.hardware.broadcastradio@1.1_hal", 19 ":android.hardware.broadcastradio@1.1_hal",
20 ], 20 ],
@@ -30,7 +30,7 @@ genrule {
30genrule { 30genrule {
31 name: "android.hardware.broadcastradio@1.1_genc++_headers", 31 name: "android.hardware.broadcastradio@1.1_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.broadcastradio@1.1", 33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1",
34 srcs: [ 34 srcs: [
35 ":android.hardware.broadcastradio@1.1_hal", 35 ":android.hardware.broadcastradio@1.1_hal",
36 ], 36 ],
diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp
index 76f1cf3e..8c6aa432 100644
--- a/camera/common/1.0/Android.bp
+++ b/camera/common/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.camera.common@1.0_genc++", 11 name: "android.hardware.camera.common@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.camera.common@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.camera.common@1.0_hal", 15 ":android.hardware.camera.common@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.camera.common@1.0_genc++_headers", 23 name: "android.hardware.camera.common@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.camera.common@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.camera.common@1.0_hal", 27 ":android.hardware.camera.common@1.0_hal",
28 ], 28 ],
diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index 0b65892d..c9c942d3 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -13,7 +13,7 @@ filegroup {
13genrule { 13genrule {
14 name: "android.hardware.camera.device@1.0_genc++", 14 name: "android.hardware.camera.device@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.camera.device@1.0", 16 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
17 srcs: [ 17 srcs: [
18 ":android.hardware.camera.device@1.0_hal", 18 ":android.hardware.camera.device@1.0_hal",
19 ], 19 ],
@@ -28,7 +28,7 @@ genrule {
28genrule { 28genrule {
29 name: "android.hardware.camera.device@1.0_genc++_headers", 29 name: "android.hardware.camera.device@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.camera.device@1.0", 31 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
32 srcs: [ 32 srcs: [
33 ":android.hardware.camera.device@1.0_hal", 33 ":android.hardware.camera.device@1.0_hal",
34 ], 34 ],
diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp
index cbfdcff0..9a7491b7 100644
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -13,7 +13,7 @@ filegroup {
13genrule { 13genrule {
14 name: "android.hardware.camera.device@3.2_genc++", 14 name: "android.hardware.camera.device@3.2_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.camera.device@3.2", 16 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
17 srcs: [ 17 srcs: [
18 ":android.hardware.camera.device@3.2_hal", 18 ":android.hardware.camera.device@3.2_hal",
19 ], 19 ],
@@ -28,7 +28,7 @@ genrule {
28genrule { 28genrule {
29 name: "android.hardware.camera.device@3.2_genc++_headers", 29 name: "android.hardware.camera.device@3.2_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.camera.device@3.2", 31 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
32 srcs: [ 32 srcs: [
33 ":android.hardware.camera.device@3.2_hal", 33 ":android.hardware.camera.device@3.2_hal",
34 ], 34 ],
diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp
index 0534b9c0..c3cd28ec 100644
--- a/camera/metadata/3.2/Android.bp
+++ b/camera/metadata/3.2/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.camera.metadata@3.2_genc++", 11 name: "android.hardware.camera.metadata@3.2_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.camera.metadata@3.2", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2",
14 srcs: [ 14 srcs: [
15 ":android.hardware.camera.metadata@3.2_hal", 15 ":android.hardware.camera.metadata@3.2_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.camera.metadata@3.2_genc++_headers", 23 name: "android.hardware.camera.metadata@3.2_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.camera.metadata@3.2", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2",
26 srcs: [ 26 srcs: [
27 ":android.hardware.camera.metadata@3.2_hal", 27 ":android.hardware.camera.metadata@3.2_hal",
28 ], 28 ],
diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp
index 02e02eba..5d25eda9 100644
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.camera.provider@2.4_genc++", 12 name: "android.hardware.camera.provider@2.4_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.camera.provider@2.4", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
15 srcs: [ 15 srcs: [
16 ":android.hardware.camera.provider@2.4_hal", 16 ":android.hardware.camera.provider@2.4_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.camera.provider@2.4_genc++_headers", 25 name: "android.hardware.camera.provider@2.4_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.camera.provider@2.4", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
28 srcs: [ 28 srcs: [
29 ":android.hardware.camera.provider@2.4_hal", 29 ":android.hardware.camera.provider@2.4_hal",
30 ], 30 ],
diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp
index a4c7175f..f66a747a 100644
--- a/contexthub/1.0/Android.bp
+++ b/contexthub/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.contexthub@1.0_genc++", 13 name: "android.hardware.contexthub@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.contexthub@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.contexthub@1.0_hal", 17 ":android.hardware.contexthub@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.contexthub@1.0_genc++_headers", 27 name: "android.hardware.contexthub@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.contexthub@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.contexthub@1.0_hal", 31 ":android.hardware.contexthub@1.0_hal",
32 ], 32 ],
diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp
index 0ca47663..587829a3 100644
--- a/drm/1.0/Android.bp
+++ b/drm/1.0/Android.bp
@@ -15,7 +15,7 @@ filegroup {
15genrule { 15genrule {
16 name: "android.hardware.drm@1.0_genc++", 16 name: "android.hardware.drm@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.drm@1.0", 18 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
19 srcs: [ 19 srcs: [
20 ":android.hardware.drm@1.0_hal", 20 ":android.hardware.drm@1.0_hal",
21 ], 21 ],
@@ -32,7 +32,7 @@ genrule {
32genrule { 32genrule {
33 name: "android.hardware.drm@1.0_genc++_headers", 33 name: "android.hardware.drm@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.drm@1.0", 35 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
36 srcs: [ 36 srcs: [
37 ":android.hardware.drm@1.0_hal", 37 ":android.hardware.drm@1.0_hal",
38 ], 38 ],
diff --git a/dumpstate/1.0/Android.bp b/dumpstate/1.0/Android.bp
index df028b49..25830501 100644
--- a/dumpstate/1.0/Android.bp
+++ b/dumpstate/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.dumpstate@1.0_genc++", 11 name: "android.hardware.dumpstate@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.dumpstate@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.dumpstate@1.0_hal", 15 ":android.hardware.dumpstate@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.dumpstate@1.0_genc++_headers", 23 name: "android.hardware.dumpstate@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.dumpstate@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.dumpstate@1.0_hal", 27 ":android.hardware.dumpstate@1.0_hal",
28 ], 28 ],
diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp
index eddf0e50..1c44110f 100644
--- a/gatekeeper/1.0/Android.bp
+++ b/gatekeeper/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.gatekeeper@1.0_genc++", 12 name: "android.hardware.gatekeeper@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.gatekeeper@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.gatekeeper@1.0_hal", 16 ":android.hardware.gatekeeper@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.gatekeeper@1.0_genc++_headers", 25 name: "android.hardware.gatekeeper@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.gatekeeper@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.gatekeeper@1.0_hal", 29 ":android.hardware.gatekeeper@1.0_hal",
30 ], 30 ],
diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp
index 42f35b82..a1b167d6 100644
--- a/gnss/1.0/Android.bp
+++ b/gnss/1.0/Android.bp
@@ -30,7 +30,7 @@ filegroup {
30genrule { 30genrule {
31 name: "android.hardware.gnss@1.0_genc++", 31 name: "android.hardware.gnss@1.0_genc++",
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.gnss@1.0", 33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0",
34 srcs: [ 34 srcs: [
35 ":android.hardware.gnss@1.0_hal", 35 ":android.hardware.gnss@1.0_hal",
36 ], 36 ],
@@ -62,7 +62,7 @@ genrule {
62genrule { 62genrule {
63 name: "android.hardware.gnss@1.0_genc++_headers", 63 name: "android.hardware.gnss@1.0_genc++_headers",
64 tools: ["hidl-gen"], 64 tools: ["hidl-gen"],
65 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", 65 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0",
66 srcs: [ 66 srcs: [
67 ":android.hardware.gnss@1.0_hal", 67 ":android.hardware.gnss@1.0_hal",
68 ], 68 ],
diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 77a3f701..278f69d0 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.graphics.allocator@2.0_genc++", 11 name: "android.hardware.graphics.allocator@2.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.graphics.allocator@2.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.graphics.allocator@2.0_hal", 15 ":android.hardware.graphics.allocator@2.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.graphics.allocator@2.0_genc++_headers", 23 name: "android.hardware.graphics.allocator@2.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.graphics.allocator@2.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.graphics.allocator@2.0_hal", 27 ":android.hardware.graphics.allocator@2.0_hal",
28 ], 28 ],
diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp
index e7adee69..8747b2db 100644
--- a/graphics/bufferqueue/1.0/Android.bp
+++ b/graphics/bufferqueue/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.graphics.bufferqueue@1.0_genc++", 12 name: "android.hardware.graphics.bufferqueue@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.graphics.bufferqueue@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.graphics.bufferqueue@1.0_hal", 16 ":android.hardware.graphics.bufferqueue@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.graphics.bufferqueue@1.0_genc++_headers", 25 name: "android.hardware.graphics.bufferqueue@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.graphics.bufferqueue@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.graphics.bufferqueue@1.0_hal", 29 ":android.hardware.graphics.bufferqueue@1.0_hal",
30 ], 30 ],
diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp
index 69c88441..69e1aa05 100644
--- a/graphics/common/1.0/Android.bp
+++ b/graphics/common/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.graphics.common@1.0_genc++", 11 name: "android.hardware.graphics.common@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.graphics.common@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.graphics.common@1.0_hal", 15 ":android.hardware.graphics.common@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.graphics.common@1.0_genc++_headers", 23 name: "android.hardware.graphics.common@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.graphics.common@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.graphics.common@1.0_hal", 27 ":android.hardware.graphics.common@1.0_hal",
28 ], 28 ],
diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp
index a3d76d53..ed5c193a 100644
--- a/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@ -13,7 +13,7 @@ filegroup {
13genrule { 13genrule {
14 name: "android.hardware.graphics.composer@2.1_genc++", 14 name: "android.hardware.graphics.composer@2.1_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.graphics.composer@2.1", 16 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
17 srcs: [ 17 srcs: [
18 ":android.hardware.graphics.composer@2.1_hal", 18 ":android.hardware.graphics.composer@2.1_hal",
19 ], 19 ],
@@ -28,7 +28,7 @@ genrule {
28genrule { 28genrule {
29 name: "android.hardware.graphics.composer@2.1_genc++_headers", 29 name: "android.hardware.graphics.composer@2.1_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.graphics.composer@2.1", 31 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
32 srcs: [ 32 srcs: [
33 ":android.hardware.graphics.composer@2.1_hal", 33 ":android.hardware.graphics.composer@2.1_hal",
34 ], 34 ],
diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp
index b95c54d6..bb53937e 100644
--- a/graphics/mapper/2.0/Android.bp
+++ b/graphics/mapper/2.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.graphics.mapper@2.0_genc++", 12 name: "android.hardware.graphics.mapper@2.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.graphics.mapper@2.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.graphics.mapper@2.0_hal", 16 ":android.hardware.graphics.mapper@2.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.graphics.mapper@2.0_genc++_headers", 25 name: "android.hardware.graphics.mapper@2.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.graphics.mapper@2.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.graphics.mapper@2.0_hal", 29 ":android.hardware.graphics.mapper@2.0_hal",
30 ], 30 ],
diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp
index 16ee7e95..6b664cb7 100644
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.health@1.0_genc++", 12 name: "android.hardware.health@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.health@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.health@1.0_hal", 16 ":android.hardware.health@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.health@1.0_genc++_headers", 25 name: "android.hardware.health@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.health@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.health@1.0_hal", 29 ":android.hardware.health@1.0_hal",
30 ], 30 ],
diff --git a/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp
index 0afee991..fa5dd3ad 100644
--- a/keymaster/3.0/Android.bp
+++ b/keymaster/3.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.keymaster@3.0_genc++", 12 name: "android.hardware.keymaster@3.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.keymaster@3.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.keymaster@3.0_hal", 16 ":android.hardware.keymaster@3.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.keymaster@3.0_genc++_headers", 25 name: "android.hardware.keymaster@3.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.keymaster@3.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.keymaster@3.0_hal", 29 ":android.hardware.keymaster@3.0_hal",
30 ], 30 ],
diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp
index b830ef05..e0a889cc 100644
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.light@2.0_genc++", 12 name: "android.hardware.light@2.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.light@2.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.light@2.0_hal", 16 ":android.hardware.light@2.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.light@2.0_genc++_headers", 25 name: "android.hardware.light@2.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.light@2.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.light@2.0_hal", 29 ":android.hardware.light@2.0_hal",
30 ], 30 ],
diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp
index 04a36835..816b6057 100644
--- a/media/1.0/Android.bp
+++ b/media/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.media@1.0_genc++", 11 name: "android.hardware.media@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.media@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.media@1.0_hal", 15 ":android.hardware.media@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.media@1.0_genc++_headers", 23 name: "android.hardware.media@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.media@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.media@1.0_hal", 27 ":android.hardware.media@1.0_hal",
28 ], 28 ],
diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp
index 0ecf085f..775b4348 100644
--- a/media/omx/1.0/Android.bp
+++ b/media/omx/1.0/Android.bp
@@ -16,7 +16,7 @@ filegroup {
16genrule { 16genrule {
17 name: "android.hardware.media.omx@1.0_genc++", 17 name: "android.hardware.media.omx@1.0_genc++",
18 tools: ["hidl-gen"], 18 tools: ["hidl-gen"],
19 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", 19 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0",
20 srcs: [ 20 srcs: [
21 ":android.hardware.media.omx@1.0_hal", 21 ":android.hardware.media.omx@1.0_hal",
22 ], 22 ],
@@ -34,7 +34,7 @@ genrule {
34genrule { 34genrule {
35 name: "android.hardware.media.omx@1.0_genc++_headers", 35 name: "android.hardware.media.omx@1.0_genc++_headers",
36 tools: ["hidl-gen"], 36 tools: ["hidl-gen"],
37 cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", 37 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0",
38 srcs: [ 38 srcs: [
39 ":android.hardware.media.omx@1.0_hal", 39 ":android.hardware.media.omx@1.0_hal",
40 ], 40 ],
diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp
index 4a4e179d..de985f00 100644
--- a/memtrack/1.0/Android.bp
+++ b/memtrack/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.memtrack@1.0_genc++", 12 name: "android.hardware.memtrack@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.memtrack@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.memtrack@1.0_hal", 16 ":android.hardware.memtrack@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.memtrack@1.0_genc++_headers", 25 name: "android.hardware.memtrack@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.memtrack@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.memtrack@1.0_hal", 29 ":android.hardware.memtrack@1.0_hal",
30 ], 30 ],
diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp
index 5958b12b..e0758ebd 100644
--- a/power/1.0/Android.bp
+++ b/power/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.power@1.0_genc++", 12 name: "android.hardware.power@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.power@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.power@1.0_hal", 16 ":android.hardware.power@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.power@1.0_genc++_headers", 25 name: "android.hardware.power@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.power@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.power@1.0_hal", 29 ":android.hardware.power@1.0_hal",
30 ], 30 ],
diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp
index 043e1391..964c8ef2 100644
--- a/sensors/1.0/Android.bp
+++ b/sensors/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.sensors@1.0_genc++", 12 name: "android.hardware.sensors@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.sensors@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.sensors@1.0_hal", 16 ":android.hardware.sensors@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.sensors@1.0_genc++_headers", 25 name: "android.hardware.sensors@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.sensors@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.sensors@1.0_hal", 29 ":android.hardware.sensors@1.0_hal",
30 ], 30 ],
diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp
index 742311d2..51b3fe5d 100644
--- a/soundtrigger/2.0/Android.bp
+++ b/soundtrigger/2.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.soundtrigger@2.0_genc++", 13 name: "android.hardware.soundtrigger@2.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.soundtrigger@2.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.soundtrigger@2.0_hal", 17 ":android.hardware.soundtrigger@2.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.soundtrigger@2.0_genc++_headers", 27 name: "android.hardware.soundtrigger@2.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.soundtrigger@2.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.soundtrigger@2.0_hal", 31 ":android.hardware.soundtrigger@2.0_hal",
32 ], 32 ],
diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp
index 14403b6d..94205681 100644
--- a/tests/extension/light/2.0/Android.bp
+++ b/tests/extension/light/2.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.tests.extension.light@2.0_genc++", 12 name: "android.hardware.tests.extension.light@2.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.extension.light@2.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.tests.extension.light@2.0_hal", 16 ":android.hardware.tests.extension.light@2.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.tests.extension.light@2.0_genc++_headers", 25 name: "android.hardware.tests.extension.light@2.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.extension.light@2.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.tests.extension.light@2.0_hal", 29 ":android.hardware.tests.extension.light@2.0_hal",
30 ], 30 ],
diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index 41f5ab8c..7f9c75a6 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.thermal@1.0_genc++", 12 name: "android.hardware.thermal@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.thermal@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.thermal@1.0_hal", 16 ":android.hardware.thermal@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.thermal@1.0_genc++_headers", 25 name: "android.hardware.thermal@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.thermal@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.thermal@1.0_hal", 29 ":android.hardware.thermal@1.0_hal",
30 ], 30 ],
diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp
index 3f8973d1..e6b48867 100644
--- a/tv/cec/1.0/Android.bp
+++ b/tv/cec/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.tv.cec@1.0_genc++", 13 name: "android.hardware.tv.cec@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.tv.cec@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.tv.cec@1.0_hal", 17 ":android.hardware.tv.cec@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.tv.cec@1.0_genc++_headers", 27 name: "android.hardware.tv.cec@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.tv.cec@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.tv.cec@1.0_hal", 31 ":android.hardware.tv.cec@1.0_hal",
32 ], 32 ],
diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp
index 65a7b027..468ef125 100644
--- a/tv/input/1.0/Android.bp
+++ b/tv/input/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.tv.input@1.0_genc++", 13 name: "android.hardware.tv.input@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.tv.input@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.tv.input@1.0_hal", 17 ":android.hardware.tv.input@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.tv.input@1.0_genc++_headers", 27 name: "android.hardware.tv.input@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.tv.input@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.tv.input@1.0_hal", 31 ":android.hardware.tv.input@1.0_hal",
32 ], 32 ],
diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp
index 11856a0f..847288b4 100644
--- a/usb/1.0/Android.bp
+++ b/usb/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
12genrule { 12genrule {
13 name: "android.hardware.usb@1.0_genc++", 13 name: "android.hardware.usb@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.usb@1.0", 15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0",
16 srcs: [ 16 srcs: [
17 ":android.hardware.usb@1.0_hal", 17 ":android.hardware.usb@1.0_hal",
18 ], 18 ],
@@ -26,7 +26,7 @@ genrule {
26genrule { 26genrule {
27 name: "android.hardware.usb@1.0_genc++_headers", 27 name: "android.hardware.usb@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.usb@1.0", 29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0",
30 srcs: [ 30 srcs: [
31 ":android.hardware.usb@1.0_hal", 31 ":android.hardware.usb@1.0_hal",
32 ], 32 ],
diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp
index 204ff503..5d570c93 100644
--- a/vibrator/1.0/Android.bp
+++ b/vibrator/1.0/Android.bp
@@ -11,7 +11,7 @@ filegroup {
11genrule { 11genrule {
12 name: "android.hardware.vibrator@1.0_genc++", 12 name: "android.hardware.vibrator@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.vibrator@1.0", 14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0",
15 srcs: [ 15 srcs: [
16 ":android.hardware.vibrator@1.0_hal", 16 ":android.hardware.vibrator@1.0_hal",
17 ], 17 ],
@@ -24,7 +24,7 @@ genrule {
24genrule { 24genrule {
25 name: "android.hardware.vibrator@1.0_genc++_headers", 25 name: "android.hardware.vibrator@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.vibrator@1.0", 27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0",
28 srcs: [ 28 srcs: [
29 ":android.hardware.vibrator@1.0_hal", 29 ":android.hardware.vibrator@1.0_hal",
30 ], 30 ],
diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp
index 66c346ea..69011c46 100644
--- a/vr/1.0/Android.bp
+++ b/vr/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
10genrule { 10genrule {
11 name: "android.hardware.vr@1.0_genc++", 11 name: "android.hardware.vr@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.vr@1.0", 13 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0",
14 srcs: [ 14 srcs: [
15 ":android.hardware.vr@1.0_hal", 15 ":android.hardware.vr@1.0_hal",
16 ], 16 ],
@@ -22,7 +22,7 @@ genrule {
22genrule { 22genrule {
23 name: "android.hardware.vr@1.0_genc++_headers", 23 name: "android.hardware.vr@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.vr@1.0", 25 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0",
26 srcs: [ 26 srcs: [
27 ":android.hardware.vr@1.0_hal", 27 ":android.hardware.vr@1.0_hal",
28 ], 28 ],