diff options
64 files changed, 128 insertions, 128 deletions
diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp index 9aa9e2c4be..393c1f7b8f 100644 --- a/audio/2.0/Android.bp +++ b/audio/2.0/Android.bp @@ -17,7 +17,7 @@ filegroup { genrule { name: "android.hardware.audio@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", srcs: [ ":android.hardware.audio@2.0_hal", ], @@ -36,7 +36,7 @@ genrule { genrule { name: "android.hardware.audio@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", srcs: [ ":android.hardware.audio@2.0_hal", ], diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp index fa80d20d52..f198c1583e 100644 --- a/audio/common/2.0/Android.bp +++ b/audio/common/2.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.audio.common@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0", srcs: [ ":android.hardware.audio.common@2.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.audio.common@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0", srcs: [ ":android.hardware.audio.common@2.0_hal", ], diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp index fea2a3359a..6cf6ad6826 100644 --- a/audio/effect/2.0/Android.bp +++ b/audio/effect/2.0/Android.bp @@ -24,7 +24,7 @@ filegroup { genrule { name: "android.hardware.audio.effect@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", srcs: [ ":android.hardware.audio.effect@2.0_hal", ], @@ -50,7 +50,7 @@ genrule { genrule { name: "android.hardware.audio.effect@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", srcs: [ ":android.hardware.audio.effect@2.0_hal", ], diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp index a9f094fe6a..e3752b0b8b 100644 --- a/automotive/evs/1.0/Android.bp +++ b/automotive/evs/1.0/Android.bp @@ -14,7 +14,7 @@ filegroup { genrule { name: "android.hardware.automotive.evs@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0", srcs: [ ":android.hardware.automotive.evs@1.0_hal", ], @@ -30,7 +30,7 @@ genrule { genrule { name: "android.hardware.automotive.evs@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0", srcs: [ ":android.hardware.automotive.evs@1.0_hal", ], diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index b6fde6e72b..ce069d8869 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.automotive.vehicle@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0", srcs: [ ":android.hardware.automotive.vehicle@2.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.automotive.vehicle@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0", srcs: [ ":android.hardware.automotive.vehicle@2.0_hal", ], diff --git a/automotive/vehicle/2.1/Android.bp b/automotive/vehicle/2.1/Android.bp index 536950a4a0..184df9b5cf 100644 --- a/automotive/vehicle/2.1/Android.bp +++ b/automotive/vehicle/2.1/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.automotive.vehicle@2.1_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1", srcs: [ ":android.hardware.automotive.vehicle@2.1_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.automotive.vehicle@2.1_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1", srcs: [ ":android.hardware.automotive.vehicle@2.1_hal", ], diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp index 9a6e9d894a..2f3547cbb0 100644 --- a/biometrics/fingerprint/2.1/Android.bp +++ b/biometrics/fingerprint/2.1/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.biometrics.fingerprint@2.1_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", srcs: [ ":android.hardware.biometrics.fingerprint@2.1_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.biometrics.fingerprint@2.1_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", srcs: [ ":android.hardware.biometrics.fingerprint@2.1_hal", ], diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp index e831069473..041b8af338 100644 --- a/bluetooth/1.0/Android.bp +++ b/bluetooth/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.bluetooth@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0", srcs: [ ":android.hardware.bluetooth@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.bluetooth@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0", srcs: [ ":android.hardware.bluetooth@1.0_hal", ], diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp index c56499a4b9..d641c2bf4d 100644 --- a/boot/1.0/Android.bp +++ b/boot/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.boot@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", srcs: [ ":android.hardware.boot@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.boot@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", srcs: [ ":android.hardware.boot@1.0_hal", ], diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp index cbed9f758d..3ec489aca1 100644 --- a/broadcastradio/1.0/Android.bp +++ b/broadcastradio/1.0/Android.bp @@ -14,7 +14,7 @@ filegroup { genrule { name: "android.hardware.broadcastradio@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0", srcs: [ ":android.hardware.broadcastradio@1.0_hal", ], @@ -30,7 +30,7 @@ genrule { genrule { name: "android.hardware.broadcastradio@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0", srcs: [ ":android.hardware.broadcastradio@1.0_hal", ], diff --git a/broadcastradio/1.1/Android.bp b/broadcastradio/1.1/Android.bp index 2c51ca54a5..e270d68d95 100644 --- a/broadcastradio/1.1/Android.bp +++ b/broadcastradio/1.1/Android.bp @@ -14,7 +14,7 @@ filegroup { genrule { name: "android.hardware.broadcastradio@1.1_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1", srcs: [ ":android.hardware.broadcastradio@1.1_hal", ], @@ -30,7 +30,7 @@ genrule { genrule { name: "android.hardware.broadcastradio@1.1_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1", srcs: [ ":android.hardware.broadcastradio@1.1_hal", ], diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp index 76f1cf3e2a..8c6aa43203 100644 --- a/camera/common/1.0/Android.bp +++ b/camera/common/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.camera.common@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0", srcs: [ ":android.hardware.camera.common@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.camera.common@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0", srcs: [ ":android.hardware.camera.common@1.0_hal", ], diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp index 0b65892d6f..c9c942d303 100644 --- a/camera/device/1.0/Android.bp +++ b/camera/device/1.0/Android.bp @@ -13,7 +13,7 @@ filegroup { genrule { name: "android.hardware.camera.device@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0", srcs: [ ":android.hardware.camera.device@1.0_hal", ], @@ -28,7 +28,7 @@ genrule { genrule { name: "android.hardware.camera.device@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0", srcs: [ ":android.hardware.camera.device@1.0_hal", ], diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp index cbfdcff0d2..9a7491b7af 100644 --- a/camera/device/3.2/Android.bp +++ b/camera/device/3.2/Android.bp @@ -13,7 +13,7 @@ filegroup { genrule { name: "android.hardware.camera.device@3.2_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2", srcs: [ ":android.hardware.camera.device@3.2_hal", ], @@ -28,7 +28,7 @@ genrule { genrule { name: "android.hardware.camera.device@3.2_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2", srcs: [ ":android.hardware.camera.device@3.2_hal", ], diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp index 0534b9c00d..c3cd28ecab 100644 --- a/camera/metadata/3.2/Android.bp +++ b/camera/metadata/3.2/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.camera.metadata@3.2_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2", srcs: [ ":android.hardware.camera.metadata@3.2_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.camera.metadata@3.2_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2", srcs: [ ":android.hardware.camera.metadata@3.2_hal", ], diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp index 02e02eba41..5d25eda901 100644 --- a/camera/provider/2.4/Android.bp +++ b/camera/provider/2.4/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.camera.provider@2.4_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4", srcs: [ ":android.hardware.camera.provider@2.4_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.camera.provider@2.4_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4", srcs: [ ":android.hardware.camera.provider@2.4_hal", ], diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp index bd203ccf90..5b36e2a26d 100644 --- a/configstore/1.0/Android.bp +++ b/configstore/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.configstore@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0", srcs: [ ":android.hardware.configstore@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.configstore@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0", srcs: [ ":android.hardware.configstore@1.0_hal", ], diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp index a4c7175f46..f66a747ace 100644 --- a/contexthub/1.0/Android.bp +++ b/contexthub/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.contexthub@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", srcs: [ ":android.hardware.contexthub@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.contexthub@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", srcs: [ ":android.hardware.contexthub@1.0_hal", ], diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp index 0ca47663e9..587829a362 100644 --- a/drm/1.0/Android.bp +++ b/drm/1.0/Android.bp @@ -15,7 +15,7 @@ filegroup { genrule { name: "android.hardware.drm@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0", srcs: [ ":android.hardware.drm@1.0_hal", ], @@ -32,7 +32,7 @@ genrule { genrule { name: "android.hardware.drm@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0", srcs: [ ":android.hardware.drm@1.0_hal", ], diff --git a/dumpstate/1.0/Android.bp b/dumpstate/1.0/Android.bp index df028b49af..258305011a 100644 --- a/dumpstate/1.0/Android.bp +++ b/dumpstate/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.dumpstate@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0", srcs: [ ":android.hardware.dumpstate@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.dumpstate@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0", srcs: [ ":android.hardware.dumpstate@1.0_hal", ], diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp index eddf0e50d5..1c44110fe1 100644 --- a/gatekeeper/1.0/Android.bp +++ b/gatekeeper/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.gatekeeper@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0", srcs: [ ":android.hardware.gatekeeper@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.gatekeeper@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0", srcs: [ ":android.hardware.gatekeeper@1.0_hal", ], diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp index 42f35b8227..a1b167d6ec 100644 --- a/gnss/1.0/Android.bp +++ b/gnss/1.0/Android.bp @@ -30,7 +30,7 @@ filegroup { genrule { name: "android.hardware.gnss@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", srcs: [ ":android.hardware.gnss@1.0_hal", ], @@ -62,7 +62,7 @@ genrule { genrule { name: "android.hardware.gnss@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", srcs: [ ":android.hardware.gnss@1.0_hal", ], diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp index 77a3f70132..278f69d016 100644 --- a/graphics/allocator/2.0/Android.bp +++ b/graphics/allocator/2.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.graphics.allocator@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", srcs: [ ":android.hardware.graphics.allocator@2.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.graphics.allocator@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", srcs: [ ":android.hardware.graphics.allocator@2.0_hal", ], diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp index e7adee6900..8747b2db9b 100644 --- a/graphics/bufferqueue/1.0/Android.bp +++ b/graphics/bufferqueue/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.graphics.bufferqueue@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", srcs: [ ":android.hardware.graphics.bufferqueue@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.graphics.bufferqueue@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", srcs: [ ":android.hardware.graphics.bufferqueue@1.0_hal", ], diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp index 69c8844168..69e1aa057b 100644 --- a/graphics/common/1.0/Android.bp +++ b/graphics/common/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.graphics.common@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", srcs: [ ":android.hardware.graphics.common@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.graphics.common@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", srcs: [ ":android.hardware.graphics.common@1.0_hal", ], diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp index a3d76d53e8..ed5c193a6b 100644 --- a/graphics/composer/2.1/Android.bp +++ b/graphics/composer/2.1/Android.bp @@ -13,7 +13,7 @@ filegroup { genrule { name: "android.hardware.graphics.composer@2.1_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", srcs: [ ":android.hardware.graphics.composer@2.1_hal", ], @@ -28,7 +28,7 @@ genrule { genrule { name: "android.hardware.graphics.composer@2.1_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", srcs: [ ":android.hardware.graphics.composer@2.1_hal", ], diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp index b95c54d6cf..bb53937e5c 100644 --- a/graphics/mapper/2.0/Android.bp +++ b/graphics/mapper/2.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.graphics.mapper@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", srcs: [ ":android.hardware.graphics.mapper@2.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.graphics.mapper@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", srcs: [ ":android.hardware.graphics.mapper@2.0_hal", ], diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp index 16ee7e95e5..6b664cb7cd 100644 --- a/health/1.0/Android.bp +++ b/health/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.health@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", srcs: [ ":android.hardware.health@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.health@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", srcs: [ ":android.hardware.health@1.0_hal", ], diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp index 6f52736279..ae3171ae45 100644 --- a/ir/1.0/Android.bp +++ b/ir/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.ir@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", srcs: [ ":android.hardware.ir@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.ir@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", srcs: [ ":android.hardware.ir@1.0_hal", ], diff --git a/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp index 0afee9917f..fa5dd3ad11 100644 --- a/keymaster/3.0/Android.bp +++ b/keymaster/3.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.keymaster@3.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0", srcs: [ ":android.hardware.keymaster@3.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.keymaster@3.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0", srcs: [ ":android.hardware.keymaster@3.0_hal", ], diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp index b830ef0578..e0a889cc28 100644 --- a/light/2.0/Android.bp +++ b/light/2.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.light@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", srcs: [ ":android.hardware.light@2.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.light@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", srcs: [ ":android.hardware.light@2.0_hal", ], diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp index 04a3683511..816b6057fe 100644 --- a/media/1.0/Android.bp +++ b/media/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.media@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0", srcs: [ ":android.hardware.media@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.media@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0", srcs: [ ":android.hardware.media@1.0_hal", ], diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp index 0ecf085fcd..775b434816 100644 --- a/media/omx/1.0/Android.bp +++ b/media/omx/1.0/Android.bp @@ -16,7 +16,7 @@ filegroup { genrule { name: "android.hardware.media.omx@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", srcs: [ ":android.hardware.media.omx@1.0_hal", ], @@ -34,7 +34,7 @@ genrule { genrule { name: "android.hardware.media.omx@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", srcs: [ ":android.hardware.media.omx@1.0_hal", ], diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp index 4a4e179d78..de985f0060 100644 --- a/memtrack/1.0/Android.bp +++ b/memtrack/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.memtrack@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", srcs: [ ":android.hardware.memtrack@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.memtrack@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", srcs: [ ":android.hardware.memtrack@1.0_hal", ], diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index f583a42ffa..76ea255a58 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.nfc@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", srcs: [ ":android.hardware.nfc@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.nfc@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", srcs: [ ":android.hardware.nfc@1.0_hal", ], diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp index 5958b12bfd..e0758ebd54 100644 --- a/power/1.0/Android.bp +++ b/power/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.power@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0", srcs: [ ":android.hardware.power@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.power@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0", srcs: [ ":android.hardware.power@1.0_hal", ], diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp index 768de499f4..c95c67ffe4 100644 --- a/radio/1.0/Android.bp +++ b/radio/1.0/Android.bp @@ -15,7 +15,7 @@ filegroup { genrule { name: "android.hardware.radio@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0", srcs: [ ":android.hardware.radio@1.0_hal", ], @@ -32,7 +32,7 @@ genrule { genrule { name: "android.hardware.radio@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0", srcs: [ ":android.hardware.radio@1.0_hal", ], diff --git a/radio/deprecated/1.0/Android.bp b/radio/deprecated/1.0/Android.bp index e81186c4b4..60e52a6388 100644 --- a/radio/deprecated/1.0/Android.bp +++ b/radio/deprecated/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.radio.deprecated@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0", srcs: [ ":android.hardware.radio.deprecated@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.radio.deprecated@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0", srcs: [ ":android.hardware.radio.deprecated@1.0_hal", ], diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp index b82dc4af22..11090c3c8e 100644 --- a/renderscript/1.0/Android.bp +++ b/renderscript/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.renderscript@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", srcs: [ ":android.hardware.renderscript@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.renderscript@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", srcs: [ ":android.hardware.renderscript@1.0_hal", ], diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index 043e139175..964c8ef2f8 100644 --- a/sensors/1.0/Android.bp +++ b/sensors/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.sensors@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0", srcs: [ ":android.hardware.sensors@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.sensors@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0", srcs: [ ":android.hardware.sensors@1.0_hal", ], diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp index 742311d26c..51b3fe5d13 100644 --- a/soundtrigger/2.0/Android.bp +++ b/soundtrigger/2.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.soundtrigger@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0", srcs: [ ":android.hardware.soundtrigger@2.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.soundtrigger@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0", srcs: [ ":android.hardware.soundtrigger@2.0_hal", ], diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index f7a6f7524a..2b5c111dd6 100644 --- a/tests/bar/1.0/Android.bp +++ b/tests/bar/1.0/Android.bp @@ -15,7 +15,7 @@ filegroup { genrule { name: "android.hardware.tests.bar@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0", srcs: [ ":android.hardware.tests.bar@1.0_hal", ], @@ -32,7 +32,7 @@ genrule { genrule { name: "android.hardware.tests.bar@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0", srcs: [ ":android.hardware.tests.bar@1.0_hal", ], diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp index e55a782265..f0cddf8fd4 100644 --- a/tests/baz/1.0/Android.bp +++ b/tests/baz/1.0/Android.bp @@ -14,7 +14,7 @@ filegroup { genrule { name: "android.hardware.tests.baz@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0", srcs: [ ":android.hardware.tests.baz@1.0_hal", ], @@ -30,7 +30,7 @@ genrule { genrule { name: "android.hardware.tests.baz@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0", srcs: [ ":android.hardware.tests.baz@1.0_hal", ], diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp index 6fcc0f8536..f3c6d5d3a9 100644 --- a/tests/expression/1.0/Android.bp +++ b/tests/expression/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.tests.expression@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0", srcs: [ ":android.hardware.tests.expression@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.tests.expression@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0", srcs: [ ":android.hardware.tests.expression@1.0_hal", ], diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp index 14403b6d1f..94205681fc 100644 --- a/tests/extension/light/2.0/Android.bp +++ b/tests/extension/light/2.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.tests.extension.light@2.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0", srcs: [ ":android.hardware.tests.extension.light@2.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.tests.extension.light@2.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0", srcs: [ ":android.hardware.tests.extension.light@2.0_hal", ], diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index a631be8468..d66ba2ded9 100644 --- a/tests/foo/1.0/Android.bp +++ b/tests/foo/1.0/Android.bp @@ -15,7 +15,7 @@ filegroup { genrule { name: "android.hardware.tests.foo@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0", srcs: [ ":android.hardware.tests.foo@1.0_hal", ], @@ -32,7 +32,7 @@ genrule { genrule { name: "android.hardware.tests.foo@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0", srcs: [ ":android.hardware.tests.foo@1.0_hal", ], diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp index aeefeedf55..e88bf5f342 100644 --- a/tests/hash/1.0/Android.bp +++ b/tests/hash/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.tests.hash@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0", srcs: [ ":android.hardware.tests.hash@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.tests.hash@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0", srcs: [ ":android.hardware.tests.hash@1.0_hal", ], diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp index 11ee4f92b4..db70fa21ac 100644 --- a/tests/inheritance/1.0/Android.bp +++ b/tests/inheritance/1.0/Android.bp @@ -13,7 +13,7 @@ filegroup { genrule { name: "android.hardware.tests.inheritance@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0", srcs: [ ":android.hardware.tests.inheritance@1.0_hal", ], @@ -28,7 +28,7 @@ genrule { genrule { name: "android.hardware.tests.inheritance@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0", srcs: [ ":android.hardware.tests.inheritance@1.0_hal", ], diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp index e8d28a3cb4..ed3657058b 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.tests.libhwbinder@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0", srcs: [ ":android.hardware.tests.libhwbinder@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.tests.libhwbinder@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0", srcs: [ ":android.hardware.tests.libhwbinder@1.0_hal", ], diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index e49f43674e..523f5304f8 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.tests.memory@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0", srcs: [ ":android.hardware.tests.memory@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.tests.memory@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0", srcs: [ ":android.hardware.tests.memory@1.0_hal", ], diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp index 98bdd19ab9..6be8cc5504 100644 --- a/tests/msgq/1.0/Android.bp +++ b/tests/msgq/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.tests.msgq@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0", srcs: [ ":android.hardware.tests.msgq@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.tests.msgq@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0", srcs: [ ":android.hardware.tests.msgq@1.0_hal", ], diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp index 48f2ec0a6c..0adcb4fd23 100644 --- a/tests/pointer/1.0/Android.bp +++ b/tests/pointer/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.tests.pointer@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0", srcs: [ ":android.hardware.tests.pointer@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.tests.pointer@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0", srcs: [ ":android.hardware.tests.pointer@1.0_hal", ], diff --git a/tests/versioning/1.0/Android.bp b/tests/versioning/1.0/Android.bp index ee41ea4592..f0a14bc3f5 100644 --- a/tests/versioning/1.0/Android.bp +++ b/tests/versioning/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.tests.versioning@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", srcs: [ ":android.hardware.tests.versioning@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.tests.versioning@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", srcs: [ ":android.hardware.tests.versioning@1.0_hal", ], diff --git a/tests/versioning/2.2/Android.bp b/tests/versioning/2.2/Android.bp index bf412a651e..b6fd7443ff 100644 --- a/tests/versioning/2.2/Android.bp +++ b/tests/versioning/2.2/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.tests.versioning@2.2_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", srcs: [ ":android.hardware.tests.versioning@2.2_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.tests.versioning@2.2_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", srcs: [ ":android.hardware.tests.versioning@2.2_hal", ], diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp index a8aee8e93f..47411172ff 100644 --- a/tests/versioning/2.3/Android.bp +++ b/tests/versioning/2.3/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.tests.versioning@2.3_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", srcs: [ ":android.hardware.tests.versioning@2.3_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.tests.versioning@2.3_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", srcs: [ ":android.hardware.tests.versioning@2.3_hal", ], diff --git a/tests/versioning/2.4/Android.bp b/tests/versioning/2.4/Android.bp index 37e787f4b1..f576bf13e8 100644 --- a/tests/versioning/2.4/Android.bp +++ b/tests/versioning/2.4/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.tests.versioning@2.4_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", srcs: [ ":android.hardware.tests.versioning@2.4_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.tests.versioning@2.4_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", srcs: [ ":android.hardware.tests.versioning@2.4_hal", ], diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp index 41f5ab8c8f..7f9c75a650 100644 --- a/thermal/1.0/Android.bp +++ b/thermal/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.thermal@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", srcs: [ ":android.hardware.thermal@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.thermal@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", srcs: [ ":android.hardware.thermal@1.0_hal", ], diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp index 3f8973d11c..e6b488679b 100644 --- a/tv/cec/1.0/Android.bp +++ b/tv/cec/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.tv.cec@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", srcs: [ ":android.hardware.tv.cec@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.tv.cec@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", srcs: [ ":android.hardware.tv.cec@1.0_hal", ], diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp index 65a7b027c3..468ef125ff 100644 --- a/tv/input/1.0/Android.bp +++ b/tv/input/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.tv.input@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", srcs: [ ":android.hardware.tv.input@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.tv.input@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", srcs: [ ":android.hardware.tv.input@1.0_hal", ], diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp index 11856a0f34..847288b466 100644 --- a/usb/1.0/Android.bp +++ b/usb/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.usb@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", srcs: [ ":android.hardware.usb@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.usb@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", srcs: [ ":android.hardware.usb@1.0_hal", ], diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp index 204ff5033e..5d570c9387 100644 --- a/vibrator/1.0/Android.bp +++ b/vibrator/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.vibrator@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", srcs: [ ":android.hardware.vibrator@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.vibrator@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", srcs: [ ":android.hardware.vibrator@1.0_hal", ], diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp index 66c346eafa..69011c4602 100644 --- a/vr/1.0/Android.bp +++ b/vr/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.vr@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", srcs: [ ":android.hardware.vr@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.vr@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", srcs: [ ":android.hardware.vr@1.0_hal", ], diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp index 9126aafefa..7289e8aebe 100644 --- a/wifi/1.0/Android.bp +++ b/wifi/1.0/Android.bp @@ -23,7 +23,7 @@ filegroup { genrule { name: "android.hardware.wifi@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", srcs: [ ":android.hardware.wifi@1.0_hal", ], @@ -48,7 +48,7 @@ genrule { genrule { name: "android.hardware.wifi@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", srcs: [ ":android.hardware.wifi@1.0_hal", ], diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp index d6cb071669..883d600310 100644 --- a/wifi/supplicant/1.0/Android.bp +++ b/wifi/supplicant/1.0/Android.bp @@ -22,7 +22,7 @@ filegroup { genrule { name: "android.hardware.wifi.supplicant@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0", srcs: [ ":android.hardware.wifi.supplicant@1.0_hal", ], @@ -46,7 +46,7 @@ genrule { genrule { name: "android.hardware.wifi.supplicant@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0", srcs: [ ":android.hardware.wifi.supplicant@1.0_hal", ], |