diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp index 264105c710..feee5184ab 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 6f8e83cae1..2ca7e7e4b2 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 ea9eb655d7..2348c972d5 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 6ad4b0371f..5e56ab8e76 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 d863840d73..5e4e36ba5f 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 8145eaa761..3f0a4d307a 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/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp index 61e9a2c44d..49291672ab 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 f9819b7376..c01c605258 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 f16c776c42..0a888e68bd 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 30f0431024..1162e6c983 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 900a97cd24..c34ab326c2 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/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp index 80ce80b0d8..736ec7e535 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 4f49f2a6d6..8e7da0c5a6 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 cfdf560d4a..3139bf5f21 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 7dfa48759a..6c84f3dfab 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 3f729b5a93..9aa401ad40 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 b4d656c9fa..debcfb7c7f 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 1244816fa6..4ae0e346a8 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 21e6618321..b21f535ca7 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 67c238c788..41b106e212 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 3ef216e0e6..6d71315074 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/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp index a407797875..922259cbfb 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 d70848fdfd..d9e999aa13 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 65b2489d38..18a99a2ab6 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 bc0871041d..25d41536f8 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/power/1.0/Android.bp b/power/1.0/Android.bp index 57ab2cf980..9412a8870c 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/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index 4ab3ffb737..256ed9bbbc 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 402339a8b0..2ef3fccd5a 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/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp index 19cbb58983..deb9fb7ea9 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/thermal/1.0/Android.bp b/thermal/1.0/Android.bp index ceabfbdf45..bbede029e4 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 3be3904c5b..6aca979647 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 13b9c2a9cb..a0d7109a12 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 c4b0d4df70..4c5c8e3b37 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 092719fdbd..32be07771e 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 8344aaea68..f0aef5cd10 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", ],