diff options
author | Steven Moreland <smoreland@google.com> | 2017-09-26 10:11:18 -0700 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-09-27 08:55:47 -0700 |
commit | 3788a7321f9be086429e39745121fa8d40565f9e (patch) | |
tree | 9d9ba3b3a6b00ce9e0f5d83cd4da93a0052f56a4 | |
parent | 91799c6cc7ec13e1c5579131cf9daa8333f4d62b (diff) | |
download | android_hardware_interfaces-3788a7321f9be086429e39745121fa8d40565f9e.tar.gz android_hardware_interfaces-3788a7321f9be086429e39745121fa8d40565f9e.tar.bz2 android_hardware_interfaces-3788a7321f9be086429e39745121fa8d40565f9e.zip |
Update makefiles for hidl-adapter (2/2).
Bug: 37518178
Test: none
Change-Id: I77fe67964f89da8b66aeb8df6d424de0f8689f8d
-rw-r--r-- | camera/device/3.3/Android.bp | 85 | ||||
-rw-r--r-- | cas/1.0/Android.bp | 80 | ||||
-rw-r--r-- | cas/Android.bp | 2 | ||||
-rw-r--r-- | cas/native/1.0/Android.bp | 79 | ||||
-rw-r--r-- | configstore/1.1/Android.bp | 79 | ||||
-rw-r--r-- | neuralnetworks/1.0/Android.bp | 78 | ||||
-rw-r--r-- | oemlock/1.0/Android.bp | 74 | ||||
-rw-r--r-- | power/1.1/Android.bp | 79 | ||||
-rw-r--r-- | thermal/1.1/Android.bp | 81 | ||||
-rw-r--r-- | usb/1.1/Android.bp | 81 | ||||
-rw-r--r-- | vibrator/1.1/Android.bp | 79 | ||||
-rw-r--r-- | weaver/1.0/Android.bp | 74 | ||||
-rw-r--r-- | wifi/1.1/Android.bp | 81 | ||||
-rw-r--r-- | wifi/1.2/Android.bp | 86 | ||||
-rw-r--r-- | wifi/offload/1.0/Android.bp | 76 |
15 files changed, 1113 insertions, 1 deletions
diff --git a/camera/device/3.3/Android.bp b/camera/device/3.3/Android.bp index 2a1999165..29b63f834 100644 --- a/camera/device/3.3/Android.bp +++ b/camera/device/3.3/Android.bp @@ -70,3 +70,88 @@ cc_library { "android.hardware.graphics.common@1.0", ], } + +genrule { + name: "android.hardware.camera.device@3.3-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3", + srcs: [ + ":android.hardware.camera.device@3.3_hal", + ], + out: [ + "android/hardware/camera/device/3.3/ACameraDeviceSession.cpp", + ], +} + +genrule { + name: "android.hardware.camera.device@3.3-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3", + srcs: [ + ":android.hardware.camera.device@3.3_hal", + ], + out: [ + "android/hardware/camera/device/3.3/ACameraDeviceSession.h", + ], +} + + +cc_library { + name: "android.hardware.camera.device@3.3-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.camera.device@3.3-adapter-helper_genc++"], + generated_headers: ["android.hardware.camera.device@3.3-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.camera.device@3.3-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.camera.common@1.0", + "android.hardware.camera.device@3.2", + "android.hardware.camera.device@3.3", + "android.hardware.graphics.common@1.0", + "android.hardware.camera.device@3.2-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.camera.common@1.0", + "android.hardware.camera.device@3.2", + "android.hardware.camera.device@3.3", + "android.hardware.graphics.common@1.0", + "android.hardware.camera.device@3.2-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.camera.device@3.3-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.camera.device@3.3-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.camera.common@1.0", + "android.hardware.camera.device@3.2", + "android.hardware.camera.device@3.3", + "android.hardware.graphics.common@1.0", + "android.hardware.camera.device@3.3-adapter-helper", + ], + generated_sources: ["android.hardware.camera.device@3.3-adapter_genc++"], +} diff --git a/cas/1.0/Android.bp b/cas/1.0/Android.bp index 6d94793b7..ea8c10ee1 100644 --- a/cas/1.0/Android.bp +++ b/cas/1.0/Android.bp @@ -85,3 +85,83 @@ cc_library { "libutils", ], } + +genrule { + name: "android.hardware.cas@1.0-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", + srcs: [ + ":android.hardware.cas@1.0_hal", + ], + out: [ + "android/hardware/cas/1.0/ACas.cpp", + "android/hardware/cas/1.0/ACasListener.cpp", + "android/hardware/cas/1.0/ADescramblerBase.cpp", + "android/hardware/cas/1.0/AMediaCasService.cpp", + ], +} + +genrule { + name: "android.hardware.cas@1.0-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", + srcs: [ + ":android.hardware.cas@1.0_hal", + ], + out: [ + "android/hardware/cas/1.0/ACas.h", + "android/hardware/cas/1.0/ACasListener.h", + "android/hardware/cas/1.0/ADescramblerBase.h", + "android/hardware/cas/1.0/AMediaCasService.h", + ], +} + + +cc_library { + name: "android.hardware.cas@1.0-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.cas@1.0-adapter-helper_genc++"], + generated_headers: ["android.hardware.cas@1.0-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.cas@1.0-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.cas@1.0", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.cas@1.0", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.cas@1.0-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.cas@1.0-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.cas@1.0", + "android.hardware.cas@1.0-adapter-helper", + ], + generated_sources: ["android.hardware.cas@1.0-adapter_genc++"], +} diff --git a/cas/Android.bp b/cas/Android.bp index 8208d3d51..36bd60747 100644 --- a/cas/Android.bp +++ b/cas/Android.bp @@ -1,7 +1,7 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0", - "1.0/vts/functional", "1.0/default", + "1.0/vts/functional", "native/1.0", ] diff --git a/cas/native/1.0/Android.bp b/cas/native/1.0/Android.bp index e39cab1f7..4b5472a8d 100644 --- a/cas/native/1.0/Android.bp +++ b/cas/native/1.0/Android.bp @@ -66,3 +66,82 @@ cc_library { "android.hardware.cas@1.0", ], } + +genrule { + name: "android.hardware.cas.native@1.0-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0", + srcs: [ + ":android.hardware.cas.native@1.0_hal", + ], + out: [ + "android/hardware/cas/native/1.0/ADescrambler.cpp", + ], +} + +genrule { + name: "android.hardware.cas.native@1.0-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0", + srcs: [ + ":android.hardware.cas.native@1.0_hal", + ], + out: [ + "android/hardware/cas/native/1.0/ADescrambler.h", + ], +} + + +cc_library { + name: "android.hardware.cas.native@1.0-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.cas.native@1.0-adapter-helper_genc++"], + generated_headers: ["android.hardware.cas.native@1.0-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.cas.native@1.0-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.cas.native@1.0", + "android.hardware.cas@1.0", + "android.hardware.cas@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.cas.native@1.0", + "android.hardware.cas@1.0", + "android.hardware.cas@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.cas.native@1.0-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.cas.native@1.0-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.cas.native@1.0", + "android.hardware.cas@1.0", + "android.hardware.cas.native@1.0-adapter-helper", + ], + generated_sources: ["android.hardware.cas.native@1.0-adapter_genc++"], +} diff --git a/configstore/1.1/Android.bp b/configstore/1.1/Android.bp index 92fb7c139..1bddc6c48 100644 --- a/configstore/1.1/Android.bp +++ b/configstore/1.1/Android.bp @@ -62,3 +62,82 @@ cc_library { "android.hardware.configstore@1.0", ], } + +genrule { + name: "android.hardware.configstore@1.1-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1", + srcs: [ + ":android.hardware.configstore@1.1_hal", + ], + out: [ + "android/hardware/configstore/1.1/ASurfaceFlingerConfigs.cpp", + ], +} + +genrule { + name: "android.hardware.configstore@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1", + srcs: [ + ":android.hardware.configstore@1.1_hal", + ], + out: [ + "android/hardware/configstore/1.1/ASurfaceFlingerConfigs.h", + ], +} + + +cc_library { + name: "android.hardware.configstore@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.configstore@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.configstore@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.configstore@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.configstore@1.0", + "android.hardware.configstore@1.1", + "android.hardware.configstore@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.configstore@1.0", + "android.hardware.configstore@1.1", + "android.hardware.configstore@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.configstore@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.configstore@1.1-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.configstore@1.0", + "android.hardware.configstore@1.1", + "android.hardware.configstore@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.configstore@1.1-adapter_genc++"], +} diff --git a/neuralnetworks/1.0/Android.bp b/neuralnetworks/1.0/Android.bp index d7c3bbbf7..8f0b2148e 100644 --- a/neuralnetworks/1.0/Android.bp +++ b/neuralnetworks/1.0/Android.bp @@ -78,3 +78,81 @@ cc_library { "libutils", ], } + +genrule { + name: "android.hardware.neuralnetworks@1.0-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0", + srcs: [ + ":android.hardware.neuralnetworks@1.0_hal", + ], + out: [ + "android/hardware/neuralnetworks/1.0/ADevice.cpp", + "android/hardware/neuralnetworks/1.0/AEvent.cpp", + "android/hardware/neuralnetworks/1.0/APreparedModel.cpp", + ], +} + +genrule { + name: "android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0", + srcs: [ + ":android.hardware.neuralnetworks@1.0_hal", + ], + out: [ + "android/hardware/neuralnetworks/1.0/ADevice.h", + "android/hardware/neuralnetworks/1.0/AEvent.h", + "android/hardware/neuralnetworks/1.0/APreparedModel.h", + ], +} + + +cc_library { + name: "android.hardware.neuralnetworks@1.0-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++"], + generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.neuralnetworks@1.0", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.neuralnetworks@1.0", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.neuralnetworks@1.0-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.neuralnetworks@1.0-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.neuralnetworks@1.0", + "android.hardware.neuralnetworks@1.0-adapter-helper", + ], + generated_sources: ["android.hardware.neuralnetworks@1.0-adapter_genc++"], +} diff --git a/oemlock/1.0/Android.bp b/oemlock/1.0/Android.bp index 742061d5d..e4cc23626 100644 --- a/oemlock/1.0/Android.bp +++ b/oemlock/1.0/Android.bp @@ -64,3 +64,77 @@ cc_library { "libutils", ], } + +genrule { + name: "android.hardware.oemlock@1.0-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", + srcs: [ + ":android.hardware.oemlock@1.0_hal", + ], + out: [ + "android/hardware/oemlock/1.0/AOemLock.cpp", + ], +} + +genrule { + name: "android.hardware.oemlock@1.0-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", + srcs: [ + ":android.hardware.oemlock@1.0_hal", + ], + out: [ + "android/hardware/oemlock/1.0/AOemLock.h", + ], +} + + +cc_library { + name: "android.hardware.oemlock@1.0-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.oemlock@1.0-adapter-helper_genc++"], + generated_headers: ["android.hardware.oemlock@1.0-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.oemlock@1.0-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.oemlock@1.0", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.oemlock@1.0", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.oemlock@1.0-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.oemlock@1.0-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.oemlock@1.0", + "android.hardware.oemlock@1.0-adapter-helper", + ], + generated_sources: ["android.hardware.oemlock@1.0-adapter_genc++"], +} diff --git a/power/1.1/Android.bp b/power/1.1/Android.bp index fb10aba15..8da0894a5 100644 --- a/power/1.1/Android.bp +++ b/power/1.1/Android.bp @@ -66,3 +66,82 @@ cc_library { "android.hardware.power@1.0", ], } + +genrule { + name: "android.hardware.power@1.1-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", + srcs: [ + ":android.hardware.power@1.1_hal", + ], + out: [ + "android/hardware/power/1.1/APower.cpp", + ], +} + +genrule { + name: "android.hardware.power@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", + srcs: [ + ":android.hardware.power@1.1_hal", + ], + out: [ + "android/hardware/power/1.1/APower.h", + ], +} + + +cc_library { + name: "android.hardware.power@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.power@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.power@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.power@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.power@1.0", + "android.hardware.power@1.1", + "android.hardware.power@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.power@1.0", + "android.hardware.power@1.1", + "android.hardware.power@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.power@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.power@1.1-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.power@1.0", + "android.hardware.power@1.1", + "android.hardware.power@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.power@1.1-adapter_genc++"], +} diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp index 0985d947b..58e709eea 100644 --- a/thermal/1.1/Android.bp +++ b/thermal/1.1/Android.bp @@ -69,3 +69,84 @@ cc_library { "android.hardware.thermal@1.0", ], } + +genrule { + name: "android.hardware.thermal@1.1-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1", + srcs: [ + ":android.hardware.thermal@1.1_hal", + ], + out: [ + "android/hardware/thermal/1.1/AThermal.cpp", + "android/hardware/thermal/1.1/AThermalCallback.cpp", + ], +} + +genrule { + name: "android.hardware.thermal@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1", + srcs: [ + ":android.hardware.thermal@1.1_hal", + ], + out: [ + "android/hardware/thermal/1.1/AThermal.h", + "android/hardware/thermal/1.1/AThermalCallback.h", + ], +} + + +cc_library { + name: "android.hardware.thermal@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.thermal@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.thermal@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.thermal@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.thermal@1.0", + "android.hardware.thermal@1.1", + "android.hardware.thermal@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.thermal@1.0", + "android.hardware.thermal@1.1", + "android.hardware.thermal@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.thermal@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.thermal@1.1-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.thermal@1.0", + "android.hardware.thermal@1.1", + "android.hardware.thermal@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.thermal@1.1-adapter_genc++"], +} diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp index 5466001bf..c6c2034cd 100644 --- a/usb/1.1/Android.bp +++ b/usb/1.1/Android.bp @@ -73,3 +73,84 @@ cc_library { "android.hardware.usb@1.0", ], } + +genrule { + name: "android.hardware.usb@1.1-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", + srcs: [ + ":android.hardware.usb@1.1_hal", + ], + out: [ + "android/hardware/usb/1.1/AUsb.cpp", + "android/hardware/usb/1.1/AUsbCallback.cpp", + ], +} + +genrule { + name: "android.hardware.usb@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", + srcs: [ + ":android.hardware.usb@1.1_hal", + ], + out: [ + "android/hardware/usb/1.1/AUsb.h", + "android/hardware/usb/1.1/AUsbCallback.h", + ], +} + + +cc_library { + name: "android.hardware.usb@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.usb@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.usb@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.usb@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.usb@1.0", + "android.hardware.usb@1.1", + "android.hardware.usb@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.usb@1.0", + "android.hardware.usb@1.1", + "android.hardware.usb@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.usb@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.usb@1.1-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.usb@1.0", + "android.hardware.usb@1.1", + "android.hardware.usb@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.usb@1.1-adapter_genc++"], +} diff --git a/vibrator/1.1/Android.bp b/vibrator/1.1/Android.bp index a47f37c9a..7ce197145 100644 --- a/vibrator/1.1/Android.bp +++ b/vibrator/1.1/Android.bp @@ -66,3 +66,82 @@ cc_library { "android.hardware.vibrator@1.0", ], } + +genrule { + name: "android.hardware.vibrator@1.1-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", + srcs: [ + ":android.hardware.vibrator@1.1_hal", + ], + out: [ + "android/hardware/vibrator/1.1/AVibrator.cpp", + ], +} + +genrule { + name: "android.hardware.vibrator@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", + srcs: [ + ":android.hardware.vibrator@1.1_hal", + ], + out: [ + "android/hardware/vibrator/1.1/AVibrator.h", + ], +} + + +cc_library { + name: "android.hardware.vibrator@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.vibrator@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.vibrator@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.vibrator@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.vibrator@1.0", + "android.hardware.vibrator@1.1", + "android.hardware.vibrator@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.vibrator@1.0", + "android.hardware.vibrator@1.1", + "android.hardware.vibrator@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.vibrator@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.vibrator@1.1-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.vibrator@1.0", + "android.hardware.vibrator@1.1", + "android.hardware.vibrator@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.vibrator@1.1-adapter_genc++"], +} diff --git a/weaver/1.0/Android.bp b/weaver/1.0/Android.bp index cdc59c9d0..c4077535a 100644 --- a/weaver/1.0/Android.bp +++ b/weaver/1.0/Android.bp @@ -64,3 +64,77 @@ cc_library { "libutils", ], } + +genrule { + name: "android.hardware.weaver@1.0-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", + srcs: [ + ":android.hardware.weaver@1.0_hal", + ], + out: [ + "android/hardware/weaver/1.0/AWeaver.cpp", + ], +} + +genrule { + name: "android.hardware.weaver@1.0-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", + srcs: [ + ":android.hardware.weaver@1.0_hal", + ], + out: [ + "android/hardware/weaver/1.0/AWeaver.h", + ], +} + + +cc_library { + name: "android.hardware.weaver@1.0-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.weaver@1.0-adapter-helper_genc++"], + generated_headers: ["android.hardware.weaver@1.0-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.weaver@1.0-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.weaver@1.0", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.weaver@1.0", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.weaver@1.0-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.weaver@1.0-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.weaver@1.0", + "android.hardware.weaver@1.0-adapter-helper", + ], + generated_sources: ["android.hardware.weaver@1.0-adapter_genc++"], +} diff --git a/wifi/1.1/Android.bp b/wifi/1.1/Android.bp index aa6e9379b..0b6ecb81f 100644 --- a/wifi/1.1/Android.bp +++ b/wifi/1.1/Android.bp @@ -69,3 +69,84 @@ cc_library { "android.hardware.wifi@1.0", ], } + +genrule { + name: "android.hardware.wifi@1.1-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.1", + srcs: [ + ":android.hardware.wifi@1.1_hal", + ], + out: [ + "android/hardware/wifi/1.1/AWifi.cpp", + "android/hardware/wifi/1.1/AWifiChip.cpp", + ], +} + +genrule { + name: "android.hardware.wifi@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.1", + srcs: [ + ":android.hardware.wifi@1.1_hal", + ], + out: [ + "android/hardware/wifi/1.1/AWifi.h", + "android/hardware/wifi/1.1/AWifiChip.h", + ], +} + + +cc_library { + name: "android.hardware.wifi@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.wifi@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.wifi@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.wifi@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.wifi@1.0", + "android.hardware.wifi@1.1", + "android.hardware.wifi@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.wifi@1.0", + "android.hardware.wifi@1.1", + "android.hardware.wifi@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.wifi@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.wifi@1.1-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.wifi@1.0", + "android.hardware.wifi@1.1", + "android.hardware.wifi@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.wifi@1.1-adapter_genc++"], +} diff --git a/wifi/1.2/Android.bp b/wifi/1.2/Android.bp index e9fac3d8e..4cf5b3567 100644 --- a/wifi/1.2/Android.bp +++ b/wifi/1.2/Android.bp @@ -71,3 +71,89 @@ cc_library { "android.hardware.wifi@1.1", ], } + +genrule { + name: "android.hardware.wifi@1.2-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2", + srcs: [ + ":android.hardware.wifi@1.2_hal", + ], + out: [ + "android/hardware/wifi/1.2/AWifi.cpp", + "android/hardware/wifi/1.2/AWifiChip.cpp", + ], +} + +genrule { + name: "android.hardware.wifi@1.2-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2", + srcs: [ + ":android.hardware.wifi@1.2_hal", + ], + out: [ + "android/hardware/wifi/1.2/AWifi.h", + "android/hardware/wifi/1.2/AWifiChip.h", + ], +} + + +cc_library { + name: "android.hardware.wifi@1.2-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.wifi@1.2-adapter-helper_genc++"], + generated_headers: ["android.hardware.wifi@1.2-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.wifi@1.2-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.wifi@1.0", + "android.hardware.wifi@1.1", + "android.hardware.wifi@1.2", + "android.hardware.wifi@1.0-adapter-helper", + "android.hardware.wifi@1.1-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.wifi@1.0", + "android.hardware.wifi@1.1", + "android.hardware.wifi@1.2", + "android.hardware.wifi@1.0-adapter-helper", + "android.hardware.wifi@1.1-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.wifi@1.2-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.wifi@1.2-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.wifi@1.0", + "android.hardware.wifi@1.1", + "android.hardware.wifi@1.2", + "android.hardware.wifi@1.2-adapter-helper", + ], + generated_sources: ["android.hardware.wifi@1.2-adapter_genc++"], +} diff --git a/wifi/offload/1.0/Android.bp b/wifi/offload/1.0/Android.bp index 5b7fcad87..017fc397e 100644 --- a/wifi/offload/1.0/Android.bp +++ b/wifi/offload/1.0/Android.bp @@ -71,3 +71,79 @@ cc_library { "libutils", ], } + +genrule { + name: "android.hardware.wifi.offload@1.0-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0", + srcs: [ + ":android.hardware.wifi.offload@1.0_hal", + ], + out: [ + "android/hardware/wifi/offload/1.0/AOffload.cpp", + "android/hardware/wifi/offload/1.0/AOffloadCallback.cpp", + ], +} + +genrule { + name: "android.hardware.wifi.offload@1.0-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0", + srcs: [ + ":android.hardware.wifi.offload@1.0_hal", + ], + out: [ + "android/hardware/wifi/offload/1.0/AOffload.h", + "android/hardware/wifi/offload/1.0/AOffloadCallback.h", + ], +} + + +cc_library { + name: "android.hardware.wifi.offload@1.0-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.wifi.offload@1.0-adapter-helper_genc++"], + generated_headers: ["android.hardware.wifi.offload@1.0-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.wifi.offload@1.0-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.wifi.offload@1.0", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.wifi.offload@1.0", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.wifi.offload@1.0-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.wifi.offload@1.0-adapter", + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.wifi.offload@1.0", + "android.hardware.wifi.offload@1.0-adapter-helper", + ], + generated_sources: ["android.hardware.wifi.offload@1.0-adapter_genc++"], +} |