From cb360c60d861eb7a3d4306142d0b53bc4adff681 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 9 May 2017 14:34:19 -0700 Subject: [PATCH] Update makefiles for c++-sources and c++-headers. Test: pass Bug: 38174080 Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601 --- bluetooth/1.0/Android.bp | 4 ++-- boot/1.0/Android.bp | 4 ++-- configstore/1.0/Android.bp | 4 ++-- ir/1.0/Android.bp | 4 ++-- nfc/1.0/Android.bp | 4 ++-- radio/1.0/Android.bp | 4 ++-- radio/1.1/Android.bp | 4 ++-- radio/deprecated/1.0/Android.bp | 4 ++-- renderscript/1.0/Android.bp | 4 ++-- tests/bar/1.0/Android.bp | 4 ++-- tests/baz/1.0/Android.bp | 4 ++-- tests/expression/1.0/Android.bp | 4 ++-- tests/foo/1.0/Android.bp | 4 ++-- tests/hash/1.0/Android.bp | 4 ++-- tests/inheritance/1.0/Android.bp | 4 ++-- tests/libhwbinder/1.0/Android.bp | 4 ++-- tests/memory/1.0/Android.bp | 4 ++-- tests/msgq/1.0/Android.bp | 4 ++-- tests/pointer/1.0/Android.bp | 4 ++-- tests/versioning/1.0/Android.bp | 4 ++-- tests/versioning/2.2/Android.bp | 4 ++-- tests/versioning/2.3/Android.bp | 4 ++-- tests/versioning/2.4/Android.bp | 4 ++-- tetheroffload/config/1.0/Android.bp | 4 ++-- tetheroffload/control/1.0/Android.bp | 4 ++-- wifi/1.0/Android.bp | 4 ++-- wifi/supplicant/1.0/Android.bp | 4 ++-- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp index 2c965ed988..4cc3b50390 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 807ae029a8..d75d6ac6fb 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/configstore/1.0/Android.bp b/configstore/1.0/Android.bp index 4993dc3040..db7ec97bc4 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/ir/1.0/Android.bp b/ir/1.0/Android.bp index 2612bd2549..2c53047749 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/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index d62e0a396b..8faf2a1ae9 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/radio/1.0/Android.bp b/radio/1.0/Android.bp index e89a743fa8..b58d85a6d5 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/1.1/Android.bp b/radio/1.1/Android.bp index 4987004815..f5ba178aea 100644 --- a/radio/1.1/Android.bp +++ b/radio/1.1/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.radio@1.1_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1", srcs: [ ":android.hardware.radio@1.1_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.radio@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.radio@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1", srcs: [ ":android.hardware.radio@1.1_hal", ], diff --git a/radio/deprecated/1.0/Android.bp b/radio/deprecated/1.0/Android.bp index af93ec5c17..a812a7462a 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 b92b6f6ef1..a033b41498 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/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index 8b2111f70d..e0dbe98164 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 22e1e4bb13..cc9e2a489b 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 9b938b1d04..8bdad0e7c8 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/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index da2120f7fe..54260e9c9d 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 db72039d0d..c2aa8047f5 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 8569c4024c..6b99a55fb4 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 7f3d1447fd..9fc19d1201 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -10,7 +10,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", ], @@ -22,7 +22,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 4d8febf179..ed64f5d2de 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 e5d3a82861..04a64f66cd 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 d1eafb09d1..ae0d0c8969 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 13c1327f13..c3e4b57661 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 910f7b44a6..624a61e1eb 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 6359ebaceb..247b2ff127 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 67cc318fae..ff9ca1fff0 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/tetheroffload/config/1.0/Android.bp b/tetheroffload/config/1.0/Android.bp index 09fc574729..ddf7c223cf 100644 --- a/tetheroffload/config/1.0/Android.bp +++ b/tetheroffload/config/1.0/Android.bp @@ -10,7 +10,7 @@ filegroup { genrule { name: "android.hardware.tetheroffload.config@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0", srcs: [ ":android.hardware.tetheroffload.config@1.0_hal", ], @@ -22,7 +22,7 @@ genrule { genrule { name: "android.hardware.tetheroffload.config@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.tetheroffload.config@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0", srcs: [ ":android.hardware.tetheroffload.config@1.0_hal", ], diff --git a/tetheroffload/control/1.0/Android.bp b/tetheroffload/control/1.0/Android.bp index 9361e8b8ef..6f504460f3 100644 --- a/tetheroffload/control/1.0/Android.bp +++ b/tetheroffload/control/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.tetheroffload.control@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0", srcs: [ ":android.hardware.tetheroffload.control@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.tetheroffload.control@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.tetheroffload.control@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0", srcs: [ ":android.hardware.tetheroffload.control@1.0_hal", ], diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp index 256fad415c..3a446086c4 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 bc57cf7d1b..c692f9a3dc 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", ],