diff options
| author | Steven Moreland <smoreland@google.com> | 2017-11-09 19:05:17 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-11-10 09:06:55 -0800 |
| commit | a1169dd600091cc9a451b91e7b4573dc1d9049b3 (patch) | |
| tree | e7b60403dc8cb464f2d9f9782c8bf06262e6bf74 | |
| parent | 771dff2a2d014df7118263d2c0a8cc8522cf480c (diff) | |
| download | platform_hardware_interfaces-a1169dd600091cc9a451b91e7b4573dc1d9049b3.tar.gz platform_hardware_interfaces-a1169dd600091cc9a451b91e7b4573dc1d9049b3.tar.bz2 platform_hardware_interfaces-a1169dd600091cc9a451b91e7b4573dc1d9049b3.zip | |
Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
71 files changed, 1347 insertions, 11823 deletions
diff --git a/Android.bp b/Android.bp index 7ae00b66ac..978559a649 100644 --- a/Android.bp +++ b/Android.bp @@ -2,6 +2,11 @@ subdirs = [ "*" ] +hidl_package_root { + name: "android.hardware", + path: "hardware/interfaces", +} + cc_defaults { name: "hidl_defaults", cflags: [ diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp index db3efbcd99..1643c12f46 100644 --- a/audio/2.0/Android.bp +++ b/audio/2.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.audio@2.0_hal", +hidl_interface { + name: "android.hardware.audio@2.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IDevice.hal", @@ -12,209 +16,21 @@ filegroup { "IStreamOut.hal", "IStreamOutCallback.hal", ], -} - -genrule { - name: "android.hardware.audio@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", - srcs: [ - ":android.hardware.audio@2.0_hal", - ], - out: [ - "android/hardware/audio/2.0/types.cpp", - "android/hardware/audio/2.0/DeviceAll.cpp", - "android/hardware/audio/2.0/DevicesFactoryAll.cpp", - "android/hardware/audio/2.0/PrimaryDeviceAll.cpp", - "android/hardware/audio/2.0/StreamAll.cpp", - "android/hardware/audio/2.0/StreamInAll.cpp", - "android/hardware/audio/2.0/StreamOutAll.cpp", - "android/hardware/audio/2.0/StreamOutCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.audio@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", - srcs: [ - ":android.hardware.audio@2.0_hal", - ], - out: [ - "android/hardware/audio/2.0/types.h", - "android/hardware/audio/2.0/hwtypes.h", - "android/hardware/audio/2.0/IDevice.h", - "android/hardware/audio/2.0/IHwDevice.h", - "android/hardware/audio/2.0/BnHwDevice.h", - "android/hardware/audio/2.0/BpHwDevice.h", - "android/hardware/audio/2.0/BsDevice.h", - "android/hardware/audio/2.0/IDevicesFactory.h", - "android/hardware/audio/2.0/IHwDevicesFactory.h", - "android/hardware/audio/2.0/BnHwDevicesFactory.h", - "android/hardware/audio/2.0/BpHwDevicesFactory.h", - "android/hardware/audio/2.0/BsDevicesFactory.h", - "android/hardware/audio/2.0/IPrimaryDevice.h", - "android/hardware/audio/2.0/IHwPrimaryDevice.h", - "android/hardware/audio/2.0/BnHwPrimaryDevice.h", - "android/hardware/audio/2.0/BpHwPrimaryDevice.h", - "android/hardware/audio/2.0/BsPrimaryDevice.h", - "android/hardware/audio/2.0/IStream.h", - "android/hardware/audio/2.0/IHwStream.h", - "android/hardware/audio/2.0/BnHwStream.h", - "android/hardware/audio/2.0/BpHwStream.h", - "android/hardware/audio/2.0/BsStream.h", - "android/hardware/audio/2.0/IStreamIn.h", - "android/hardware/audio/2.0/IHwStreamIn.h", - "android/hardware/audio/2.0/BnHwStreamIn.h", - "android/hardware/audio/2.0/BpHwStreamIn.h", - "android/hardware/audio/2.0/BsStreamIn.h", - "android/hardware/audio/2.0/IStreamOut.h", - "android/hardware/audio/2.0/IHwStreamOut.h", - "android/hardware/audio/2.0/BnHwStreamOut.h", - "android/hardware/audio/2.0/BpHwStreamOut.h", - "android/hardware/audio/2.0/BsStreamOut.h", - "android/hardware/audio/2.0/IStreamOutCallback.h", - "android/hardware/audio/2.0/IHwStreamOutCallback.h", - "android/hardware/audio/2.0/BnHwStreamOutCallback.h", - "android/hardware/audio/2.0/BpHwStreamOutCallback.h", - "android/hardware/audio/2.0/BsStreamOutCallback.h", - ], -} - -cc_library { - name: "android.hardware.audio@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.audio@2.0_genc++"], - generated_headers: ["android.hardware.audio@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.audio@2.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.audio.common@2.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.audio.common@2.0", - ], -} - -// This package is not java compatible. Not creating java target. - -genrule { - name: "android.hardware.audio-V2.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0", - srcs: [ - ":android.hardware.audio@2.0_hal", - ], - out: [ - "android/hardware/audio/V2_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.audio-V2.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.audio-V2.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.audio@2.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.audio@2.0", - srcs: [ - ":android.hardware.audio@2.0_hal", - ], - out: [ - "android/hardware/audio/2.0/ADevice.cpp", - "android/hardware/audio/2.0/ADevicesFactory.cpp", - "android/hardware/audio/2.0/APrimaryDevice.cpp", - "android/hardware/audio/2.0/AStream.cpp", - "android/hardware/audio/2.0/AStreamIn.cpp", - "android/hardware/audio/2.0/AStreamOut.cpp", - "android/hardware/audio/2.0/AStreamOutCallback.cpp", - ], -} - -genrule { - name: "android.hardware.audio@2.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.audio@2.0", - srcs: [ - ":android.hardware.audio@2.0_hal", - ], - out: [ - "android/hardware/audio/2.0/ADevice.h", - "android/hardware/audio/2.0/ADevicesFactory.h", - "android/hardware/audio/2.0/APrimaryDevice.h", - "android/hardware/audio/2.0/AStream.h", - "android/hardware/audio/2.0/AStreamIn.h", - "android/hardware/audio/2.0/AStreamOut.h", - "android/hardware/audio/2.0/AStreamOutCallback.h", - ], -} - -cc_library { - name: "android.hardware.audio@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.audio@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.audio@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.audio@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.audio.common@2.0", - "android.hardware.audio@2.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.audio.common@2.0", - "android.hardware.audio@2.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "AudioDrain", + "DeviceAddress", + "MessageQueueFlagBits", + "MmapBufferInfo", + "MmapPosition", + "ParameterValue", + "Result", + "TimeSpec", ], + gen_java: false, + gen_java_constants: true, } -genrule { - name: "android.hardware.audio@2.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.audio@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.audio@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.audio.common@2.0", - "android.hardware.audio@2.0", - "android.hardware.audio@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.audio@2.0-adapter_genc++"], -} diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp index 4ca82b22f7..878b5946e8 100644 --- a/audio/common/2.0/Android.bp +++ b/audio/common/2.0/Android.bp @@ -1,81 +1,48 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.audio.common@2.0_hal", - srcs: [ - "types.hal", - ], -} - -genrule { - name: "android.hardware.audio.common@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0", - srcs: [ - ":android.hardware.audio.common@2.0_hal", - ], - out: [ - "android/hardware/audio/common/2.0/types.cpp", - ], -} - -genrule { - name: "android.hardware.audio.common@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0", - srcs: [ - ":android.hardware.audio.common@2.0_hal", - ], - out: [ - "android/hardware/audio/common/2.0/types.h", - "android/hardware/audio/common/2.0/hwtypes.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.audio.common@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.audio.common@2.0_genc++"], - generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -genrule { - name: "android.hardware.audio.common-V2.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0", srcs: [ - ":android.hardware.audio.common@2.0_hal", - ], - out: [ - "android/hardware/audio/common/V2_0/Constants.java", + "types.hal", ], + types: [ + "AudioChannelMask", + "AudioConfig", + "AudioDevice", + "AudioFormat", + "AudioGain", + "AudioGainConfig", + "AudioGainMode", + "AudioHandleConsts", + "AudioInputFlag", + "AudioInterleave", + "AudioMixLatencyClass", + "AudioMode", + "AudioOffloadInfo", + "AudioOutputFlag", + "AudioPort", + "AudioPortConfig", + "AudioPortConfigDeviceExt", + "AudioPortConfigMask", + "AudioPortConfigSessionExt", + "AudioPortDeviceExt", + "AudioPortMixExt", + "AudioPortRole", + "AudioPortSessionExt", + "AudioPortType", + "AudioSessionConsts", + "AudioSource", + "AudioStreamType", + "AudioUsage", + "FixedChannelCount", + "ThreadInfo", + "Uuid", + ], + gen_java: false, + gen_java_constants: true, } -java_library { - name: "android.hardware.audio.common-V2.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.audio.common-V2.0-java-constants_gen_java"], -} -// This package has no interfaces. Not creating versioning adapter. diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp index 09fd3a41b3..c4f8b06949 100644 --- a/audio/effect/2.0/Android.bp +++ b/audio/effect/2.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.audio.effect@2.0_hal", +hidl_interface { + name: "android.hardware.audio.effect@2.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IAcousticEchoCancelerEffect.hal", @@ -19,265 +23,25 @@ filegroup { "IVirtualizerEffect.hal", "IVisualizerEffect.hal", ], -} - -genrule { - name: "android.hardware.audio.effect@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", - srcs: [ - ":android.hardware.audio.effect@2.0_hal", - ], - out: [ - "android/hardware/audio/effect/2.0/types.cpp", - "android/hardware/audio/effect/2.0/AcousticEchoCancelerEffectAll.cpp", - "android/hardware/audio/effect/2.0/AutomaticGainControlEffectAll.cpp", - "android/hardware/audio/effect/2.0/BassBoostEffectAll.cpp", - "android/hardware/audio/effect/2.0/DownmixEffectAll.cpp", - "android/hardware/audio/effect/2.0/EffectAll.cpp", - "android/hardware/audio/effect/2.0/EffectBufferProviderCallbackAll.cpp", - "android/hardware/audio/effect/2.0/EffectsFactoryAll.cpp", - "android/hardware/audio/effect/2.0/EnvironmentalReverbEffectAll.cpp", - "android/hardware/audio/effect/2.0/EqualizerEffectAll.cpp", - "android/hardware/audio/effect/2.0/LoudnessEnhancerEffectAll.cpp", - "android/hardware/audio/effect/2.0/NoiseSuppressionEffectAll.cpp", - "android/hardware/audio/effect/2.0/PresetReverbEffectAll.cpp", - "android/hardware/audio/effect/2.0/VirtualizerEffectAll.cpp", - "android/hardware/audio/effect/2.0/VisualizerEffectAll.cpp", - ], -} - -genrule { - name: "android.hardware.audio.effect@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", - srcs: [ - ":android.hardware.audio.effect@2.0_hal", - ], - out: [ - "android/hardware/audio/effect/2.0/types.h", - "android/hardware/audio/effect/2.0/hwtypes.h", - "android/hardware/audio/effect/2.0/IAcousticEchoCancelerEffect.h", - "android/hardware/audio/effect/2.0/IHwAcousticEchoCancelerEffect.h", - "android/hardware/audio/effect/2.0/BnHwAcousticEchoCancelerEffect.h", - "android/hardware/audio/effect/2.0/BpHwAcousticEchoCancelerEffect.h", - "android/hardware/audio/effect/2.0/BsAcousticEchoCancelerEffect.h", - "android/hardware/audio/effect/2.0/IAutomaticGainControlEffect.h", - "android/hardware/audio/effect/2.0/IHwAutomaticGainControlEffect.h", - "android/hardware/audio/effect/2.0/BnHwAutomaticGainControlEffect.h", - "android/hardware/audio/effect/2.0/BpHwAutomaticGainControlEffect.h", - "android/hardware/audio/effect/2.0/BsAutomaticGainControlEffect.h", - "android/hardware/audio/effect/2.0/IBassBoostEffect.h", - "android/hardware/audio/effect/2.0/IHwBassBoostEffect.h", - "android/hardware/audio/effect/2.0/BnHwBassBoostEffect.h", - "android/hardware/audio/effect/2.0/BpHwBassBoostEffect.h", - "android/hardware/audio/effect/2.0/BsBassBoostEffect.h", - "android/hardware/audio/effect/2.0/IDownmixEffect.h", - "android/hardware/audio/effect/2.0/IHwDownmixEffect.h", - "android/hardware/audio/effect/2.0/BnHwDownmixEffect.h", - "android/hardware/audio/effect/2.0/BpHwDownmixEffect.h", - "android/hardware/audio/effect/2.0/BsDownmixEffect.h", - "android/hardware/audio/effect/2.0/IEffect.h", - "android/hardware/audio/effect/2.0/IHwEffect.h", - "android/hardware/audio/effect/2.0/BnHwEffect.h", - "android/hardware/audio/effect/2.0/BpHwEffect.h", - "android/hardware/audio/effect/2.0/BsEffect.h", - "android/hardware/audio/effect/2.0/IEffectBufferProviderCallback.h", - "android/hardware/audio/effect/2.0/IHwEffectBufferProviderCallback.h", - "android/hardware/audio/effect/2.0/BnHwEffectBufferProviderCallback.h", - "android/hardware/audio/effect/2.0/BpHwEffectBufferProviderCallback.h", - "android/hardware/audio/effect/2.0/BsEffectBufferProviderCallback.h", - "android/hardware/audio/effect/2.0/IEffectsFactory.h", - "android/hardware/audio/effect/2.0/IHwEffectsFactory.h", - "android/hardware/audio/effect/2.0/BnHwEffectsFactory.h", - "android/hardware/audio/effect/2.0/BpHwEffectsFactory.h", - "android/hardware/audio/effect/2.0/BsEffectsFactory.h", - "android/hardware/audio/effect/2.0/IEnvironmentalReverbEffect.h", - "android/hardware/audio/effect/2.0/IHwEnvironmentalReverbEffect.h", - "android/hardware/audio/effect/2.0/BnHwEnvironmentalReverbEffect.h", - "android/hardware/audio/effect/2.0/BpHwEnvironmentalReverbEffect.h", - "android/hardware/audio/effect/2.0/BsEnvironmentalReverbEffect.h", - "android/hardware/audio/effect/2.0/IEqualizerEffect.h", - "android/hardware/audio/effect/2.0/IHwEqualizerEffect.h", - "android/hardware/audio/effect/2.0/BnHwEqualizerEffect.h", - "android/hardware/audio/effect/2.0/BpHwEqualizerEffect.h", - "android/hardware/audio/effect/2.0/BsEqualizerEffect.h", - "android/hardware/audio/effect/2.0/ILoudnessEnhancerEffect.h", - "android/hardware/audio/effect/2.0/IHwLoudnessEnhancerEffect.h", - "android/hardware/audio/effect/2.0/BnHwLoudnessEnhancerEffect.h", - "android/hardware/audio/effect/2.0/BpHwLoudnessEnhancerEffect.h", - "android/hardware/audio/effect/2.0/BsLoudnessEnhancerEffect.h", - "android/hardware/audio/effect/2.0/INoiseSuppressionEffect.h", - "android/hardware/audio/effect/2.0/IHwNoiseSuppressionEffect.h", - "android/hardware/audio/effect/2.0/BnHwNoiseSuppressionEffect.h", - "android/hardware/audio/effect/2.0/BpHwNoiseSuppressionEffect.h", - "android/hardware/audio/effect/2.0/BsNoiseSuppressionEffect.h", - "android/hardware/audio/effect/2.0/IPresetReverbEffect.h", - "android/hardware/audio/effect/2.0/IHwPresetReverbEffect.h", - "android/hardware/audio/effect/2.0/BnHwPresetReverbEffect.h", - "android/hardware/audio/effect/2.0/BpHwPresetReverbEffect.h", - "android/hardware/audio/effect/2.0/BsPresetReverbEffect.h", - "android/hardware/audio/effect/2.0/IVirtualizerEffect.h", - "android/hardware/audio/effect/2.0/IHwVirtualizerEffect.h", - "android/hardware/audio/effect/2.0/BnHwVirtualizerEffect.h", - "android/hardware/audio/effect/2.0/BpHwVirtualizerEffect.h", - "android/hardware/audio/effect/2.0/BsVirtualizerEffect.h", - "android/hardware/audio/effect/2.0/IVisualizerEffect.h", - "android/hardware/audio/effect/2.0/IHwVisualizerEffect.h", - "android/hardware/audio/effect/2.0/BnHwVisualizerEffect.h", - "android/hardware/audio/effect/2.0/BpHwVisualizerEffect.h", - "android/hardware/audio/effect/2.0/BsVisualizerEffect.h", - ], -} - -cc_library { - name: "android.hardware.audio.effect@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.audio.effect@2.0_genc++"], - generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.audio.common@2.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.audio.common@2.0", - ], -} - -// This package is not java compatible. Not creating java target. - -genrule { - name: "android.hardware.audio.effect-V2.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0", - srcs: [ - ":android.hardware.audio.effect@2.0_hal", - ], - out: [ - "android/hardware/audio/effect/V2_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.audio.effect-V2.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.audio.effect-V2.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.audio.effect@2.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.audio.effect@2.0", - srcs: [ - ":android.hardware.audio.effect@2.0_hal", - ], - out: [ - "android/hardware/audio/effect/2.0/AAcousticEchoCancelerEffect.cpp", - "android/hardware/audio/effect/2.0/AAutomaticGainControlEffect.cpp", - "android/hardware/audio/effect/2.0/ABassBoostEffect.cpp", - "android/hardware/audio/effect/2.0/ADownmixEffect.cpp", - "android/hardware/audio/effect/2.0/AEffect.cpp", - "android/hardware/audio/effect/2.0/AEffectBufferProviderCallback.cpp", - "android/hardware/audio/effect/2.0/AEffectsFactory.cpp", - "android/hardware/audio/effect/2.0/AEnvironmentalReverbEffect.cpp", - "android/hardware/audio/effect/2.0/AEqualizerEffect.cpp", - "android/hardware/audio/effect/2.0/ALoudnessEnhancerEffect.cpp", - "android/hardware/audio/effect/2.0/ANoiseSuppressionEffect.cpp", - "android/hardware/audio/effect/2.0/APresetReverbEffect.cpp", - "android/hardware/audio/effect/2.0/AVirtualizerEffect.cpp", - "android/hardware/audio/effect/2.0/AVisualizerEffect.cpp", - ], -} - -genrule { - name: "android.hardware.audio.effect@2.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.audio.effect@2.0", - srcs: [ - ":android.hardware.audio.effect@2.0_hal", - ], - out: [ - "android/hardware/audio/effect/2.0/AAcousticEchoCancelerEffect.h", - "android/hardware/audio/effect/2.0/AAutomaticGainControlEffect.h", - "android/hardware/audio/effect/2.0/ABassBoostEffect.h", - "android/hardware/audio/effect/2.0/ADownmixEffect.h", - "android/hardware/audio/effect/2.0/AEffect.h", - "android/hardware/audio/effect/2.0/AEffectBufferProviderCallback.h", - "android/hardware/audio/effect/2.0/AEffectsFactory.h", - "android/hardware/audio/effect/2.0/AEnvironmentalReverbEffect.h", - "android/hardware/audio/effect/2.0/AEqualizerEffect.h", - "android/hardware/audio/effect/2.0/ALoudnessEnhancerEffect.h", - "android/hardware/audio/effect/2.0/ANoiseSuppressionEffect.h", - "android/hardware/audio/effect/2.0/APresetReverbEffect.h", - "android/hardware/audio/effect/2.0/AVirtualizerEffect.h", - "android/hardware/audio/effect/2.0/AVisualizerEffect.h", - ], -} - -cc_library { - name: "android.hardware.audio.effect@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.audio.effect@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.audio.effect@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.audio.effect@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.audio.common@2.0", - "android.hardware.audio.effect@2.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", + interfaces: [ "android.hardware.audio.common@2.0", - "android.hardware.audio.effect@2.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.audio.effect@2.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.audio.effect@2.0", - out: ["main.cpp"] + "android.hidl.base@1.0", + ], + types: [ + "AudioBuffer", + "EffectAuxChannelsConfig", + "EffectBufferAccess", + "EffectBufferConfig", + "EffectConfig", + "EffectConfigParameters", + "EffectDescriptor", + "EffectFeature", + "EffectFlags", + "EffectOffloadParameter", + "MessageQueueFlagBits", + "Result", + ], + gen_java: false, + gen_java_constants: true, } -cc_test { - name: "android.hardware.audio.effect@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.audio.common@2.0", - "android.hardware.audio.effect@2.0", - "android.hardware.audio.effect@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.audio.effect@2.0-adapter_genc++"], -} diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp index 16f83b4d88..dbcce928e1 100644 --- a/biometrics/fingerprint/2.1/Android.bp +++ b/biometrics/fingerprint/2.1/Android.bp @@ -1,185 +1,30 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.biometrics.fingerprint@2.1_hal", - srcs: [ - "types.hal", - "IBiometricsFingerprint.hal", - "IBiometricsFingerprintClientCallback.hal", - ], -} - -genrule { - name: "android.hardware.biometrics.fingerprint@2.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", - srcs: [ - ":android.hardware.biometrics.fingerprint@2.1_hal", - ], - out: [ - "android/hardware/biometrics/fingerprint/2.1/types.cpp", - "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintAll.cpp", - "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.biometrics.fingerprint@2.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", - srcs: [ - ":android.hardware.biometrics.fingerprint@2.1_hal", - ], - out: [ - "android/hardware/biometrics/fingerprint/2.1/types.h", - "android/hardware/biometrics/fingerprint/2.1/hwtypes.h", - "android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h", - "android/hardware/biometrics/fingerprint/2.1/IHwBiometricsFingerprint.h", - "android/hardware/biometrics/fingerprint/2.1/BnHwBiometricsFingerprint.h", - "android/hardware/biometrics/fingerprint/2.1/BpHwBiometricsFingerprint.h", - "android/hardware/biometrics/fingerprint/2.1/BsBiometricsFingerprint.h", - "android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h", - "android/hardware/biometrics/fingerprint/2.1/IHwBiometricsFingerprintClientCallback.h", - "android/hardware/biometrics/fingerprint/2.1/BnHwBiometricsFingerprintClientCallback.h", - "android/hardware/biometrics/fingerprint/2.1/BpHwBiometricsFingerprintClientCallback.h", - "android/hardware/biometrics/fingerprint/2.1/BsBiometricsFingerprintClientCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.biometrics.fingerprint@2.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.biometrics.fingerprint@2.1_genc++"], - generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"], - export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.biometrics.fingerprint-V2.1-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", srcs: [ - ":android.hardware.biometrics.fingerprint@2.1_hal", - ], - out: [ - "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquired.java", - "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquiredInfo.java", - "android/hardware/biometrics/fingerprint/V2_1/FingerprintAuthenticated.java", - "android/hardware/biometrics/fingerprint/V2_1/FingerprintEnroll.java", - "android/hardware/biometrics/fingerprint/V2_1/FingerprintError.java", - "android/hardware/biometrics/fingerprint/V2_1/FingerprintFingerId.java", - "android/hardware/biometrics/fingerprint/V2_1/FingerprintIterator.java", - "android/hardware/biometrics/fingerprint/V2_1/FingerprintMsgType.java", - "android/hardware/biometrics/fingerprint/V2_1/RequestStatus.java", - "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprint.java", - "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprintClientCallback.java", - ], -} - -java_library { - name: "android.hardware.biometrics.fingerprint-V2.1-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.biometrics.fingerprint-V2.1-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.biometrics.fingerprint@2.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.biometrics.fingerprint@2.1", - srcs: [ - ":android.hardware.biometrics.fingerprint@2.1_hal", - ], - out: [ - "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprint.cpp", - "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprintClientCallback.cpp", - ], -} - -genrule { - name: "android.hardware.biometrics.fingerprint@2.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.biometrics.fingerprint@2.1", - srcs: [ - ":android.hardware.biometrics.fingerprint@2.1_hal", + "types.hal", + "IBiometricsFingerprint.hal", + "IBiometricsFingerprintClientCallback.hal", ], - out: [ - "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprint.h", - "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprintClientCallback.h", + interfaces: [ + "android.hidl.base@1.0", ], -} - -cc_library { - name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++"], - generated_headers: ["android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.biometrics.fingerprint@2.1", - "android.hidl.base@1.0-adapter-helper", + types: [ + "FingerprintAcquired", + "FingerprintAcquiredInfo", + "FingerprintAuthenticated", + "FingerprintEnroll", + "FingerprintError", + "FingerprintFingerId", + "FingerprintIterator", + "FingerprintMsgType", + "RequestStatus", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.biometrics.fingerprint@2.1", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.biometrics.fingerprint@2.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.biometrics.fingerprint@2.1", - out: ["main.cpp"] + gen_java: true, } -cc_test { - name: "android.hardware.biometrics.fingerprint@2.1-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.biometrics.fingerprint@2.1", - "android.hardware.biometrics.fingerprint@2.1-adapter-helper", - ], - generated_sources: ["android.hardware.biometrics.fingerprint@2.1-adapter_genc++"], -} diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp index e5b3b4be02..49df8a324a 100644 --- a/bluetooth/1.0/Android.bp +++ b/bluetooth/1.0/Android.bp @@ -1,177 +1,22 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -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"], - 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", - ], - out: [ - "android/hardware/bluetooth/1.0/types.cpp", - "android/hardware/bluetooth/1.0/BluetoothHciAll.cpp", - "android/hardware/bluetooth/1.0/BluetoothHciCallbacksAll.cpp", - ], -} - -genrule { - name: "android.hardware.bluetooth@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/bluetooth/1.0/types.h", - "android/hardware/bluetooth/1.0/hwtypes.h", - "android/hardware/bluetooth/1.0/IBluetoothHci.h", - "android/hardware/bluetooth/1.0/IHwBluetoothHci.h", - "android/hardware/bluetooth/1.0/BnHwBluetoothHci.h", - "android/hardware/bluetooth/1.0/BpHwBluetoothHci.h", - "android/hardware/bluetooth/1.0/BsBluetoothHci.h", - "android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.h", - "android/hardware/bluetooth/1.0/IHwBluetoothHciCallbacks.h", - "android/hardware/bluetooth/1.0/BnHwBluetoothHciCallbacks.h", - "android/hardware/bluetooth/1.0/BpHwBluetoothHciCallbacks.h", - "android/hardware/bluetooth/1.0/BsBluetoothHciCallbacks.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.bluetooth@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.bluetooth@1.0_genc++"], - generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.bluetooth-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0", srcs: [ - ":android.hardware.bluetooth@1.0_hal", - ], - out: [ - "android/hardware/bluetooth/V1_0/Status.java", - "android/hardware/bluetooth/V1_0/IBluetoothHci.java", - "android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java", - ], -} - -java_library { - name: "android.hardware.bluetooth-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.bluetooth-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.bluetooth@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.bluetooth@1.0", - srcs: [ - ":android.hardware.bluetooth@1.0_hal", - ], - out: [ - "android/hardware/bluetooth/1.0/ABluetoothHci.cpp", - "android/hardware/bluetooth/1.0/ABluetoothHciCallbacks.cpp", - ], -} - -genrule { - name: "android.hardware.bluetooth@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.bluetooth@1.0", - srcs: [ - ":android.hardware.bluetooth@1.0_hal", + "types.hal", + "IBluetoothHci.hal", + "IBluetoothHciCallbacks.hal", ], - out: [ - "android/hardware/bluetooth/1.0/ABluetoothHci.h", - "android/hardware/bluetooth/1.0/ABluetoothHciCallbacks.h", + interfaces: [ + "android.hidl.base@1.0", ], -} - -cc_library { - name: "android.hardware.bluetooth@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.bluetooth@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.bluetooth@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.bluetooth@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.bluetooth@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Status", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.bluetooth@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.bluetooth@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.bluetooth@1.0", - out: ["main.cpp"] + gen_java: true, } -cc_test { - name: "android.hardware.bluetooth@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.bluetooth@1.0", - "android.hardware.bluetooth@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.bluetooth@1.0-adapter_genc++"], -} diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp index 98db2abc6d..85c3b613e7 100644 --- a/boot/1.0/Android.bp +++ b/boot/1.0/Android.bp @@ -1,168 +1,22 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.boot@1.0_hal", - srcs: [ - "types.hal", - "IBootControl.hal", - ], -} - -genrule { - name: "android.hardware.boot@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/boot/1.0/types.cpp", - "android/hardware/boot/1.0/BootControlAll.cpp", - ], -} - -genrule { - name: "android.hardware.boot@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/boot/1.0/types.h", - "android/hardware/boot/1.0/hwtypes.h", - "android/hardware/boot/1.0/IBootControl.h", - "android/hardware/boot/1.0/IHwBootControl.h", - "android/hardware/boot/1.0/BnHwBootControl.h", - "android/hardware/boot/1.0/BpHwBootControl.h", - "android/hardware/boot/1.0/BsBootControl.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.boot@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.boot@1.0_genc++"], - generated_headers: ["android.hardware.boot@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.boot@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.boot-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", srcs: [ - ":android.hardware.boot@1.0_hal", - ], - out: [ - "android/hardware/boot/V1_0/BoolResult.java", - "android/hardware/boot/V1_0/CommandResult.java", - "android/hardware/boot/V1_0/IBootControl.java", - ], -} - -java_library { - name: "android.hardware.boot-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.boot-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.boot@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.boot@1.0", - srcs: [ - ":android.hardware.boot@1.0_hal", - ], - out: [ - "android/hardware/boot/1.0/ABootControl.cpp", - ], -} - -genrule { - name: "android.hardware.boot@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.boot@1.0", - srcs: [ - ":android.hardware.boot@1.0_hal", - ], - out: [ - "android/hardware/boot/1.0/ABootControl.h", + "types.hal", + "IBootControl.hal", ], -} - -cc_library { - name: "android.hardware.boot@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.boot@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.boot@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.boot@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.boot@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.boot@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "BoolResult", + "CommandResult", ], + gen_java: true, } -genrule { - name: "android.hardware.boot@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.boot@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.boot@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.boot@1.0", - "android.hardware.boot@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.boot@1.0-adapter_genc++"], -} diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp index 6e994d7ddf..ecfecc40a5 100644 --- a/broadcastradio/1.0/Android.bp +++ b/broadcastradio/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.broadcastradio@1.0_hal", +hidl_interface { + name: "android.hardware.broadcastradio@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IBroadcastRadio.hal", @@ -9,164 +13,26 @@ filegroup { "ITuner.hal", "ITunerCallback.hal", ], + interfaces: [ + "android.hidl.base@1.0", + ], + types: [ + "AmBandConfig", + "Band", + "BandConfig", + "Class", + "Deemphasis", + "Direction", + "FmBandConfig", + "MetaData", + "MetaDataClock", + "MetadataKey", + "MetadataType", + "ProgramInfo", + "Properties", + "Rds", + "Result", + ], + gen_java: false, } -genrule { - name: "android.hardware.broadcastradio@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0", - srcs: [ - ":android.hardware.broadcastradio@1.0_hal", - ], - out: [ - "android/hardware/broadcastradio/1.0/types.cpp", - "android/hardware/broadcastradio/1.0/BroadcastRadioAll.cpp", - "android/hardware/broadcastradio/1.0/BroadcastRadioFactoryAll.cpp", - "android/hardware/broadcastradio/1.0/TunerAll.cpp", - "android/hardware/broadcastradio/1.0/TunerCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.broadcastradio@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0", - srcs: [ - ":android.hardware.broadcastradio@1.0_hal", - ], - out: [ - "android/hardware/broadcastradio/1.0/types.h", - "android/hardware/broadcastradio/1.0/hwtypes.h", - "android/hardware/broadcastradio/1.0/IBroadcastRadio.h", - "android/hardware/broadcastradio/1.0/IHwBroadcastRadio.h", - "android/hardware/broadcastradio/1.0/BnHwBroadcastRadio.h", - "android/hardware/broadcastradio/1.0/BpHwBroadcastRadio.h", - "android/hardware/broadcastradio/1.0/BsBroadcastRadio.h", - "android/hardware/broadcastradio/1.0/IBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.0/IHwBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.0/BnHwBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.0/BpHwBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.0/BsBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.0/ITuner.h", - "android/hardware/broadcastradio/1.0/IHwTuner.h", - "android/hardware/broadcastradio/1.0/BnHwTuner.h", - "android/hardware/broadcastradio/1.0/BpHwTuner.h", - "android/hardware/broadcastradio/1.0/BsTuner.h", - "android/hardware/broadcastradio/1.0/ITunerCallback.h", - "android/hardware/broadcastradio/1.0/IHwTunerCallback.h", - "android/hardware/broadcastradio/1.0/BnHwTunerCallback.h", - "android/hardware/broadcastradio/1.0/BpHwTunerCallback.h", - "android/hardware/broadcastradio/1.0/BsTunerCallback.h", - ], -} - -cc_library { - name: "android.hardware.broadcastradio@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.broadcastradio@1.0_genc++"], - generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.broadcastradio@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.broadcastradio@1.0", - srcs: [ - ":android.hardware.broadcastradio@1.0_hal", - ], - out: [ - "android/hardware/broadcastradio/1.0/ABroadcastRadio.cpp", - "android/hardware/broadcastradio/1.0/ABroadcastRadioFactory.cpp", - "android/hardware/broadcastradio/1.0/ATuner.cpp", - "android/hardware/broadcastradio/1.0/ATunerCallback.cpp", - ], -} - -genrule { - name: "android.hardware.broadcastradio@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.broadcastradio@1.0", - srcs: [ - ":android.hardware.broadcastradio@1.0_hal", - ], - out: [ - "android/hardware/broadcastradio/1.0/ABroadcastRadio.h", - "android/hardware/broadcastradio/1.0/ABroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.0/ATuner.h", - "android/hardware/broadcastradio/1.0/ATunerCallback.h", - ], -} - -cc_library { - name: "android.hardware.broadcastradio@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.broadcastradio@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.broadcastradio@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.broadcastradio@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.broadcastradio@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.broadcastradio@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.broadcastradio@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.broadcastradio@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.broadcastradio@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.broadcastradio@1.0", - "android.hardware.broadcastradio@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.broadcastradio@1.0-adapter_genc++"], -} diff --git a/broadcastradio/1.1/Android.bp b/broadcastradio/1.1/Android.bp index a487c3fd8b..9f8e7ec551 100644 --- a/broadcastradio/1.1/Android.bp +++ b/broadcastradio/1.1/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.broadcastradio@1.1_hal", +hidl_interface { + name: "android.hardware.broadcastradio@1.1", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IBroadcastRadio.hal", @@ -9,171 +13,16 @@ filegroup { "ITuner.hal", "ITunerCallback.hal", ], -} - -genrule { - name: "android.hardware.broadcastradio@1.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1", - srcs: [ - ":android.hardware.broadcastradio@1.1_hal", - ], - out: [ - "android/hardware/broadcastradio/1.1/types.cpp", - "android/hardware/broadcastradio/1.1/BroadcastRadioAll.cpp", - "android/hardware/broadcastradio/1.1/BroadcastRadioFactoryAll.cpp", - "android/hardware/broadcastradio/1.1/TunerAll.cpp", - "android/hardware/broadcastradio/1.1/TunerCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.broadcastradio@1.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1", - srcs: [ - ":android.hardware.broadcastradio@1.1_hal", - ], - out: [ - "android/hardware/broadcastradio/1.1/types.h", - "android/hardware/broadcastradio/1.1/hwtypes.h", - "android/hardware/broadcastradio/1.1/IBroadcastRadio.h", - "android/hardware/broadcastradio/1.1/IHwBroadcastRadio.h", - "android/hardware/broadcastradio/1.1/BnHwBroadcastRadio.h", - "android/hardware/broadcastradio/1.1/BpHwBroadcastRadio.h", - "android/hardware/broadcastradio/1.1/BsBroadcastRadio.h", - "android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.1/IHwBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.1/BnHwBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.1/BpHwBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.1/BsBroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.1/ITuner.h", - "android/hardware/broadcastradio/1.1/IHwTuner.h", - "android/hardware/broadcastradio/1.1/BnHwTuner.h", - "android/hardware/broadcastradio/1.1/BpHwTuner.h", - "android/hardware/broadcastradio/1.1/BsTuner.h", - "android/hardware/broadcastradio/1.1/ITunerCallback.h", - "android/hardware/broadcastradio/1.1/IHwTunerCallback.h", - "android/hardware/broadcastradio/1.1/BnHwTunerCallback.h", - "android/hardware/broadcastradio/1.1/BpHwTunerCallback.h", - "android/hardware/broadcastradio/1.1/BsTunerCallback.h", - ], -} - -cc_library { - name: "android.hardware.broadcastradio@1.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.broadcastradio@1.1_genc++"], - generated_headers: ["android.hardware.broadcastradio@1.1_genc++_headers"], - export_generated_headers: ["android.hardware.broadcastradio@1.1_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ "android.hardware.broadcastradio@1.0", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.broadcastradio@1.0", + types: [ + "ProgramInfo", + "ProgramInfoFlags", + "ProgramListResult", + "Properties", ], + gen_java: false, } -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.broadcastradio@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.broadcastradio@1.1", - srcs: [ - ":android.hardware.broadcastradio@1.1_hal", - ], - out: [ - "android/hardware/broadcastradio/1.1/ABroadcastRadio.cpp", - "android/hardware/broadcastradio/1.1/ABroadcastRadioFactory.cpp", - "android/hardware/broadcastradio/1.1/ATuner.cpp", - "android/hardware/broadcastradio/1.1/ATunerCallback.cpp", - ], -} - -genrule { - name: "android.hardware.broadcastradio@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.broadcastradio@1.1", - srcs: [ - ":android.hardware.broadcastradio@1.1_hal", - ], - out: [ - "android/hardware/broadcastradio/1.1/ABroadcastRadio.h", - "android/hardware/broadcastradio/1.1/ABroadcastRadioFactory.h", - "android/hardware/broadcastradio/1.1/ATuner.h", - "android/hardware/broadcastradio/1.1/ATunerCallback.h", - ], -} - -cc_library { - name: "android.hardware.broadcastradio@1.1-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.broadcastradio@1.1-adapter-helper_genc++"], - generated_headers: ["android.hardware.broadcastradio@1.1-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.broadcastradio@1.1-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.broadcastradio@1.0", - "android.hardware.broadcastradio@1.1", - "android.hardware.broadcastradio@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.broadcastradio@1.0", - "android.hardware.broadcastradio@1.1", - "android.hardware.broadcastradio@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.broadcastradio@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.broadcastradio@1.1", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.broadcastradio@1.1-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.broadcastradio@1.0", - "android.hardware.broadcastradio@1.1", - "android.hardware.broadcastradio@1.1-adapter-helper", - ], - generated_sources: ["android.hardware.broadcastradio@1.1-adapter_genc++"], -} diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp index 8a553e2e66..c42e0541ab 100644 --- a/camera/common/1.0/Android.bp +++ b/camera/common/1.0/Android.bp @@ -1,93 +1,25 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.camera.common@1.0_hal", - srcs: [ - "types.hal", - ], -} - -genrule { - name: "android.hardware.camera.common@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0", - srcs: [ - ":android.hardware.camera.common@1.0_hal", - ], - out: [ - "android/hardware/camera/common/1.0/types.cpp", - ], -} - -genrule { - name: "android.hardware.camera.common@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0", - srcs: [ - ":android.hardware.camera.common@1.0_hal", - ], - out: [ - "android/hardware/camera/common/1.0/types.h", - "android/hardware/camera/common/1.0/hwtypes.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.camera.common@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.common@1.0_genc++"], - generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.camera.common-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0", srcs: [ - ":android.hardware.camera.common@1.0_hal", - ], - out: [ - "android/hardware/camera/common/V1_0/CameraDeviceStatus.java", - "android/hardware/camera/common/V1_0/CameraMetadataType.java", - "android/hardware/camera/common/V1_0/CameraResourceCost.java", - "android/hardware/camera/common/V1_0/Status.java", - "android/hardware/camera/common/V1_0/TagBoundaryId.java", - "android/hardware/camera/common/V1_0/TorchMode.java", - "android/hardware/camera/common/V1_0/TorchModeStatus.java", - "android/hardware/camera/common/V1_0/VendorTag.java", - "android/hardware/camera/common/V1_0/VendorTagSection.java", + "types.hal", ], + types: [ + "CameraDeviceStatus", + "CameraMetadataType", + "CameraResourceCost", + "Status", + "TagBoundaryId", + "TorchMode", + "TorchModeStatus", + "VendorTag", + "VendorTagSection", + ], + gen_java: true, } -java_library { - name: "android.hardware.camera.common-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.camera.common-V1.0-java_gen_java"], - libs: [ - "hwbinder", - ] -} - -// This package does not export any types. Not creating java constants export. - -// This package has no interfaces. Not creating versioning adapter. diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp index f19aae9816..dbf2a10d4f 100644 --- a/camera/device/1.0/Android.bp +++ b/camera/device/1.0/Android.bp @@ -1,173 +1,34 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.camera.device@1.0_hal", - srcs: [ - "types.hal", - "ICameraDevice.hal", - "ICameraDeviceCallback.hal", - "ICameraDevicePreviewCallback.hal", - ], -} - -genrule { - name: "android.hardware.camera.device@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0", - srcs: [ - ":android.hardware.camera.device@1.0_hal", - ], - out: [ - "android/hardware/camera/device/1.0/types.cpp", - "android/hardware/camera/device/1.0/CameraDeviceAll.cpp", - "android/hardware/camera/device/1.0/CameraDeviceCallbackAll.cpp", - "android/hardware/camera/device/1.0/CameraDevicePreviewCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.camera.device@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0", - srcs: [ - ":android.hardware.camera.device@1.0_hal", - ], - out: [ - "android/hardware/camera/device/1.0/types.h", - "android/hardware/camera/device/1.0/hwtypes.h", - "android/hardware/camera/device/1.0/ICameraDevice.h", - "android/hardware/camera/device/1.0/IHwCameraDevice.h", - "android/hardware/camera/device/1.0/BnHwCameraDevice.h", - "android/hardware/camera/device/1.0/BpHwCameraDevice.h", - "android/hardware/camera/device/1.0/BsCameraDevice.h", - "android/hardware/camera/device/1.0/ICameraDeviceCallback.h", - "android/hardware/camera/device/1.0/IHwCameraDeviceCallback.h", - "android/hardware/camera/device/1.0/BnHwCameraDeviceCallback.h", - "android/hardware/camera/device/1.0/BpHwCameraDeviceCallback.h", - "android/hardware/camera/device/1.0/BsCameraDeviceCallback.h", - "android/hardware/camera/device/1.0/ICameraDevicePreviewCallback.h", - "android/hardware/camera/device/1.0/IHwCameraDevicePreviewCallback.h", - "android/hardware/camera/device/1.0/BnHwCameraDevicePreviewCallback.h", - "android/hardware/camera/device/1.0/BpHwCameraDevicePreviewCallback.h", - "android/hardware/camera/device/1.0/BsCameraDevicePreviewCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.camera.device@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.device@1.0_genc++"], - generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.camera.common@1.0", - "android.hardware.graphics.common@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.camera.common@1.0", - "android.hardware.graphics.common@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.camera.device@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.camera.device@1.0", - srcs: [ - ":android.hardware.camera.device@1.0_hal", - ], - out: [ - "android/hardware/camera/device/1.0/ACameraDevice.cpp", - "android/hardware/camera/device/1.0/ACameraDeviceCallback.cpp", - "android/hardware/camera/device/1.0/ACameraDevicePreviewCallback.cpp", - ], -} - -genrule { - name: "android.hardware.camera.device@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.camera.device@1.0", srcs: [ - ":android.hardware.camera.device@1.0_hal", - ], - out: [ - "android/hardware/camera/device/1.0/ACameraDevice.h", - "android/hardware/camera/device/1.0/ACameraDeviceCallback.h", - "android/hardware/camera/device/1.0/ACameraDevicePreviewCallback.h", + "types.hal", + "ICameraDevice.hal", + "ICameraDeviceCallback.hal", + "ICameraDevicePreviewCallback.hal", ], -} - -cc_library { - name: "android.hardware.camera.device@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.device@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.camera.device@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.camera.device@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.camera.common@1.0", - "android.hardware.camera.device@1.0", "android.hardware.graphics.common@1.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@1.0", - "android.hardware.graphics.common@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "CameraFace", + "CameraFacing", + "CameraFrameMetadata", + "CameraInfo", + "CommandType", + "DataCallbackMsg", + "FrameCallbackFlag", + "HandleTimestampMessage", + "NotifyCallbackMsg", + "VideoFrameMessage", ], + gen_java: false, } -genrule { - name: "android.hardware.camera.device@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.camera.device@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.camera.device@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.camera.device@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.camera.device@1.0-adapter_genc++"], -} diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp index 0dcbdb4855..a8a164e23d 100644 --- a/camera/device/3.2/Android.bp +++ b/camera/device/3.2/Android.bp @@ -1,173 +1,44 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.camera.device@3.2_hal", - srcs: [ - "types.hal", - "ICameraDevice.hal", - "ICameraDeviceCallback.hal", - "ICameraDeviceSession.hal", - ], -} - -genrule { - name: "android.hardware.camera.device@3.2_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2", - srcs: [ - ":android.hardware.camera.device@3.2_hal", - ], - out: [ - "android/hardware/camera/device/3.2/types.cpp", - "android/hardware/camera/device/3.2/CameraDeviceAll.cpp", - "android/hardware/camera/device/3.2/CameraDeviceCallbackAll.cpp", - "android/hardware/camera/device/3.2/CameraDeviceSessionAll.cpp", - ], -} - -genrule { - name: "android.hardware.camera.device@3.2_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2", - srcs: [ - ":android.hardware.camera.device@3.2_hal", - ], - out: [ - "android/hardware/camera/device/3.2/types.h", - "android/hardware/camera/device/3.2/hwtypes.h", - "android/hardware/camera/device/3.2/ICameraDevice.h", - "android/hardware/camera/device/3.2/IHwCameraDevice.h", - "android/hardware/camera/device/3.2/BnHwCameraDevice.h", - "android/hardware/camera/device/3.2/BpHwCameraDevice.h", - "android/hardware/camera/device/3.2/BsCameraDevice.h", - "android/hardware/camera/device/3.2/ICameraDeviceCallback.h", - "android/hardware/camera/device/3.2/IHwCameraDeviceCallback.h", - "android/hardware/camera/device/3.2/BnHwCameraDeviceCallback.h", - "android/hardware/camera/device/3.2/BpHwCameraDeviceCallback.h", - "android/hardware/camera/device/3.2/BsCameraDeviceCallback.h", - "android/hardware/camera/device/3.2/ICameraDeviceSession.h", - "android/hardware/camera/device/3.2/IHwCameraDeviceSession.h", - "android/hardware/camera/device/3.2/BnHwCameraDeviceSession.h", - "android/hardware/camera/device/3.2/BpHwCameraDeviceSession.h", - "android/hardware/camera/device/3.2/BsCameraDeviceSession.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.camera.device@3.2", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.device@3.2_genc++"], - generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"], - export_generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.camera.common@1.0", - "android.hardware.graphics.common@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.camera.common@1.0", - "android.hardware.graphics.common@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.camera.device@3.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.camera.device@3.2", srcs: [ - ":android.hardware.camera.device@3.2_hal", - ], - out: [ - "android/hardware/camera/device/3.2/ACameraDevice.cpp", - "android/hardware/camera/device/3.2/ACameraDeviceCallback.cpp", - "android/hardware/camera/device/3.2/ACameraDeviceSession.cpp", - ], -} - -genrule { - name: "android.hardware.camera.device@3.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.camera.device@3.2", - srcs: [ - ":android.hardware.camera.device@3.2_hal", - ], - out: [ - "android/hardware/camera/device/3.2/ACameraDevice.h", - "android/hardware/camera/device/3.2/ACameraDeviceCallback.h", - "android/hardware/camera/device/3.2/ACameraDeviceSession.h", - ], -} - -cc_library { - name: "android.hardware.camera.device@3.2-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.device@3.2-adapter-helper_genc++"], - generated_headers: ["android.hardware.camera.device@3.2-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.camera.device@3.2-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.graphics.common@1.0", - "android.hidl.base@1.0-adapter-helper", + "types.hal", + "ICameraDevice.hal", + "ICameraDeviceCallback.hal", + "ICameraDeviceSession.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", + interfaces: [ "android.hardware.camera.common@1.0", - "android.hardware.camera.device@3.2", "android.hardware.graphics.common@1.0", - "android.hidl.base@1.0-adapter-helper", - ], + "android.hidl.base@1.0", + ], + types: [ + "BufferCache", + "BufferStatus", + "CameraBlob", + "CameraBlobId", + "CaptureRequest", + "CaptureResult", + "ErrorCode", + "ErrorMsg", + "HalStream", + "HalStreamConfiguration", + "MsgType", + "NotifyMsg", + "RequestTemplate", + "ShutterMsg", + "Stream", + "StreamBuffer", + "StreamConfiguration", + "StreamConfigurationMode", + "StreamRotation", + "StreamType", + ], + gen_java: false, } -genrule { - name: "android.hardware.camera.device@3.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.camera.device@3.2", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.camera.device@3.2-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@3.2", - "android.hardware.graphics.common@1.0", - "android.hardware.camera.device@3.2-adapter-helper", - ], - generated_sources: ["android.hardware.camera.device@3.2-adapter_genc++"], -} diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp index 455a271480..bce2c9bdba 100644 --- a/camera/metadata/3.2/Android.bp +++ b/camera/metadata/3.2/Android.bp @@ -1,148 +1,80 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.camera.metadata@3.2_hal", - srcs: [ - "types.hal", - ], -} - -genrule { - name: "android.hardware.camera.metadata@3.2_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2", - srcs: [ - ":android.hardware.camera.metadata@3.2_hal", - ], - out: [ - "android/hardware/camera/metadata/3.2/types.cpp", - ], -} - -genrule { - name: "android.hardware.camera.metadata@3.2_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2", - srcs: [ - ":android.hardware.camera.metadata@3.2_hal", - ], - out: [ - "android/hardware/camera/metadata/3.2/types.h", - "android/hardware/camera/metadata/3.2/hwtypes.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.camera.metadata@3.2", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.metadata@3.2_genc++"], - generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"], - export_generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.camera.metadata-V3.2-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2", srcs: [ - ":android.hardware.camera.metadata@3.2_hal", + "types.hal", ], - out: [ - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidBlackLevelLock.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidColorCorrectionAberrationMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidColorCorrectionMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeAntibandingMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeLock.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeLockAvailable.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAePrecaptureTrigger.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeState.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAfMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAfState.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAfTrigger.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbLock.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbLockAvailable.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbState.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlCaptureIntent.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlEffectMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlEnableZsl.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlSceneMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlVideoStabilizationMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidDemosaicMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidDepthAvailableDepthStreamConfigurations.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidDepthDepthIsExclusive.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidEdgeMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidFlashInfoAvailable.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidFlashMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidFlashState.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidHotPixelMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidInfoSupportedHardwareLevel.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLedAvailableLeds.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLedTransmit.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensFacing.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensInfoFocusDistanceCalibration.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensOpticalStabilizationMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensState.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidNoiseReductionMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidQuirksPartialResult.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidRequestAvailableCapabilities.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidRequestMetadataMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidRequestType.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidScalerAvailableFormats.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidScalerAvailableStreamConfigurations.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidScalerCroppingType.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorInfoColorFilterArrangement.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorInfoLensShadingApplied.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorInfoTimestampSource.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorReferenceIlluminant1.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorTestPatternMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidShadingMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsFaceDetectMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsHistogramMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsHotPixelMapMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsLensShadingMapMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsSceneFlicker.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsSharpnessMapMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSyncFrameNumber.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSyncMaxLatency.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidTonemapMode.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidTonemapPresetCurve.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataSection.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataSectionStart.java", - "android/hardware/camera/metadata/V3_2/CameraMetadataTag.java", + types: [ + "CameraMetadataEnumAndroidBlackLevelLock", + "CameraMetadataEnumAndroidColorCorrectionAberrationMode", + "CameraMetadataEnumAndroidColorCorrectionMode", + "CameraMetadataEnumAndroidControlAeAntibandingMode", + "CameraMetadataEnumAndroidControlAeLock", + "CameraMetadataEnumAndroidControlAeLockAvailable", + "CameraMetadataEnumAndroidControlAeMode", + "CameraMetadataEnumAndroidControlAePrecaptureTrigger", + "CameraMetadataEnumAndroidControlAeState", + "CameraMetadataEnumAndroidControlAfMode", + "CameraMetadataEnumAndroidControlAfState", + "CameraMetadataEnumAndroidControlAfTrigger", + "CameraMetadataEnumAndroidControlAwbLock", + "CameraMetadataEnumAndroidControlAwbLockAvailable", + "CameraMetadataEnumAndroidControlAwbMode", + "CameraMetadataEnumAndroidControlAwbState", + "CameraMetadataEnumAndroidControlCaptureIntent", + "CameraMetadataEnumAndroidControlEffectMode", + "CameraMetadataEnumAndroidControlEnableZsl", + "CameraMetadataEnumAndroidControlMode", + "CameraMetadataEnumAndroidControlSceneMode", + "CameraMetadataEnumAndroidControlVideoStabilizationMode", + "CameraMetadataEnumAndroidDemosaicMode", + "CameraMetadataEnumAndroidDepthAvailableDepthStreamConfigurations", + "CameraMetadataEnumAndroidDepthDepthIsExclusive", + "CameraMetadataEnumAndroidEdgeMode", + "CameraMetadataEnumAndroidFlashInfoAvailable", + "CameraMetadataEnumAndroidFlashMode", + "CameraMetadataEnumAndroidFlashState", + "CameraMetadataEnumAndroidHotPixelMode", + "CameraMetadataEnumAndroidInfoSupportedHardwareLevel", + "CameraMetadataEnumAndroidLedAvailableLeds", + "CameraMetadataEnumAndroidLedTransmit", + "CameraMetadataEnumAndroidLensFacing", + "CameraMetadataEnumAndroidLensInfoFocusDistanceCalibration", + "CameraMetadataEnumAndroidLensOpticalStabilizationMode", + "CameraMetadataEnumAndroidLensState", + "CameraMetadataEnumAndroidNoiseReductionMode", + "CameraMetadataEnumAndroidQuirksPartialResult", + "CameraMetadataEnumAndroidRequestAvailableCapabilities", + "CameraMetadataEnumAndroidRequestMetadataMode", + "CameraMetadataEnumAndroidRequestType", + "CameraMetadataEnumAndroidScalerAvailableFormats", + "CameraMetadataEnumAndroidScalerAvailableStreamConfigurations", + "CameraMetadataEnumAndroidScalerCroppingType", + "CameraMetadataEnumAndroidSensorInfoColorFilterArrangement", + "CameraMetadataEnumAndroidSensorInfoLensShadingApplied", + "CameraMetadataEnumAndroidSensorInfoTimestampSource", + "CameraMetadataEnumAndroidSensorReferenceIlluminant1", + "CameraMetadataEnumAndroidSensorTestPatternMode", + "CameraMetadataEnumAndroidShadingMode", + "CameraMetadataEnumAndroidStatisticsFaceDetectMode", + "CameraMetadataEnumAndroidStatisticsHistogramMode", + "CameraMetadataEnumAndroidStatisticsHotPixelMapMode", + "CameraMetadataEnumAndroidStatisticsLensShadingMapMode", + "CameraMetadataEnumAndroidStatisticsSceneFlicker", + "CameraMetadataEnumAndroidStatisticsSharpnessMapMode", + "CameraMetadataEnumAndroidSyncFrameNumber", + "CameraMetadataEnumAndroidSyncMaxLatency", + "CameraMetadataEnumAndroidTonemapMode", + "CameraMetadataEnumAndroidTonemapPresetCurve", + "CameraMetadataSection", + "CameraMetadataSectionStart", + "CameraMetadataTag", ], + gen_java: true, } -java_library { - name: "android.hardware.camera.metadata-V3.2-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.camera.metadata-V3.2-java_gen_java"], - libs: [ - "hwbinder", - ] -} - -// This package does not export any types. Not creating java constants export. - -// This package has no interfaces. Not creating versioning adapter. diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp index 3aa8d8b09f..7139ad05b3 100644 --- a/camera/provider/2.4/Android.bp +++ b/camera/provider/2.4/Android.bp @@ -1,169 +1,22 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.camera.provider@2.4_hal", - srcs: [ - "ICameraProvider.hal", - "ICameraProviderCallback.hal", - ], -} - -genrule { - name: "android.hardware.camera.provider@2.4_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4", - srcs: [ - ":android.hardware.camera.provider@2.4_hal", - ], - out: [ - "android/hardware/camera/provider/2.4/CameraProviderAll.cpp", - "android/hardware/camera/provider/2.4/CameraProviderCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.camera.provider@2.4_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4", - srcs: [ - ":android.hardware.camera.provider@2.4_hal", - ], - out: [ - "android/hardware/camera/provider/2.4/ICameraProvider.h", - "android/hardware/camera/provider/2.4/IHwCameraProvider.h", - "android/hardware/camera/provider/2.4/BnHwCameraProvider.h", - "android/hardware/camera/provider/2.4/BpHwCameraProvider.h", - "android/hardware/camera/provider/2.4/BsCameraProvider.h", - "android/hardware/camera/provider/2.4/ICameraProviderCallback.h", - "android/hardware/camera/provider/2.4/IHwCameraProviderCallback.h", - "android/hardware/camera/provider/2.4/BnHwCameraProviderCallback.h", - "android/hardware/camera/provider/2.4/BpHwCameraProviderCallback.h", - "android/hardware/camera/provider/2.4/BsCameraProviderCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.camera.provider@2.4", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.provider@2.4_genc++"], - generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"], - export_generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@1.0", - "android.hardware.camera.device@3.2", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@1.0", - "android.hardware.camera.device@3.2", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.camera.provider@2.4-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.provider@2.4", srcs: [ - ":android.hardware.camera.provider@2.4_hal", - ], - out: [ - "android/hardware/camera/provider/2.4/ACameraProvider.cpp", - "android/hardware/camera/provider/2.4/ACameraProviderCallback.cpp", - ], -} - -genrule { - name: "android.hardware.camera.provider@2.4-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.provider@2.4", - srcs: [ - ":android.hardware.camera.provider@2.4_hal", - ], - out: [ - "android/hardware/camera/provider/2.4/ACameraProvider.h", - "android/hardware/camera/provider/2.4/ACameraProviderCallback.h", - ], -} - -cc_library { - name: "android.hardware.camera.provider@2.4-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.camera.provider@2.4-adapter-helper_genc++"], - generated_headers: ["android.hardware.camera.provider@2.4-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.camera.provider@2.4-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@1.0", - "android.hardware.camera.device@3.2", - "android.hardware.camera.provider@2.4", - "android.hardware.camera.device@1.0-adapter-helper", - "android.hardware.camera.device@3.2-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "ICameraProvider.hal", + "ICameraProviderCallback.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", + interfaces: [ "android.hardware.camera.common@1.0", "android.hardware.camera.device@1.0", "android.hardware.camera.device@3.2", - "android.hardware.camera.provider@2.4", - "android.hardware.camera.device@1.0-adapter-helper", - "android.hardware.camera.device@3.2-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hardware.graphics.common@1.0", + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.camera.provider@2.4-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.provider@2.4", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.camera.provider@2.4-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@1.0", - "android.hardware.camera.device@3.2", - "android.hardware.camera.provider@2.4", - "android.hardware.camera.provider@2.4-adapter-helper", - ], - generated_sources: ["android.hardware.camera.provider@2.4-adapter_genc++"], -} diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp index da0331b717..5e98e5c4e4 100644 --- a/configstore/1.0/Android.bp +++ b/configstore/1.0/Android.bp @@ -1,172 +1,26 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.configstore@1.0_hal", - srcs: [ - "types.hal", - "ISurfaceFlingerConfigs.hal", - ], -} - -genrule { - name: "android.hardware.configstore@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/configstore/1.0/types.cpp", - "android/hardware/configstore/1.0/SurfaceFlingerConfigsAll.cpp", - ], -} - -genrule { - name: "android.hardware.configstore@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/configstore/1.0/types.h", - "android/hardware/configstore/1.0/hwtypes.h", - "android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h", - "android/hardware/configstore/1.0/IHwSurfaceFlingerConfigs.h", - "android/hardware/configstore/1.0/BnHwSurfaceFlingerConfigs.h", - "android/hardware/configstore/1.0/BpHwSurfaceFlingerConfigs.h", - "android/hardware/configstore/1.0/BsSurfaceFlingerConfigs.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.configstore@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.configstore@1.0_genc++"], - generated_headers: ["android.hardware.configstore@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.configstore@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.configstore-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0", srcs: [ - ":android.hardware.configstore@1.0_hal", - ], - out: [ - "android/hardware/configstore/V1_0/OptionalBool.java", - "android/hardware/configstore/V1_0/OptionalInt32.java", - "android/hardware/configstore/V1_0/OptionalInt64.java", - "android/hardware/configstore/V1_0/OptionalString.java", - "android/hardware/configstore/V1_0/OptionalUInt32.java", - "android/hardware/configstore/V1_0/OptionalUInt64.java", - "android/hardware/configstore/V1_0/ISurfaceFlingerConfigs.java", - ], -} - -java_library { - name: "android.hardware.configstore-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.configstore-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.configstore@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.configstore@1.0", - srcs: [ - ":android.hardware.configstore@1.0_hal", - ], - out: [ - "android/hardware/configstore/1.0/ASurfaceFlingerConfigs.cpp", - ], -} - -genrule { - name: "android.hardware.configstore@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.configstore@1.0", - srcs: [ - ":android.hardware.configstore@1.0_hal", - ], - out: [ - "android/hardware/configstore/1.0/ASurfaceFlingerConfigs.h", + "types.hal", + "ISurfaceFlingerConfigs.hal", ], -} - -cc_library { - name: "android.hardware.configstore@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.configstore@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.configstore@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.configstore@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.configstore@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.configstore@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "OptionalBool", + "OptionalInt32", + "OptionalInt64", + "OptionalString", + "OptionalUInt32", + "OptionalUInt64", ], + gen_java: true, } -genrule { - name: "android.hardware.configstore@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.configstore@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.configstore@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.configstore@1.0", - "android.hardware.configstore@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.configstore@1.0-adapter_genc++"], -} diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp index 93b3bf4491..77dba66bef 100644 --- a/contexthub/1.0/Android.bp +++ b/contexthub/1.0/Android.bp @@ -1,190 +1,35 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.contexthub@1.0_hal", - srcs: [ - "types.hal", - "IContexthub.hal", - "IContexthubCallback.hal", - ], -} - -genrule { - name: "android.hardware.contexthub@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", - srcs: [ - ":android.hardware.contexthub@1.0_hal", - ], - out: [ - "android/hardware/contexthub/1.0/types.cpp", - "android/hardware/contexthub/1.0/ContexthubAll.cpp", - "android/hardware/contexthub/1.0/ContexthubCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.contexthub@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", - srcs: [ - ":android.hardware.contexthub@1.0_hal", - ], - out: [ - "android/hardware/contexthub/1.0/types.h", - "android/hardware/contexthub/1.0/hwtypes.h", - "android/hardware/contexthub/1.0/IContexthub.h", - "android/hardware/contexthub/1.0/IHwContexthub.h", - "android/hardware/contexthub/1.0/BnHwContexthub.h", - "android/hardware/contexthub/1.0/BpHwContexthub.h", - "android/hardware/contexthub/1.0/BsContexthub.h", - "android/hardware/contexthub/1.0/IContexthubCallback.h", - "android/hardware/contexthub/1.0/IHwContexthubCallback.h", - "android/hardware/contexthub/1.0/BnHwContexthubCallback.h", - "android/hardware/contexthub/1.0/BpHwContexthubCallback.h", - "android/hardware/contexthub/1.0/BsContexthubCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.contexthub@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.contexthub@1.0_genc++"], - generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.contexthub-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", srcs: [ - ":android.hardware.contexthub@1.0_hal", - ], - out: [ - "android/hardware/contexthub/V1_0/AsyncEventType.java", - "android/hardware/contexthub/V1_0/ContextHub.java", - "android/hardware/contexthub/V1_0/ContextHubMsg.java", - "android/hardware/contexthub/V1_0/HostEndPoint.java", - "android/hardware/contexthub/V1_0/HubAppInfo.java", - "android/hardware/contexthub/V1_0/HubMemoryFlag.java", - "android/hardware/contexthub/V1_0/HubMemoryType.java", - "android/hardware/contexthub/V1_0/MemRange.java", - "android/hardware/contexthub/V1_0/NanoAppBinary.java", - "android/hardware/contexthub/V1_0/NanoAppFlags.java", - "android/hardware/contexthub/V1_0/PhysicalSensor.java", - "android/hardware/contexthub/V1_0/Result.java", - "android/hardware/contexthub/V1_0/SensorType.java", - "android/hardware/contexthub/V1_0/TransactionResult.java", - "android/hardware/contexthub/V1_0/IContexthub.java", - "android/hardware/contexthub/V1_0/IContexthubCallback.java", - ], -} - -java_library { - name: "android.hardware.contexthub-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.contexthub-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.contexthub@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.contexthub@1.0", - srcs: [ - ":android.hardware.contexthub@1.0_hal", - ], - out: [ - "android/hardware/contexthub/1.0/AContexthub.cpp", - "android/hardware/contexthub/1.0/AContexthubCallback.cpp", - ], -} - -genrule { - name: "android.hardware.contexthub@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.contexthub@1.0", - srcs: [ - ":android.hardware.contexthub@1.0_hal", + "types.hal", + "IContexthub.hal", + "IContexthubCallback.hal", ], - out: [ - "android/hardware/contexthub/1.0/AContexthub.h", - "android/hardware/contexthub/1.0/AContexthubCallback.h", + interfaces: [ + "android.hidl.base@1.0", ], -} - -cc_library { - name: "android.hardware.contexthub@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.contexthub@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.contexthub@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.contexthub@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.contexthub@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "AsyncEventType", + "ContextHub", + "ContextHubMsg", + "HostEndPoint", + "HubAppInfo", + "HubMemoryFlag", + "HubMemoryType", + "MemRange", + "NanoAppBinary", + "NanoAppFlags", + "PhysicalSensor", + "Result", + "SensorType", + "TransactionResult", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.contexthub@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.contexthub@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.contexthub@1.0", - out: ["main.cpp"] + gen_java: true, } -cc_test { - name: "android.hardware.contexthub@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.contexthub@1.0", - "android.hardware.contexthub@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.contexthub@1.0-adapter_genc++"], -} diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp index eb26e8688d..aca5ae492e 100644 --- a/drm/1.0/Android.bp +++ b/drm/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.drm@1.0_hal", +hidl_interface { + name: "android.hardware.drm@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "ICryptoFactory.hal", @@ -10,172 +14,25 @@ filegroup { "IDrmPlugin.hal", "IDrmPluginListener.hal", ], -} - -genrule { - name: "android.hardware.drm@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0", - srcs: [ - ":android.hardware.drm@1.0_hal", + interfaces: [ + "android.hidl.base@1.0", ], - out: [ - "android/hardware/drm/1.0/types.cpp", - "android/hardware/drm/1.0/CryptoFactoryAll.cpp", - "android/hardware/drm/1.0/CryptoPluginAll.cpp", - "android/hardware/drm/1.0/DrmFactoryAll.cpp", - "android/hardware/drm/1.0/DrmPluginAll.cpp", - "android/hardware/drm/1.0/DrmPluginListenerAll.cpp", + types: [ + "BufferType", + "DestinationBuffer", + "EventType", + "KeyRequestType", + "KeyStatus", + "KeyStatusType", + "KeyType", + "KeyValue", + "Mode", + "Pattern", + "SecureStop", + "SharedBuffer", + "Status", + "SubSample", ], + gen_java: false, } -genrule { - name: "android.hardware.drm@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0", - srcs: [ - ":android.hardware.drm@1.0_hal", - ], - out: [ - "android/hardware/drm/1.0/types.h", - "android/hardware/drm/1.0/hwtypes.h", - "android/hardware/drm/1.0/ICryptoFactory.h", - "android/hardware/drm/1.0/IHwCryptoFactory.h", - "android/hardware/drm/1.0/BnHwCryptoFactory.h", - "android/hardware/drm/1.0/BpHwCryptoFactory.h", - "android/hardware/drm/1.0/BsCryptoFactory.h", - "android/hardware/drm/1.0/ICryptoPlugin.h", - "android/hardware/drm/1.0/IHwCryptoPlugin.h", - "android/hardware/drm/1.0/BnHwCryptoPlugin.h", - "android/hardware/drm/1.0/BpHwCryptoPlugin.h", - "android/hardware/drm/1.0/BsCryptoPlugin.h", - "android/hardware/drm/1.0/IDrmFactory.h", - "android/hardware/drm/1.0/IHwDrmFactory.h", - "android/hardware/drm/1.0/BnHwDrmFactory.h", - "android/hardware/drm/1.0/BpHwDrmFactory.h", - "android/hardware/drm/1.0/BsDrmFactory.h", - "android/hardware/drm/1.0/IDrmPlugin.h", - "android/hardware/drm/1.0/IHwDrmPlugin.h", - "android/hardware/drm/1.0/BnHwDrmPlugin.h", - "android/hardware/drm/1.0/BpHwDrmPlugin.h", - "android/hardware/drm/1.0/BsDrmPlugin.h", - "android/hardware/drm/1.0/IDrmPluginListener.h", - "android/hardware/drm/1.0/IHwDrmPluginListener.h", - "android/hardware/drm/1.0/BnHwDrmPluginListener.h", - "android/hardware/drm/1.0/BpHwDrmPluginListener.h", - "android/hardware/drm/1.0/BsDrmPluginListener.h", - ], -} - -cc_library { - name: "android.hardware.drm@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.drm@1.0_genc++"], - generated_headers: ["android.hardware.drm@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.drm@1.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.drm@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.drm@1.0", - srcs: [ - ":android.hardware.drm@1.0_hal", - ], - out: [ - "android/hardware/drm/1.0/ACryptoFactory.cpp", - "android/hardware/drm/1.0/ACryptoPlugin.cpp", - "android/hardware/drm/1.0/ADrmFactory.cpp", - "android/hardware/drm/1.0/ADrmPlugin.cpp", - "android/hardware/drm/1.0/ADrmPluginListener.cpp", - ], -} - -genrule { - name: "android.hardware.drm@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.drm@1.0", - srcs: [ - ":android.hardware.drm@1.0_hal", - ], - out: [ - "android/hardware/drm/1.0/ACryptoFactory.h", - "android/hardware/drm/1.0/ACryptoPlugin.h", - "android/hardware/drm/1.0/ADrmFactory.h", - "android/hardware/drm/1.0/ADrmPlugin.h", - "android/hardware/drm/1.0/ADrmPluginListener.h", - ], -} - -cc_library { - name: "android.hardware.drm@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.drm@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.drm@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.drm@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.drm@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.drm@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.drm@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.drm@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.drm@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.drm@1.0", - "android.hardware.drm@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.drm@1.0-adapter_genc++"], -} diff --git a/dumpstate/1.0/Android.bp b/dumpstate/1.0/Android.bp index 04ad6d884d..bc704f1032 100644 --- a/dumpstate/1.0/Android.bp +++ b/dumpstate/1.0/Android.bp @@ -1,141 +1,17 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.dumpstate@1.0_hal", - srcs: [ - "IDumpstateDevice.hal", - ], -} - -genrule { - name: "android.hardware.dumpstate@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0", - srcs: [ - ":android.hardware.dumpstate@1.0_hal", - ], - out: [ - "android/hardware/dumpstate/1.0/DumpstateDeviceAll.cpp", - ], -} - -genrule { - name: "android.hardware.dumpstate@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0", - srcs: [ - ":android.hardware.dumpstate@1.0_hal", - ], - out: [ - "android/hardware/dumpstate/1.0/IDumpstateDevice.h", - "android/hardware/dumpstate/1.0/IHwDumpstateDevice.h", - "android/hardware/dumpstate/1.0/BnHwDumpstateDevice.h", - "android/hardware/dumpstate/1.0/BpHwDumpstateDevice.h", - "android/hardware/dumpstate/1.0/BsDumpstateDevice.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.dumpstate@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.dumpstate@1.0_genc++"], - generated_headers: ["android.hardware.dumpstate@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.dumpstate@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.dumpstate@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.dumpstate@1.0", - srcs: [ - ":android.hardware.dumpstate@1.0_hal", - ], - out: [ - "android/hardware/dumpstate/1.0/ADumpstateDevice.cpp", - ], -} - -genrule { - name: "android.hardware.dumpstate@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.dumpstate@1.0", srcs: [ - ":android.hardware.dumpstate@1.0_hal", - ], - out: [ - "android/hardware/dumpstate/1.0/ADumpstateDevice.h", - ], -} - -cc_library { - name: "android.hardware.dumpstate@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.dumpstate@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.dumpstate@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.dumpstate@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.dumpstate@1.0", - "android.hidl.base@1.0-adapter-helper", + "IDumpstateDevice.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.dumpstate@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.dumpstate@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.dumpstate@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.dumpstate@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.dumpstate@1.0", - "android.hardware.dumpstate@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.dumpstate@1.0-adapter_genc++"], -} diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp index dad29790b8..7dc2133ff6 100644 --- a/gatekeeper/1.0/Android.bp +++ b/gatekeeper/1.0/Android.bp @@ -1,168 +1,22 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.gatekeeper@1.0_hal", - srcs: [ - "types.hal", - "IGatekeeper.hal", - ], -} - -genrule { - name: "android.hardware.gatekeeper@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0", - srcs: [ - ":android.hardware.gatekeeper@1.0_hal", - ], - out: [ - "android/hardware/gatekeeper/1.0/types.cpp", - "android/hardware/gatekeeper/1.0/GatekeeperAll.cpp", - ], -} - -genrule { - name: "android.hardware.gatekeeper@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0", - srcs: [ - ":android.hardware.gatekeeper@1.0_hal", - ], - out: [ - "android/hardware/gatekeeper/1.0/types.h", - "android/hardware/gatekeeper/1.0/hwtypes.h", - "android/hardware/gatekeeper/1.0/IGatekeeper.h", - "android/hardware/gatekeeper/1.0/IHwGatekeeper.h", - "android/hardware/gatekeeper/1.0/BnHwGatekeeper.h", - "android/hardware/gatekeeper/1.0/BpHwGatekeeper.h", - "android/hardware/gatekeeper/1.0/BsGatekeeper.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.gatekeeper@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.gatekeeper@1.0_genc++"], - generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.gatekeeper-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0", srcs: [ - ":android.hardware.gatekeeper@1.0_hal", - ], - out: [ - "android/hardware/gatekeeper/V1_0/GatekeeperResponse.java", - "android/hardware/gatekeeper/V1_0/GatekeeperStatusCode.java", - "android/hardware/gatekeeper/V1_0/IGatekeeper.java", - ], -} - -java_library { - name: "android.hardware.gatekeeper-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.gatekeeper-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.gatekeeper@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.gatekeeper@1.0", - srcs: [ - ":android.hardware.gatekeeper@1.0_hal", - ], - out: [ - "android/hardware/gatekeeper/1.0/AGatekeeper.cpp", - ], -} - -genrule { - name: "android.hardware.gatekeeper@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.gatekeeper@1.0", - srcs: [ - ":android.hardware.gatekeeper@1.0_hal", - ], - out: [ - "android/hardware/gatekeeper/1.0/AGatekeeper.h", + "types.hal", + "IGatekeeper.hal", ], -} - -cc_library { - name: "android.hardware.gatekeeper@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.gatekeeper@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.gatekeeper@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.gatekeeper@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.gatekeeper@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.gatekeeper@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "GatekeeperResponse", + "GatekeeperStatusCode", ], + gen_java: true, } -genrule { - name: "android.hardware.gatekeeper@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.gatekeeper@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.gatekeeper@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.gatekeeper@1.0", - "android.hardware.gatekeeper@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.gatekeeper@1.0-adapter_genc++"], -} diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp index 81920b7413..dc659a3a2a 100644 --- a/gnss/1.0/Android.bp +++ b/gnss/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.gnss@1.0_hal", +hidl_interface { + name: "android.hardware.gnss@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IAGnss.hal", @@ -25,352 +29,16 @@ filegroup { "IGnssXtra.hal", "IGnssXtraCallback.hal", ], -} - -genrule { - name: "android.hardware.gnss@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", - srcs: [ - ":android.hardware.gnss@1.0_hal", - ], - out: [ - "android/hardware/gnss/1.0/types.cpp", - "android/hardware/gnss/1.0/AGnssAll.cpp", - "android/hardware/gnss/1.0/AGnssCallbackAll.cpp", - "android/hardware/gnss/1.0/AGnssRilAll.cpp", - "android/hardware/gnss/1.0/AGnssRilCallbackAll.cpp", - "android/hardware/gnss/1.0/GnssAll.cpp", - "android/hardware/gnss/1.0/GnssBatchingAll.cpp", - "android/hardware/gnss/1.0/GnssBatchingCallbackAll.cpp", - "android/hardware/gnss/1.0/GnssCallbackAll.cpp", - "android/hardware/gnss/1.0/GnssConfigurationAll.cpp", - "android/hardware/gnss/1.0/GnssDebugAll.cpp", - "android/hardware/gnss/1.0/GnssGeofenceCallbackAll.cpp", - "android/hardware/gnss/1.0/GnssGeofencingAll.cpp", - "android/hardware/gnss/1.0/GnssMeasurementAll.cpp", - "android/hardware/gnss/1.0/GnssMeasurementCallbackAll.cpp", - "android/hardware/gnss/1.0/GnssNavigationMessageAll.cpp", - "android/hardware/gnss/1.0/GnssNavigationMessageCallbackAll.cpp", - "android/hardware/gnss/1.0/GnssNiAll.cpp", - "android/hardware/gnss/1.0/GnssNiCallbackAll.cpp", - "android/hardware/gnss/1.0/GnssXtraAll.cpp", - "android/hardware/gnss/1.0/GnssXtraCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.gnss@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", - srcs: [ - ":android.hardware.gnss@1.0_hal", - ], - out: [ - "android/hardware/gnss/1.0/types.h", - "android/hardware/gnss/1.0/hwtypes.h", - "android/hardware/gnss/1.0/IAGnss.h", - "android/hardware/gnss/1.0/IHwAGnss.h", - "android/hardware/gnss/1.0/BnHwAGnss.h", - "android/hardware/gnss/1.0/BpHwAGnss.h", - "android/hardware/gnss/1.0/BsAGnss.h", - "android/hardware/gnss/1.0/IAGnssCallback.h", - "android/hardware/gnss/1.0/IHwAGnssCallback.h", - "android/hardware/gnss/1.0/BnHwAGnssCallback.h", - "android/hardware/gnss/1.0/BpHwAGnssCallback.h", - "android/hardware/gnss/1.0/BsAGnssCallback.h", - "android/hardware/gnss/1.0/IAGnssRil.h", - "android/hardware/gnss/1.0/IHwAGnssRil.h", - "android/hardware/gnss/1.0/BnHwAGnssRil.h", - "android/hardware/gnss/1.0/BpHwAGnssRil.h", - "android/hardware/gnss/1.0/BsAGnssRil.h", - "android/hardware/gnss/1.0/IAGnssRilCallback.h", - "android/hardware/gnss/1.0/IHwAGnssRilCallback.h", - "android/hardware/gnss/1.0/BnHwAGnssRilCallback.h", - "android/hardware/gnss/1.0/BpHwAGnssRilCallback.h", - "android/hardware/gnss/1.0/BsAGnssRilCallback.h", - "android/hardware/gnss/1.0/IGnss.h", - "android/hardware/gnss/1.0/IHwGnss.h", - "android/hardware/gnss/1.0/BnHwGnss.h", - "android/hardware/gnss/1.0/BpHwGnss.h", - "android/hardware/gnss/1.0/BsGnss.h", - "android/hardware/gnss/1.0/IGnssBatching.h", - "android/hardware/gnss/1.0/IHwGnssBatching.h", - "android/hardware/gnss/1.0/BnHwGnssBatching.h", - "android/hardware/gnss/1.0/BpHwGnssBatching.h", - "android/hardware/gnss/1.0/BsGnssBatching.h", - "android/hardware/gnss/1.0/IGnssBatchingCallback.h", - "android/hardware/gnss/1.0/IHwGnssBatchingCallback.h", - "android/hardware/gnss/1.0/BnHwGnssBatchingCallback.h", - "android/hardware/gnss/1.0/BpHwGnssBatchingCallback.h", - "android/hardware/gnss/1.0/BsGnssBatchingCallback.h", - "android/hardware/gnss/1.0/IGnssCallback.h", - "android/hardware/gnss/1.0/IHwGnssCallback.h", - "android/hardware/gnss/1.0/BnHwGnssCallback.h", - "android/hardware/gnss/1.0/BpHwGnssCallback.h", - "android/hardware/gnss/1.0/BsGnssCallback.h", - "android/hardware/gnss/1.0/IGnssConfiguration.h", - "android/hardware/gnss/1.0/IHwGnssConfiguration.h", - "android/hardware/gnss/1.0/BnHwGnssConfiguration.h", - "android/hardware/gnss/1.0/BpHwGnssConfiguration.h", - "android/hardware/gnss/1.0/BsGnssConfiguration.h", - "android/hardware/gnss/1.0/IGnssDebug.h", - "android/hardware/gnss/1.0/IHwGnssDebug.h", - "android/hardware/gnss/1.0/BnHwGnssDebug.h", - "android/hardware/gnss/1.0/BpHwGnssDebug.h", - "android/hardware/gnss/1.0/BsGnssDebug.h", - "android/hardware/gnss/1.0/IGnssGeofenceCallback.h", - "android/hardware/gnss/1.0/IHwGnssGeofenceCallback.h", - "android/hardware/gnss/1.0/BnHwGnssGeofenceCallback.h", - "android/hardware/gnss/1.0/BpHwGnssGeofenceCallback.h", - "android/hardware/gnss/1.0/BsGnssGeofenceCallback.h", - "android/hardware/gnss/1.0/IGnssGeofencing.h", - "android/hardware/gnss/1.0/IHwGnssGeofencing.h", - "android/hardware/gnss/1.0/BnHwGnssGeofencing.h", - "android/hardware/gnss/1.0/BpHwGnssGeofencing.h", - "android/hardware/gnss/1.0/BsGnssGeofencing.h", - "android/hardware/gnss/1.0/IGnssMeasurement.h", - "android/hardware/gnss/1.0/IHwGnssMeasurement.h", - "android/hardware/gnss/1.0/BnHwGnssMeasurement.h", - "android/hardware/gnss/1.0/BpHwGnssMeasurement.h", - "android/hardware/gnss/1.0/BsGnssMeasurement.h", - "android/hardware/gnss/1.0/IGnssMeasurementCallback.h", - "android/hardware/gnss/1.0/IHwGnssMeasurementCallback.h", - "android/hardware/gnss/1.0/BnHwGnssMeasurementCallback.h", - "android/hardware/gnss/1.0/BpHwGnssMeasurementCallback.h", - "android/hardware/gnss/1.0/BsGnssMeasurementCallback.h", - "android/hardware/gnss/1.0/IGnssNavigationMessage.h", - "android/hardware/gnss/1.0/IHwGnssNavigationMessage.h", - "android/hardware/gnss/1.0/BnHwGnssNavigationMessage.h", - "android/hardware/gnss/1.0/BpHwGnssNavigationMessage.h", - "android/hardware/gnss/1.0/BsGnssNavigationMessage.h", - "android/hardware/gnss/1.0/IGnssNavigationMessageCallback.h", - "android/hardware/gnss/1.0/IHwGnssNavigationMessageCallback.h", - "android/hardware/gnss/1.0/BnHwGnssNavigationMessageCallback.h", - "android/hardware/gnss/1.0/BpHwGnssNavigationMessageCallback.h", - "android/hardware/gnss/1.0/BsGnssNavigationMessageCallback.h", - "android/hardware/gnss/1.0/IGnssNi.h", - "android/hardware/gnss/1.0/IHwGnssNi.h", - "android/hardware/gnss/1.0/BnHwGnssNi.h", - "android/hardware/gnss/1.0/BpHwGnssNi.h", - "android/hardware/gnss/1.0/BsGnssNi.h", - "android/hardware/gnss/1.0/IGnssNiCallback.h", - "android/hardware/gnss/1.0/IHwGnssNiCallback.h", - "android/hardware/gnss/1.0/BnHwGnssNiCallback.h", - "android/hardware/gnss/1.0/BpHwGnssNiCallback.h", - "android/hardware/gnss/1.0/BsGnssNiCallback.h", - "android/hardware/gnss/1.0/IGnssXtra.h", - "android/hardware/gnss/1.0/IHwGnssXtra.h", - "android/hardware/gnss/1.0/BnHwGnssXtra.h", - "android/hardware/gnss/1.0/BpHwGnssXtra.h", - "android/hardware/gnss/1.0/BsGnssXtra.h", - "android/hardware/gnss/1.0/IGnssXtraCallback.h", - "android/hardware/gnss/1.0/IHwGnssXtraCallback.h", - "android/hardware/gnss/1.0/BnHwGnssXtraCallback.h", - "android/hardware/gnss/1.0/BpHwGnssXtraCallback.h", - "android/hardware/gnss/1.0/BsGnssXtraCallback.h", - ], -} - -cc_library { - name: "android.hardware.gnss@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.gnss@1.0_genc++"], - generated_headers: ["android.hardware.gnss@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.gnss@1.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.gnss-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", - srcs: [ - ":android.hardware.gnss@1.0_hal", - ], - out: [ - "android/hardware/gnss/V1_0/GnssConstellationType.java", - "android/hardware/gnss/V1_0/GnssLocation.java", - "android/hardware/gnss/V1_0/GnssLocationFlags.java", - "android/hardware/gnss/V1_0/GnssMax.java", - "android/hardware/gnss/V1_0/IAGnss.java", - "android/hardware/gnss/V1_0/IAGnssCallback.java", - "android/hardware/gnss/V1_0/IAGnssRil.java", - "android/hardware/gnss/V1_0/IAGnssRilCallback.java", - "android/hardware/gnss/V1_0/IGnss.java", - "android/hardware/gnss/V1_0/IGnssBatching.java", - "android/hardware/gnss/V1_0/IGnssBatchingCallback.java", - "android/hardware/gnss/V1_0/IGnssCallback.java", - "android/hardware/gnss/V1_0/IGnssConfiguration.java", - "android/hardware/gnss/V1_0/IGnssDebug.java", - "android/hardware/gnss/V1_0/IGnssGeofenceCallback.java", - "android/hardware/gnss/V1_0/IGnssGeofencing.java", - "android/hardware/gnss/V1_0/IGnssMeasurement.java", - "android/hardware/gnss/V1_0/IGnssMeasurementCallback.java", - "android/hardware/gnss/V1_0/IGnssNavigationMessage.java", - "android/hardware/gnss/V1_0/IGnssNavigationMessageCallback.java", - "android/hardware/gnss/V1_0/IGnssNi.java", - "android/hardware/gnss/V1_0/IGnssNiCallback.java", - "android/hardware/gnss/V1_0/IGnssXtra.java", - "android/hardware/gnss/V1_0/IGnssXtraCallback.java", + interfaces: [ + "android.hidl.base@1.0", ], -} - -java_library { - name: "android.hardware.gnss-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.gnss-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.gnss-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0", - srcs: [ - ":android.hardware.gnss@1.0_hal", - ], - out: [ - "android/hardware/gnss/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.gnss-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.gnss-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.gnss@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.gnss@1.0", - srcs: [ - ":android.hardware.gnss@1.0_hal", - ], - out: [ - "android/hardware/gnss/1.0/AAGnss.cpp", - "android/hardware/gnss/1.0/AAGnssCallback.cpp", - "android/hardware/gnss/1.0/AAGnssRil.cpp", - "android/hardware/gnss/1.0/AAGnssRilCallback.cpp", - "android/hardware/gnss/1.0/AGnss.cpp", - "android/hardware/gnss/1.0/AGnssBatching.cpp", - "android/hardware/gnss/1.0/AGnssBatchingCallback.cpp", - "android/hardware/gnss/1.0/AGnssCallback.cpp", - "android/hardware/gnss/1.0/AGnssConfiguration.cpp", - "android/hardware/gnss/1.0/AGnssDebug.cpp", - "android/hardware/gnss/1.0/AGnssGeofenceCallback.cpp", - "android/hardware/gnss/1.0/AGnssGeofencing.cpp", - "android/hardware/gnss/1.0/AGnssMeasurement.cpp", - "android/hardware/gnss/1.0/AGnssMeasurementCallback.cpp", - "android/hardware/gnss/1.0/AGnssNavigationMessage.cpp", - "android/hardware/gnss/1.0/AGnssNavigationMessageCallback.cpp", - "android/hardware/gnss/1.0/AGnssNi.cpp", - "android/hardware/gnss/1.0/AGnssNiCallback.cpp", - "android/hardware/gnss/1.0/AGnssXtra.cpp", - "android/hardware/gnss/1.0/AGnssXtraCallback.cpp", + types: [ + "GnssConstellationType", + "GnssLocation", + "GnssLocationFlags", + "GnssMax", ], + gen_java: true, + gen_java_constants: true, } -genrule { - name: "android.hardware.gnss@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.gnss@1.0", - srcs: [ - ":android.hardware.gnss@1.0_hal", - ], - out: [ - "android/hardware/gnss/1.0/AAGnss.h", - "android/hardware/gnss/1.0/AAGnssCallback.h", - "android/hardware/gnss/1.0/AAGnssRil.h", - "android/hardware/gnss/1.0/AAGnssRilCallback.h", - "android/hardware/gnss/1.0/AGnss.h", - "android/hardware/gnss/1.0/AGnssBatching.h", - "android/hardware/gnss/1.0/AGnssBatchingCallback.h", - "android/hardware/gnss/1.0/AGnssCallback.h", - "android/hardware/gnss/1.0/AGnssConfiguration.h", - "android/hardware/gnss/1.0/AGnssDebug.h", - "android/hardware/gnss/1.0/AGnssGeofenceCallback.h", - "android/hardware/gnss/1.0/AGnssGeofencing.h", - "android/hardware/gnss/1.0/AGnssMeasurement.h", - "android/hardware/gnss/1.0/AGnssMeasurementCallback.h", - "android/hardware/gnss/1.0/AGnssNavigationMessage.h", - "android/hardware/gnss/1.0/AGnssNavigationMessageCallback.h", - "android/hardware/gnss/1.0/AGnssNi.h", - "android/hardware/gnss/1.0/AGnssNiCallback.h", - "android/hardware/gnss/1.0/AGnssXtra.h", - "android/hardware/gnss/1.0/AGnssXtraCallback.h", - ], -} - -cc_library { - name: "android.hardware.gnss@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.gnss@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.gnss@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.gnss@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.gnss@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.gnss@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.gnss@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.gnss@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.gnss@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.gnss@1.0", - "android.hardware.gnss@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.gnss@1.0-adapter_genc++"], -} diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp index e98f90af35..0b0722e249 100644 --- a/graphics/allocator/2.0/Android.bp +++ b/graphics/allocator/2.0/Android.bp @@ -1,154 +1,20 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.allocator@2.0_hal", - srcs: [ - "IAllocator.hal", - ], -} - -genrule { - name: "android.hardware.graphics.allocator@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", - srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/AllocatorAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.allocator@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", - srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/IAllocator.h", - "android/hardware/graphics/allocator/2.0/IHwAllocator.h", - "android/hardware/graphics/allocator/2.0/BnHwAllocator.h", - "android/hardware/graphics/allocator/2.0/BpHwAllocator.h", - "android/hardware/graphics/allocator/2.0/BsAllocator.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.allocator@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.allocator@2.0_genc++"], - generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, support_system_process: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.allocator@2.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.graphics.allocator@2.0", srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/AAllocator.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.allocator@2.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.graphics.allocator@2.0", - srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/AAllocator.h", - ], -} - -cc_library { - name: "android.hardware.graphics.allocator@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.allocator@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.allocator@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.allocator@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.graphics.allocator@2.0", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@2.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "IAllocator.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.allocator@2.0", + interfaces: [ "android.hardware.graphics.common@1.0", "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@2.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.allocator@2.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.graphics.allocator@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.allocator@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.allocator@2.0", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.allocator@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.allocator@2.0-adapter_genc++"], -} diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp index 5e930b9fcc..0333a4296d 100644 --- a/graphics/bufferqueue/1.0/Android.bp +++ b/graphics/bufferqueue/1.0/Android.bp @@ -1,160 +1,20 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.bufferqueue@1.0_hal", - srcs: [ - "IGraphicBufferProducer.hal", - "IProducerListener.hal", - ], -} - -genrule { - name: "android.hardware.graphics.bufferqueue@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", - srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/GraphicBufferProducerAll.cpp", - "android/hardware/graphics/bufferqueue/1.0/ProducerListenerAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.bufferqueue@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", - srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/IHwGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/BnHwGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/BpHwGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/BsGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/IProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/IHwProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/BnHwProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/BpHwProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/BsProducerListener.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.bufferqueue@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.bufferqueue@1.0_genc++"], - generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.bufferqueue@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.graphics.bufferqueue@1.0", - srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/AGraphicBufferProducer.cpp", - "android/hardware/graphics/bufferqueue/1.0/AProducerListener.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.bufferqueue@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.graphics.bufferqueue@1.0", srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/AGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/AProducerListener.h", - ], -} - -cc_library { - name: "android.hardware.graphics.bufferqueue@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - "android.hidl.base@1.0-adapter-helper", + "IGraphicBufferProducer.hal", + "IProducerListener.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.bufferqueue@1.0", + interfaces: [ "android.hardware.graphics.common@1.0", "android.hardware.media@1.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.bufferqueue@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.graphics.bufferqueue@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.bufferqueue@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - "android.hardware.graphics.bufferqueue@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.bufferqueue@1.0-adapter_genc++"], -} diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp index 4ea9c1a27d..f88cbdf083 100644 --- a/graphics/common/1.0/Android.bp +++ b/graphics/common/1.0/Android.bp @@ -1,108 +1,25 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.common@1.0_hal", - srcs: [ - "types.hal", - ], -} - -genrule { - name: "android.hardware.graphics.common@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", - srcs: [ - ":android.hardware.graphics.common@1.0_hal", - ], - out: [ - "android/hardware/graphics/common/1.0/types.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.common@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", - srcs: [ - ":android.hardware.graphics.common@1.0_hal", - ], - out: [ - "android/hardware/graphics/common/1.0/types.h", - "android/hardware/graphics/common/1.0/hwtypes.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.common@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.common@1.0_genc++"], - generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, support_system_process: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.graphics.common-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", - srcs: [ - ":android.hardware.graphics.common@1.0_hal", - ], - out: [ - "android/hardware/graphics/common/V1_0/BufferUsage.java", - "android/hardware/graphics/common/V1_0/ColorMode.java", - "android/hardware/graphics/common/V1_0/ColorTransform.java", - "android/hardware/graphics/common/V1_0/Dataspace.java", - "android/hardware/graphics/common/V1_0/Hdr.java", - "android/hardware/graphics/common/V1_0/PixelFormat.java", - "android/hardware/graphics/common/V1_0/Transform.java", - ], -} - -java_library { - name: "android.hardware.graphics.common-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.graphics.common-V1.0-java_gen_java"], - libs: [ - "hwbinder", - ] -} - -genrule { - name: "android.hardware.graphics.common-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", srcs: [ - ":android.hardware.graphics.common@1.0_hal", + "types.hal", ], - out: [ - "android/hardware/graphics/common/V1_0/Constants.java", + types: [ + "BufferUsage", + "ColorMode", + "ColorTransform", + "Dataspace", + "Hdr", + "PixelFormat", + "Transform", ], + gen_java: true, + gen_java_constants: true, } -java_library { - name: "android.hardware.graphics.common-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.graphics.common-V1.0-java-constants_gen_java"], -} -// This package has no interfaces. Not creating versioning adapter. diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp index 41cc5a6b6d..8fbc8c293b 100644 --- a/graphics/composer/2.1/Android.bp +++ b/graphics/composer/2.1/Android.bp @@ -1,168 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.composer@2.1_hal", - srcs: [ - "types.hal", - "IComposer.hal", - "IComposerCallback.hal", - "IComposerClient.hal", - ], -} - -genrule { - name: "android.hardware.graphics.composer@2.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", - srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/types.cpp", - "android/hardware/graphics/composer/2.1/ComposerAll.cpp", - "android/hardware/graphics/composer/2.1/ComposerCallbackAll.cpp", - "android/hardware/graphics/composer/2.1/ComposerClientAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.composer@2.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", - srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/types.h", - "android/hardware/graphics/composer/2.1/hwtypes.h", - "android/hardware/graphics/composer/2.1/IComposer.h", - "android/hardware/graphics/composer/2.1/IHwComposer.h", - "android/hardware/graphics/composer/2.1/BnHwComposer.h", - "android/hardware/graphics/composer/2.1/BpHwComposer.h", - "android/hardware/graphics/composer/2.1/BsComposer.h", - "android/hardware/graphics/composer/2.1/IComposerCallback.h", - "android/hardware/graphics/composer/2.1/IHwComposerCallback.h", - "android/hardware/graphics/composer/2.1/BnHwComposerCallback.h", - "android/hardware/graphics/composer/2.1/BpHwComposerCallback.h", - "android/hardware/graphics/composer/2.1/BsComposerCallback.h", - "android/hardware/graphics/composer/2.1/IComposerClient.h", - "android/hardware/graphics/composer/2.1/IHwComposerClient.h", - "android/hardware/graphics/composer/2.1/BnHwComposerClient.h", - "android/hardware/graphics/composer/2.1/BpHwComposerClient.h", - "android/hardware/graphics/composer/2.1/BsComposerClient.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.composer@2.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.composer@2.1_genc++"], - generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.composer@2.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.graphics.composer@2.1", srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/AComposer.cpp", - "android/hardware/graphics/composer/2.1/AComposerCallback.cpp", - "android/hardware/graphics/composer/2.1/AComposerClient.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.composer@2.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.graphics.composer@2.1", - srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/AComposer.h", - "android/hardware/graphics/composer/2.1/AComposerCallback.h", - "android/hardware/graphics/composer/2.1/AComposerClient.h", + "types.hal", + "IComposer.hal", + "IComposerCallback.hal", + "IComposerClient.hal", ], -} - -cc_library { - name: "android.hardware.graphics.composer@2.1-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.composer@2.1-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.composer@2.1-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.composer@2.1-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.graphics.common@1.0", - "android.hardware.graphics.composer@2.1", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.composer@2.1", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Error", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.composer@2.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.graphics.composer@2.1", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.composer@2.1-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.composer@2.1", - "android.hardware.graphics.composer@2.1-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.composer@2.1-adapter_genc++"], -} diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp index 3b9f0d83e9..2f9a344590 100644 --- a/graphics/mapper/2.0/Android.bp +++ b/graphics/mapper/2.0/Android.bp @@ -1,151 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.mapper@2.0_hal", - srcs: [ - "types.hal", - "IMapper.hal", - ], -} - -genrule { - name: "android.hardware.graphics.mapper@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", - srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/types.cpp", - "android/hardware/graphics/mapper/2.0/MapperAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.mapper@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", - srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/types.h", - "android/hardware/graphics/mapper/2.0/hwtypes.h", - "android/hardware/graphics/mapper/2.0/IMapper.h", - "android/hardware/graphics/mapper/2.0/IHwMapper.h", - "android/hardware/graphics/mapper/2.0/BnHwMapper.h", - "android/hardware/graphics/mapper/2.0/BpHwMapper.h", - "android/hardware/graphics/mapper/2.0/BsMapper.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.mapper@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.mapper@2.0_genc++"], - generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, support_system_process: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.mapper@2.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.graphics.mapper@2.0", - srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/AMapper.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.mapper@2.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.graphics.mapper@2.0", srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/AMapper.h", + "types.hal", + "IMapper.hal", ], -} - -cc_library { - name: "android.hardware.graphics.mapper@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.mapper@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.mapper@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.mapper@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Error", + "YCbCrLayout", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.mapper@2.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.graphics.mapper@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.mapper@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.mapper@2.0-adapter_genc++"], -} diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp index 4fe1f2d8a1..dcbaf58803 100644 --- a/health/1.0/Android.bp +++ b/health/1.0/Android.bp @@ -1,187 +1,26 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.health@1.0_hal", - srcs: [ - "types.hal", - "IHealth.hal", - ], -} - -genrule { - name: "android.hardware.health@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", - srcs: [ - ":android.hardware.health@1.0_hal", - ], - out: [ - "android/hardware/health/1.0/types.cpp", - "android/hardware/health/1.0/HealthAll.cpp", - ], -} - -genrule { - name: "android.hardware.health@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", - srcs: [ - ":android.hardware.health@1.0_hal", - ], - out: [ - "android/hardware/health/1.0/types.h", - "android/hardware/health/1.0/hwtypes.h", - "android/hardware/health/1.0/IHealth.h", - "android/hardware/health/1.0/IHwHealth.h", - "android/hardware/health/1.0/BnHwHealth.h", - "android/hardware/health/1.0/BpHwHealth.h", - "android/hardware/health/1.0/BsHealth.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.health@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.health@1.0_genc++"], - generated_headers: ["android.hardware.health@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.health@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.health-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", - srcs: [ - ":android.hardware.health@1.0_hal", - ], - out: [ - "android/hardware/health/V1_0/BatteryHealth.java", - "android/hardware/health/V1_0/BatteryStatus.java", - "android/hardware/health/V1_0/HealthConfig.java", - "android/hardware/health/V1_0/HealthInfo.java", - "android/hardware/health/V1_0/Result.java", - "android/hardware/health/V1_0/IHealth.java", - ], -} - -java_library { - name: "android.hardware.health-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.health-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.health-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0", - srcs: [ - ":android.hardware.health@1.0_hal", - ], - out: [ - "android/hardware/health/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.health-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.health-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.health@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.health@1.0", - srcs: [ - ":android.hardware.health@1.0_hal", - ], - out: [ - "android/hardware/health/1.0/AHealth.cpp", - ], -} - -genrule { - name: "android.hardware.health@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.health@1.0", srcs: [ - ":android.hardware.health@1.0_hal", - ], - out: [ - "android/hardware/health/1.0/AHealth.h", + "types.hal", + "IHealth.hal", ], -} - -cc_library { - name: "android.hardware.health@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.health@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.health@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.health@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.health@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.health@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "BatteryHealth", + "BatteryStatus", + "HealthConfig", + "HealthInfo", + "Result", ], + gen_java: true, + gen_java_constants: true, } -genrule { - name: "android.hardware.health@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.health@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.health@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.health@1.0", - "android.hardware.health@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.health@1.0-adapter_genc++"], -} diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp index f5c93da7a2..272acb38c8 100644 --- a/ir/1.0/Android.bp +++ b/ir/1.0/Android.bp @@ -1,167 +1,21 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.ir@1.0_hal", - srcs: [ - "types.hal", - "IConsumerIr.hal", - ], -} - -genrule { - name: "android.hardware.ir@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/ir/1.0/types.cpp", - "android/hardware/ir/1.0/ConsumerIrAll.cpp", - ], -} - -genrule { - name: "android.hardware.ir@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/ir/1.0/types.h", - "android/hardware/ir/1.0/hwtypes.h", - "android/hardware/ir/1.0/IConsumerIr.h", - "android/hardware/ir/1.0/IHwConsumerIr.h", - "android/hardware/ir/1.0/BnHwConsumerIr.h", - "android/hardware/ir/1.0/BpHwConsumerIr.h", - "android/hardware/ir/1.0/BsConsumerIr.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.ir@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.ir@1.0_genc++"], - generated_headers: ["android.hardware.ir@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.ir@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.ir-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", srcs: [ - ":android.hardware.ir@1.0_hal", - ], - out: [ - "android/hardware/ir/V1_0/ConsumerIrFreqRange.java", - "android/hardware/ir/V1_0/IConsumerIr.java", - ], -} - -java_library { - name: "android.hardware.ir-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.ir-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.ir@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.ir@1.0", - srcs: [ - ":android.hardware.ir@1.0_hal", - ], - out: [ - "android/hardware/ir/1.0/AConsumerIr.cpp", - ], -} - -genrule { - name: "android.hardware.ir@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.ir@1.0", - srcs: [ - ":android.hardware.ir@1.0_hal", - ], - out: [ - "android/hardware/ir/1.0/AConsumerIr.h", + "types.hal", + "IConsumerIr.hal", ], -} - -cc_library { - name: "android.hardware.ir@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.ir@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.ir@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.ir@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.ir@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.ir@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "ConsumerIrFreqRange", ], + gen_java: true, } -genrule { - name: "android.hardware.ir@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.ir@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.ir@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.ir@1.0", - "android.hardware.ir@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.ir@1.0-adapter_genc++"], -} diff --git a/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp index b84e4ef8ae..e0f1b9460a 100644 --- a/keymaster/3.0/Android.bp +++ b/keymaster/3.0/Android.bp @@ -1,145 +1,38 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.keymaster@3.0_hal", - srcs: [ - "types.hal", - "IKeymasterDevice.hal", - ], -} - -genrule { - name: "android.hardware.keymaster@3.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0", - srcs: [ - ":android.hardware.keymaster@3.0_hal", - ], - out: [ - "android/hardware/keymaster/3.0/types.cpp", - "android/hardware/keymaster/3.0/KeymasterDeviceAll.cpp", - ], -} - -genrule { - name: "android.hardware.keymaster@3.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0", - srcs: [ - ":android.hardware.keymaster@3.0_hal", - ], - out: [ - "android/hardware/keymaster/3.0/types.h", - "android/hardware/keymaster/3.0/hwtypes.h", - "android/hardware/keymaster/3.0/IKeymasterDevice.h", - "android/hardware/keymaster/3.0/IHwKeymasterDevice.h", - "android/hardware/keymaster/3.0/BnHwKeymasterDevice.h", - "android/hardware/keymaster/3.0/BpHwKeymasterDevice.h", - "android/hardware/keymaster/3.0/BsKeymasterDevice.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.keymaster@3.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.keymaster@3.0_genc++"], - generated_headers: ["android.hardware.keymaster@3.0_genc++_headers"], - export_generated_headers: ["android.hardware.keymaster@3.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.keymaster@3.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.keymaster@3.0", - srcs: [ - ":android.hardware.keymaster@3.0_hal", - ], - out: [ - "android/hardware/keymaster/3.0/AKeymasterDevice.cpp", - ], -} - -genrule { - name: "android.hardware.keymaster@3.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.keymaster@3.0", srcs: [ - ":android.hardware.keymaster@3.0_hal", - ], - out: [ - "android/hardware/keymaster/3.0/AKeymasterDevice.h", - ], -} - -cc_library { - name: "android.hardware.keymaster@3.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.keymaster@3.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.keymaster@3.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.keymaster@3.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.keymaster@3.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.keymaster@3.0", - "android.hidl.base@1.0-adapter-helper", + "types.hal", + "IKeymasterDevice.hal", ], + interfaces: [ + "android.hidl.base@1.0", + ], + types: [ + "Algorithm", + "BlockMode", + "Digest", + "EcCurve", + "ErrorCode", + "HardwareAuthToken", + "HardwareAuthenticatorType", + "KeyBlobUsageRequirements", + "KeyCharacteristics", + "KeyDerivationFunction", + "KeyFormat", + "KeyOrigin", + "KeyParameter", + "KeyPurpose", + "PaddingMode", + "SecurityLevel", + "Tag", + "TagType", + ], + gen_java: false, } -genrule { - name: "android.hardware.keymaster@3.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.keymaster@3.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.keymaster@3.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.keymaster@3.0", - "android.hardware.keymaster@3.0-adapter-helper", - ], - generated_sources: ["android.hardware.keymaster@3.0-adapter_genc++"], -} diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp index 2e7d84a650..ee58f93997 100644 --- a/light/2.0/Android.bp +++ b/light/2.0/Android.bp @@ -1,171 +1,25 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.light@2.0_hal", - srcs: [ - "types.hal", - "ILight.hal", - ], -} - -genrule { - name: "android.hardware.light@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", - srcs: [ - ":android.hardware.light@2.0_hal", - ], - out: [ - "android/hardware/light/2.0/types.cpp", - "android/hardware/light/2.0/LightAll.cpp", - ], -} - -genrule { - name: "android.hardware.light@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", - srcs: [ - ":android.hardware.light@2.0_hal", - ], - out: [ - "android/hardware/light/2.0/types.h", - "android/hardware/light/2.0/hwtypes.h", - "android/hardware/light/2.0/ILight.h", - "android/hardware/light/2.0/IHwLight.h", - "android/hardware/light/2.0/BnHwLight.h", - "android/hardware/light/2.0/BpHwLight.h", - "android/hardware/light/2.0/BsLight.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.light@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.light@2.0_genc++"], - generated_headers: ["android.hardware.light@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.light@2.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.light-V2.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", srcs: [ - ":android.hardware.light@2.0_hal", - ], - out: [ - "android/hardware/light/V2_0/Brightness.java", - "android/hardware/light/V2_0/Flash.java", - "android/hardware/light/V2_0/LightState.java", - "android/hardware/light/V2_0/Status.java", - "android/hardware/light/V2_0/Type.java", - "android/hardware/light/V2_0/ILight.java", - ], -} - -java_library { - name: "android.hardware.light-V2.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.light-V2.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.light@2.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.light@2.0", - srcs: [ - ":android.hardware.light@2.0_hal", - ], - out: [ - "android/hardware/light/2.0/ALight.cpp", - ], -} - -genrule { - name: "android.hardware.light@2.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.light@2.0", - srcs: [ - ":android.hardware.light@2.0_hal", - ], - out: [ - "android/hardware/light/2.0/ALight.h", + "types.hal", + "ILight.hal", ], -} - -cc_library { - name: "android.hardware.light@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.light@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.light@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.light@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.light@2.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.light@2.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Brightness", + "Flash", + "LightState", + "Status", + "Type", ], + gen_java: true, } -genrule { - name: "android.hardware.light@2.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.light@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.light@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.light@2.0", - "android.hardware.light@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.light@2.0-adapter_genc++"], -} diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp index 4957717f6f..c5d49b6b44 100644 --- a/media/1.0/Android.bp +++ b/media/1.0/Android.bp @@ -1,67 +1,22 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.media@1.0_hal", - srcs: [ - "types.hal", - ], -} - -genrule { - name: "android.hardware.media@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0", - srcs: [ - ":android.hardware.media@1.0_hal", - ], - out: [ - "android/hardware/media/1.0/types.cpp", - ], -} - -genrule { - name: "android.hardware.media@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0", - srcs: [ - ":android.hardware.media@1.0_hal", - ], - out: [ - "android/hardware/media/1.0/types.h", - "android/hardware/media/1.0/hwtypes.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.media@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.media@1.0_genc++"], - generated_headers: ["android.hardware.media@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.media@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", + srcs: [ + "types.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + interfaces: [ "android.hardware.graphics.common@1.0", ], + types: [ + "AnwBuffer", + "AnwBufferAttributes", + "Rect", + ], + gen_java: false, } -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - -// This package has no interfaces. Not creating versioning adapter. diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp index 9cec144eb7..89709bdc56 100644 --- a/media/omx/1.0/Android.bp +++ b/media/omx/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.media.omx@1.0_hal", +hidl_interface { + name: "android.hardware.media.omx@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IGraphicBufferSource.hal", @@ -11,197 +15,19 @@ filegroup { "IOmxObserver.hal", "IOmxStore.hal", ], -} - -genrule { - name: "android.hardware.media.omx@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", - srcs: [ - ":android.hardware.media.omx@1.0_hal", - ], - out: [ - "android/hardware/media/omx/1.0/types.cpp", - "android/hardware/media/omx/1.0/GraphicBufferSourceAll.cpp", - "android/hardware/media/omx/1.0/OmxAll.cpp", - "android/hardware/media/omx/1.0/OmxBufferSourceAll.cpp", - "android/hardware/media/omx/1.0/OmxNodeAll.cpp", - "android/hardware/media/omx/1.0/OmxObserverAll.cpp", - "android/hardware/media/omx/1.0/OmxStoreAll.cpp", - ], -} - -genrule { - name: "android.hardware.media.omx@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0", - srcs: [ - ":android.hardware.media.omx@1.0_hal", - ], - out: [ - "android/hardware/media/omx/1.0/types.h", - "android/hardware/media/omx/1.0/hwtypes.h", - "android/hardware/media/omx/1.0/IGraphicBufferSource.h", - "android/hardware/media/omx/1.0/IHwGraphicBufferSource.h", - "android/hardware/media/omx/1.0/BnHwGraphicBufferSource.h", - "android/hardware/media/omx/1.0/BpHwGraphicBufferSource.h", - "android/hardware/media/omx/1.0/BsGraphicBufferSource.h", - "android/hardware/media/omx/1.0/IOmx.h", - "android/hardware/media/omx/1.0/IHwOmx.h", - "android/hardware/media/omx/1.0/BnHwOmx.h", - "android/hardware/media/omx/1.0/BpHwOmx.h", - "android/hardware/media/omx/1.0/BsOmx.h", - "android/hardware/media/omx/1.0/IOmxBufferSource.h", - "android/hardware/media/omx/1.0/IHwOmxBufferSource.h", - "android/hardware/media/omx/1.0/BnHwOmxBufferSource.h", - "android/hardware/media/omx/1.0/BpHwOmxBufferSource.h", - "android/hardware/media/omx/1.0/BsOmxBufferSource.h", - "android/hardware/media/omx/1.0/IOmxNode.h", - "android/hardware/media/omx/1.0/IHwOmxNode.h", - "android/hardware/media/omx/1.0/BnHwOmxNode.h", - "android/hardware/media/omx/1.0/BpHwOmxNode.h", - "android/hardware/media/omx/1.0/BsOmxNode.h", - "android/hardware/media/omx/1.0/IOmxObserver.h", - "android/hardware/media/omx/1.0/IHwOmxObserver.h", - "android/hardware/media/omx/1.0/BnHwOmxObserver.h", - "android/hardware/media/omx/1.0/BpHwOmxObserver.h", - "android/hardware/media/omx/1.0/BsOmxObserver.h", - "android/hardware/media/omx/1.0/IOmxStore.h", - "android/hardware/media/omx/1.0/IHwOmxStore.h", - "android/hardware/media/omx/1.0/BnHwOmxStore.h", - "android/hardware/media/omx/1.0/BpHwOmxStore.h", - "android/hardware/media/omx/1.0/BsOmxStore.h", - ], -} - -cc_library { - name: "android.hardware.media.omx@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.media.omx@1.0_genc++"], - generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ "android.hardware.graphics.bufferqueue@1.0", "android.hardware.graphics.common@1.0", "android.hardware.media@1.0", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", + types: [ + "CodecBuffer", + "ColorAspects", + "Message", + "PortMode", + "Status", ], + gen_java: false, } -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.media.omx@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.media.omx@1.0", - srcs: [ - ":android.hardware.media.omx@1.0_hal", - ], - out: [ - "android/hardware/media/omx/1.0/AGraphicBufferSource.cpp", - "android/hardware/media/omx/1.0/AOmx.cpp", - "android/hardware/media/omx/1.0/AOmxBufferSource.cpp", - "android/hardware/media/omx/1.0/AOmxNode.cpp", - "android/hardware/media/omx/1.0/AOmxObserver.cpp", - "android/hardware/media/omx/1.0/AOmxStore.cpp", - ], -} - -genrule { - name: "android.hardware.media.omx@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.media.omx@1.0", - srcs: [ - ":android.hardware.media.omx@1.0_hal", - ], - out: [ - "android/hardware/media/omx/1.0/AGraphicBufferSource.h", - "android/hardware/media/omx/1.0/AOmx.h", - "android/hardware/media/omx/1.0/AOmxBufferSource.h", - "android/hardware/media/omx/1.0/AOmxNode.h", - "android/hardware/media/omx/1.0/AOmxObserver.h", - "android/hardware/media/omx/1.0/AOmxStore.h", - ], -} - -cc_library { - name: "android.hardware.media.omx@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.media.omx@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.media.omx@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.media.omx@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media.omx@1.0", - "android.hardware.media@1.0", - "android.hardware.graphics.bufferqueue@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media.omx@1.0", - "android.hardware.media@1.0", - "android.hardware.graphics.bufferqueue@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.media.omx@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.media.omx@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.media.omx@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media.omx@1.0", - "android.hardware.media@1.0", - "android.hardware.media.omx@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.media.omx@1.0-adapter_genc++"], -} diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp index 0bbcae878d..d56aa64dd5 100644 --- a/memtrack/1.0/Android.bp +++ b/memtrack/1.0/Android.bp @@ -1,170 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.memtrack@1.0_hal", - srcs: [ - "types.hal", - "IMemtrack.hal", - ], -} - -genrule { - name: "android.hardware.memtrack@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", - srcs: [ - ":android.hardware.memtrack@1.0_hal", - ], - out: [ - "android/hardware/memtrack/1.0/types.cpp", - "android/hardware/memtrack/1.0/MemtrackAll.cpp", - ], -} - -genrule { - name: "android.hardware.memtrack@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", - srcs: [ - ":android.hardware.memtrack@1.0_hal", - ], - out: [ - "android/hardware/memtrack/1.0/types.h", - "android/hardware/memtrack/1.0/hwtypes.h", - "android/hardware/memtrack/1.0/IMemtrack.h", - "android/hardware/memtrack/1.0/IHwMemtrack.h", - "android/hardware/memtrack/1.0/BnHwMemtrack.h", - "android/hardware/memtrack/1.0/BpHwMemtrack.h", - "android/hardware/memtrack/1.0/BsMemtrack.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.memtrack@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.memtrack@1.0_genc++"], - generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.memtrack-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", srcs: [ - ":android.hardware.memtrack@1.0_hal", - ], - out: [ - "android/hardware/memtrack/V1_0/MemtrackFlag.java", - "android/hardware/memtrack/V1_0/MemtrackRecord.java", - "android/hardware/memtrack/V1_0/MemtrackStatus.java", - "android/hardware/memtrack/V1_0/MemtrackType.java", - "android/hardware/memtrack/V1_0/IMemtrack.java", - ], -} - -java_library { - name: "android.hardware.memtrack-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.memtrack-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.memtrack@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.memtrack@1.0", - srcs: [ - ":android.hardware.memtrack@1.0_hal", - ], - out: [ - "android/hardware/memtrack/1.0/AMemtrack.cpp", - ], -} - -genrule { - name: "android.hardware.memtrack@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.memtrack@1.0", - srcs: [ - ":android.hardware.memtrack@1.0_hal", - ], - out: [ - "android/hardware/memtrack/1.0/AMemtrack.h", + "types.hal", + "IMemtrack.hal", ], -} - -cc_library { - name: "android.hardware.memtrack@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.memtrack@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.memtrack@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.memtrack@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.memtrack@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.memtrack@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "MemtrackFlag", + "MemtrackRecord", + "MemtrackStatus", + "MemtrackType", ], + gen_java: true, } -genrule { - name: "android.hardware.memtrack@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.memtrack@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.memtrack@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.memtrack@1.0", - "android.hardware.memtrack@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.memtrack@1.0-adapter_genc++"], -} diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index 4d0a49f3e4..f821355092 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0/Android.bp @@ -1,194 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -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"], - 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", - ], - out: [ - "android/hardware/nfc/1.0/types.cpp", - "android/hardware/nfc/1.0/NfcAll.cpp", - "android/hardware/nfc/1.0/NfcClientCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.nfc@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/nfc/1.0/types.h", - "android/hardware/nfc/1.0/hwtypes.h", - "android/hardware/nfc/1.0/INfc.h", - "android/hardware/nfc/1.0/IHwNfc.h", - "android/hardware/nfc/1.0/BnHwNfc.h", - "android/hardware/nfc/1.0/BpHwNfc.h", - "android/hardware/nfc/1.0/BsNfc.h", - "android/hardware/nfc/1.0/INfcClientCallback.h", - "android/hardware/nfc/1.0/IHwNfcClientCallback.h", - "android/hardware/nfc/1.0/BnHwNfcClientCallback.h", - "android/hardware/nfc/1.0/BpHwNfcClientCallback.h", - "android/hardware/nfc/1.0/BsNfcClientCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.nfc@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.nfc@1.0_genc++"], - generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.nfc-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", - srcs: [ - ":android.hardware.nfc@1.0_hal", - ], - out: [ - "android/hardware/nfc/V1_0/NfcEvent.java", - "android/hardware/nfc/V1_0/NfcStatus.java", - "android/hardware/nfc/V1_0/INfc.java", - "android/hardware/nfc/V1_0/INfcClientCallback.java", - ], -} - -java_library { - name: "android.hardware.nfc-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.nfc-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.nfc-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0", srcs: [ - ":android.hardware.nfc@1.0_hal", - ], - out: [ - "android/hardware/nfc/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.nfc-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.nfc-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.nfc@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.nfc@1.0", - srcs: [ - ":android.hardware.nfc@1.0_hal", - ], - out: [ - "android/hardware/nfc/1.0/ANfc.cpp", - "android/hardware/nfc/1.0/ANfcClientCallback.cpp", - ], -} - -genrule { - name: "android.hardware.nfc@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.nfc@1.0", - srcs: [ - ":android.hardware.nfc@1.0_hal", - ], - out: [ - "android/hardware/nfc/1.0/ANfc.h", - "android/hardware/nfc/1.0/ANfcClientCallback.h", + "types.hal", + "INfc.hal", + "INfcClientCallback.hal", ], -} - -cc_library { - name: "android.hardware.nfc@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.nfc@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.nfc@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.nfc@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.nfc@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.nfc@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "NfcEvent", + "NfcStatus", ], + gen_java: true, + gen_java_constants: true, } -genrule { - name: "android.hardware.nfc@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.nfc@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.nfc@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.nfc@1.0", - "android.hardware.nfc@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.nfc@1.0-adapter_genc++"], -} diff --git a/oemlock/1.0/Android.bp b/oemlock/1.0/Android.bp index 5dcc89e204..c4ad989ca4 100644 --- a/oemlock/1.0/Android.bp +++ b/oemlock/1.0/Android.bp @@ -1,168 +1,22 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.oemlock@1.0_hal", - srcs: [ - "types.hal", - "IOemLock.hal", - ], -} - -genrule { - name: "android.hardware.oemlock@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.cpp", - "android/hardware/oemlock/1.0/OemLockAll.cpp", - ], -} - -genrule { - name: "android.hardware.oemlock@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.h", - "android/hardware/oemlock/1.0/hwtypes.h", - "android/hardware/oemlock/1.0/IOemLock.h", - "android/hardware/oemlock/1.0/IHwOemLock.h", - "android/hardware/oemlock/1.0/BnHwOemLock.h", - "android/hardware/oemlock/1.0/BpHwOemLock.h", - "android/hardware/oemlock/1.0/BsOemLock.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.oemlock@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.oemlock@1.0_genc++"], - generated_headers: ["android.hardware.oemlock@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.oemlock@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.oemlock-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -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/V1_0/OemLockSecureStatus.java", - "android/hardware/oemlock/V1_0/OemLockStatus.java", - "android/hardware/oemlock/V1_0/IOemLock.java", - ], -} - -java_library { - name: "android.hardware.oemlock-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.oemlock-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -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", + "types.hal", + "IOemLock.hal", ], -} - -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", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.oemlock@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "OemLockSecureStatus", + "OemLockStatus", ], + gen_java: true, } -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", - defaults: ["hidl-module-defaults"], - 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.0/Android.bp b/power/1.0/Android.bp index 5ac42f6f3b..92c9483328 100644 --- a/power/1.0/Android.bp +++ b/power/1.0/Android.bp @@ -1,171 +1,25 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.power@1.0_hal", - srcs: [ - "types.hal", - "IPower.hal", - ], -} - -genrule { - name: "android.hardware.power@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0", - srcs: [ - ":android.hardware.power@1.0_hal", - ], - out: [ - "android/hardware/power/1.0/types.cpp", - "android/hardware/power/1.0/PowerAll.cpp", - ], -} - -genrule { - name: "android.hardware.power@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0", - srcs: [ - ":android.hardware.power@1.0_hal", - ], - out: [ - "android/hardware/power/1.0/types.h", - "android/hardware/power/1.0/hwtypes.h", - "android/hardware/power/1.0/IPower.h", - "android/hardware/power/1.0/IHwPower.h", - "android/hardware/power/1.0/BnHwPower.h", - "android/hardware/power/1.0/BpHwPower.h", - "android/hardware/power/1.0/BsPower.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.power@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.power@1.0_genc++"], - generated_headers: ["android.hardware.power@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.power@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.power-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0", srcs: [ - ":android.hardware.power@1.0_hal", - ], - out: [ - "android/hardware/power/V1_0/Feature.java", - "android/hardware/power/V1_0/PowerHint.java", - "android/hardware/power/V1_0/PowerStatePlatformSleepState.java", - "android/hardware/power/V1_0/PowerStateVoter.java", - "android/hardware/power/V1_0/Status.java", - "android/hardware/power/V1_0/IPower.java", - ], -} - -java_library { - name: "android.hardware.power-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.power-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.power@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.power@1.0", - srcs: [ - ":android.hardware.power@1.0_hal", - ], - out: [ - "android/hardware/power/1.0/APower.cpp", - ], -} - -genrule { - name: "android.hardware.power@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.power@1.0", - srcs: [ - ":android.hardware.power@1.0_hal", - ], - out: [ - "android/hardware/power/1.0/APower.h", + "types.hal", + "IPower.hal", ], -} - -cc_library { - name: "android.hardware.power@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.power@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.power@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.power@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.power@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.power@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Feature", + "PowerHint", + "PowerStatePlatformSleepState", + "PowerStateVoter", + "Status", ], + gen_java: true, } -genrule { - name: "android.hardware.power@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.power@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.power@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.power@1.0", - "android.hardware.power@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.power@1.0-adapter_genc++"], -} diff --git a/power/1.1/Android.bp b/power/1.1/Android.bp index cea638350b..d1d8021053 100644 --- a/power/1.1/Android.bp +++ b/power/1.1/Android.bp @@ -1,176 +1,23 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.power@1.1_hal", - srcs: [ - "types.hal", - "IPower.hal", - ], -} - -genrule { - name: "android.hardware.power@1.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.cpp", - "android/hardware/power/1.1/PowerAll.cpp", - ], -} - -genrule { - name: "android.hardware.power@1.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.h", - "android/hardware/power/1.1/hwtypes.h", - "android/hardware/power/1.1/IPower.h", - "android/hardware/power/1.1/IHwPower.h", - "android/hardware/power/1.1/BnHwPower.h", - "android/hardware/power/1.1/BpHwPower.h", - "android/hardware/power/1.1/BsPower.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.power@1.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.power@1.1_genc++"], - generated_headers: ["android.hardware.power@1.1_genc++_headers"], - export_generated_headers: ["android.hardware.power@1.1_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.power@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.power@1.0", - ], -} - -genrule { - name: "android.hardware.power-V1.1-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -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/V1_1/PowerStateSubsystem.java", - "android/hardware/power/V1_1/PowerStateSubsystemSleepState.java", - "android/hardware/power/V1_1/IPower.java", - ], -} - -java_library { - name: "android.hardware.power-V1.1-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.power-V1.1-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.power-V1.0-java", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -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", + "types.hal", + "IPower.hal", ], -} - -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", + interfaces: [ "android.hardware.power@1.0", - "android.hardware.power@1.1", - "android.hardware.power@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - 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", + types: [ + "PowerStateSubsystem", + "PowerStateSubsystemSleepState", ], + gen_java: true, } -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", - defaults: ["hidl-module-defaults"], - 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/radio/1.0/Android.bp b/radio/1.0/Android.bp index f5791a7cc1..72a3ca60ab 100644 --- a/radio/1.0/Android.bp +++ b/radio/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.radio@1.0_hal", +hidl_interface { + name: "android.hardware.radio@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IRadio.hal", @@ -10,351 +14,165 @@ filegroup { "ISap.hal", "ISapCallback.hal", ], + interfaces: [ + "android.hidl.base@1.0", + ], + types: [ + "ActivityStatsInfo", + "ApnAuthType", + "ApnTypes", + "AppState", + "AppStatus", + "AppType", + "Call", + "CallForwardInfo", + "CallForwardInfoStatus", + "CallPresentation", + "CallState", + "CardState", + "CardStatus", + "Carrier", + "CarrierMatchType", + "CarrierRestrictions", + "CdmaBroadcastSmsConfigInfo", + "CdmaCallWaiting", + "CdmaCallWaitingNumberPlan", + "CdmaCallWaitingNumberPresentation", + "CdmaCallWaitingNumberType", + "CdmaDisplayInfoRecord", + "CdmaInfoRecName", + "CdmaInformationRecord", + "CdmaInformationRecords", + "CdmaLineControlInfoRecord", + "CdmaNumberInfoRecord", + "CdmaOtaProvisionStatus", + "CdmaRedirectingNumberInfoRecord", + "CdmaRedirectingReason", + "CdmaRoamingType", + "CdmaSignalInfoRecord", + "CdmaSignalStrength", + "CdmaSmsAck", + "CdmaSmsAddress", + "CdmaSmsDigitMode", + "CdmaSmsErrorClass", + "CdmaSmsMessage", + "CdmaSmsNumberMode", + "CdmaSmsNumberPlan", + "CdmaSmsNumberType", + "CdmaSmsSubaddress", + "CdmaSmsSubaddressType", + "CdmaSmsWriteArgs", + "CdmaSmsWriteArgsStatus", + "CdmaSubscriptionSource", + "CdmaT53AudioControlInfoRecord", + "CdmaT53ClirInfoRecord", + "CellIdentity", + "CellIdentityCdma", + "CellIdentityGsm", + "CellIdentityLte", + "CellIdentityTdscdma", + "CellIdentityWcdma", + "CellInfo", + "CellInfoCdma", + "CellInfoGsm", + "CellInfoLte", + "CellInfoTdscdma", + "CellInfoType", + "CellInfoWcdma", + "CfData", + "ClipStatus", + "Clir", + "DataCallFailCause", + "DataProfileId", + "DataProfileInfo", + "DataProfileInfoType", + "DataRegStateResult", + "DeviceStateType", + "Dial", + "EvdoSignalStrength", + "GsmBroadcastSmsConfigInfo", + "GsmSignalStrength", + "GsmSmsMessage", + "HardwareConfig", + "HardwareConfigModem", + "HardwareConfigSim", + "HardwareConfigState", + "HardwareConfigType", + "IccIo", + "IccIoResult", + "ImsSmsMessage", + "IndicationFilter", + "LastCallFailCause", + "LastCallFailCauseInfo", + "LceDataInfo", + "LceStatus", + "LceStatusInfo", + "LteSignalStrength", + "MvnoType", + "NeighboringCell", + "NvItem", + "NvWriteItem", + "OperatorInfo", + "OperatorStatus", + "P2Constant", + "PcoDataInfo", + "PersoSubstate", + "PhoneRestrictedState", + "PinState", + "PreferredNetworkType", + "RadioAccessFamily", + "RadioBandMode", + "RadioCapability", + "RadioCapabilityPhase", + "RadioCapabilityStatus", + "RadioCdmaSmsConst", + "RadioConst", + "RadioError", + "RadioIndicationType", + "RadioResponseInfo", + "RadioResponseType", + "RadioState", + "RadioTechnology", + "RadioTechnologyFamily", + "RegState", + "ResetNvType", + "RestrictedState", + "SapApduType", + "SapConnectRsp", + "SapDisconnectType", + "SapResultCode", + "SapStatus", + "SapTransferProtocol", + "SelectUiccSub", + "SendSmsResult", + "SetupDataCallResult", + "SignalStrength", + "SimApdu", + "SimRefreshResult", + "SimRefreshType", + "SmsAcknowledgeFailCause", + "SmsWriteArgs", + "SmsWriteArgsStatus", + "SrvccState", + "SsInfoData", + "SsRequestType", + "SsServiceType", + "SsTeleserviceType", + "StkCcUnsolSsResult", + "SubscriptionType", + "SuppServiceClass", + "SuppSvcNotification", + "TdScdmaSignalStrength", + "TimeStampType", + "TtyMode", + "UiccSubActStatus", + "UssdModeType", + "UusDcs", + "UusInfo", + "UusType", + "VoiceRegStateResult", + "WcdmaSignalStrength", + ], + gen_java: true, } -genrule { - name: "android.hardware.radio@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/radio/1.0/types.cpp", - "android/hardware/radio/1.0/RadioAll.cpp", - "android/hardware/radio/1.0/RadioIndicationAll.cpp", - "android/hardware/radio/1.0/RadioResponseAll.cpp", - "android/hardware/radio/1.0/SapAll.cpp", - "android/hardware/radio/1.0/SapCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.radio@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/radio/1.0/types.h", - "android/hardware/radio/1.0/hwtypes.h", - "android/hardware/radio/1.0/IRadio.h", - "android/hardware/radio/1.0/IHwRadio.h", - "android/hardware/radio/1.0/BnHwRadio.h", - "android/hardware/radio/1.0/BpHwRadio.h", - "android/hardware/radio/1.0/BsRadio.h", - "android/hardware/radio/1.0/IRadioIndication.h", - "android/hardware/radio/1.0/IHwRadioIndication.h", - "android/hardware/radio/1.0/BnHwRadioIndication.h", - "android/hardware/radio/1.0/BpHwRadioIndication.h", - "android/hardware/radio/1.0/BsRadioIndication.h", - "android/hardware/radio/1.0/IRadioResponse.h", - "android/hardware/radio/1.0/IHwRadioResponse.h", - "android/hardware/radio/1.0/BnHwRadioResponse.h", - "android/hardware/radio/1.0/BpHwRadioResponse.h", - "android/hardware/radio/1.0/BsRadioResponse.h", - "android/hardware/radio/1.0/ISap.h", - "android/hardware/radio/1.0/IHwSap.h", - "android/hardware/radio/1.0/BnHwSap.h", - "android/hardware/radio/1.0/BpHwSap.h", - "android/hardware/radio/1.0/BsSap.h", - "android/hardware/radio/1.0/ISapCallback.h", - "android/hardware/radio/1.0/IHwSapCallback.h", - "android/hardware/radio/1.0/BnHwSapCallback.h", - "android/hardware/radio/1.0/BpHwSapCallback.h", - "android/hardware/radio/1.0/BsSapCallback.h", - ], -} - -cc_library { - name: "android.hardware.radio@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio@1.0_genc++"], - generated_headers: ["android.hardware.radio@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.radio@1.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.radio-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0", - srcs: [ - ":android.hardware.radio@1.0_hal", - ], - out: [ - "android/hardware/radio/V1_0/ActivityStatsInfo.java", - "android/hardware/radio/V1_0/ApnAuthType.java", - "android/hardware/radio/V1_0/ApnTypes.java", - "android/hardware/radio/V1_0/AppState.java", - "android/hardware/radio/V1_0/AppStatus.java", - "android/hardware/radio/V1_0/AppType.java", - "android/hardware/radio/V1_0/Call.java", - "android/hardware/radio/V1_0/CallForwardInfo.java", - "android/hardware/radio/V1_0/CallForwardInfoStatus.java", - "android/hardware/radio/V1_0/CallPresentation.java", - "android/hardware/radio/V1_0/CallState.java", - "android/hardware/radio/V1_0/CardState.java", - "android/hardware/radio/V1_0/CardStatus.java", - "android/hardware/radio/V1_0/Carrier.java", - "android/hardware/radio/V1_0/CarrierMatchType.java", - "android/hardware/radio/V1_0/CarrierRestrictions.java", - "android/hardware/radio/V1_0/CdmaBroadcastSmsConfigInfo.java", - "android/hardware/radio/V1_0/CdmaCallWaiting.java", - "android/hardware/radio/V1_0/CdmaCallWaitingNumberPlan.java", - "android/hardware/radio/V1_0/CdmaCallWaitingNumberPresentation.java", - "android/hardware/radio/V1_0/CdmaCallWaitingNumberType.java", - "android/hardware/radio/V1_0/CdmaDisplayInfoRecord.java", - "android/hardware/radio/V1_0/CdmaInfoRecName.java", - "android/hardware/radio/V1_0/CdmaInformationRecord.java", - "android/hardware/radio/V1_0/CdmaInformationRecords.java", - "android/hardware/radio/V1_0/CdmaLineControlInfoRecord.java", - "android/hardware/radio/V1_0/CdmaNumberInfoRecord.java", - "android/hardware/radio/V1_0/CdmaOtaProvisionStatus.java", - "android/hardware/radio/V1_0/CdmaRedirectingNumberInfoRecord.java", - "android/hardware/radio/V1_0/CdmaRedirectingReason.java", - "android/hardware/radio/V1_0/CdmaRoamingType.java", - "android/hardware/radio/V1_0/CdmaSignalInfoRecord.java", - "android/hardware/radio/V1_0/CdmaSignalStrength.java", - "android/hardware/radio/V1_0/CdmaSmsAck.java", - "android/hardware/radio/V1_0/CdmaSmsAddress.java", - "android/hardware/radio/V1_0/CdmaSmsDigitMode.java", - "android/hardware/radio/V1_0/CdmaSmsErrorClass.java", - "android/hardware/radio/V1_0/CdmaSmsMessage.java", - "android/hardware/radio/V1_0/CdmaSmsNumberMode.java", - "android/hardware/radio/V1_0/CdmaSmsNumberPlan.java", - "android/hardware/radio/V1_0/CdmaSmsNumberType.java", - "android/hardware/radio/V1_0/CdmaSmsSubaddress.java", - "android/hardware/radio/V1_0/CdmaSmsSubaddressType.java", - "android/hardware/radio/V1_0/CdmaSmsWriteArgs.java", - "android/hardware/radio/V1_0/CdmaSmsWriteArgsStatus.java", - "android/hardware/radio/V1_0/CdmaSubscriptionSource.java", - "android/hardware/radio/V1_0/CdmaT53AudioControlInfoRecord.java", - "android/hardware/radio/V1_0/CdmaT53ClirInfoRecord.java", - "android/hardware/radio/V1_0/CellIdentity.java", - "android/hardware/radio/V1_0/CellIdentityCdma.java", - "android/hardware/radio/V1_0/CellIdentityGsm.java", - "android/hardware/radio/V1_0/CellIdentityLte.java", - "android/hardware/radio/V1_0/CellIdentityTdscdma.java", - "android/hardware/radio/V1_0/CellIdentityWcdma.java", - "android/hardware/radio/V1_0/CellInfo.java", - "android/hardware/radio/V1_0/CellInfoCdma.java", - "android/hardware/radio/V1_0/CellInfoGsm.java", - "android/hardware/radio/V1_0/CellInfoLte.java", - "android/hardware/radio/V1_0/CellInfoTdscdma.java", - "android/hardware/radio/V1_0/CellInfoType.java", - "android/hardware/radio/V1_0/CellInfoWcdma.java", - "android/hardware/radio/V1_0/CfData.java", - "android/hardware/radio/V1_0/ClipStatus.java", - "android/hardware/radio/V1_0/Clir.java", - "android/hardware/radio/V1_0/DataCallFailCause.java", - "android/hardware/radio/V1_0/DataProfileId.java", - "android/hardware/radio/V1_0/DataProfileInfo.java", - "android/hardware/radio/V1_0/DataProfileInfoType.java", - "android/hardware/radio/V1_0/DataRegStateResult.java", - "android/hardware/radio/V1_0/DeviceStateType.java", - "android/hardware/radio/V1_0/Dial.java", - "android/hardware/radio/V1_0/EvdoSignalStrength.java", - "android/hardware/radio/V1_0/GsmBroadcastSmsConfigInfo.java", - "android/hardware/radio/V1_0/GsmSignalStrength.java", - "android/hardware/radio/V1_0/GsmSmsMessage.java", - "android/hardware/radio/V1_0/HardwareConfig.java", - "android/hardware/radio/V1_0/HardwareConfigModem.java", - "android/hardware/radio/V1_0/HardwareConfigSim.java", - "android/hardware/radio/V1_0/HardwareConfigState.java", - "android/hardware/radio/V1_0/HardwareConfigType.java", - "android/hardware/radio/V1_0/IccIo.java", - "android/hardware/radio/V1_0/IccIoResult.java", - "android/hardware/radio/V1_0/ImsSmsMessage.java", - "android/hardware/radio/V1_0/IndicationFilter.java", - "android/hardware/radio/V1_0/LastCallFailCause.java", - "android/hardware/radio/V1_0/LastCallFailCauseInfo.java", - "android/hardware/radio/V1_0/LceDataInfo.java", - "android/hardware/radio/V1_0/LceStatus.java", - "android/hardware/radio/V1_0/LceStatusInfo.java", - "android/hardware/radio/V1_0/LteSignalStrength.java", - "android/hardware/radio/V1_0/MvnoType.java", - "android/hardware/radio/V1_0/NeighboringCell.java", - "android/hardware/radio/V1_0/NvItem.java", - "android/hardware/radio/V1_0/NvWriteItem.java", - "android/hardware/radio/V1_0/OperatorInfo.java", - "android/hardware/radio/V1_0/OperatorStatus.java", - "android/hardware/radio/V1_0/P2Constant.java", - "android/hardware/radio/V1_0/PcoDataInfo.java", - "android/hardware/radio/V1_0/PersoSubstate.java", - "android/hardware/radio/V1_0/PhoneRestrictedState.java", - "android/hardware/radio/V1_0/PinState.java", - "android/hardware/radio/V1_0/PreferredNetworkType.java", - "android/hardware/radio/V1_0/RadioAccessFamily.java", - "android/hardware/radio/V1_0/RadioBandMode.java", - "android/hardware/radio/V1_0/RadioCapability.java", - "android/hardware/radio/V1_0/RadioCapabilityPhase.java", - "android/hardware/radio/V1_0/RadioCapabilityStatus.java", - "android/hardware/radio/V1_0/RadioCdmaSmsConst.java", - "android/hardware/radio/V1_0/RadioConst.java", - "android/hardware/radio/V1_0/RadioError.java", - "android/hardware/radio/V1_0/RadioIndicationType.java", - "android/hardware/radio/V1_0/RadioResponseInfo.java", - "android/hardware/radio/V1_0/RadioResponseType.java", - "android/hardware/radio/V1_0/RadioState.java", - "android/hardware/radio/V1_0/RadioTechnology.java", - "android/hardware/radio/V1_0/RadioTechnologyFamily.java", - "android/hardware/radio/V1_0/RegState.java", - "android/hardware/radio/V1_0/ResetNvType.java", - "android/hardware/radio/V1_0/RestrictedState.java", - "android/hardware/radio/V1_0/SapApduType.java", - "android/hardware/radio/V1_0/SapConnectRsp.java", - "android/hardware/radio/V1_0/SapDisconnectType.java", - "android/hardware/radio/V1_0/SapResultCode.java", - "android/hardware/radio/V1_0/SapStatus.java", - "android/hardware/radio/V1_0/SapTransferProtocol.java", - "android/hardware/radio/V1_0/SelectUiccSub.java", - "android/hardware/radio/V1_0/SendSmsResult.java", - "android/hardware/radio/V1_0/SetupDataCallResult.java", - "android/hardware/radio/V1_0/SignalStrength.java", - "android/hardware/radio/V1_0/SimApdu.java", - "android/hardware/radio/V1_0/SimRefreshResult.java", - "android/hardware/radio/V1_0/SimRefreshType.java", - "android/hardware/radio/V1_0/SmsAcknowledgeFailCause.java", - "android/hardware/radio/V1_0/SmsWriteArgs.java", - "android/hardware/radio/V1_0/SmsWriteArgsStatus.java", - "android/hardware/radio/V1_0/SrvccState.java", - "android/hardware/radio/V1_0/SsInfoData.java", - "android/hardware/radio/V1_0/SsRequestType.java", - "android/hardware/radio/V1_0/SsServiceType.java", - "android/hardware/radio/V1_0/SsTeleserviceType.java", - "android/hardware/radio/V1_0/StkCcUnsolSsResult.java", - "android/hardware/radio/V1_0/SubscriptionType.java", - "android/hardware/radio/V1_0/SuppServiceClass.java", - "android/hardware/radio/V1_0/SuppSvcNotification.java", - "android/hardware/radio/V1_0/TdScdmaSignalStrength.java", - "android/hardware/radio/V1_0/TimeStampType.java", - "android/hardware/radio/V1_0/TtyMode.java", - "android/hardware/radio/V1_0/UiccSubActStatus.java", - "android/hardware/radio/V1_0/UssdModeType.java", - "android/hardware/radio/V1_0/UusDcs.java", - "android/hardware/radio/V1_0/UusInfo.java", - "android/hardware/radio/V1_0/UusType.java", - "android/hardware/radio/V1_0/VoiceRegStateResult.java", - "android/hardware/radio/V1_0/WcdmaSignalStrength.java", - "android/hardware/radio/V1_0/IRadio.java", - "android/hardware/radio/V1_0/IRadioIndication.java", - "android/hardware/radio/V1_0/IRadioResponse.java", - "android/hardware/radio/V1_0/ISap.java", - "android/hardware/radio/V1_0/ISapCallback.java", - ], -} - -java_library { - name: "android.hardware.radio-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.radio-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.radio@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.radio@1.0", - srcs: [ - ":android.hardware.radio@1.0_hal", - ], - out: [ - "android/hardware/radio/1.0/ARadio.cpp", - "android/hardware/radio/1.0/ARadioIndication.cpp", - "android/hardware/radio/1.0/ARadioResponse.cpp", - "android/hardware/radio/1.0/ASap.cpp", - "android/hardware/radio/1.0/ASapCallback.cpp", - ], -} - -genrule { - name: "android.hardware.radio@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.radio@1.0", - srcs: [ - ":android.hardware.radio@1.0_hal", - ], - out: [ - "android/hardware/radio/1.0/ARadio.h", - "android/hardware/radio/1.0/ARadioIndication.h", - "android/hardware/radio/1.0/ARadioResponse.h", - "android/hardware/radio/1.0/ASap.h", - "android/hardware/radio/1.0/ASapCallback.h", - ], -} - -cc_library { - name: "android.hardware.radio@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.radio@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.radio@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.radio@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.radio@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.radio@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.radio@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.radio@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.radio@1.0", - "android.hardware.radio@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.radio@1.0-adapter_genc++"], -} diff --git a/radio/1.1/Android.bp b/radio/1.1/Android.bp index 623ec21520..5eecb31919 100644 --- a/radio/1.1/Android.bp +++ b/radio/1.1/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.radio@1.1_hal", +hidl_interface { + name: "android.hardware.radio@1.1", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IRadio.hal", @@ -9,211 +13,27 @@ filegroup { "IRadioResponse.hal", "ISap.hal", ], -} - -genrule { - name: "android.hardware.radio@1.1_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/radio/1.1/types.cpp", - "android/hardware/radio/1.1/RadioAll.cpp", - "android/hardware/radio/1.1/RadioIndicationAll.cpp", - "android/hardware/radio/1.1/RadioResponseAll.cpp", - "android/hardware/radio/1.1/SapAll.cpp", - ], -} - -genrule { - name: "android.hardware.radio@1.1_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/radio/1.1/types.h", - "android/hardware/radio/1.1/hwtypes.h", - "android/hardware/radio/1.1/IRadio.h", - "android/hardware/radio/1.1/IHwRadio.h", - "android/hardware/radio/1.1/BnHwRadio.h", - "android/hardware/radio/1.1/BpHwRadio.h", - "android/hardware/radio/1.1/BsRadio.h", - "android/hardware/radio/1.1/IRadioIndication.h", - "android/hardware/radio/1.1/IHwRadioIndication.h", - "android/hardware/radio/1.1/BnHwRadioIndication.h", - "android/hardware/radio/1.1/BpHwRadioIndication.h", - "android/hardware/radio/1.1/BsRadioIndication.h", - "android/hardware/radio/1.1/IRadioResponse.h", - "android/hardware/radio/1.1/IHwRadioResponse.h", - "android/hardware/radio/1.1/BnHwRadioResponse.h", - "android/hardware/radio/1.1/BpHwRadioResponse.h", - "android/hardware/radio/1.1/BsRadioResponse.h", - "android/hardware/radio/1.1/ISap.h", - "android/hardware/radio/1.1/IHwSap.h", - "android/hardware/radio/1.1/BnHwSap.h", - "android/hardware/radio/1.1/BpHwSap.h", - "android/hardware/radio/1.1/BsSap.h", - ], -} - -cc_library { - name: "android.hardware.radio@1.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio@1.1_genc++"], - generated_headers: ["android.hardware.radio@1.1_genc++_headers"], - export_generated_headers: ["android.hardware.radio@1.1_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ "android.hardware.radio@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.radio@1.0", - ], + "android.hidl.base@1.0", + ], + types: [ + "CardPowerState", + "EutranBands", + "GeranBands", + "ImsiEncryptionInfo", + "KeepaliveRequest", + "KeepaliveStatus", + "KeepaliveStatusCode", + "KeepaliveType", + "NetworkScanRequest", + "NetworkScanResult", + "RadioAccessNetworks", + "RadioAccessSpecifier", + "ScanStatus", + "ScanType", + "UtranBands", + ], + gen_java: true, } -genrule { - name: "android.hardware.radio-V1.1-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1", - srcs: [ - ":android.hardware.radio@1.1_hal", - ], - out: [ - "android/hardware/radio/V1_1/CardPowerState.java", - "android/hardware/radio/V1_1/EutranBands.java", - "android/hardware/radio/V1_1/GeranBands.java", - "android/hardware/radio/V1_1/ImsiEncryptionInfo.java", - "android/hardware/radio/V1_1/KeepaliveRequest.java", - "android/hardware/radio/V1_1/KeepaliveStatus.java", - "android/hardware/radio/V1_1/KeepaliveStatusCode.java", - "android/hardware/radio/V1_1/KeepaliveType.java", - "android/hardware/radio/V1_1/NetworkScanRequest.java", - "android/hardware/radio/V1_1/NetworkScanResult.java", - "android/hardware/radio/V1_1/RadioAccessNetworks.java", - "android/hardware/radio/V1_1/RadioAccessSpecifier.java", - "android/hardware/radio/V1_1/ScanStatus.java", - "android/hardware/radio/V1_1/ScanType.java", - "android/hardware/radio/V1_1/UtranBands.java", - "android/hardware/radio/V1_1/IRadio.java", - "android/hardware/radio/V1_1/IRadioIndication.java", - "android/hardware/radio/V1_1/IRadioResponse.java", - "android/hardware/radio/V1_1/ISap.java", - ], -} - -java_library { - name: "android.hardware.radio-V1.1-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.radio-V1.1-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.radio-V1.0-java", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.radio@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.radio@1.1", - srcs: [ - ":android.hardware.radio@1.1_hal", - ], - out: [ - "android/hardware/radio/1.1/ARadio.cpp", - "android/hardware/radio/1.1/ARadioIndication.cpp", - "android/hardware/radio/1.1/ARadioResponse.cpp", - "android/hardware/radio/1.1/ASap.cpp", - ], -} - -genrule { - name: "android.hardware.radio@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.radio@1.1", - srcs: [ - ":android.hardware.radio@1.1_hal", - ], - out: [ - "android/hardware/radio/1.1/ARadio.h", - "android/hardware/radio/1.1/ARadioIndication.h", - "android/hardware/radio/1.1/ARadioResponse.h", - "android/hardware/radio/1.1/ASap.h", - ], -} - -cc_library { - name: "android.hardware.radio@1.1-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio@1.1-adapter-helper_genc++"], - generated_headers: ["android.hardware.radio@1.1-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.radio@1.1-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.radio@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.radio@1.1", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.radio@1.1-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.1-adapter-helper", - ], - generated_sources: ["android.hardware.radio@1.1-adapter_genc++"], -} diff --git a/radio/1.2/Android.bp b/radio/1.2/Android.bp index dc787496d4..cdb9bf6e44 100644 --- a/radio/1.2/Android.bp +++ b/radio/1.2/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.radio@1.2_hal", +hidl_interface { + name: "android.hardware.radio@1.2", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IRadio.hal", @@ -9,220 +13,29 @@ filegroup { "IRadioResponse.hal", "ISap.hal", ], -} - -genrule { - name: "android.hardware.radio@1.2_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.2", - srcs: [ - ":android.hardware.radio@1.2_hal", - ], - out: [ - "android/hardware/radio/1.2/types.cpp", - "android/hardware/radio/1.2/RadioAll.cpp", - "android/hardware/radio/1.2/RadioIndicationAll.cpp", - "android/hardware/radio/1.2/RadioResponseAll.cpp", - "android/hardware/radio/1.2/SapAll.cpp", - ], -} - -genrule { - name: "android.hardware.radio@1.2_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.2", - srcs: [ - ":android.hardware.radio@1.2_hal", - ], - out: [ - "android/hardware/radio/1.2/types.h", - "android/hardware/radio/1.2/hwtypes.h", - "android/hardware/radio/1.2/IRadio.h", - "android/hardware/radio/1.2/IHwRadio.h", - "android/hardware/radio/1.2/BnHwRadio.h", - "android/hardware/radio/1.2/BpHwRadio.h", - "android/hardware/radio/1.2/BsRadio.h", - "android/hardware/radio/1.2/IRadioIndication.h", - "android/hardware/radio/1.2/IHwRadioIndication.h", - "android/hardware/radio/1.2/BnHwRadioIndication.h", - "android/hardware/radio/1.2/BpHwRadioIndication.h", - "android/hardware/radio/1.2/BsRadioIndication.h", - "android/hardware/radio/1.2/IRadioResponse.h", - "android/hardware/radio/1.2/IHwRadioResponse.h", - "android/hardware/radio/1.2/BnHwRadioResponse.h", - "android/hardware/radio/1.2/BpHwRadioResponse.h", - "android/hardware/radio/1.2/BsRadioResponse.h", - "android/hardware/radio/1.2/ISap.h", - "android/hardware/radio/1.2/IHwSap.h", - "android/hardware/radio/1.2/BnHwSap.h", - "android/hardware/radio/1.2/BpHwSap.h", - "android/hardware/radio/1.2/BsSap.h", - ], -} - -cc_library { - name: "android.hardware.radio@1.2", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio@1.2_genc++"], - generated_headers: ["android.hardware.radio@1.2_genc++_headers"], - export_generated_headers: ["android.hardware.radio@1.2_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + interfaces: [ "android.hardware.radio@1.0", "android.hardware.radio@1.1", - ], -} - -genrule { - name: "android.hardware.radio-V1.2-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.2", - srcs: [ - ":android.hardware.radio@1.2_hal", - ], - out: [ - "android/hardware/radio/V1_2/CellIdentityCdma.java", - "android/hardware/radio/V1_2/CellIdentityGsm.java", - "android/hardware/radio/V1_2/CellIdentityLte.java", - "android/hardware/radio/V1_2/CellIdentityOperatorNames.java", - "android/hardware/radio/V1_2/CellIdentityWcdma.java", - "android/hardware/radio/V1_2/CellInfo.java", - "android/hardware/radio/V1_2/CellInfoCdma.java", - "android/hardware/radio/V1_2/CellInfoGsm.java", - "android/hardware/radio/V1_2/CellInfoLte.java", - "android/hardware/radio/V1_2/CellInfoWcdma.java", - "android/hardware/radio/V1_2/IncrementalResultsPeriodicityRange.java", - "android/hardware/radio/V1_2/MaxSearchTimeRange.java", - "android/hardware/radio/V1_2/NetworkScanRequest.java", - "android/hardware/radio/V1_2/NetworkScanResult.java", - "android/hardware/radio/V1_2/RadioConst.java", - "android/hardware/radio/V1_2/ScanIntervalRange.java", - "android/hardware/radio/V1_2/IRadio.java", - "android/hardware/radio/V1_2/IRadioIndication.java", - "android/hardware/radio/V1_2/IRadioResponse.java", - "android/hardware/radio/V1_2/ISap.java", - ], + "android.hidl.base@1.0", + ], + types: [ + "CellIdentityCdma", + "CellIdentityGsm", + "CellIdentityLte", + "CellIdentityOperatorNames", + "CellIdentityWcdma", + "CellInfo", + "CellInfoCdma", + "CellInfoGsm", + "CellInfoLte", + "CellInfoWcdma", + "IncrementalResultsPeriodicityRange", + "MaxSearchTimeRange", + "NetworkScanRequest", + "NetworkScanResult", + "RadioConst", + "ScanIntervalRange", + ], + gen_java: true, } -java_library { - name: "android.hardware.radio-V1.2-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.radio-V1.2-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.radio-V1.0-java", - "android.hardware.radio-V1.1-java", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.radio@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.radio@1.2", - srcs: [ - ":android.hardware.radio@1.2_hal", - ], - out: [ - "android/hardware/radio/1.2/ARadio.cpp", - "android/hardware/radio/1.2/ARadioIndication.cpp", - "android/hardware/radio/1.2/ARadioResponse.cpp", - "android/hardware/radio/1.2/ASap.cpp", - ], -} - -genrule { - name: "android.hardware.radio@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.radio@1.2", - srcs: [ - ":android.hardware.radio@1.2_hal", - ], - out: [ - "android/hardware/radio/1.2/ARadio.h", - "android/hardware/radio/1.2/ARadioIndication.h", - "android/hardware/radio/1.2/ARadioResponse.h", - "android/hardware/radio/1.2/ASap.h", - ], -} - -cc_library { - name: "android.hardware.radio@1.2-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio@1.2-adapter-helper_genc++"], - generated_headers: ["android.hardware.radio@1.2-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.radio@1.2-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.2", - "android.hardware.radio@1.0-adapter-helper", - "android.hardware.radio@1.1-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.2", - "android.hardware.radio@1.0-adapter-helper", - "android.hardware.radio@1.1-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.radio@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.radio@1.2", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.radio@1.2-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.2", - "android.hardware.radio@1.2-adapter-helper", - ], - generated_sources: ["android.hardware.radio@1.2-adapter_genc++"], -} diff --git a/radio/deprecated/1.0/Android.bp b/radio/deprecated/1.0/Android.bp index 937e42cf99..c9f86f0a7c 100644 --- a/radio/deprecated/1.0/Android.bp +++ b/radio/deprecated/1.0/Android.bp @@ -1,190 +1,20 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.radio.deprecated@1.0_hal", - srcs: [ - "IOemHook.hal", - "IOemHookIndication.hal", - "IOemHookResponse.hal", - ], -} - -genrule { - name: "android.hardware.radio.deprecated@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/radio/deprecated/1.0/OemHookAll.cpp", - "android/hardware/radio/deprecated/1.0/OemHookIndicationAll.cpp", - "android/hardware/radio/deprecated/1.0/OemHookResponseAll.cpp", - ], -} - -genrule { - name: "android.hardware.radio.deprecated@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/radio/deprecated/1.0/IOemHook.h", - "android/hardware/radio/deprecated/1.0/IHwOemHook.h", - "android/hardware/radio/deprecated/1.0/BnHwOemHook.h", - "android/hardware/radio/deprecated/1.0/BpHwOemHook.h", - "android/hardware/radio/deprecated/1.0/BsOemHook.h", - "android/hardware/radio/deprecated/1.0/IOemHookIndication.h", - "android/hardware/radio/deprecated/1.0/IHwOemHookIndication.h", - "android/hardware/radio/deprecated/1.0/BnHwOemHookIndication.h", - "android/hardware/radio/deprecated/1.0/BpHwOemHookIndication.h", - "android/hardware/radio/deprecated/1.0/BsOemHookIndication.h", - "android/hardware/radio/deprecated/1.0/IOemHookResponse.h", - "android/hardware/radio/deprecated/1.0/IHwOemHookResponse.h", - "android/hardware/radio/deprecated/1.0/BnHwOemHookResponse.h", - "android/hardware/radio/deprecated/1.0/BpHwOemHookResponse.h", - "android/hardware/radio/deprecated/1.0/BsOemHookResponse.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.radio.deprecated@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio.deprecated@1.0_genc++"], - generated_headers: ["android.hardware.radio.deprecated@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.radio.deprecated@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.radio@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.radio@1.0", - ], -} - -genrule { - name: "android.hardware.radio.deprecated-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0", - srcs: [ - ":android.hardware.radio.deprecated@1.0_hal", - ], - out: [ - "android/hardware/radio/deprecated/V1_0/IOemHook.java", - "android/hardware/radio/deprecated/V1_0/IOemHookIndication.java", - "android/hardware/radio/deprecated/V1_0/IOemHookResponse.java", - ], -} - -java_library { - name: "android.hardware.radio.deprecated-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.radio.deprecated-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.radio-V1.0-java", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.radio.deprecated@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.radio.deprecated@1.0", srcs: [ - ":android.hardware.radio.deprecated@1.0_hal", - ], - out: [ - "android/hardware/radio/deprecated/1.0/AOemHook.cpp", - "android/hardware/radio/deprecated/1.0/AOemHookIndication.cpp", - "android/hardware/radio/deprecated/1.0/AOemHookResponse.cpp", - ], -} - -genrule { - name: "android.hardware.radio.deprecated@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.radio.deprecated@1.0", - srcs: [ - ":android.hardware.radio.deprecated@1.0_hal", - ], - out: [ - "android/hardware/radio/deprecated/1.0/AOemHook.h", - "android/hardware/radio/deprecated/1.0/AOemHookIndication.h", - "android/hardware/radio/deprecated/1.0/AOemHookResponse.h", - ], -} - -cc_library { - name: "android.hardware.radio.deprecated@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.radio.deprecated@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.radio.deprecated@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.radio.deprecated@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.radio.deprecated@1.0", - "android.hardware.radio@1.0", - "android.hardware.radio@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "IOemHook.hal", + "IOemHookIndication.hal", + "IOemHookResponse.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.radio.deprecated@1.0", + interfaces: [ "android.hardware.radio@1.0", - "android.hardware.radio@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], + gen_java: true, } -genrule { - name: "android.hardware.radio.deprecated@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.radio.deprecated@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.radio.deprecated@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.radio.deprecated@1.0", - "android.hardware.radio@1.0", - "android.hardware.radio.deprecated@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.radio.deprecated@1.0-adapter_genc++"], -} diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp index 9b6f7a8e34..79b2ff7d8e 100644 --- a/renderscript/1.0/Android.bp +++ b/renderscript/1.0/Android.bp @@ -1,171 +1,38 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.renderscript@1.0_hal", - srcs: [ - "types.hal", - "IContext.hal", - "IDevice.hal", - ], -} - -genrule { - name: "android.hardware.renderscript@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/renderscript/1.0/types.cpp", - "android/hardware/renderscript/1.0/ContextAll.cpp", - "android/hardware/renderscript/1.0/DeviceAll.cpp", - ], -} - -genrule { - name: "android.hardware.renderscript@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/renderscript/1.0/types.h", - "android/hardware/renderscript/1.0/hwtypes.h", - "android/hardware/renderscript/1.0/IContext.h", - "android/hardware/renderscript/1.0/IHwContext.h", - "android/hardware/renderscript/1.0/BnHwContext.h", - "android/hardware/renderscript/1.0/BpHwContext.h", - "android/hardware/renderscript/1.0/BsContext.h", - "android/hardware/renderscript/1.0/IDevice.h", - "android/hardware/renderscript/1.0/IHwDevice.h", - "android/hardware/renderscript/1.0/BnHwDevice.h", - "android/hardware/renderscript/1.0/BpHwDevice.h", - "android/hardware/renderscript/1.0/BsDevice.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.renderscript@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.renderscript@1.0_genc++"], - generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, support_system_process: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -genrule { - name: "android.hardware.renderscript-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", - srcs: [ - ":android.hardware.renderscript@1.0_hal", - ], - out: [ - "android/hardware/renderscript/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.renderscript-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.renderscript-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.renderscript@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.renderscript@1.0", srcs: [ - ":android.hardware.renderscript@1.0_hal", - ], - out: [ - "android/hardware/renderscript/1.0/AContext.cpp", - "android/hardware/renderscript/1.0/ADevice.cpp", - ], -} - -genrule { - name: "android.hardware.renderscript@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.renderscript@1.0", - srcs: [ - ":android.hardware.renderscript@1.0_hal", - ], - out: [ - "android/hardware/renderscript/1.0/AContext.h", - "android/hardware/renderscript/1.0/ADevice.h", - ], -} - -cc_library { - name: "android.hardware.renderscript@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.renderscript@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.renderscript@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.renderscript@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.renderscript@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.renderscript@1.0", - "android.hidl.base@1.0-adapter-helper", + "types.hal", + "IContext.hal", + "IDevice.hal", ], + interfaces: [ + "android.hidl.base@1.0", + ], + types: [ + "AllocationCubemapFace", + "AllocationMipmapControl", + "AllocationUsageType", + "ContextFlags", + "ContextType", + "DataKind", + "DataType", + "ForEachStrategy", + "MessageToClientType", + "MetadataSignatureBitval", + "SamplerValue", + "ScriptCall", + "ScriptIntrinsicID", + "ThreadPriorities", + "YuvFormat", + ], + gen_java: false, + gen_java_constants: true, } -genrule { - name: "android.hardware.renderscript@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.renderscript@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.renderscript@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.renderscript@1.0", - "android.hardware.renderscript@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.renderscript@1.0-adapter_genc++"], -} diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index 6f9df6f7fc..92c3c1b601 100644 --- a/sensors/1.0/Android.bp +++ b/sensors/1.0/Android.bp @@ -1,161 +1,44 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.sensors@1.0_hal", - srcs: [ - "types.hal", - "ISensors.hal", - ], -} - -genrule { - name: "android.hardware.sensors@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0", - srcs: [ - ":android.hardware.sensors@1.0_hal", - ], - out: [ - "android/hardware/sensors/1.0/types.cpp", - "android/hardware/sensors/1.0/SensorsAll.cpp", - ], -} - -genrule { - name: "android.hardware.sensors@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0", - srcs: [ - ":android.hardware.sensors@1.0_hal", - ], - out: [ - "android/hardware/sensors/1.0/types.h", - "android/hardware/sensors/1.0/hwtypes.h", - "android/hardware/sensors/1.0/ISensors.h", - "android/hardware/sensors/1.0/IHwSensors.h", - "android/hardware/sensors/1.0/BnHwSensors.h", - "android/hardware/sensors/1.0/BpHwSensors.h", - "android/hardware/sensors/1.0/BsSensors.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.sensors@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.sensors@1.0_genc++"], - generated_headers: ["android.hardware.sensors@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.sensors@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -genrule { - name: "android.hardware.sensors-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0", - srcs: [ - ":android.hardware.sensors@1.0_hal", - ], - out: [ - "android/hardware/sensors/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.sensors-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.sensors-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.sensors@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.sensors@1.0", - srcs: [ - ":android.hardware.sensors@1.0_hal", - ], - out: [ - "android/hardware/sensors/1.0/ASensors.cpp", - ], -} - -genrule { - name: "android.hardware.sensors@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.sensors@1.0", srcs: [ - ":android.hardware.sensors@1.0_hal", - ], - out: [ - "android/hardware/sensors/1.0/ASensors.h", - ], -} - -cc_library { - name: "android.hardware.sensors@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.sensors@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.sensors@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.sensors@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.sensors@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.sensors@1.0", - "android.hidl.base@1.0-adapter-helper", + "types.hal", + "ISensors.hal", ], + interfaces: [ + "android.hidl.base@1.0", + ], + types: [ + "AdditionalInfo", + "AdditionalInfoType", + "DynamicSensorInfo", + "Event", + "EventPayload", + "HeartRate", + "MetaData", + "MetaDataEventType", + "OperationMode", + "RateLevel", + "Result", + "SensorFlagBits", + "SensorFlagShift", + "SensorInfo", + "SensorStatus", + "SensorType", + "SensorsEventFormatOffset", + "SharedMemFormat", + "SharedMemInfo", + "SharedMemType", + "Uncal", + "Vec3", + "Vec4", + ], + gen_java: false, + gen_java_constants: true, } -genrule { - name: "android.hardware.sensors@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.sensors@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.sensors@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.sensors@1.0", - "android.hardware.sensors@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.sensors@1.0-adapter_genc++"], -} diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp index 64e98a24bf..92f031adbd 100644 --- a/soundtrigger/2.0/Android.bp +++ b/soundtrigger/2.0/Android.bp @@ -1,159 +1,26 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.soundtrigger@2.0_hal", - srcs: [ - "types.hal", - "ISoundTriggerHw.hal", - "ISoundTriggerHwCallback.hal", - ], -} - -genrule { - name: "android.hardware.soundtrigger@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0", - srcs: [ - ":android.hardware.soundtrigger@2.0_hal", - ], - out: [ - "android/hardware/soundtrigger/2.0/types.cpp", - "android/hardware/soundtrigger/2.0/SoundTriggerHwAll.cpp", - "android/hardware/soundtrigger/2.0/SoundTriggerHwCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.soundtrigger@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0", - srcs: [ - ":android.hardware.soundtrigger@2.0_hal", - ], - out: [ - "android/hardware/soundtrigger/2.0/types.h", - "android/hardware/soundtrigger/2.0/hwtypes.h", - "android/hardware/soundtrigger/2.0/ISoundTriggerHw.h", - "android/hardware/soundtrigger/2.0/IHwSoundTriggerHw.h", - "android/hardware/soundtrigger/2.0/BnHwSoundTriggerHw.h", - "android/hardware/soundtrigger/2.0/BpHwSoundTriggerHw.h", - "android/hardware/soundtrigger/2.0/BsSoundTriggerHw.h", - "android/hardware/soundtrigger/2.0/ISoundTriggerHwCallback.h", - "android/hardware/soundtrigger/2.0/IHwSoundTriggerHwCallback.h", - "android/hardware/soundtrigger/2.0/BnHwSoundTriggerHwCallback.h", - "android/hardware/soundtrigger/2.0/BpHwSoundTriggerHwCallback.h", - "android/hardware/soundtrigger/2.0/BsSoundTriggerHwCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.soundtrigger@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.soundtrigger@2.0_genc++"], - generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.audio.common@2.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.audio.common@2.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.soundtrigger@2.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.soundtrigger@2.0", srcs: [ - ":android.hardware.soundtrigger@2.0_hal", - ], - out: [ - "android/hardware/soundtrigger/2.0/ASoundTriggerHw.cpp", - "android/hardware/soundtrigger/2.0/ASoundTriggerHwCallback.cpp", - ], -} - -genrule { - name: "android.hardware.soundtrigger@2.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.soundtrigger@2.0", - srcs: [ - ":android.hardware.soundtrigger@2.0_hal", - ], - out: [ - "android/hardware/soundtrigger/2.0/ASoundTriggerHw.h", - "android/hardware/soundtrigger/2.0/ASoundTriggerHwCallback.h", + "types.hal", + "ISoundTriggerHw.hal", + "ISoundTriggerHwCallback.hal", ], -} - -cc_library { - name: "android.hardware.soundtrigger@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.soundtrigger@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.soundtrigger@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.soundtrigger@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.audio.common@2.0", - "android.hardware.soundtrigger@2.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.audio.common@2.0", - "android.hardware.soundtrigger@2.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "ConfidenceLevel", + "PhraseRecognitionExtra", + "RecognitionMode", + "SoundModelType", ], + gen_java: false, } -genrule { - name: "android.hardware.soundtrigger@2.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.soundtrigger@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.soundtrigger@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.audio.common@2.0", - "android.hardware.soundtrigger@2.0", - "android.hardware.soundtrigger@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.soundtrigger@2.0-adapter_genc++"], -} diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index be286b50b4..45c84bcb9b 100644 --- a/tests/bar/1.0/Android.bp +++ b/tests/bar/1.0/Android.bp @@ -1,7 +1,8 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.bar@1.0_hal", +hidl_interface { + name: "android.hardware.tests.bar@1.0", + root: "android.hardware", srcs: [ "types.hal", "IBar.hal", @@ -10,176 +11,13 @@ filegroup { "IImportRules.hal", "IImportTypes.hal", ], -} - -genrule { - name: "android.hardware.tests.bar@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/bar/1.0/types.cpp", - "android/hardware/tests/bar/1.0/BarAll.cpp", - "android/hardware/tests/bar/1.0/ComplicatedAll.cpp", - "android/hardware/tests/bar/1.0/FooCallbackAll.cpp", - "android/hardware/tests/bar/1.0/ImportRulesAll.cpp", - "android/hardware/tests/bar/1.0/ImportTypesAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.bar@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/bar/1.0/types.h", - "android/hardware/tests/bar/1.0/hwtypes.h", - "android/hardware/tests/bar/1.0/IBar.h", - "android/hardware/tests/bar/1.0/IHwBar.h", - "android/hardware/tests/bar/1.0/BnHwBar.h", - "android/hardware/tests/bar/1.0/BpHwBar.h", - "android/hardware/tests/bar/1.0/BsBar.h", - "android/hardware/tests/bar/1.0/IComplicated.h", - "android/hardware/tests/bar/1.0/IHwComplicated.h", - "android/hardware/tests/bar/1.0/BnHwComplicated.h", - "android/hardware/tests/bar/1.0/BpHwComplicated.h", - "android/hardware/tests/bar/1.0/BsComplicated.h", - "android/hardware/tests/bar/1.0/IFooCallback.h", - "android/hardware/tests/bar/1.0/IHwFooCallback.h", - "android/hardware/tests/bar/1.0/BnHwFooCallback.h", - "android/hardware/tests/bar/1.0/BpHwFooCallback.h", - "android/hardware/tests/bar/1.0/BsFooCallback.h", - "android/hardware/tests/bar/1.0/IImportRules.h", - "android/hardware/tests/bar/1.0/IHwImportRules.h", - "android/hardware/tests/bar/1.0/BnHwImportRules.h", - "android/hardware/tests/bar/1.0/BpHwImportRules.h", - "android/hardware/tests/bar/1.0/BsImportRules.h", - "android/hardware/tests/bar/1.0/IImportTypes.h", - "android/hardware/tests/bar/1.0/IHwImportTypes.h", - "android/hardware/tests/bar/1.0/BnHwImportTypes.h", - "android/hardware/tests/bar/1.0/BpHwImportTypes.h", - "android/hardware/tests/bar/1.0/BsImportTypes.h", - ], -} - -cc_library { - name: "android.hardware.tests.bar@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.bar@1.0_genc++"], - generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ "android.hardware.tests.foo@1.0", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.tests.foo@1.0", + types: [ + "Def", ], + gen_java: false, } -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.bar@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.tests.bar@1.0", - srcs: [ - ":android.hardware.tests.bar@1.0_hal", - ], - out: [ - "android/hardware/tests/bar/1.0/ABar.cpp", - "android/hardware/tests/bar/1.0/AComplicated.cpp", - "android/hardware/tests/bar/1.0/AFooCallback.cpp", - "android/hardware/tests/bar/1.0/AImportRules.cpp", - "android/hardware/tests/bar/1.0/AImportTypes.cpp", - ], -} - -genrule { - name: "android.hardware.tests.bar@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.tests.bar@1.0", - srcs: [ - ":android.hardware.tests.bar@1.0_hal", - ], - out: [ - "android/hardware/tests/bar/1.0/ABar.h", - "android/hardware/tests/bar/1.0/AComplicated.h", - "android/hardware/tests/bar/1.0/AFooCallback.h", - "android/hardware/tests/bar/1.0/AImportRules.h", - "android/hardware/tests/bar/1.0/AImportTypes.h", - ], -} - -cc_library { - name: "android.hardware.tests.bar@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.bar@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.bar@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.bar@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.bar@1.0", - "android.hardware.tests.foo@1.0", - "android.hardware.tests.foo@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.bar@1.0", - "android.hardware.tests.foo@1.0", - "android.hardware.tests.foo@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.bar@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.tests.bar@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.bar@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.bar@1.0", - "android.hardware.tests.foo@1.0", - "android.hardware.tests.bar@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.bar@1.0-adapter_genc++"], -} diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp index 6281ddc028..edf8fe6713 100644 --- a/tests/baz/1.0/Android.bp +++ b/tests/baz/1.0/Android.bp @@ -1,7 +1,8 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.baz@1.0_hal", +hidl_interface { + name: "android.hardware.tests.baz@1.0", + root: "android.hardware", srcs: [ "types.hal", "IBase.hal", @@ -9,185 +10,11 @@ filegroup { "IBazCallback.hal", "IQuux.hal", ], -} - -genrule { - name: "android.hardware.tests.baz@1.0_genc++", - tools: ["hidl-gen"], - 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", + interfaces: [ + "android.hidl.base@1.0", ], - out: [ - "android/hardware/tests/baz/1.0/types.cpp", - "android/hardware/tests/baz/1.0/BaseAll.cpp", - "android/hardware/tests/baz/1.0/BazAll.cpp", - "android/hardware/tests/baz/1.0/BazCallbackAll.cpp", - "android/hardware/tests/baz/1.0/QuuxAll.cpp", + types: [ ], + gen_java: true, } -genrule { - name: "android.hardware.tests.baz@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/baz/1.0/types.h", - "android/hardware/tests/baz/1.0/hwtypes.h", - "android/hardware/tests/baz/1.0/IBase.h", - "android/hardware/tests/baz/1.0/IHwBase.h", - "android/hardware/tests/baz/1.0/BnHwBase.h", - "android/hardware/tests/baz/1.0/BpHwBase.h", - "android/hardware/tests/baz/1.0/BsBase.h", - "android/hardware/tests/baz/1.0/IBaz.h", - "android/hardware/tests/baz/1.0/IHwBaz.h", - "android/hardware/tests/baz/1.0/BnHwBaz.h", - "android/hardware/tests/baz/1.0/BpHwBaz.h", - "android/hardware/tests/baz/1.0/BsBaz.h", - "android/hardware/tests/baz/1.0/IBazCallback.h", - "android/hardware/tests/baz/1.0/IHwBazCallback.h", - "android/hardware/tests/baz/1.0/BnHwBazCallback.h", - "android/hardware/tests/baz/1.0/BpHwBazCallback.h", - "android/hardware/tests/baz/1.0/BsBazCallback.h", - "android/hardware/tests/baz/1.0/IQuux.h", - "android/hardware/tests/baz/1.0/IHwQuux.h", - "android/hardware/tests/baz/1.0/BnHwQuux.h", - "android/hardware/tests/baz/1.0/BpHwQuux.h", - "android/hardware/tests/baz/1.0/BsQuux.h", - ], -} - -cc_library { - name: "android.hardware.tests.baz@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.baz@1.0_genc++"], - generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tests.baz-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0", - srcs: [ - ":android.hardware.tests.baz@1.0_hal", - ], - out: [ - "android/hardware/tests/baz/V1_0/IBase.java", - "android/hardware/tests/baz/V1_0/IBaz.java", - "android/hardware/tests/baz/V1_0/IBazCallback.java", - "android/hardware/tests/baz/V1_0/IQuux.java", - ], -} - -java_library { - name: "android.hardware.tests.baz-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tests.baz-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.baz@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.tests.baz@1.0", - srcs: [ - ":android.hardware.tests.baz@1.0_hal", - ], - out: [ - "android/hardware/tests/baz/1.0/ABase.cpp", - "android/hardware/tests/baz/1.0/ABaz.cpp", - "android/hardware/tests/baz/1.0/ABazCallback.cpp", - "android/hardware/tests/baz/1.0/AQuux.cpp", - ], -} - -genrule { - name: "android.hardware.tests.baz@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.tests.baz@1.0", - srcs: [ - ":android.hardware.tests.baz@1.0_hal", - ], - out: [ - "android/hardware/tests/baz/1.0/ABase.h", - "android/hardware/tests/baz/1.0/ABaz.h", - "android/hardware/tests/baz/1.0/ABazCallback.h", - "android/hardware/tests/baz/1.0/AQuux.h", - ], -} - -cc_library { - name: "android.hardware.tests.baz@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.baz@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.baz@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.baz@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.baz@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.baz@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.baz@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.tests.baz@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.baz@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.baz@1.0", - "android.hardware.tests.baz@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.baz@1.0-adapter_genc++"], -} diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp index 6209549be3..61ca6ac4c8 100644 --- a/tests/expression/1.0/Android.bp +++ b/tests/expression/1.0/Android.bp @@ -1,169 +1,15 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.expression@1.0_hal", +hidl_interface { + name: "android.hardware.tests.expression@1.0", + root: "android.hardware", srcs: [ "IExpression.hal", "IExpressionExt.hal", ], -} - -genrule { - name: "android.hardware.tests.expression@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/expression/1.0/ExpressionAll.cpp", - "android/hardware/tests/expression/1.0/ExpressionExtAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.expression@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/expression/1.0/IExpression.h", - "android/hardware/tests/expression/1.0/IHwExpression.h", - "android/hardware/tests/expression/1.0/BnHwExpression.h", - "android/hardware/tests/expression/1.0/BpHwExpression.h", - "android/hardware/tests/expression/1.0/BsExpression.h", - "android/hardware/tests/expression/1.0/IExpressionExt.h", - "android/hardware/tests/expression/1.0/IHwExpressionExt.h", - "android/hardware/tests/expression/1.0/BnHwExpressionExt.h", - "android/hardware/tests/expression/1.0/BpHwExpressionExt.h", - "android/hardware/tests/expression/1.0/BsExpressionExt.h", - ], -} - -cc_library { - name: "android.hardware.tests.expression@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.expression@1.0_genc++"], - generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tests.expression-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0", - srcs: [ - ":android.hardware.tests.expression@1.0_hal", - ], - out: [ - "android/hardware/tests/expression/V1_0/IExpression.java", - "android/hardware/tests/expression/V1_0/IExpressionExt.java", - ], -} - -java_library { - name: "android.hardware.tests.expression-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tests.expression-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.expression@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.tests.expression@1.0", - srcs: [ - ":android.hardware.tests.expression@1.0_hal", - ], - out: [ - "android/hardware/tests/expression/1.0/AExpression.cpp", - "android/hardware/tests/expression/1.0/AExpressionExt.cpp", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: true, } -genrule { - name: "android.hardware.tests.expression@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.tests.expression@1.0", - srcs: [ - ":android.hardware.tests.expression@1.0_hal", - ], - out: [ - "android/hardware/tests/expression/1.0/AExpression.h", - "android/hardware/tests/expression/1.0/AExpressionExt.h", - ], -} - -cc_library { - name: "android.hardware.tests.expression@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.expression@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.expression@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.expression@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.expression@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.expression@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.expression@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.tests.expression@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.expression@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.expression@1.0", - "android.hardware.tests.expression@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.expression@1.0-adapter_genc++"], -} diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp index 612c2d6db9..58c8392eb4 100644 --- a/tests/extension/light/2.0/Android.bp +++ b/tests/extension/light/2.0/Android.bp @@ -1,174 +1,21 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.extension.light@2.0_hal", +hidl_interface { + name: "android.hardware.tests.extension.light@2.0", + root: "android.hardware", srcs: [ "types.hal", "ILight.hal", ], -} - -genrule { - name: "android.hardware.tests.extension.light@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0", - srcs: [ - ":android.hardware.tests.extension.light@2.0_hal", - ], - out: [ - "android/hardware/tests/extension/light/2.0/types.cpp", - "android/hardware/tests/extension/light/2.0/LightAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.extension.light@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0", - srcs: [ - ":android.hardware.tests.extension.light@2.0_hal", - ], - out: [ - "android/hardware/tests/extension/light/2.0/types.h", - "android/hardware/tests/extension/light/2.0/hwtypes.h", - "android/hardware/tests/extension/light/2.0/ILight.h", - "android/hardware/tests/extension/light/2.0/IHwLight.h", - "android/hardware/tests/extension/light/2.0/BnHwLight.h", - "android/hardware/tests/extension/light/2.0/BpHwLight.h", - "android/hardware/tests/extension/light/2.0/BsLight.h", - ], -} - -cc_library { - name: "android.hardware.tests.extension.light@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.extension.light@2.0_genc++"], - generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ "android.hardware.light@2.0", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.light@2.0", + types: [ + "Brightness", + "Default", + "LightState", ], + gen_java: true, } -genrule { - name: "android.hardware.tests.extension.light-V2.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0", - srcs: [ - ":android.hardware.tests.extension.light@2.0_hal", - ], - out: [ - "android/hardware/tests/extension/light/V2_0/Brightness.java", - "android/hardware/tests/extension/light/V2_0/Default.java", - "android/hardware/tests/extension/light/V2_0/LightState.java", - "android/hardware/tests/extension/light/V2_0/ILight.java", - ], -} - -java_library { - name: "android.hardware.tests.extension.light-V2.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tests.extension.light-V2.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.light-V2.0-java", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.extension.light@2.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.tests.extension.light@2.0", - srcs: [ - ":android.hardware.tests.extension.light@2.0_hal", - ], - out: [ - "android/hardware/tests/extension/light/2.0/ALight.cpp", - ], -} - -genrule { - name: "android.hardware.tests.extension.light@2.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.tests.extension.light@2.0", - srcs: [ - ":android.hardware.tests.extension.light@2.0_hal", - ], - out: [ - "android/hardware/tests/extension/light/2.0/ALight.h", - ], -} - -cc_library { - name: "android.hardware.tests.extension.light@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.extension.light@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.extension.light@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.extension.light@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.light@2.0", - "android.hardware.tests.extension.light@2.0", - "android.hardware.light@2.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.light@2.0", - "android.hardware.tests.extension.light@2.0", - "android.hardware.light@2.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.extension.light@2.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.tests.extension.light@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.extension.light@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.light@2.0", - "android.hardware.tests.extension.light@2.0", - "android.hardware.tests.extension.light@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.extension.light@2.0-adapter_genc++"], -} diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index 313027094c..986115cbb0 100644 --- a/tests/foo/1.0/Android.bp +++ b/tests/foo/1.0/Android.bp @@ -1,7 +1,8 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.foo@1.0_hal", +hidl_interface { + name: "android.hardware.tests.foo@1.0", + root: "android.hardware", srcs: [ "types.hal", "IFoo.hal", @@ -10,169 +11,15 @@ filegroup { "ISimple.hal", "ITheirTypes.hal", ], -} - -genrule { - name: "android.hardware.tests.foo@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/foo/1.0/types.cpp", - "android/hardware/tests/foo/1.0/FooAll.cpp", - "android/hardware/tests/foo/1.0/FooCallbackAll.cpp", - "android/hardware/tests/foo/1.0/MyTypesAll.cpp", - "android/hardware/tests/foo/1.0/SimpleAll.cpp", - "android/hardware/tests/foo/1.0/TheirTypesAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.foo@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/foo/1.0/types.h", - "android/hardware/tests/foo/1.0/hwtypes.h", - "android/hardware/tests/foo/1.0/IFoo.h", - "android/hardware/tests/foo/1.0/IHwFoo.h", - "android/hardware/tests/foo/1.0/BnHwFoo.h", - "android/hardware/tests/foo/1.0/BpHwFoo.h", - "android/hardware/tests/foo/1.0/BsFoo.h", - "android/hardware/tests/foo/1.0/IFooCallback.h", - "android/hardware/tests/foo/1.0/IHwFooCallback.h", - "android/hardware/tests/foo/1.0/BnHwFooCallback.h", - "android/hardware/tests/foo/1.0/BpHwFooCallback.h", - "android/hardware/tests/foo/1.0/BsFooCallback.h", - "android/hardware/tests/foo/1.0/IMyTypes.h", - "android/hardware/tests/foo/1.0/IHwMyTypes.h", - "android/hardware/tests/foo/1.0/BnHwMyTypes.h", - "android/hardware/tests/foo/1.0/BpHwMyTypes.h", - "android/hardware/tests/foo/1.0/BsMyTypes.h", - "android/hardware/tests/foo/1.0/ISimple.h", - "android/hardware/tests/foo/1.0/IHwSimple.h", - "android/hardware/tests/foo/1.0/BnHwSimple.h", - "android/hardware/tests/foo/1.0/BpHwSimple.h", - "android/hardware/tests/foo/1.0/BsSimple.h", - "android/hardware/tests/foo/1.0/ITheirTypes.h", - "android/hardware/tests/foo/1.0/IHwTheirTypes.h", - "android/hardware/tests/foo/1.0/BnHwTheirTypes.h", - "android/hardware/tests/foo/1.0/BpHwTheirTypes.h", - "android/hardware/tests/foo/1.0/BsTheirTypes.h", - ], -} - -cc_library { - name: "android.hardware.tests.foo@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.foo@1.0_genc++"], - generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + types: [ + "Abc", + "Def", + "Outer", + "Unrelated", ], + gen_java: false, } -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.foo@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.tests.foo@1.0", - srcs: [ - ":android.hardware.tests.foo@1.0_hal", - ], - out: [ - "android/hardware/tests/foo/1.0/AFoo.cpp", - "android/hardware/tests/foo/1.0/AFooCallback.cpp", - "android/hardware/tests/foo/1.0/AMyTypes.cpp", - "android/hardware/tests/foo/1.0/ASimple.cpp", - "android/hardware/tests/foo/1.0/ATheirTypes.cpp", - ], -} - -genrule { - name: "android.hardware.tests.foo@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.tests.foo@1.0", - srcs: [ - ":android.hardware.tests.foo@1.0_hal", - ], - out: [ - "android/hardware/tests/foo/1.0/AFoo.h", - "android/hardware/tests/foo/1.0/AFooCallback.h", - "android/hardware/tests/foo/1.0/AMyTypes.h", - "android/hardware/tests/foo/1.0/ASimple.h", - "android/hardware/tests/foo/1.0/ATheirTypes.h", - ], -} - -cc_library { - name: "android.hardware.tests.foo@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.foo@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.foo@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.foo@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.foo@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.foo@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.foo@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.tests.foo@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.foo@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.foo@1.0", - "android.hardware.tests.foo@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.foo@1.0-adapter_genc++"], -} diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp index 3d5822f054..20334cdd99 100644 --- a/tests/hash/1.0/Android.bp +++ b/tests/hash/1.0/Android.bp @@ -1,159 +1,14 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.hash@1.0_hal", - srcs: [ - "IHash.hal", - ], -} - -genrule { - name: "android.hardware.tests.hash@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/hash/1.0/HashAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.hash@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/hash/1.0/IHash.h", - "android/hardware/tests/hash/1.0/IHwHash.h", - "android/hardware/tests/hash/1.0/BnHwHash.h", - "android/hardware/tests/hash/1.0/BpHwHash.h", - "android/hardware/tests/hash/1.0/BsHash.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.tests.hash@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.hash@1.0_genc++"], - generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tests.hash-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0", - srcs: [ - ":android.hardware.tests.hash@1.0_hal", - ], - out: [ - "android/hardware/tests/hash/V1_0/IHash.java", - ], -} - -java_library { - name: "android.hardware.tests.hash-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tests.hash-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.hash@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.tests.hash@1.0", + root: "android.hardware", srcs: [ - ":android.hardware.tests.hash@1.0_hal", - ], - out: [ - "android/hardware/tests/hash/1.0/AHash.cpp", - ], -} - -genrule { - name: "android.hardware.tests.hash@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.tests.hash@1.0", - srcs: [ - ":android.hardware.tests.hash@1.0_hal", - ], - out: [ - "android/hardware/tests/hash/1.0/AHash.h", - ], -} - -cc_library { - name: "android.hardware.tests.hash@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.hash@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.hash@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.hash@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.hash@1.0", - "android.hidl.base@1.0-adapter-helper", + "IHash.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.hash@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: true, } -genrule { - name: "android.hardware.tests.hash@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.tests.hash@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.hash@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.hash@1.0", - "android.hardware.tests.hash@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.hash@1.0-adapter_genc++"], -} diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp index 6b8c27e3d7..1d36d075ab 100644 --- a/tests/inheritance/1.0/Android.bp +++ b/tests/inheritance/1.0/Android.bp @@ -1,189 +1,17 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.inheritance@1.0_hal", +hidl_interface { + name: "android.hardware.tests.inheritance@1.0", + root: "android.hardware", srcs: [ "IChild.hal", "IFetcher.hal", "IGrandparent.hal", "IParent.hal", ], -} - -genrule { - name: "android.hardware.tests.inheritance@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/inheritance/1.0/ChildAll.cpp", - "android/hardware/tests/inheritance/1.0/FetcherAll.cpp", - "android/hardware/tests/inheritance/1.0/GrandparentAll.cpp", - "android/hardware/tests/inheritance/1.0/ParentAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.inheritance@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/inheritance/1.0/IChild.h", - "android/hardware/tests/inheritance/1.0/IHwChild.h", - "android/hardware/tests/inheritance/1.0/BnHwChild.h", - "android/hardware/tests/inheritance/1.0/BpHwChild.h", - "android/hardware/tests/inheritance/1.0/BsChild.h", - "android/hardware/tests/inheritance/1.0/IFetcher.h", - "android/hardware/tests/inheritance/1.0/IHwFetcher.h", - "android/hardware/tests/inheritance/1.0/BnHwFetcher.h", - "android/hardware/tests/inheritance/1.0/BpHwFetcher.h", - "android/hardware/tests/inheritance/1.0/BsFetcher.h", - "android/hardware/tests/inheritance/1.0/IGrandparent.h", - "android/hardware/tests/inheritance/1.0/IHwGrandparent.h", - "android/hardware/tests/inheritance/1.0/BnHwGrandparent.h", - "android/hardware/tests/inheritance/1.0/BpHwGrandparent.h", - "android/hardware/tests/inheritance/1.0/BsGrandparent.h", - "android/hardware/tests/inheritance/1.0/IParent.h", - "android/hardware/tests/inheritance/1.0/IHwParent.h", - "android/hardware/tests/inheritance/1.0/BnHwParent.h", - "android/hardware/tests/inheritance/1.0/BpHwParent.h", - "android/hardware/tests/inheritance/1.0/BsParent.h", - ], -} - -cc_library { - name: "android.hardware.tests.inheritance@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.inheritance@1.0_genc++"], - generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tests.inheritance-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0", - srcs: [ - ":android.hardware.tests.inheritance@1.0_hal", - ], - out: [ - "android/hardware/tests/inheritance/V1_0/IChild.java", - "android/hardware/tests/inheritance/V1_0/IFetcher.java", - "android/hardware/tests/inheritance/V1_0/IGrandparent.java", - "android/hardware/tests/inheritance/V1_0/IParent.java", - ], -} - -java_library { - name: "android.hardware.tests.inheritance-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tests.inheritance-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.inheritance@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.tests.inheritance@1.0", - srcs: [ - ":android.hardware.tests.inheritance@1.0_hal", - ], - out: [ - "android/hardware/tests/inheritance/1.0/AChild.cpp", - "android/hardware/tests/inheritance/1.0/AFetcher.cpp", - "android/hardware/tests/inheritance/1.0/AGrandparent.cpp", - "android/hardware/tests/inheritance/1.0/AParent.cpp", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: true, } -genrule { - name: "android.hardware.tests.inheritance@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.tests.inheritance@1.0", - srcs: [ - ":android.hardware.tests.inheritance@1.0_hal", - ], - out: [ - "android/hardware/tests/inheritance/1.0/AChild.h", - "android/hardware/tests/inheritance/1.0/AFetcher.h", - "android/hardware/tests/inheritance/1.0/AGrandparent.h", - "android/hardware/tests/inheritance/1.0/AParent.h", - ], -} - -cc_library { - name: "android.hardware.tests.inheritance@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.inheritance@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.inheritance@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.inheritance@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.inheritance@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.inheritance@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.inheritance@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.tests.inheritance@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.inheritance@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.inheritance@1.0", - "android.hardware.tests.inheritance@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.inheritance@1.0-adapter_genc++"], -} diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp index 0aff0e9036..d561002429 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -1,169 +1,15 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.libhwbinder@1.0_hal", +hidl_interface { + name: "android.hardware.tests.libhwbinder@1.0", + root: "android.hardware", srcs: [ "IBenchmark.hal", "IScheduleTest.hal", ], -} - -genrule { - name: "android.hardware.tests.libhwbinder@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/libhwbinder/1.0/BenchmarkAll.cpp", - "android/hardware/tests/libhwbinder/1.0/ScheduleTestAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.libhwbinder@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/libhwbinder/1.0/IBenchmark.h", - "android/hardware/tests/libhwbinder/1.0/IHwBenchmark.h", - "android/hardware/tests/libhwbinder/1.0/BnHwBenchmark.h", - "android/hardware/tests/libhwbinder/1.0/BpHwBenchmark.h", - "android/hardware/tests/libhwbinder/1.0/BsBenchmark.h", - "android/hardware/tests/libhwbinder/1.0/IScheduleTest.h", - "android/hardware/tests/libhwbinder/1.0/IHwScheduleTest.h", - "android/hardware/tests/libhwbinder/1.0/BnHwScheduleTest.h", - "android/hardware/tests/libhwbinder/1.0/BpHwScheduleTest.h", - "android/hardware/tests/libhwbinder/1.0/BsScheduleTest.h", - ], -} - -cc_library { - name: "android.hardware.tests.libhwbinder@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.libhwbinder@1.0_genc++"], - generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tests.libhwbinder-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0", - srcs: [ - ":android.hardware.tests.libhwbinder@1.0_hal", - ], - out: [ - "android/hardware/tests/libhwbinder/V1_0/IBenchmark.java", - "android/hardware/tests/libhwbinder/V1_0/IScheduleTest.java", - ], -} - -java_library { - name: "android.hardware.tests.libhwbinder-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tests.libhwbinder-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.libhwbinder@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.tests.libhwbinder@1.0", - srcs: [ - ":android.hardware.tests.libhwbinder@1.0_hal", - ], - out: [ - "android/hardware/tests/libhwbinder/1.0/ABenchmark.cpp", - "android/hardware/tests/libhwbinder/1.0/AScheduleTest.cpp", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: true, } -genrule { - name: "android.hardware.tests.libhwbinder@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.tests.libhwbinder@1.0", - srcs: [ - ":android.hardware.tests.libhwbinder@1.0_hal", - ], - out: [ - "android/hardware/tests/libhwbinder/1.0/ABenchmark.h", - "android/hardware/tests/libhwbinder/1.0/AScheduleTest.h", - ], -} - -cc_library { - name: "android.hardware.tests.libhwbinder@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.libhwbinder@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.libhwbinder@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.libhwbinder@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.libhwbinder@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.libhwbinder@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.libhwbinder@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.tests.libhwbinder@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.libhwbinder@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.libhwbinder@1.0", - "android.hardware.tests.libhwbinder@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.libhwbinder@1.0-adapter_genc++"], -} diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index 0af8b656dd..cd97fe4893 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp @@ -1,138 +1,14 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.memory@1.0_hal", - srcs: [ - "IMemoryTest.hal", - ], -} - -genrule { - name: "android.hardware.tests.memory@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/memory/1.0/MemoryTestAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.memory@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/memory/1.0/IMemoryTest.h", - "android/hardware/tests/memory/1.0/IHwMemoryTest.h", - "android/hardware/tests/memory/1.0/BnHwMemoryTest.h", - "android/hardware/tests/memory/1.0/BpHwMemoryTest.h", - "android/hardware/tests/memory/1.0/BsMemoryTest.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.tests.memory@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.memory@1.0_genc++"], - generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.memory@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.tests.memory@1.0", - srcs: [ - ":android.hardware.tests.memory@1.0_hal", - ], - out: [ - "android/hardware/tests/memory/1.0/AMemoryTest.cpp", - ], -} - -genrule { - name: "android.hardware.tests.memory@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.tests.memory@1.0", + root: "android.hardware", srcs: [ - ":android.hardware.tests.memory@1.0_hal", - ], - out: [ - "android/hardware/tests/memory/1.0/AMemoryTest.h", - ], -} - -cc_library { - name: "android.hardware.tests.memory@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.memory@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.memory@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.memory@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.memory@1.0", - "android.hidl.base@1.0-adapter-helper", + "IMemoryTest.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.memory@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.tests.memory@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.tests.memory@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.memory@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.memory@1.0", - "android.hardware.tests.memory@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.memory@1.0-adapter_genc++"], -} diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp index c30553df56..2d8d565a5f 100644 --- a/tests/msgq/1.0/Android.bp +++ b/tests/msgq/1.0/Android.bp @@ -1,147 +1,15 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.msgq@1.0_hal", +hidl_interface { + name: "android.hardware.tests.msgq@1.0", + root: "android.hardware", srcs: [ "IBenchmarkMsgQ.hal", "ITestMsgQ.hal", ], -} - -genrule { - name: "android.hardware.tests.msgq@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/msgq/1.0/BenchmarkMsgQAll.cpp", - "android/hardware/tests/msgq/1.0/TestMsgQAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.msgq@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/msgq/1.0/IBenchmarkMsgQ.h", - "android/hardware/tests/msgq/1.0/IHwBenchmarkMsgQ.h", - "android/hardware/tests/msgq/1.0/BnHwBenchmarkMsgQ.h", - "android/hardware/tests/msgq/1.0/BpHwBenchmarkMsgQ.h", - "android/hardware/tests/msgq/1.0/BsBenchmarkMsgQ.h", - "android/hardware/tests/msgq/1.0/ITestMsgQ.h", - "android/hardware/tests/msgq/1.0/IHwTestMsgQ.h", - "android/hardware/tests/msgq/1.0/BnHwTestMsgQ.h", - "android/hardware/tests/msgq/1.0/BpHwTestMsgQ.h", - "android/hardware/tests/msgq/1.0/BsTestMsgQ.h", - ], -} - -cc_library { - name: "android.hardware.tests.msgq@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.msgq@1.0_genc++"], - generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.msgq@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.tests.msgq@1.0", - srcs: [ - ":android.hardware.tests.msgq@1.0_hal", - ], - out: [ - "android/hardware/tests/msgq/1.0/ABenchmarkMsgQ.cpp", - "android/hardware/tests/msgq/1.0/ATestMsgQ.cpp", - ], -} - -genrule { - name: "android.hardware.tests.msgq@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.tests.msgq@1.0", - srcs: [ - ":android.hardware.tests.msgq@1.0_hal", - ], - out: [ - "android/hardware/tests/msgq/1.0/ABenchmarkMsgQ.h", - "android/hardware/tests/msgq/1.0/ATestMsgQ.h", - ], -} - -cc_library { - name: "android.hardware.tests.msgq@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.msgq@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.msgq@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.msgq@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.msgq@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.msgq@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.tests.msgq@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.tests.msgq@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.msgq@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.msgq@1.0", - "android.hardware.tests.msgq@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.msgq@1.0-adapter_genc++"], -} diff --git a/tests/multithread/1.0/Android.bp b/tests/multithread/1.0/Android.bp index cebf90e59f..0d21b1b1dd 100644 --- a/tests/multithread/1.0/Android.bp +++ b/tests/multithread/1.0/Android.bp @@ -1,159 +1,14 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.multithread@1.0_hal", - srcs: [ - "IMultithread.hal", - ], -} - -genrule { - name: "android.hardware.tests.multithread@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.multithread@1.0", - srcs: [ - ":android.hardware.tests.multithread@1.0_hal", - ], - out: [ - "android/hardware/tests/multithread/1.0/MultithreadAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.multithread@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.multithread@1.0", - srcs: [ - ":android.hardware.tests.multithread@1.0_hal", - ], - out: [ - "android/hardware/tests/multithread/1.0/IMultithread.h", - "android/hardware/tests/multithread/1.0/IHwMultithread.h", - "android/hardware/tests/multithread/1.0/BnHwMultithread.h", - "android/hardware/tests/multithread/1.0/BpHwMultithread.h", - "android/hardware/tests/multithread/1.0/BsMultithread.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.tests.multithread@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.multithread@1.0_genc++"], - generated_headers: ["android.hardware.tests.multithread@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.multithread@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tests.multithread-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.multithread@1.0", - srcs: [ - ":android.hardware.tests.multithread@1.0_hal", - ], - out: [ - "android/hardware/tests/multithread/V1_0/IMultithread.java", - ], -} - -java_library { - name: "android.hardware.tests.multithread-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tests.multithread-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.multithread@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.tests.multithread@1.0", + root: "android.hardware", srcs: [ - ":android.hardware.tests.multithread@1.0_hal", - ], - out: [ - "android/hardware/tests/multithread/1.0/AMultithread.cpp", - ], -} - -genrule { - name: "android.hardware.tests.multithread@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.tests.multithread@1.0", - srcs: [ - ":android.hardware.tests.multithread@1.0_hal", - ], - out: [ - "android/hardware/tests/multithread/1.0/AMultithread.h", - ], -} - -cc_library { - name: "android.hardware.tests.multithread@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.multithread@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.multithread@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.multithread@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.multithread@1.0", - "android.hidl.base@1.0-adapter-helper", + "IMultithread.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.multithread@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: true, } -genrule { - name: "android.hardware.tests.multithread@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.tests.multithread@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.multithread@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.multithread@1.0", - "android.hardware.tests.multithread@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.multithread@1.0-adapter_genc++"], -} diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp index 34cbaa9244..3dc8e8a949 100644 --- a/tests/pointer/1.0/Android.bp +++ b/tests/pointer/1.0/Android.bp @@ -1,147 +1,15 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.pointer@1.0_hal", +hidl_interface { + name: "android.hardware.tests.pointer@1.0", + root: "android.hardware", srcs: [ "IGraph.hal", "IPointer.hal", ], -} - -genrule { - name: "android.hardware.tests.pointer@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/pointer/1.0/GraphAll.cpp", - "android/hardware/tests/pointer/1.0/PointerAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.pointer@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tests/pointer/1.0/IGraph.h", - "android/hardware/tests/pointer/1.0/IHwGraph.h", - "android/hardware/tests/pointer/1.0/BnHwGraph.h", - "android/hardware/tests/pointer/1.0/BpHwGraph.h", - "android/hardware/tests/pointer/1.0/BsGraph.h", - "android/hardware/tests/pointer/1.0/IPointer.h", - "android/hardware/tests/pointer/1.0/IHwPointer.h", - "android/hardware/tests/pointer/1.0/BnHwPointer.h", - "android/hardware/tests/pointer/1.0/BpHwPointer.h", - "android/hardware/tests/pointer/1.0/BsPointer.h", - ], -} - -cc_library { - name: "android.hardware.tests.pointer@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.pointer@1.0_genc++"], - generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.pointer@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.tests.pointer@1.0", - srcs: [ - ":android.hardware.tests.pointer@1.0_hal", - ], - out: [ - "android/hardware/tests/pointer/1.0/AGraph.cpp", - "android/hardware/tests/pointer/1.0/APointer.cpp", - ], -} - -genrule { - name: "android.hardware.tests.pointer@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.tests.pointer@1.0", - srcs: [ - ":android.hardware.tests.pointer@1.0_hal", - ], - out: [ - "android/hardware/tests/pointer/1.0/AGraph.h", - "android/hardware/tests/pointer/1.0/APointer.h", - ], -} - -cc_library { - name: "android.hardware.tests.pointer@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.pointer@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.pointer@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.pointer@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.pointer@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.pointer@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.tests.pointer@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.tests.pointer@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.pointer@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.pointer@1.0", - "android.hardware.tests.pointer@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.pointer@1.0-adapter_genc++"], -} diff --git a/tests/trie/1.0/Android.bp b/tests/trie/1.0/Android.bp index be45d12b9b..870a350f34 100644 --- a/tests/trie/1.0/Android.bp +++ b/tests/trie/1.0/Android.bp @@ -1,142 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tests.trie@1.0_hal", +hidl_interface { + name: "android.hardware.tests.trie@1.0", + root: "android.hardware", srcs: [ "types.hal", "ITrie.hal", ], -} - -genrule { - name: "android.hardware.tests.trie@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.trie@1.0", - srcs: [ - ":android.hardware.tests.trie@1.0_hal", - ], - out: [ - "android/hardware/tests/trie/1.0/types.cpp", - "android/hardware/tests/trie/1.0/TrieAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.trie@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.trie@1.0", - srcs: [ - ":android.hardware.tests.trie@1.0_hal", - ], - out: [ - "android/hardware/tests/trie/1.0/types.h", - "android/hardware/tests/trie/1.0/hwtypes.h", - "android/hardware/tests/trie/1.0/ITrie.h", - "android/hardware/tests/trie/1.0/IHwTrie.h", - "android/hardware/tests/trie/1.0/BnHwTrie.h", - "android/hardware/tests/trie/1.0/BpHwTrie.h", - "android/hardware/tests/trie/1.0/BsTrie.h", - ], -} - -cc_library { - name: "android.hardware.tests.trie@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.trie@1.0_genc++"], - generated_headers: ["android.hardware.tests.trie@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.trie@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + types: [ + "A", + "B", + "E1", + "E2", + "S", + "TrieEdge", + "TrieNode", ], + gen_java: false, } -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tests.trie@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.tests.trie@1.0", - srcs: [ - ":android.hardware.tests.trie@1.0_hal", - ], - out: [ - "android/hardware/tests/trie/1.0/ATrie.cpp", - ], -} - -genrule { - name: "android.hardware.tests.trie@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.tests.trie@1.0", - srcs: [ - ":android.hardware.tests.trie@1.0_hal", - ], - out: [ - "android/hardware/tests/trie/1.0/ATrie.h", - ], -} - -cc_library { - name: "android.hardware.tests.trie@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.trie@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tests.trie@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tests.trie@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tests.trie@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tests.trie@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tests.trie@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.tests.trie@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tests.trie@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tests.trie@1.0", - "android.hardware.tests.trie@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tests.trie@1.0-adapter_genc++"], -} diff --git a/tetheroffload/config/1.0/Android.bp b/tetheroffload/config/1.0/Android.bp index e299ed2d85..9d0dc5fb5d 100644 --- a/tetheroffload/config/1.0/Android.bp +++ b/tetheroffload/config/1.0/Android.bp @@ -1,141 +1,17 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tetheroffload.config@1.0_hal", - srcs: [ - "IOffloadConfig.hal", - ], -} - -genrule { - name: "android.hardware.tetheroffload.config@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tetheroffload/config/1.0/OffloadConfigAll.cpp", - ], -} - -genrule { - name: "android.hardware.tetheroffload.config@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tetheroffload/config/1.0/IOffloadConfig.h", - "android/hardware/tetheroffload/config/1.0/IHwOffloadConfig.h", - "android/hardware/tetheroffload/config/1.0/BnHwOffloadConfig.h", - "android/hardware/tetheroffload/config/1.0/BpHwOffloadConfig.h", - "android/hardware/tetheroffload/config/1.0/BsOffloadConfig.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.tetheroffload.config@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tetheroffload.config@1.0_genc++"], - generated_headers: ["android.hardware.tetheroffload.config@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tetheroffload.config@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tetheroffload.config@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.tetheroffload.config@1.0", - srcs: [ - ":android.hardware.tetheroffload.config@1.0_hal", - ], - out: [ - "android/hardware/tetheroffload/config/1.0/AOffloadConfig.cpp", - ], -} - -genrule { - name: "android.hardware.tetheroffload.config@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.tetheroffload.config@1.0", srcs: [ - ":android.hardware.tetheroffload.config@1.0_hal", - ], - out: [ - "android/hardware/tetheroffload/config/1.0/AOffloadConfig.h", - ], -} - -cc_library { - name: "android.hardware.tetheroffload.config@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tetheroffload.config@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tetheroffload.config@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tetheroffload.config@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tetheroffload.config@1.0", - "android.hidl.base@1.0-adapter-helper", + "IOffloadConfig.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tetheroffload.config@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.tetheroffload.config@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.tetheroffload.config@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tetheroffload.config@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tetheroffload.config@1.0", - "android.hardware.tetheroffload.config@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tetheroffload.config@1.0-adapter_genc++"], -} diff --git a/tetheroffload/control/1.0/Android.bp b/tetheroffload/control/1.0/Android.bp index f9ea7e0166..8e3fd2729f 100644 --- a/tetheroffload/control/1.0/Android.bp +++ b/tetheroffload/control/1.0/Android.bp @@ -1,180 +1,25 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tetheroffload.control@1.0_hal", - srcs: [ - "types.hal", - "IOffloadControl.hal", - "ITetheringOffloadCallback.hal", - ], -} - -genrule { - name: "android.hardware.tetheroffload.control@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tetheroffload/control/1.0/types.cpp", - "android/hardware/tetheroffload/control/1.0/OffloadControlAll.cpp", - "android/hardware/tetheroffload/control/1.0/TetheringOffloadCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.tetheroffload.control@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/tetheroffload/control/1.0/types.h", - "android/hardware/tetheroffload/control/1.0/hwtypes.h", - "android/hardware/tetheroffload/control/1.0/IOffloadControl.h", - "android/hardware/tetheroffload/control/1.0/IHwOffloadControl.h", - "android/hardware/tetheroffload/control/1.0/BnHwOffloadControl.h", - "android/hardware/tetheroffload/control/1.0/BpHwOffloadControl.h", - "android/hardware/tetheroffload/control/1.0/BsOffloadControl.h", - "android/hardware/tetheroffload/control/1.0/ITetheringOffloadCallback.h", - "android/hardware/tetheroffload/control/1.0/IHwTetheringOffloadCallback.h", - "android/hardware/tetheroffload/control/1.0/BnHwTetheringOffloadCallback.h", - "android/hardware/tetheroffload/control/1.0/BpHwTetheringOffloadCallback.h", - "android/hardware/tetheroffload/control/1.0/BsTetheringOffloadCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.tetheroffload.control@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tetheroffload.control@1.0_genc++"], - generated_headers: ["android.hardware.tetheroffload.control@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tetheroffload.control@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tetheroffload.control-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0", srcs: [ - ":android.hardware.tetheroffload.control@1.0_hal", - ], - out: [ - "android/hardware/tetheroffload/control/V1_0/IPv4AddrPortPair.java", - "android/hardware/tetheroffload/control/V1_0/NatTimeoutUpdate.java", - "android/hardware/tetheroffload/control/V1_0/NetworkProtocol.java", - "android/hardware/tetheroffload/control/V1_0/OffloadCallbackEvent.java", - "android/hardware/tetheroffload/control/V1_0/IOffloadControl.java", - "android/hardware/tetheroffload/control/V1_0/ITetheringOffloadCallback.java", - ], -} - -java_library { - name: "android.hardware.tetheroffload.control-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tetheroffload.control-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tetheroffload.control@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.tetheroffload.control@1.0", - srcs: [ - ":android.hardware.tetheroffload.control@1.0_hal", - ], - out: [ - "android/hardware/tetheroffload/control/1.0/AOffloadControl.cpp", - "android/hardware/tetheroffload/control/1.0/ATetheringOffloadCallback.cpp", - ], -} - -genrule { - name: "android.hardware.tetheroffload.control@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.tetheroffload.control@1.0", - srcs: [ - ":android.hardware.tetheroffload.control@1.0_hal", + "types.hal", + "IOffloadControl.hal", + "ITetheringOffloadCallback.hal", ], - out: [ - "android/hardware/tetheroffload/control/1.0/AOffloadControl.h", - "android/hardware/tetheroffload/control/1.0/ATetheringOffloadCallback.h", + interfaces: [ + "android.hidl.base@1.0", ], -} - -cc_library { - name: "android.hardware.tetheroffload.control@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tetheroffload.control@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tetheroffload.control@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tetheroffload.control@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tetheroffload.control@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "IPv4AddrPortPair", + "NatTimeoutUpdate", + "NetworkProtocol", + "OffloadCallbackEvent", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tetheroffload.control@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tetheroffload.control@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.tetheroffload.control@1.0", - out: ["main.cpp"] + gen_java: true, } -cc_test { - name: "android.hardware.tetheroffload.control@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tetheroffload.control@1.0", - "android.hardware.tetheroffload.control@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tetheroffload.control@1.0-adapter_genc++"], -} diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp index 43a0f68cfe..e764e2843d 100644 --- a/thermal/1.0/Android.bp +++ b/thermal/1.0/Android.bp @@ -1,189 +1,28 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.thermal@1.0_hal", - srcs: [ - "types.hal", - "IThermal.hal", - ], -} - -genrule { - name: "android.hardware.thermal@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", - srcs: [ - ":android.hardware.thermal@1.0_hal", - ], - out: [ - "android/hardware/thermal/1.0/types.cpp", - "android/hardware/thermal/1.0/ThermalAll.cpp", - ], -} - -genrule { - name: "android.hardware.thermal@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", - srcs: [ - ":android.hardware.thermal@1.0_hal", - ], - out: [ - "android/hardware/thermal/1.0/types.h", - "android/hardware/thermal/1.0/hwtypes.h", - "android/hardware/thermal/1.0/IThermal.h", - "android/hardware/thermal/1.0/IHwThermal.h", - "android/hardware/thermal/1.0/BnHwThermal.h", - "android/hardware/thermal/1.0/BpHwThermal.h", - "android/hardware/thermal/1.0/BsThermal.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.thermal@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.thermal@1.0_genc++"], - generated_headers: ["android.hardware.thermal@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.thermal@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.thermal-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", - srcs: [ - ":android.hardware.thermal@1.0_hal", - ], - out: [ - "android/hardware/thermal/V1_0/CoolingDevice.java", - "android/hardware/thermal/V1_0/CoolingType.java", - "android/hardware/thermal/V1_0/CpuUsage.java", - "android/hardware/thermal/V1_0/Temperature.java", - "android/hardware/thermal/V1_0/TemperatureType.java", - "android/hardware/thermal/V1_0/ThermalStatus.java", - "android/hardware/thermal/V1_0/ThermalStatusCode.java", - "android/hardware/thermal/V1_0/IThermal.java", - ], -} - -java_library { - name: "android.hardware.thermal-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.thermal-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.thermal-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0", - srcs: [ - ":android.hardware.thermal@1.0_hal", - ], - out: [ - "android/hardware/thermal/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.thermal-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.thermal-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.thermal@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.thermal@1.0", - srcs: [ - ":android.hardware.thermal@1.0_hal", - ], - out: [ - "android/hardware/thermal/1.0/AThermal.cpp", - ], -} - -genrule { - name: "android.hardware.thermal@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.thermal@1.0", srcs: [ - ":android.hardware.thermal@1.0_hal", - ], - out: [ - "android/hardware/thermal/1.0/AThermal.h", + "types.hal", + "IThermal.hal", ], -} - -cc_library { - name: "android.hardware.thermal@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.thermal@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.thermal@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.thermal@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.thermal@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.thermal@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "CoolingDevice", + "CoolingType", + "CpuUsage", + "Temperature", + "TemperatureType", + "ThermalStatus", + "ThermalStatusCode", ], + gen_java: true, + gen_java_constants: true, } -genrule { - name: "android.hardware.thermal@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.thermal@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.thermal@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.thermal@1.0", - "android.hardware.thermal@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.thermal@1.0-adapter_genc++"], -} diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp index 8c538c5c6a..2aa155e8fc 100644 --- a/tv/cec/1.0/Android.bp +++ b/tv/cec/1.0/Android.bp @@ -1,188 +1,33 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tv.cec@1.0_hal", - srcs: [ - "types.hal", - "IHdmiCec.hal", - "IHdmiCecCallback.hal", - ], -} - -genrule { - name: "android.hardware.tv.cec@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", - srcs: [ - ":android.hardware.tv.cec@1.0_hal", - ], - out: [ - "android/hardware/tv/cec/1.0/types.cpp", - "android/hardware/tv/cec/1.0/HdmiCecAll.cpp", - "android/hardware/tv/cec/1.0/HdmiCecCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.tv.cec@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", - srcs: [ - ":android.hardware.tv.cec@1.0_hal", - ], - out: [ - "android/hardware/tv/cec/1.0/types.h", - "android/hardware/tv/cec/1.0/hwtypes.h", - "android/hardware/tv/cec/1.0/IHdmiCec.h", - "android/hardware/tv/cec/1.0/IHwHdmiCec.h", - "android/hardware/tv/cec/1.0/BnHwHdmiCec.h", - "android/hardware/tv/cec/1.0/BpHwHdmiCec.h", - "android/hardware/tv/cec/1.0/BsHdmiCec.h", - "android/hardware/tv/cec/1.0/IHdmiCecCallback.h", - "android/hardware/tv/cec/1.0/IHwHdmiCecCallback.h", - "android/hardware/tv/cec/1.0/BnHwHdmiCecCallback.h", - "android/hardware/tv/cec/1.0/BpHwHdmiCecCallback.h", - "android/hardware/tv/cec/1.0/BsHdmiCecCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.tv.cec@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tv.cec@1.0_genc++"], - generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.tv.cec-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", srcs: [ - ":android.hardware.tv.cec@1.0_hal", - ], - out: [ - "android/hardware/tv/cec/V1_0/AbortReason.java", - "android/hardware/tv/cec/V1_0/CecDeviceType.java", - "android/hardware/tv/cec/V1_0/CecLogicalAddress.java", - "android/hardware/tv/cec/V1_0/CecMessage.java", - "android/hardware/tv/cec/V1_0/CecMessageType.java", - "android/hardware/tv/cec/V1_0/HdmiPortInfo.java", - "android/hardware/tv/cec/V1_0/HdmiPortType.java", - "android/hardware/tv/cec/V1_0/HotplugEvent.java", - "android/hardware/tv/cec/V1_0/MaxLength.java", - "android/hardware/tv/cec/V1_0/OptionKey.java", - "android/hardware/tv/cec/V1_0/Result.java", - "android/hardware/tv/cec/V1_0/SendMessageResult.java", - "android/hardware/tv/cec/V1_0/IHdmiCec.java", - "android/hardware/tv/cec/V1_0/IHdmiCecCallback.java", - ], -} - -java_library { - name: "android.hardware.tv.cec-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tv.cec-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.tv.cec@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.tv.cec@1.0", - srcs: [ - ":android.hardware.tv.cec@1.0_hal", - ], - out: [ - "android/hardware/tv/cec/1.0/AHdmiCec.cpp", - "android/hardware/tv/cec/1.0/AHdmiCecCallback.cpp", - ], -} - -genrule { - name: "android.hardware.tv.cec@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.tv.cec@1.0", - srcs: [ - ":android.hardware.tv.cec@1.0_hal", + "types.hal", + "IHdmiCec.hal", + "IHdmiCecCallback.hal", ], - out: [ - "android/hardware/tv/cec/1.0/AHdmiCec.h", - "android/hardware/tv/cec/1.0/AHdmiCecCallback.h", + interfaces: [ + "android.hidl.base@1.0", ], -} - -cc_library { - name: "android.hardware.tv.cec@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tv.cec@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tv.cec@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tv.cec@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.tv.cec@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "AbortReason", + "CecDeviceType", + "CecLogicalAddress", + "CecMessage", + "CecMessageType", + "HdmiPortInfo", + "HdmiPortType", + "HotplugEvent", + "MaxLength", + "OptionKey", + "Result", + "SendMessageResult", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.tv.cec@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.tv.cec@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.tv.cec@1.0", - out: ["main.cpp"] + gen_java: true, } -cc_test { - name: "android.hardware.tv.cec@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.tv.cec@1.0", - "android.hardware.tv.cec@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tv.cec@1.0-adapter_genc++"], -} diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp index 3ec81e8896..1bf39306d5 100644 --- a/tv/input/1.0/Android.bp +++ b/tv/input/1.0/Android.bp @@ -1,175 +1,30 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.tv.input@1.0_hal", - srcs: [ - "types.hal", - "ITvInput.hal", - "ITvInputCallback.hal", - ], -} - -genrule { - name: "android.hardware.tv.input@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", - srcs: [ - ":android.hardware.tv.input@1.0_hal", - ], - out: [ - "android/hardware/tv/input/1.0/types.cpp", - "android/hardware/tv/input/1.0/TvInputAll.cpp", - "android/hardware/tv/input/1.0/TvInputCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.tv.input@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", - srcs: [ - ":android.hardware.tv.input@1.0_hal", - ], - out: [ - "android/hardware/tv/input/1.0/types.h", - "android/hardware/tv/input/1.0/hwtypes.h", - "android/hardware/tv/input/1.0/ITvInput.h", - "android/hardware/tv/input/1.0/IHwTvInput.h", - "android/hardware/tv/input/1.0/BnHwTvInput.h", - "android/hardware/tv/input/1.0/BpHwTvInput.h", - "android/hardware/tv/input/1.0/BsTvInput.h", - "android/hardware/tv/input/1.0/ITvInputCallback.h", - "android/hardware/tv/input/1.0/IHwTvInputCallback.h", - "android/hardware/tv/input/1.0/BnHwTvInputCallback.h", - "android/hardware/tv/input/1.0/BpHwTvInputCallback.h", - "android/hardware/tv/input/1.0/BsTvInputCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.tv.input@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tv.input@1.0_genc++"], - generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.audio.common@2.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.audio.common@2.0", - ], -} - -// This package is not java compatible. Not creating java target. - -genrule { - name: "android.hardware.tv.input-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", srcs: [ - ":android.hardware.tv.input@1.0_hal", - ], - out: [ - "android/hardware/tv/input/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.tv.input-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.tv.input-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.tv.input@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.tv.input@1.0", - srcs: [ - ":android.hardware.tv.input@1.0_hal", - ], - out: [ - "android/hardware/tv/input/1.0/ATvInput.cpp", - "android/hardware/tv/input/1.0/ATvInputCallback.cpp", - ], -} - -genrule { - name: "android.hardware.tv.input@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.tv.input@1.0", - srcs: [ - ":android.hardware.tv.input@1.0_hal", - ], - out: [ - "android/hardware/tv/input/1.0/ATvInput.h", - "android/hardware/tv/input/1.0/ATvInputCallback.h", + "types.hal", + "ITvInput.hal", + "ITvInputCallback.hal", ], -} - -cc_library { - name: "android.hardware.tv.input@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tv.input@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.tv.input@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.tv.input@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.audio.common@2.0", - "android.hardware.tv.input@1.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.audio.common@2.0", - "android.hardware.tv.input@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "CableConnectionStatus", + "Result", + "TvInputDeviceInfo", + "TvInputEvent", + "TvInputEventType", + "TvInputType", + "TvStreamConfig", ], + gen_java: false, + gen_java_constants: true, } -genrule { - name: "android.hardware.tv.input@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.tv.input@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.tv.input@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.audio.common@2.0", - "android.hardware.tv.input@1.0", - "android.hardware.tv.input@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.tv.input@1.0-adapter_genc++"], -} diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp index f733e36c42..6676fa599e 100644 --- a/usb/1.0/Android.bp +++ b/usb/1.0/Android.bp @@ -1,199 +1,29 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.usb@1.0_hal", - srcs: [ - "types.hal", - "IUsb.hal", - "IUsbCallback.hal", - ], -} - -genrule { - name: "android.hardware.usb@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", - srcs: [ - ":android.hardware.usb@1.0_hal", - ], - out: [ - "android/hardware/usb/1.0/types.cpp", - "android/hardware/usb/1.0/UsbAll.cpp", - "android/hardware/usb/1.0/UsbCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.usb@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", - srcs: [ - ":android.hardware.usb@1.0_hal", - ], - out: [ - "android/hardware/usb/1.0/types.h", - "android/hardware/usb/1.0/hwtypes.h", - "android/hardware/usb/1.0/IUsb.h", - "android/hardware/usb/1.0/IHwUsb.h", - "android/hardware/usb/1.0/BnHwUsb.h", - "android/hardware/usb/1.0/BpHwUsb.h", - "android/hardware/usb/1.0/BsUsb.h", - "android/hardware/usb/1.0/IUsbCallback.h", - "android/hardware/usb/1.0/IHwUsbCallback.h", - "android/hardware/usb/1.0/BnHwUsbCallback.h", - "android/hardware/usb/1.0/BpHwUsbCallback.h", - "android/hardware/usb/1.0/BsUsbCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.usb@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.usb@1.0_genc++"], - generated_headers: ["android.hardware.usb@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.usb@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.usb-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", - srcs: [ - ":android.hardware.usb@1.0_hal", - ], - out: [ - "android/hardware/usb/V1_0/PortDataRole.java", - "android/hardware/usb/V1_0/PortMode.java", - "android/hardware/usb/V1_0/PortPowerRole.java", - "android/hardware/usb/V1_0/PortRole.java", - "android/hardware/usb/V1_0/PortRoleType.java", - "android/hardware/usb/V1_0/PortStatus.java", - "android/hardware/usb/V1_0/Status.java", - "android/hardware/usb/V1_0/IUsb.java", - "android/hardware/usb/V1_0/IUsbCallback.java", - ], -} - -java_library { - name: "android.hardware.usb-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.usb-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.usb-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0", srcs: [ - ":android.hardware.usb@1.0_hal", - ], - out: [ - "android/hardware/usb/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.usb-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.usb-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.usb@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.usb@1.0", - srcs: [ - ":android.hardware.usb@1.0_hal", - ], - out: [ - "android/hardware/usb/1.0/AUsb.cpp", - "android/hardware/usb/1.0/AUsbCallback.cpp", - ], -} - -genrule { - name: "android.hardware.usb@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.usb@1.0", - srcs: [ - ":android.hardware.usb@1.0_hal", - ], - out: [ - "android/hardware/usb/1.0/AUsb.h", - "android/hardware/usb/1.0/AUsbCallback.h", + "types.hal", + "IUsb.hal", + "IUsbCallback.hal", ], -} - -cc_library { - name: "android.hardware.usb@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.usb@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.usb@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.usb@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.usb@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.usb@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "PortDataRole", + "PortMode", + "PortPowerRole", + "PortRole", + "PortRoleType", + "PortStatus", + "Status", ], + gen_java: true, + gen_java_constants: true, } -genrule { - name: "android.hardware.usb@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.usb@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.usb@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.usb@1.0", - "android.hardware.usb@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.usb@1.0-adapter_genc++"], -} diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp index 67bc0a6683..c398f94ddc 100644 --- a/usb/1.1/Android.bp +++ b/usb/1.1/Android.bp @@ -1,202 +1,25 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.usb@1.1_hal", - srcs: [ - "types.hal", - "IUsb.hal", - "IUsbCallback.hal", - ], -} - -genrule { - name: "android.hardware.usb@1.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.cpp", - "android/hardware/usb/1.1/UsbAll.cpp", - "android/hardware/usb/1.1/UsbCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.usb@1.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.h", - "android/hardware/usb/1.1/hwtypes.h", - "android/hardware/usb/1.1/IUsb.h", - "android/hardware/usb/1.1/IHwUsb.h", - "android/hardware/usb/1.1/BnHwUsb.h", - "android/hardware/usb/1.1/BpHwUsb.h", - "android/hardware/usb/1.1/BsUsb.h", - "android/hardware/usb/1.1/IUsbCallback.h", - "android/hardware/usb/1.1/IHwUsbCallback.h", - "android/hardware/usb/1.1/BnHwUsbCallback.h", - "android/hardware/usb/1.1/BpHwUsbCallback.h", - "android/hardware/usb/1.1/BsUsbCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.usb@1.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.usb@1.1_genc++"], - generated_headers: ["android.hardware.usb@1.1_genc++_headers"], - export_generated_headers: ["android.hardware.usb@1.1_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.usb@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.usb@1.0", - ], -} - -genrule { - name: "android.hardware.usb-V1.1-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -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/V1_1/PortMode_1_1.java", - "android/hardware/usb/V1_1/PortStatus_1_1.java", - "android/hardware/usb/V1_1/IUsb.java", - "android/hardware/usb/V1_1/IUsbCallback.java", - ], -} - -java_library { - name: "android.hardware.usb-V1.1-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.usb-V1.1-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.usb-V1.0-java", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.usb-V1.1-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -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/V1_1/Constants.java", - ], -} - -java_library { - name: "android.hardware.usb-V1.1-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.usb-V1.1-java-constants_gen_java"], -} - -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", + "types.hal", + "IUsb.hal", + "IUsbCallback.hal", ], -} - -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", + interfaces: [ "android.hardware.usb@1.0", - "android.hardware.usb@1.1", - "android.hardware.usb@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - 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", + types: [ + "PortMode_1_1", + "PortStatus_1_1", ], + gen_java: true, + gen_java_constants: true, } -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", - defaults: ["hidl-module-defaults"], - 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.0/Android.bp b/vibrator/1.0/Android.bp index 9055c5e0ee..6913c88cba 100644 --- a/vibrator/1.0/Android.bp +++ b/vibrator/1.0/Android.bp @@ -1,185 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.vibrator@1.0_hal", - srcs: [ - "types.hal", - "IVibrator.hal", - ], -} - -genrule { - name: "android.hardware.vibrator@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", - srcs: [ - ":android.hardware.vibrator@1.0_hal", - ], - out: [ - "android/hardware/vibrator/1.0/types.cpp", - "android/hardware/vibrator/1.0/VibratorAll.cpp", - ], -} - -genrule { - name: "android.hardware.vibrator@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", - srcs: [ - ":android.hardware.vibrator@1.0_hal", - ], - out: [ - "android/hardware/vibrator/1.0/types.h", - "android/hardware/vibrator/1.0/hwtypes.h", - "android/hardware/vibrator/1.0/IVibrator.h", - "android/hardware/vibrator/1.0/IHwVibrator.h", - "android/hardware/vibrator/1.0/BnHwVibrator.h", - "android/hardware/vibrator/1.0/BpHwVibrator.h", - "android/hardware/vibrator/1.0/BsVibrator.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.vibrator@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.vibrator@1.0_genc++"], - generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.vibrator-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", - srcs: [ - ":android.hardware.vibrator@1.0_hal", - ], - out: [ - "android/hardware/vibrator/V1_0/Effect.java", - "android/hardware/vibrator/V1_0/EffectStrength.java", - "android/hardware/vibrator/V1_0/Status.java", - "android/hardware/vibrator/V1_0/IVibrator.java", - ], -} - -java_library { - name: "android.hardware.vibrator-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.vibrator-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.vibrator-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", - srcs: [ - ":android.hardware.vibrator@1.0_hal", - ], - out: [ - "android/hardware/vibrator/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.vibrator-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.vibrator-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.vibrator@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.vibrator@1.0", - srcs: [ - ":android.hardware.vibrator@1.0_hal", - ], - out: [ - "android/hardware/vibrator/1.0/AVibrator.cpp", - ], -} - -genrule { - name: "android.hardware.vibrator@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.vibrator@1.0", srcs: [ - ":android.hardware.vibrator@1.0_hal", - ], - out: [ - "android/hardware/vibrator/1.0/AVibrator.h", + "types.hal", + "IVibrator.hal", ], -} - -cc_library { - name: "android.hardware.vibrator@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.vibrator@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.vibrator@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.vibrator@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.vibrator@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.vibrator@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Effect", + "EffectStrength", + "Status", ], + gen_java: true, + gen_java_constants: true, } -genrule { - name: "android.hardware.vibrator@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.vibrator@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.vibrator@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.vibrator@1.0", - "android.hardware.vibrator@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.vibrator@1.0-adapter_genc++"], -} diff --git a/vibrator/1.1/Android.bp b/vibrator/1.1/Android.bp index 11985fda6a..810797bd48 100644 --- a/vibrator/1.1/Android.bp +++ b/vibrator/1.1/Android.bp @@ -1,191 +1,23 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.vibrator@1.1_hal", - srcs: [ - "types.hal", - "IVibrator.hal", - ], -} - -genrule { - name: "android.hardware.vibrator@1.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.cpp", - "android/hardware/vibrator/1.1/VibratorAll.cpp", - ], -} - -genrule { - name: "android.hardware.vibrator@1.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.h", - "android/hardware/vibrator/1.1/hwtypes.h", - "android/hardware/vibrator/1.1/IVibrator.h", - "android/hardware/vibrator/1.1/IHwVibrator.h", - "android/hardware/vibrator/1.1/BnHwVibrator.h", - "android/hardware/vibrator/1.1/BpHwVibrator.h", - "android/hardware/vibrator/1.1/BsVibrator.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.vibrator@1.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.vibrator@1.1_genc++"], - generated_headers: ["android.hardware.vibrator@1.1_genc++_headers"], - export_generated_headers: ["android.hardware.vibrator@1.1_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.vibrator@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.vibrator@1.0", - ], -} - -genrule { - name: "android.hardware.vibrator-V1.1-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -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/V1_1/Effect_1_1.java", - "android/hardware/vibrator/V1_1/IVibrator.java", - ], -} - -java_library { - name: "android.hardware.vibrator-V1.1-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.vibrator-V1.1-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.vibrator-V1.0-java", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.vibrator-V1.1-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -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/V1_1/Constants.java", - ], -} - -java_library { - name: "android.hardware.vibrator-V1.1-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.vibrator-V1.1-java-constants_gen_java"], -} - -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", + "types.hal", + "IVibrator.hal", ], -} - -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", + interfaces: [ "android.hardware.vibrator@1.0", - "android.hardware.vibrator@1.1", - "android.hardware.vibrator@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - 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", + types: [ + "Effect_1_1", ], + gen_java: true, + gen_java_constants: true, } -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", - defaults: ["hidl-module-defaults"], - 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/vr/1.0/Android.bp b/vr/1.0/Android.bp index f0a09bf5ae..ca47a6e8be 100644 --- a/vr/1.0/Android.bp +++ b/vr/1.0/Android.bp @@ -1,162 +1,17 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.vr@1.0_hal", - srcs: [ - "IVr.hal", - ], -} - -genrule { - name: "android.hardware.vr@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", - srcs: [ - ":android.hardware.vr@1.0_hal", - ], - out: [ - "android/hardware/vr/1.0/VrAll.cpp", - ], -} - -genrule { - name: "android.hardware.vr@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", - srcs: [ - ":android.hardware.vr@1.0_hal", - ], - out: [ - "android/hardware/vr/1.0/IVr.h", - "android/hardware/vr/1.0/IHwVr.h", - "android/hardware/vr/1.0/BnHwVr.h", - "android/hardware/vr/1.0/BpHwVr.h", - "android/hardware/vr/1.0/BsVr.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.vr@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.vr@1.0_genc++"], - generated_headers: ["android.hardware.vr@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.vr@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.vr-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", - srcs: [ - ":android.hardware.vr@1.0_hal", - ], - out: [ - "android/hardware/vr/V1_0/IVr.java", - ], -} - -java_library { - name: "android.hardware.vr-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.vr-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.vr@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.vr@1.0", srcs: [ - ":android.hardware.vr@1.0_hal", - ], - out: [ - "android/hardware/vr/1.0/AVr.cpp", - ], -} - -genrule { - name: "android.hardware.vr@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.vr@1.0", - srcs: [ - ":android.hardware.vr@1.0_hal", - ], - out: [ - "android/hardware/vr/1.0/AVr.h", - ], -} - -cc_library { - name: "android.hardware.vr@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.vr@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.vr@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.vr@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.vr@1.0", - "android.hidl.base@1.0-adapter-helper", + "IVr.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.vr@1.0", - "android.hidl.base@1.0-adapter-helper", + interfaces: [ + "android.hidl.base@1.0", ], + gen_java: true, } -genrule { - name: "android.hardware.vr@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.vr@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.vr@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.vr@1.0", - "android.hardware.vr@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.vr@1.0-adapter_genc++"], -} diff --git a/weaver/1.0/Android.bp b/weaver/1.0/Android.bp index b7bf1fe551..e088a161a3 100644 --- a/weaver/1.0/Android.bp +++ b/weaver/1.0/Android.bp @@ -1,170 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.weaver@1.0_hal", - srcs: [ - "types.hal", - "IWeaver.hal", - ], -} - -genrule { - name: "android.hardware.weaver@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.cpp", - "android/hardware/weaver/1.0/WeaverAll.cpp", - ], -} - -genrule { - name: "android.hardware.weaver@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.h", - "android/hardware/weaver/1.0/hwtypes.h", - "android/hardware/weaver/1.0/IWeaver.h", - "android/hardware/weaver/1.0/IHwWeaver.h", - "android/hardware/weaver/1.0/BnHwWeaver.h", - "android/hardware/weaver/1.0/BpHwWeaver.h", - "android/hardware/weaver/1.0/BsWeaver.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.weaver@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.weaver@1.0_genc++"], - generated_headers: ["android.hardware.weaver@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.weaver@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.weaver-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -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/V1_0/WeaverConfig.java", - "android/hardware/weaver/V1_0/WeaverReadResponse.java", - "android/hardware/weaver/V1_0/WeaverReadStatus.java", - "android/hardware/weaver/V1_0/WeaverStatus.java", - "android/hardware/weaver/V1_0/IWeaver.java", - ], -} - -java_library { - name: "android.hardware.weaver-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.weaver-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -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", + "types.hal", + "IWeaver.hal", ], -} - -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", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.weaver@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "WeaverConfig", + "WeaverReadResponse", + "WeaverReadStatus", + "WeaverStatus", ], + gen_java: true, } -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", - defaults: ["hidl-module-defaults"], - 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.0/Android.bp b/wifi/1.0/Android.bp index 113b3ea517..096fb6cc5d 100644 --- a/wifi/1.0/Android.bp +++ b/wifi/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.wifi@1.0_hal", +hidl_interface { + name: "android.hardware.wifi@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "IWifi.hal", @@ -18,367 +22,94 @@ filegroup { "IWifiStaIface.hal", "IWifiStaIfaceEventCallback.hal", ], + interfaces: [ + "android.hidl.base@1.0", + ], + types: [ + "IfaceType", + "NanBandIndex", + "NanBandSpecificConfig", + "NanCapabilities", + "NanCipherSuiteType", + "NanClusterEventInd", + "NanClusterEventType", + "NanConfigRequest", + "NanDataPathChannelCfg", + "NanDataPathConfirmInd", + "NanDataPathRequestInd", + "NanDataPathSecurityConfig", + "NanDataPathSecurityType", + "NanDebugConfig", + "NanDiscoveryCommonConfig", + "NanEnableRequest", + "NanFollowupReceivedInd", + "NanInitiateDataPathRequest", + "NanMatchAlg", + "NanMatchInd", + "NanParamSizeLimits", + "NanPublishRequest", + "NanPublishType", + "NanRangingIndication", + "NanRespondToDataPathIndicationRequest", + "NanSrfType", + "NanStatusType", + "NanSubscribeRequest", + "NanSubscribeType", + "NanTransmitFollowupRequest", + "NanTxType", + "RttBw", + "RttCapabilities", + "RttConfig", + "RttLciInformation", + "RttLcrInformation", + "RttMotionPattern", + "RttPeerType", + "RttPreamble", + "RttResponder", + "RttResult", + "RttStatus", + "RttType", + "StaApfPacketFilterCapabilities", + "StaBackgroundScanBucketEventReportSchemeMask", + "StaBackgroundScanBucketParameters", + "StaBackgroundScanCapabilities", + "StaBackgroundScanParameters", + "StaLinkLayerIfacePacketStats", + "StaLinkLayerIfaceStats", + "StaLinkLayerRadioStats", + "StaLinkLayerStats", + "StaRoamingCapabilities", + "StaRoamingConfig", + "StaRoamingState", + "StaScanData", + "StaScanDataFlagMask", + "StaScanLimits", + "StaScanResult", + "WifiBand", + "WifiChannelInfo", + "WifiChannelWidthInMhz", + "WifiDebugHostWakeReasonRxIcmpPacketDetails", + "WifiDebugHostWakeReasonRxMulticastPacketDetails", + "WifiDebugHostWakeReasonRxPacketDetails", + "WifiDebugHostWakeReasonStats", + "WifiDebugPacketFateFrameInfo", + "WifiDebugPacketFateFrameType", + "WifiDebugRingBufferFlags", + "WifiDebugRingBufferStatus", + "WifiDebugRingBufferVerboseLevel", + "WifiDebugRxPacketFate", + "WifiDebugRxPacketFateReport", + "WifiDebugTxPacketFate", + "WifiDebugTxPacketFateReport", + "WifiInformationElement", + "WifiNanStatus", + "WifiRateInfo", + "WifiRateNss", + "WifiRatePreamble", + "WifiStatus", + "WifiStatusCode", + ], + gen_java: true, + gen_java_constants: true, } -genrule { - name: "android.hardware.wifi@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/wifi/1.0/types.cpp", - "android/hardware/wifi/1.0/WifiAll.cpp", - "android/hardware/wifi/1.0/WifiApIfaceAll.cpp", - "android/hardware/wifi/1.0/WifiChipAll.cpp", - "android/hardware/wifi/1.0/WifiChipEventCallbackAll.cpp", - "android/hardware/wifi/1.0/WifiEventCallbackAll.cpp", - "android/hardware/wifi/1.0/WifiIfaceAll.cpp", - "android/hardware/wifi/1.0/WifiNanIfaceAll.cpp", - "android/hardware/wifi/1.0/WifiNanIfaceEventCallbackAll.cpp", - "android/hardware/wifi/1.0/WifiP2pIfaceAll.cpp", - "android/hardware/wifi/1.0/WifiRttControllerAll.cpp", - "android/hardware/wifi/1.0/WifiRttControllerEventCallbackAll.cpp", - "android/hardware/wifi/1.0/WifiStaIfaceAll.cpp", - "android/hardware/wifi/1.0/WifiStaIfaceEventCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.wifi@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/wifi/1.0/types.h", - "android/hardware/wifi/1.0/hwtypes.h", - "android/hardware/wifi/1.0/IWifi.h", - "android/hardware/wifi/1.0/IHwWifi.h", - "android/hardware/wifi/1.0/BnHwWifi.h", - "android/hardware/wifi/1.0/BpHwWifi.h", - "android/hardware/wifi/1.0/BsWifi.h", - "android/hardware/wifi/1.0/IWifiApIface.h", - "android/hardware/wifi/1.0/IHwWifiApIface.h", - "android/hardware/wifi/1.0/BnHwWifiApIface.h", - "android/hardware/wifi/1.0/BpHwWifiApIface.h", - "android/hardware/wifi/1.0/BsWifiApIface.h", - "android/hardware/wifi/1.0/IWifiChip.h", - "android/hardware/wifi/1.0/IHwWifiChip.h", - "android/hardware/wifi/1.0/BnHwWifiChip.h", - "android/hardware/wifi/1.0/BpHwWifiChip.h", - "android/hardware/wifi/1.0/BsWifiChip.h", - "android/hardware/wifi/1.0/IWifiChipEventCallback.h", - "android/hardware/wifi/1.0/IHwWifiChipEventCallback.h", - "android/hardware/wifi/1.0/BnHwWifiChipEventCallback.h", - "android/hardware/wifi/1.0/BpHwWifiChipEventCallback.h", - "android/hardware/wifi/1.0/BsWifiChipEventCallback.h", - "android/hardware/wifi/1.0/IWifiEventCallback.h", - "android/hardware/wifi/1.0/IHwWifiEventCallback.h", - "android/hardware/wifi/1.0/BnHwWifiEventCallback.h", - "android/hardware/wifi/1.0/BpHwWifiEventCallback.h", - "android/hardware/wifi/1.0/BsWifiEventCallback.h", - "android/hardware/wifi/1.0/IWifiIface.h", - "android/hardware/wifi/1.0/IHwWifiIface.h", - "android/hardware/wifi/1.0/BnHwWifiIface.h", - "android/hardware/wifi/1.0/BpHwWifiIface.h", - "android/hardware/wifi/1.0/BsWifiIface.h", - "android/hardware/wifi/1.0/IWifiNanIface.h", - "android/hardware/wifi/1.0/IHwWifiNanIface.h", - "android/hardware/wifi/1.0/BnHwWifiNanIface.h", - "android/hardware/wifi/1.0/BpHwWifiNanIface.h", - "android/hardware/wifi/1.0/BsWifiNanIface.h", - "android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.h", - "android/hardware/wifi/1.0/IHwWifiNanIfaceEventCallback.h", - "android/hardware/wifi/1.0/BnHwWifiNanIfaceEventCallback.h", - "android/hardware/wifi/1.0/BpHwWifiNanIfaceEventCallback.h", - "android/hardware/wifi/1.0/BsWifiNanIfaceEventCallback.h", - "android/hardware/wifi/1.0/IWifiP2pIface.h", - "android/hardware/wifi/1.0/IHwWifiP2pIface.h", - "android/hardware/wifi/1.0/BnHwWifiP2pIface.h", - "android/hardware/wifi/1.0/BpHwWifiP2pIface.h", - "android/hardware/wifi/1.0/BsWifiP2pIface.h", - "android/hardware/wifi/1.0/IWifiRttController.h", - "android/hardware/wifi/1.0/IHwWifiRttController.h", - "android/hardware/wifi/1.0/BnHwWifiRttController.h", - "android/hardware/wifi/1.0/BpHwWifiRttController.h", - "android/hardware/wifi/1.0/BsWifiRttController.h", - "android/hardware/wifi/1.0/IWifiRttControllerEventCallback.h", - "android/hardware/wifi/1.0/IHwWifiRttControllerEventCallback.h", - "android/hardware/wifi/1.0/BnHwWifiRttControllerEventCallback.h", - "android/hardware/wifi/1.0/BpHwWifiRttControllerEventCallback.h", - "android/hardware/wifi/1.0/BsWifiRttControllerEventCallback.h", - "android/hardware/wifi/1.0/IWifiStaIface.h", - "android/hardware/wifi/1.0/IHwWifiStaIface.h", - "android/hardware/wifi/1.0/BnHwWifiStaIface.h", - "android/hardware/wifi/1.0/BpHwWifiStaIface.h", - "android/hardware/wifi/1.0/BsWifiStaIface.h", - "android/hardware/wifi/1.0/IWifiStaIfaceEventCallback.h", - "android/hardware/wifi/1.0/IHwWifiStaIfaceEventCallback.h", - "android/hardware/wifi/1.0/BnHwWifiStaIfaceEventCallback.h", - "android/hardware/wifi/1.0/BpHwWifiStaIfaceEventCallback.h", - "android/hardware/wifi/1.0/BsWifiStaIfaceEventCallback.h", - ], -} - -cc_library { - name: "android.hardware.wifi@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.wifi@1.0_genc++"], - generated_headers: ["android.hardware.wifi@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.wifi@1.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.wifi-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", - srcs: [ - ":android.hardware.wifi@1.0_hal", - ], - out: [ - "android/hardware/wifi/V1_0/IfaceType.java", - "android/hardware/wifi/V1_0/NanBandIndex.java", - "android/hardware/wifi/V1_0/NanBandSpecificConfig.java", - "android/hardware/wifi/V1_0/NanCapabilities.java", - "android/hardware/wifi/V1_0/NanCipherSuiteType.java", - "android/hardware/wifi/V1_0/NanClusterEventInd.java", - "android/hardware/wifi/V1_0/NanClusterEventType.java", - "android/hardware/wifi/V1_0/NanConfigRequest.java", - "android/hardware/wifi/V1_0/NanDataPathChannelCfg.java", - "android/hardware/wifi/V1_0/NanDataPathConfirmInd.java", - "android/hardware/wifi/V1_0/NanDataPathRequestInd.java", - "android/hardware/wifi/V1_0/NanDataPathSecurityConfig.java", - "android/hardware/wifi/V1_0/NanDataPathSecurityType.java", - "android/hardware/wifi/V1_0/NanDebugConfig.java", - "android/hardware/wifi/V1_0/NanDiscoveryCommonConfig.java", - "android/hardware/wifi/V1_0/NanEnableRequest.java", - "android/hardware/wifi/V1_0/NanFollowupReceivedInd.java", - "android/hardware/wifi/V1_0/NanInitiateDataPathRequest.java", - "android/hardware/wifi/V1_0/NanMatchAlg.java", - "android/hardware/wifi/V1_0/NanMatchInd.java", - "android/hardware/wifi/V1_0/NanParamSizeLimits.java", - "android/hardware/wifi/V1_0/NanPublishRequest.java", - "android/hardware/wifi/V1_0/NanPublishType.java", - "android/hardware/wifi/V1_0/NanRangingIndication.java", - "android/hardware/wifi/V1_0/NanRespondToDataPathIndicationRequest.java", - "android/hardware/wifi/V1_0/NanSrfType.java", - "android/hardware/wifi/V1_0/NanStatusType.java", - "android/hardware/wifi/V1_0/NanSubscribeRequest.java", - "android/hardware/wifi/V1_0/NanSubscribeType.java", - "android/hardware/wifi/V1_0/NanTransmitFollowupRequest.java", - "android/hardware/wifi/V1_0/NanTxType.java", - "android/hardware/wifi/V1_0/RttBw.java", - "android/hardware/wifi/V1_0/RttCapabilities.java", - "android/hardware/wifi/V1_0/RttConfig.java", - "android/hardware/wifi/V1_0/RttLciInformation.java", - "android/hardware/wifi/V1_0/RttLcrInformation.java", - "android/hardware/wifi/V1_0/RttMotionPattern.java", - "android/hardware/wifi/V1_0/RttPeerType.java", - "android/hardware/wifi/V1_0/RttPreamble.java", - "android/hardware/wifi/V1_0/RttResponder.java", - "android/hardware/wifi/V1_0/RttResult.java", - "android/hardware/wifi/V1_0/RttStatus.java", - "android/hardware/wifi/V1_0/RttType.java", - "android/hardware/wifi/V1_0/StaApfPacketFilterCapabilities.java", - "android/hardware/wifi/V1_0/StaBackgroundScanBucketEventReportSchemeMask.java", - "android/hardware/wifi/V1_0/StaBackgroundScanBucketParameters.java", - "android/hardware/wifi/V1_0/StaBackgroundScanCapabilities.java", - "android/hardware/wifi/V1_0/StaBackgroundScanParameters.java", - "android/hardware/wifi/V1_0/StaLinkLayerIfacePacketStats.java", - "android/hardware/wifi/V1_0/StaLinkLayerIfaceStats.java", - "android/hardware/wifi/V1_0/StaLinkLayerRadioStats.java", - "android/hardware/wifi/V1_0/StaLinkLayerStats.java", - "android/hardware/wifi/V1_0/StaRoamingCapabilities.java", - "android/hardware/wifi/V1_0/StaRoamingConfig.java", - "android/hardware/wifi/V1_0/StaRoamingState.java", - "android/hardware/wifi/V1_0/StaScanData.java", - "android/hardware/wifi/V1_0/StaScanDataFlagMask.java", - "android/hardware/wifi/V1_0/StaScanLimits.java", - "android/hardware/wifi/V1_0/StaScanResult.java", - "android/hardware/wifi/V1_0/WifiBand.java", - "android/hardware/wifi/V1_0/WifiChannelInfo.java", - "android/hardware/wifi/V1_0/WifiChannelWidthInMhz.java", - "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java", - "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java", - "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxPacketDetails.java", - "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonStats.java", - "android/hardware/wifi/V1_0/WifiDebugPacketFateFrameInfo.java", - "android/hardware/wifi/V1_0/WifiDebugPacketFateFrameType.java", - "android/hardware/wifi/V1_0/WifiDebugRingBufferFlags.java", - "android/hardware/wifi/V1_0/WifiDebugRingBufferStatus.java", - "android/hardware/wifi/V1_0/WifiDebugRingBufferVerboseLevel.java", - "android/hardware/wifi/V1_0/WifiDebugRxPacketFate.java", - "android/hardware/wifi/V1_0/WifiDebugRxPacketFateReport.java", - "android/hardware/wifi/V1_0/WifiDebugTxPacketFate.java", - "android/hardware/wifi/V1_0/WifiDebugTxPacketFateReport.java", - "android/hardware/wifi/V1_0/WifiInformationElement.java", - "android/hardware/wifi/V1_0/WifiNanStatus.java", - "android/hardware/wifi/V1_0/WifiRateInfo.java", - "android/hardware/wifi/V1_0/WifiRateNss.java", - "android/hardware/wifi/V1_0/WifiRatePreamble.java", - "android/hardware/wifi/V1_0/WifiStatus.java", - "android/hardware/wifi/V1_0/WifiStatusCode.java", - "android/hardware/wifi/V1_0/IWifi.java", - "android/hardware/wifi/V1_0/IWifiApIface.java", - "android/hardware/wifi/V1_0/IWifiChip.java", - "android/hardware/wifi/V1_0/IWifiChipEventCallback.java", - "android/hardware/wifi/V1_0/IWifiEventCallback.java", - "android/hardware/wifi/V1_0/IWifiIface.java", - "android/hardware/wifi/V1_0/IWifiNanIface.java", - "android/hardware/wifi/V1_0/IWifiNanIfaceEventCallback.java", - "android/hardware/wifi/V1_0/IWifiP2pIface.java", - "android/hardware/wifi/V1_0/IWifiRttController.java", - "android/hardware/wifi/V1_0/IWifiRttControllerEventCallback.java", - "android/hardware/wifi/V1_0/IWifiStaIface.java", - "android/hardware/wifi/V1_0/IWifiStaIfaceEventCallback.java", - ], -} - -java_library { - name: "android.hardware.wifi-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.wifi-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -genrule { - name: "android.hardware.wifi-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0", - srcs: [ - ":android.hardware.wifi@1.0_hal", - ], - out: [ - "android/hardware/wifi/V1_0/Constants.java", - ], -} - -java_library { - name: "android.hardware.wifi-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.wifi-V1.0-java-constants_gen_java"], -} - -genrule { - name: "android.hardware.wifi@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@1.0", - srcs: [ - ":android.hardware.wifi@1.0_hal", - ], - out: [ - "android/hardware/wifi/1.0/AWifi.cpp", - "android/hardware/wifi/1.0/AWifiApIface.cpp", - "android/hardware/wifi/1.0/AWifiChip.cpp", - "android/hardware/wifi/1.0/AWifiChipEventCallback.cpp", - "android/hardware/wifi/1.0/AWifiEventCallback.cpp", - "android/hardware/wifi/1.0/AWifiIface.cpp", - "android/hardware/wifi/1.0/AWifiNanIface.cpp", - "android/hardware/wifi/1.0/AWifiNanIfaceEventCallback.cpp", - "android/hardware/wifi/1.0/AWifiP2pIface.cpp", - "android/hardware/wifi/1.0/AWifiRttController.cpp", - "android/hardware/wifi/1.0/AWifiRttControllerEventCallback.cpp", - "android/hardware/wifi/1.0/AWifiStaIface.cpp", - "android/hardware/wifi/1.0/AWifiStaIfaceEventCallback.cpp", - ], -} - -genrule { - name: "android.hardware.wifi@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@1.0", - srcs: [ - ":android.hardware.wifi@1.0_hal", - ], - out: [ - "android/hardware/wifi/1.0/AWifi.h", - "android/hardware/wifi/1.0/AWifiApIface.h", - "android/hardware/wifi/1.0/AWifiChip.h", - "android/hardware/wifi/1.0/AWifiChipEventCallback.h", - "android/hardware/wifi/1.0/AWifiEventCallback.h", - "android/hardware/wifi/1.0/AWifiIface.h", - "android/hardware/wifi/1.0/AWifiNanIface.h", - "android/hardware/wifi/1.0/AWifiNanIfaceEventCallback.h", - "android/hardware/wifi/1.0/AWifiP2pIface.h", - "android/hardware/wifi/1.0/AWifiRttController.h", - "android/hardware/wifi/1.0/AWifiRttControllerEventCallback.h", - "android/hardware/wifi/1.0/AWifiStaIface.h", - "android/hardware/wifi/1.0/AWifiStaIfaceEventCallback.h", - ], -} - -cc_library { - name: "android.hardware.wifi@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.wifi@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.wifi@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.wifi@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.wifi@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.wifi@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.wifi@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@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.wifi@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.wifi@1.0", - "android.hardware.wifi@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.wifi@1.0-adapter_genc++"], -} diff --git a/wifi/1.1/Android.bp b/wifi/1.1/Android.bp index 0878abc8a8..a4499c8313 100644 --- a/wifi/1.1/Android.bp +++ b/wifi/1.1/Android.bp @@ -1,180 +1,19 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.wifi@1.1_hal", - srcs: [ - "IWifi.hal", - "IWifiChip.hal", - ], -} - -genrule { - name: "android.hardware.wifi@1.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/WifiAll.cpp", - "android/hardware/wifi/1.1/WifiChipAll.cpp", - ], -} - -genrule { - name: "android.hardware.wifi@1.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/IWifi.h", - "android/hardware/wifi/1.1/IHwWifi.h", - "android/hardware/wifi/1.1/BnHwWifi.h", - "android/hardware/wifi/1.1/BpHwWifi.h", - "android/hardware/wifi/1.1/BsWifi.h", - "android/hardware/wifi/1.1/IWifiChip.h", - "android/hardware/wifi/1.1/IHwWifiChip.h", - "android/hardware/wifi/1.1/BnHwWifiChip.h", - "android/hardware/wifi/1.1/BpHwWifiChip.h", - "android/hardware/wifi/1.1/BsWifiChip.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.wifi@1.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.wifi@1.1_genc++"], - generated_headers: ["android.hardware.wifi@1.1_genc++_headers"], - export_generated_headers: ["android.hardware.wifi@1.1_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.wifi@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.wifi@1.0", - ], -} - -genrule { - name: "android.hardware.wifi-V1.1-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -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/V1_1/IWifi.java", - "android/hardware/wifi/V1_1/IWifiChip.java", - ], -} - -java_library { - name: "android.hardware.wifi-V1.1-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.wifi-V1.1-java_gen_java"], - libs: [ - "hwbinder", - "android.hardware.wifi-V1.0-java", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -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", + "IWifi.hal", + "IWifiChip.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", + interfaces: [ "android.hardware.wifi@1.0", - "android.hardware.wifi@1.1", - "android.hardware.wifi@1.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], + gen_java: true, } -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", - defaults: ["hidl-module-defaults"], - 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/offload/1.0/Android.bp b/wifi/offload/1.0/Android.bp index 12b2ff6cb8..c6c0e7a78e 100644 --- a/wifi/offload/1.0/Android.bp +++ b/wifi/offload/1.0/Android.bp @@ -1,154 +1,33 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.wifi.offload@1.0_hal", - srcs: [ - "types.hal", - "IOffload.hal", - "IOffloadCallback.hal", - ], -} - -genrule { - name: "android.hardware.wifi.offload@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.cpp", - "android/hardware/wifi/offload/1.0/OffloadAll.cpp", - "android/hardware/wifi/offload/1.0/OffloadCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.wifi.offload@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-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/types.h", - "android/hardware/wifi/offload/1.0/hwtypes.h", - "android/hardware/wifi/offload/1.0/IOffload.h", - "android/hardware/wifi/offload/1.0/IHwOffload.h", - "android/hardware/wifi/offload/1.0/BnHwOffload.h", - "android/hardware/wifi/offload/1.0/BpHwOffload.h", - "android/hardware/wifi/offload/1.0/BsOffload.h", - "android/hardware/wifi/offload/1.0/IOffloadCallback.h", - "android/hardware/wifi/offload/1.0/IHwOffloadCallback.h", - "android/hardware/wifi/offload/1.0/BnHwOffloadCallback.h", - "android/hardware/wifi/offload/1.0/BpHwOffloadCallback.h", - "android/hardware/wifi/offload/1.0/BsOffloadCallback.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.wifi.offload@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.wifi.offload@1.0_genc++"], - generated_headers: ["android.hardware.wifi.offload@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.wifi.offload@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -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", + "types.hal", + "IOffload.hal", + "IOffloadCallback.hal", ], -} - -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", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.wifi.offload@1.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Capability", + "LogRecord", + "NetworkInfo", + "OffloadStatus", + "OffloadStatusCode", + "RecordName", + "ScanFilter", + "ScanParam", + "ScanRecord", + "ScanResult", + "ScanStats", + "SecurityMode", ], + gen_java: false, } -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", - defaults: ["hidl-module-defaults"], - 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++"], -} diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp index 05286f1e0c..fc7ce55e3f 100644 --- a/wifi/supplicant/1.0/Android.bp +++ b/wifi/supplicant/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.wifi.supplicant@1.0_hal", +hidl_interface { + name: "android.hardware.wifi.supplicant@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "ISupplicant.hal", @@ -17,265 +21,16 @@ filegroup { "ISupplicantStaNetwork.hal", "ISupplicantStaNetworkCallback.hal", ], -} - -genrule { - name: "android.hardware.wifi.supplicant@1.0_genc++", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/types.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantCallbackAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantIfaceAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantNetworkAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceCallbackAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkCallbackAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceCallbackAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkAll.cpp", - "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallbackAll.cpp", - ], -} - -genrule { - name: "android.hardware.wifi.supplicant@1.0_genc++_headers", - tools: ["hidl-gen"], - 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", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/types.h", - "android/hardware/wifi/supplicant/1.0/hwtypes.h", - "android/hardware/wifi/supplicant/1.0/ISupplicant.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicant.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicant.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicant.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicant.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantCallback.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantCallback.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantCallback.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantCallback.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantCallback.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantIface.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantIface.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantIface.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantIface.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantIface.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantNetwork.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantNetwork.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantNetwork.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantNetwork.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pIface.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pIface.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pIface.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pIface.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pNetwork.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pNetwork.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pNetwork.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pNetwork.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaIface.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaIface.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaIface.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantStaIface.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantStaIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaNetwork.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaNetwork.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaNetwork.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantStaNetwork.h", - "android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/BsSupplicantStaNetworkCallback.h", - ], -} - -cc_library { - name: "android.hardware.wifi.supplicant@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.wifi.supplicant@1.0_genc++"], - generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"], - vendor_available: true, - vndk: { - enabled: true, - }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", + interfaces: [ + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + types: [ + "IfaceType", + "P2pGroupCapabilityMask", + "SupplicantStatus", + "SupplicantStatusCode", + "WpsConfigMethods", ], + gen_java: true, } -genrule { - name: "android.hardware.wifi.supplicant-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0", - srcs: [ - ":android.hardware.wifi.supplicant@1.0_hal", - ], - out: [ - "android/hardware/wifi/supplicant/V1_0/IfaceType.java", - "android/hardware/wifi/supplicant/V1_0/P2pGroupCapabilityMask.java", - "android/hardware/wifi/supplicant/V1_0/SupplicantStatus.java", - "android/hardware/wifi/supplicant/V1_0/SupplicantStatusCode.java", - "android/hardware/wifi/supplicant/V1_0/WpsConfigMethods.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicant.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantCallback.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantIface.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantNetwork.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIface.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIfaceCallback.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetwork.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetworkCallback.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantStaIface.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantStaIfaceCallback.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetwork.java", - "android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetworkCallback.java", - ], -} - -java_library { - name: "android.hardware.wifi.supplicant-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.wifi.supplicant-V1.0-java_gen_java"], - libs: [ - "hwbinder", - "android.hidl.base-V1.0-java", - ] -} - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.wifi.supplicant@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.supplicant@1.0", - srcs: [ - ":android.hardware.wifi.supplicant@1.0_hal", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/ASupplicant.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantCallback.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantIface.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantNetwork.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIface.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIfaceCallback.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetwork.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetworkCallback.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaIface.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaIfaceCallback.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetwork.cpp", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetworkCallback.cpp", - ], -} - -genrule { - name: "android.hardware.wifi.supplicant@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.supplicant@1.0", - srcs: [ - ":android.hardware.wifi.supplicant@1.0_hal", - ], - out: [ - "android/hardware/wifi/supplicant/1.0/ASupplicant.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantCallback.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantIface.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantNetwork.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIface.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetwork.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetworkCallback.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaIface.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaIfaceCallback.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetwork.h", - "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetworkCallback.h", - ], -} - -cc_library { - name: "android.hardware.wifi.supplicant@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.wifi.supplicant@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.wifi.supplicant@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.wifi.supplicant@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.wifi.supplicant@1.0", - "android.hidl.base@1.0-adapter-helper", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.wifi.supplicant@1.0", - "android.hidl.base@1.0-adapter-helper", - ], -} - -genrule { - name: "android.hardware.wifi.supplicant@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.supplicant@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.wifi.supplicant@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.wifi.supplicant@1.0", - "android.hardware.wifi.supplicant@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.wifi.supplicant@1.0-adapter_genc++"], -} |