From ac9f1c02f30472f69bbac7b8cd2be08b680d09a1 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Mon, 6 Feb 2017 09:59:51 -0800 Subject: [PATCH] Remove vts driver/profiler build rules. Generate filegroups for .hal files so that driver/profiler build rules can migrate to another project. Bug: 34893894 Test: mmma hardware/interfaces -j32 Change-Id: Iefc98a6df16706fbb798bc32405fe8ff0c3de450 --- benchmarks/msgq/1.0/Android.bp | 102 +------------- bluetooth/1.0/Android.bp | 120 ++--------------- boot/1.0/Android.bp | 111 ++-------------- ir/1.0/Android.bp | 111 ++-------------- nfc/1.0/Android.bp | 120 ++--------------- radio/1.0/Android.bp | 147 ++------------------- tests/bar/1.0/Android.bp | 12 ++ tests/baz/1.0/Android.bp | 10 ++ tests/expression/1.0/Android.bp | 8 ++ tests/foo/1.0/Android.bp | 12 ++ tests/inheritance/1.0/Android.bp | 10 ++ tests/libhwbinder/1.0/Android.bp | 7 + tests/memory/1.0/Android.bp | 7 + tests/msgq/1.0/Android.bp | 7 + tests/pointer/1.0/Android.bp | 8 ++ wifi/1.0/Android.bp | 219 +++---------------------------- wifi/supplicant/1.0/Android.bp | 210 +++-------------------------- 17 files changed, 173 insertions(+), 1048 deletions(-) diff --git a/benchmarks/msgq/1.0/Android.bp b/benchmarks/msgq/1.0/Android.bp index 8c853d8876..de84e811c7 100644 --- a/benchmarks/msgq/1.0/Android.bp +++ b/benchmarks/msgq/1.0/Android.bp @@ -1,5 +1,12 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.benchmarks.msgq@1.0_hal", + srcs: [ + "IBenchmarkMsgQ.hal", + ], +} + genrule { name: "android.hardware.benchmarks.msgq@1.0_genc++", tools: ["hidl-gen"], @@ -50,98 +57,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.benchmarks.msgq.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/benchmarks/msgq/1.0/ $(genDir)/android/hardware/benchmarks/msgq/1.0/", - srcs: [ - "IBenchmarkMsgQ.hal", - ], - out: [ - "android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQ.vts.cpp", - ], -} - -genrule { - name: "android.hardware.benchmarks.msgq.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/benchmarks/msgq/1.0/ $(genDir)/android/hardware/benchmarks/msgq/1.0/", - srcs: [ - "IBenchmarkMsgQ.hal", - ], - out: [ - "android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQ.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.benchmarks.msgq.vts.driver@1.0", - generated_sources: ["android.hardware.benchmarks.msgq.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.benchmarks.msgq.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.benchmarks.msgq.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.benchmarks.msgq@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.benchmarks.msgq@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/benchmarks/msgq/1.0/ $(genDir)/android/hardware/benchmarks/msgq/1.0/", - srcs: [ - "IBenchmarkMsgQ.hal", - ], - out: [ - "android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQ.vts.cpp", - ], -} - -genrule { - name: "android.hardware.benchmarks.msgq@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/benchmarks/msgq/1.0/ $(genDir)/android/hardware/benchmarks/msgq/1.0/", - srcs: [ - "IBenchmarkMsgQ.hal", - ], - out: [ - "android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQ.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.benchmarks.msgq@1.0-vts.profiler", - generated_sources: ["android.hardware.benchmarks.msgq@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.benchmarks.msgq@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.benchmarks.msgq@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.benchmarks.msgq@1.0", - ], -} diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp index f3e5a6262f..f2c394b102 100644 --- a/bluetooth/1.0/Android.bp +++ b/bluetooth/1.0/Android.bp @@ -1,5 +1,14 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.bluetooth@1.0_hal", + srcs: [ + "types.hal", + "IBluetoothHci.hal", + "IBluetoothHciCallbacks.hal", + ], +} + genrule { name: "android.hardware.bluetooth@1.0_genc++", tools: ["hidl-gen"], @@ -62,114 +71,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.bluetooth.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/", - srcs: [ - "types.hal", - "IBluetoothHci.hal", - "IBluetoothHciCallbacks.hal", - ], - out: [ - "android/hardware/bluetooth/1.0/types.vts.cpp", - "android/hardware/bluetooth/1.0/BluetoothHci.vts.cpp", - "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.cpp", - ], -} - -genrule { - name: "android.hardware.bluetooth.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/", - srcs: [ - "types.hal", - "IBluetoothHci.hal", - "IBluetoothHciCallbacks.hal", - ], - out: [ - "android/hardware/bluetooth/1.0/types.vts.h", - "android/hardware/bluetooth/1.0/BluetoothHci.vts.h", - "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.bluetooth.vts.driver@1.0", - generated_sources: ["android.hardware.bluetooth.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.bluetooth.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.bluetooth.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.bluetooth@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.bluetooth@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/", - srcs: [ - "types.hal", - "IBluetoothHci.hal", - "IBluetoothHciCallbacks.hal", - ], - out: [ - "android/hardware/bluetooth/1.0/types.vts.cpp", - "android/hardware/bluetooth/1.0/BluetoothHci.vts.cpp", - "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.cpp", - ], -} - -genrule { - name: "android.hardware.bluetooth@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/", - srcs: [ - "types.hal", - "IBluetoothHci.hal", - "IBluetoothHciCallbacks.hal", - ], - out: [ - "android/hardware/bluetooth/1.0/types.vts.h", - "android/hardware/bluetooth/1.0/BluetoothHci.vts.h", - "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.bluetooth@1.0-vts.profiler", - generated_sources: ["android.hardware.bluetooth@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.bluetooth@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.bluetooth@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.bluetooth@1.0", - ], -} diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp index 2ac549867c..9dcabc4b7b 100644 --- a/boot/1.0/Android.bp +++ b/boot/1.0/Android.bp @@ -1,5 +1,13 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.boot@1.0_hal", + srcs: [ + "types.hal", + "IBootControl.hal", + ], +} + genrule { name: "android.hardware.boot@1.0_genc++", tools: ["hidl-gen"], @@ -54,106 +62,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.boot.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/", - srcs: [ - "types.hal", - "IBootControl.hal", - ], - out: [ - "android/hardware/boot/1.0/types.vts.cpp", - "android/hardware/boot/1.0/BootControl.vts.cpp", - ], -} - -genrule { - name: "android.hardware.boot.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/", - srcs: [ - "types.hal", - "IBootControl.hal", - ], - out: [ - "android/hardware/boot/1.0/types.vts.h", - "android/hardware/boot/1.0/BootControl.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.boot.vts.driver@1.0", - generated_sources: ["android.hardware.boot.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.boot@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.boot@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/", - srcs: [ - "types.hal", - "IBootControl.hal", - ], - out: [ - "android/hardware/boot/1.0/types.vts.cpp", - "android/hardware/boot/1.0/BootControl.vts.cpp", - ], -} - -genrule { - name: "android.hardware.boot@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/", - srcs: [ - "types.hal", - "IBootControl.hal", - ], - out: [ - "android/hardware/boot/1.0/types.vts.h", - "android/hardware/boot/1.0/BootControl.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.boot@1.0-vts.profiler", - generated_sources: ["android.hardware.boot@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.boot@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.boot@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.boot@1.0", - ], -} diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp index 45e308a1a4..5628952e82 100644 --- a/ir/1.0/Android.bp +++ b/ir/1.0/Android.bp @@ -1,5 +1,13 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.ir@1.0_hal", + srcs: [ + "types.hal", + "IConsumerIr.hal", + ], +} + genrule { name: "android.hardware.ir@1.0_genc++", tools: ["hidl-gen"], @@ -54,106 +62,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.ir.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/", - srcs: [ - "types.hal", - "IConsumerIr.hal", - ], - out: [ - "android/hardware/ir/1.0/types.vts.cpp", - "android/hardware/ir/1.0/ConsumerIr.vts.cpp", - ], -} - -genrule { - name: "android.hardware.ir.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/", - srcs: [ - "types.hal", - "IConsumerIr.hal", - ], - out: [ - "android/hardware/ir/1.0/types.vts.h", - "android/hardware/ir/1.0/ConsumerIr.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.ir.vts.driver@1.0", - generated_sources: ["android.hardware.ir.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.ir.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.ir.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.ir@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.ir@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/", - srcs: [ - "types.hal", - "IConsumerIr.hal", - ], - out: [ - "android/hardware/ir/1.0/types.vts.cpp", - "android/hardware/ir/1.0/ConsumerIr.vts.cpp", - ], -} - -genrule { - name: "android.hardware.ir@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/", - srcs: [ - "types.hal", - "IConsumerIr.hal", - ], - out: [ - "android/hardware/ir/1.0/types.vts.h", - "android/hardware/ir/1.0/ConsumerIr.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.ir@1.0-vts.profiler", - generated_sources: ["android.hardware.ir@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.ir@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.ir@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.ir@1.0", - ], -} diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index e1c06c6ee5..7f228a73e5 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0/Android.bp @@ -1,5 +1,14 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.nfc@1.0_hal", + srcs: [ + "types.hal", + "INfc.hal", + "INfcClientCallback.hal", + ], +} + genrule { name: "android.hardware.nfc@1.0_genc++", tools: ["hidl-gen"], @@ -62,114 +71,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.nfc.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", - srcs: [ - "types.hal", - "INfc.hal", - "INfcClientCallback.hal", - ], - out: [ - "android/hardware/nfc/1.0/types.vts.cpp", - "android/hardware/nfc/1.0/Nfc.vts.cpp", - "android/hardware/nfc/1.0/NfcClientCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.nfc.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", - srcs: [ - "types.hal", - "INfc.hal", - "INfcClientCallback.hal", - ], - out: [ - "android/hardware/nfc/1.0/types.vts.h", - "android/hardware/nfc/1.0/Nfc.vts.h", - "android/hardware/nfc/1.0/NfcClientCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.nfc.vts.driver@1.0", - generated_sources: ["android.hardware.nfc.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.nfc.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.nfc.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.nfc@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.nfc@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", - srcs: [ - "types.hal", - "INfc.hal", - "INfcClientCallback.hal", - ], - out: [ - "android/hardware/nfc/1.0/types.vts.cpp", - "android/hardware/nfc/1.0/Nfc.vts.cpp", - "android/hardware/nfc/1.0/NfcClientCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.nfc@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", - srcs: [ - "types.hal", - "INfc.hal", - "INfcClientCallback.hal", - ], - out: [ - "android/hardware/nfc/1.0/types.vts.h", - "android/hardware/nfc/1.0/Nfc.vts.h", - "android/hardware/nfc/1.0/NfcClientCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.nfc@1.0-vts.profiler", - generated_sources: ["android.hardware.nfc@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.nfc@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.nfc@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.nfc@1.0", - ], -} diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp index 7bff57411d..d9df91057b 100644 --- a/radio/1.0/Android.bp +++ b/radio/1.0/Android.bp @@ -1,5 +1,17 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.radio@1.0_hal", + srcs: [ + "types.hal", + "IRadio.hal", + "IRadioIndication.hal", + "IRadioResponse.hal", + "ISap.hal", + "ISapCallback.hal", + ], +} + genrule { name: "android.hardware.radio@1.0_genc++", tools: ["hidl-gen"], @@ -86,138 +98,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.radio.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/", - srcs: [ - "types.hal", - "IRadio.hal", - "IRadioIndication.hal", - "IRadioResponse.hal", - "ISap.hal", - "ISapCallback.hal", - ], - out: [ - "android/hardware/radio/1.0/types.vts.cpp", - "android/hardware/radio/1.0/Radio.vts.cpp", - "android/hardware/radio/1.0/RadioIndication.vts.cpp", - "android/hardware/radio/1.0/RadioResponse.vts.cpp", - "android/hardware/radio/1.0/Sap.vts.cpp", - "android/hardware/radio/1.0/SapCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.radio.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/", - srcs: [ - "types.hal", - "IRadio.hal", - "IRadioIndication.hal", - "IRadioResponse.hal", - "ISap.hal", - "ISapCallback.hal", - ], - out: [ - "android/hardware/radio/1.0/types.vts.h", - "android/hardware/radio/1.0/Radio.vts.h", - "android/hardware/radio/1.0/RadioIndication.vts.h", - "android/hardware/radio/1.0/RadioResponse.vts.h", - "android/hardware/radio/1.0/Sap.vts.h", - "android/hardware/radio/1.0/SapCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.radio.vts.driver@1.0", - generated_sources: ["android.hardware.radio.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.radio.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.radio.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.radio@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.radio@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/", - srcs: [ - "types.hal", - "IRadio.hal", - "IRadioIndication.hal", - "IRadioResponse.hal", - "ISap.hal", - "ISapCallback.hal", - ], - out: [ - "android/hardware/radio/1.0/types.vts.cpp", - "android/hardware/radio/1.0/Radio.vts.cpp", - "android/hardware/radio/1.0/RadioIndication.vts.cpp", - "android/hardware/radio/1.0/RadioResponse.vts.cpp", - "android/hardware/radio/1.0/Sap.vts.cpp", - "android/hardware/radio/1.0/SapCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.radio@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/", - srcs: [ - "types.hal", - "IRadio.hal", - "IRadioIndication.hal", - "IRadioResponse.hal", - "ISap.hal", - "ISapCallback.hal", - ], - out: [ - "android/hardware/radio/1.0/types.vts.h", - "android/hardware/radio/1.0/Radio.vts.h", - "android/hardware/radio/1.0/RadioIndication.vts.h", - "android/hardware/radio/1.0/RadioResponse.vts.h", - "android/hardware/radio/1.0/Sap.vts.h", - "android/hardware/radio/1.0/SapCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.radio@1.0-vts.profiler", - generated_sources: ["android.hardware.radio@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.radio@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.radio@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.radio@1.0", - ], -} diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index fbec8d1ff4..924b3ab3ad 100644 --- a/tests/bar/1.0/Android.bp +++ b/tests/bar/1.0/Android.bp @@ -1,5 +1,17 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.bar@1.0_hal", + srcs: [ + "types.hal", + "IBar.hal", + "IComplicated.hal", + "IFooCallback.hal", + "IImportRules.hal", + "IImportTypes.hal", + ], +} + genrule { name: "android.hardware.tests.bar@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp index 4106838e7f..1cf71b6a1c 100644 --- a/tests/baz/1.0/Android.bp +++ b/tests/baz/1.0/Android.bp @@ -1,5 +1,15 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.baz@1.0_hal", + srcs: [ + "types.hal", + "IBase.hal", + "IBaz.hal", + "IBazCallback.hal", + ], +} + genrule { name: "android.hardware.tests.baz@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp index bb7aeddc84..1730aba13e 100644 --- a/tests/expression/1.0/Android.bp +++ b/tests/expression/1.0/Android.bp @@ -1,5 +1,13 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.expression@1.0_hal", + srcs: [ + "IExpression.hal", + "IExpressionExt.hal", + ], +} + genrule { name: "android.hardware.tests.expression@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index 8294c65e40..c65d3cfa78 100644 --- a/tests/foo/1.0/Android.bp +++ b/tests/foo/1.0/Android.bp @@ -1,5 +1,17 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.foo@1.0_hal", + srcs: [ + "types.hal", + "IFoo.hal", + "IFooCallback.hal", + "IMyTypes.hal", + "ISimple.hal", + "ITheirTypes.hal", + ], +} + genrule { name: "android.hardware.tests.foo@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp index 4389147c1c..433e9acca6 100644 --- a/tests/inheritance/1.0/Android.bp +++ b/tests/inheritance/1.0/Android.bp @@ -1,5 +1,15 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.inheritance@1.0_hal", + srcs: [ + "IChild.hal", + "IFetcher.hal", + "IGrandparent.hal", + "IParent.hal", + ], +} + genrule { name: "android.hardware.tests.inheritance@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp index 8c27225a5c..1d0b4b57d2 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -1,5 +1,12 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.libhwbinder@1.0_hal", + srcs: [ + "IBenchmark.hal", + ], +} + genrule { name: "android.hardware.tests.libhwbinder@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index d8fe811a75..3f27810a53 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp @@ -1,5 +1,12 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.memory@1.0_hal", + srcs: [ + "IMemoryTest.hal", + ], +} + genrule { name: "android.hardware.tests.memory@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp index 669722e36c..39fef893e6 100644 --- a/tests/msgq/1.0/Android.bp +++ b/tests/msgq/1.0/Android.bp @@ -1,5 +1,12 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.msgq@1.0_hal", + srcs: [ + "ITestMsgQ.hal", + ], +} + genrule { name: "android.hardware.tests.msgq@1.0_genc++", tools: ["hidl-gen"], diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp index be7f873da3..e40003d475 100644 --- a/tests/pointer/1.0/Android.bp +++ b/tests/pointer/1.0/Android.bp @@ -1,5 +1,13 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.tests.pointer@1.0_hal", + srcs: [ + "IGraph.hal", + "IPointer.hal", + ], +} + genrule { name: "android.hardware.tests.pointer@1.0_genc++", tools: ["hidl-gen"], diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp index 135cd2fc22..59326d0872 100644 --- a/wifi/1.0/Android.bp +++ b/wifi/1.0/Android.bp @@ -1,5 +1,25 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.wifi@1.0_hal", + srcs: [ + "types.hal", + "IWifi.hal", + "IWifiApIface.hal", + "IWifiChip.hal", + "IWifiChipEventCallback.hal", + "IWifiEventCallback.hal", + "IWifiIface.hal", + "IWifiNanIface.hal", + "IWifiNanIfaceEventCallback.hal", + "IWifiP2pIface.hal", + "IWifiRttController.hal", + "IWifiRttControllerEventCallback.hal", + "IWifiStaIface.hal", + "IWifiStaIfaceEventCallback.hal", + ], +} + genrule { name: "android.hardware.wifi@1.0_genc++", tools: ["hidl-gen"], @@ -150,202 +170,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.wifi.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/", - srcs: [ - "types.hal", - "IWifi.hal", - "IWifiApIface.hal", - "IWifiChip.hal", - "IWifiChipEventCallback.hal", - "IWifiEventCallback.hal", - "IWifiIface.hal", - "IWifiNanIface.hal", - "IWifiNanIfaceEventCallback.hal", - "IWifiP2pIface.hal", - "IWifiRttController.hal", - "IWifiRttControllerEventCallback.hal", - "IWifiStaIface.hal", - "IWifiStaIfaceEventCallback.hal", - ], - out: [ - "android/hardware/wifi/1.0/types.vts.cpp", - "android/hardware/wifi/1.0/Wifi.vts.cpp", - "android/hardware/wifi/1.0/WifiApIface.vts.cpp", - "android/hardware/wifi/1.0/WifiChip.vts.cpp", - "android/hardware/wifi/1.0/WifiChipEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiIface.vts.cpp", - "android/hardware/wifi/1.0/WifiNanIface.vts.cpp", - "android/hardware/wifi/1.0/WifiNanIfaceEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiP2pIface.vts.cpp", - "android/hardware/wifi/1.0/WifiRttController.vts.cpp", - "android/hardware/wifi/1.0/WifiRttControllerEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiStaIface.vts.cpp", - "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.wifi.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/", - srcs: [ - "types.hal", - "IWifi.hal", - "IWifiApIface.hal", - "IWifiChip.hal", - "IWifiChipEventCallback.hal", - "IWifiEventCallback.hal", - "IWifiIface.hal", - "IWifiNanIface.hal", - "IWifiNanIfaceEventCallback.hal", - "IWifiP2pIface.hal", - "IWifiRttController.hal", - "IWifiRttControllerEventCallback.hal", - "IWifiStaIface.hal", - "IWifiStaIfaceEventCallback.hal", - ], - out: [ - "android/hardware/wifi/1.0/types.vts.h", - "android/hardware/wifi/1.0/Wifi.vts.h", - "android/hardware/wifi/1.0/WifiApIface.vts.h", - "android/hardware/wifi/1.0/WifiChip.vts.h", - "android/hardware/wifi/1.0/WifiChipEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiIface.vts.h", - "android/hardware/wifi/1.0/WifiNanIface.vts.h", - "android/hardware/wifi/1.0/WifiNanIfaceEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiP2pIface.vts.h", - "android/hardware/wifi/1.0/WifiRttController.vts.h", - "android/hardware/wifi/1.0/WifiRttControllerEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiStaIface.vts.h", - "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.wifi.vts.driver@1.0", - generated_sources: ["android.hardware.wifi.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.wifi.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.wifi.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.wifi@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.wifi@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/", - srcs: [ - "types.hal", - "IWifi.hal", - "IWifiApIface.hal", - "IWifiChip.hal", - "IWifiChipEventCallback.hal", - "IWifiEventCallback.hal", - "IWifiIface.hal", - "IWifiNanIface.hal", - "IWifiNanIfaceEventCallback.hal", - "IWifiP2pIface.hal", - "IWifiRttController.hal", - "IWifiRttControllerEventCallback.hal", - "IWifiStaIface.hal", - "IWifiStaIfaceEventCallback.hal", - ], - out: [ - "android/hardware/wifi/1.0/types.vts.cpp", - "android/hardware/wifi/1.0/Wifi.vts.cpp", - "android/hardware/wifi/1.0/WifiApIface.vts.cpp", - "android/hardware/wifi/1.0/WifiChip.vts.cpp", - "android/hardware/wifi/1.0/WifiChipEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiIface.vts.cpp", - "android/hardware/wifi/1.0/WifiNanIface.vts.cpp", - "android/hardware/wifi/1.0/WifiNanIfaceEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiP2pIface.vts.cpp", - "android/hardware/wifi/1.0/WifiRttController.vts.cpp", - "android/hardware/wifi/1.0/WifiRttControllerEventCallback.vts.cpp", - "android/hardware/wifi/1.0/WifiStaIface.vts.cpp", - "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.wifi@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/", - srcs: [ - "types.hal", - "IWifi.hal", - "IWifiApIface.hal", - "IWifiChip.hal", - "IWifiChipEventCallback.hal", - "IWifiEventCallback.hal", - "IWifiIface.hal", - "IWifiNanIface.hal", - "IWifiNanIfaceEventCallback.hal", - "IWifiP2pIface.hal", - "IWifiRttController.hal", - "IWifiRttControllerEventCallback.hal", - "IWifiStaIface.hal", - "IWifiStaIfaceEventCallback.hal", - ], - out: [ - "android/hardware/wifi/1.0/types.vts.h", - "android/hardware/wifi/1.0/Wifi.vts.h", - "android/hardware/wifi/1.0/WifiApIface.vts.h", - "android/hardware/wifi/1.0/WifiChip.vts.h", - "android/hardware/wifi/1.0/WifiChipEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiIface.vts.h", - "android/hardware/wifi/1.0/WifiNanIface.vts.h", - "android/hardware/wifi/1.0/WifiNanIfaceEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiP2pIface.vts.h", - "android/hardware/wifi/1.0/WifiRttController.vts.h", - "android/hardware/wifi/1.0/WifiRttControllerEventCallback.vts.h", - "android/hardware/wifi/1.0/WifiStaIface.vts.h", - "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.wifi@1.0-vts.profiler", - generated_sources: ["android.hardware.wifi@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.wifi@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.wifi@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.wifi@1.0", - ], -} diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp index 565c3d2a9c..b985a9362c 100644 --- a/wifi/supplicant/1.0/Android.bp +++ b/wifi/supplicant/1.0/Android.bp @@ -1,5 +1,24 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.wifi.supplicant@1.0_hal", + srcs: [ + "types.hal", + "ISupplicant.hal", + "ISupplicantCallback.hal", + "ISupplicantIface.hal", + "ISupplicantNetwork.hal", + "ISupplicantP2pIface.hal", + "ISupplicantP2pIfaceCallback.hal", + "ISupplicantP2pNetwork.hal", + "ISupplicantP2pNetworkCallback.hal", + "ISupplicantStaIface.hal", + "ISupplicantStaIfaceCallback.hal", + "ISupplicantStaNetwork.hal", + "ISupplicantStaNetworkCallback.hal", + ], +} + genrule { name: "android.hardware.wifi.supplicant@1.0_genc++", tools: ["hidl-gen"], @@ -142,194 +161,3 @@ cc_library_shared { "android.hidl.base@1.0", ], } - -genrule { - name: "android.hardware.wifi.supplicant.vts.driver@1.0_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/", - srcs: [ - "types.hal", - "ISupplicant.hal", - "ISupplicantCallback.hal", - "ISupplicantIface.hal", - "ISupplicantNetwork.hal", - "ISupplicantP2pIface.hal", - "ISupplicantP2pIfaceCallback.hal", - "ISupplicantP2pNetwork.hal", - "ISupplicantP2pNetworkCallback.hal", - "ISupplicantStaIface.hal", - "ISupplicantStaIfaceCallback.hal", - "ISupplicantStaNetwork.hal", - "ISupplicantStaNetworkCallback.hal", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/types.vts.cpp", - "android/hardware/wifi/supplicant/1.0/Supplicant.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantIface.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantNetwork.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIface.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetwork.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIface.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetwork.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.wifi.supplicant.vts.driver@1.0_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/", - srcs: [ - "types.hal", - "ISupplicant.hal", - "ISupplicantCallback.hal", - "ISupplicantIface.hal", - "ISupplicantNetwork.hal", - "ISupplicantP2pIface.hal", - "ISupplicantP2pIfaceCallback.hal", - "ISupplicantP2pNetwork.hal", - "ISupplicantP2pNetworkCallback.hal", - "ISupplicantStaIface.hal", - "ISupplicantStaIfaceCallback.hal", - "ISupplicantStaNetwork.hal", - "ISupplicantStaNetworkCallback.hal", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/types.vts.h", - "android/hardware/wifi/supplicant/1.0/Supplicant.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantIface.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantNetwork.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIface.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetwork.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIface.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetwork.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.wifi.supplicant.vts.driver@1.0", - generated_sources: ["android.hardware.wifi.supplicant.vts.driver@1.0_genc++"], - generated_headers: ["android.hardware.wifi.supplicant.vts.driver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.wifi.supplicant.vts.driver@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libvts_common", - "libvts_datatype", - "libvts_measurement", - "libvts_multidevice_proto", - "libcamera_metadata", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.wifi.supplicant@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} - -genrule { - name: "android.hardware.wifi.supplicant@1.0-vts.profiler_genc++", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/", - srcs: [ - "types.hal", - "ISupplicant.hal", - "ISupplicantCallback.hal", - "ISupplicantIface.hal", - "ISupplicantNetwork.hal", - "ISupplicantP2pIface.hal", - "ISupplicantP2pIfaceCallback.hal", - "ISupplicantP2pNetwork.hal", - "ISupplicantP2pNetworkCallback.hal", - "ISupplicantStaIface.hal", - "ISupplicantStaIfaceCallback.hal", - "ISupplicantStaNetwork.hal", - "ISupplicantStaNetworkCallback.hal", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/types.vts.cpp", - "android/hardware/wifi/supplicant/1.0/Supplicant.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantIface.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantNetwork.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIface.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetwork.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIface.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceCallback.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetwork.vts.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.cpp", - ], -} - -genrule { - name: "android.hardware.wifi.supplicant@1.0-vts.profiler_genc++_headers", - tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/", - srcs: [ - "types.hal", - "ISupplicant.hal", - "ISupplicantCallback.hal", - "ISupplicantIface.hal", - "ISupplicantNetwork.hal", - "ISupplicantP2pIface.hal", - "ISupplicantP2pIfaceCallback.hal", - "ISupplicantP2pNetwork.hal", - "ISupplicantP2pNetworkCallback.hal", - "ISupplicantStaIface.hal", - "ISupplicantStaIfaceCallback.hal", - "ISupplicantStaNetwork.hal", - "ISupplicantStaNetworkCallback.hal", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/types.vts.h", - "android/hardware/wifi/supplicant/1.0/Supplicant.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantIface.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantNetwork.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIface.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetwork.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIface.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceCallback.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetwork.vts.h", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.h", - ], -} - -cc_library_shared { - name: "android.hardware.wifi.supplicant@1.0-vts.profiler", - generated_sources: ["android.hardware.wifi.supplicant@1.0-vts.profiler_genc++"], - generated_headers: ["android.hardware.wifi.supplicant@1.0-vts.profiler_genc++_headers"], - export_generated_headers: ["android.hardware.wifi.supplicant@1.0-vts.profiler_genc++_headers"], - shared_libs: [ - "libbase", - "libhidlbase", - "libhidltransport", - "libvts_profiling", - "libvts_multidevice_proto", - "libprotobuf-cpp-full", - "android.hidl.base@1.0", - "android.hardware.wifi.supplicant@1.0", - ], -}