diff --git a/CMakeLists.txt b/CMakeLists.txt index 05b6d8f..a7e9ffc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,135 +23,133 @@ include_directories( # AIDL set(AIDL_SRC - generated/android/media/audio/common/v1/AudioUuid.cpp + generated/android/media/audio/common/AudioPortDeviceExt.cpp + generated/android/media/audio/common/AudioProfile.cpp + generated/android/media/audio/common/AudioUsage.cpp + generated/android/media/audio/common/HeadTracking.cpp + generated/android/media/audio/common/AudioFormatDescription.cpp + generated/android/media/audio/common/AudioHalCapCriterion.cpp + generated/android/media/audio/common/AudioMMapPolicyType.cpp + generated/android/media/audio/common/AudioPolicyForceUse.cpp + generated/android/media/audio/common/AudioSource.cpp + generated/android/media/audio/common/AudioDualMonoMode.cpp + generated/android/media/audio/common/AudioPortExt.cpp + generated/android/media/audio/common/AudioDeviceAddress.cpp + generated/android/media/audio/common/PcmType.cpp + generated/android/media/audio/common/AudioDeviceType.cpp + generated/android/media/audio/common/AudioFlag.cpp + generated/android/media/audio/common/AudioMode.cpp + generated/android/media/audio/common/AudioGainMode.cpp + generated/android/media/audio/common/AudioGain.cpp + generated/android/media/audio/common/AudioConfig.cpp + generated/android/media/audio/common/AudioHalCapCriterionV2.cpp + generated/android/media/audio/common/MicrophoneDynamicInfo.cpp + generated/android/media/audio/common/AudioConfigBase.cpp + generated/android/media/audio/common/Float.cpp + generated/android/media/audio/common/AudioAttributes.cpp + generated/android/media/audio/common/Spatialization.cpp + generated/android/media/audio/common/AudioUuid.cpp + generated/android/media/audio/common/Double.cpp + generated/android/media/audio/common/AudioMMapPolicyInfo.cpp + generated/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp + generated/android/media/audio/common/AudioIoFlags.cpp + generated/android/media/audio/common/AudioDeviceDescription.cpp + generated/android/media/audio/common/AudioHalVolumeCurve.cpp + generated/android/media/audio/common/AudioEncapsulationMetadataType.cpp + generated/android/media/audio/common/AudioHalCapParameter.cpp + generated/android/media/audio/common/ExtraAudioDescriptor.cpp + generated/android/media/audio/common/MicrophoneInfo.cpp + generated/android/media/audio/common/AudioHalVolumeGroup.cpp + generated/android/media/audio/common/AudioGainConfig.cpp + generated/android/media/audio/common/AudioHalCapConfiguration.cpp + generated/android/media/audio/common/AudioLatencyMode.cpp + generated/android/media/audio/common/AudioEncapsulationMode.cpp + generated/android/media/audio/common/AudioFormatType.cpp + generated/android/media/audio/common/AudioPort.cpp + generated/android/media/audio/common/Boolean.cpp + generated/android/media/audio/common/AudioHalEngineConfig.cpp + generated/android/media/audio/common/Int.cpp + generated/android/media/audio/common/AudioHalAttributesGroup.cpp + generated/android/media/audio/common/AudioStreamType.cpp + generated/android/media/audio/common/AudioPortConfig.cpp + generated/android/media/audio/common/Void.cpp + generated/android/media/audio/common/Long.cpp + generated/android/media/audio/common/AudioHalCapDomain.cpp + generated/android/media/audio/common/Byte.cpp + generated/android/media/audio/common/AudioHalCapRule.cpp + generated/android/media/audio/common/AudioStandard.cpp + generated/android/media/audio/common/AudioMMapPolicy.cpp + generated/android/media/audio/common/AudioHalCapCriterionType.cpp + generated/android/media/audio/common/AudioPortMixExt.cpp + generated/android/media/audio/common/AudioOutputFlags.cpp + generated/android/media/audio/common/AudioHalProductStrategy.cpp + generated/android/media/audio/common/AudioChannelLayout.cpp + generated/android/media/audio/common/AudioDevice.cpp + generated/android/media/audio/common/AudioPlaybackRate.cpp + generated/android/media/audio/common/AudioPortMixExtUseCase.cpp + generated/android/media/audio/common/AudioEncapsulationType.cpp + generated/android/media/audio/common/AudioOffloadInfo.cpp + generated/android/media/audio/common/AudioProductStrategyType.cpp + generated/android/media/audio/common/AudioContentType.cpp + generated/android/media/audio/common/AudioInputFlags.cpp - src/android/media/audio/common/AudioPortDeviceExt.cpp - src/android/media/audio/common/AudioProfile.cpp - src/android/media/audio/common/AudioUsage.cpp - src/android/media/audio/common/HeadTracking.cpp - src/android/media/audio/common/AudioFormatDescription.cpp - src/android/media/audio/common/AudioHalCapCriterion.cpp - src/android/media/audio/common/AudioMMapPolicyType.cpp - src/android/media/audio/common/AudioPolicyForceUse.cpp - src/android/media/audio/common/AudioSource.cpp - src/android/media/audio/common/AudioDualMonoMode.cpp - src/android/media/audio/common/AudioPortExt.cpp - src/android/media/audio/common/AudioDeviceAddress.cpp - src/android/media/audio/common/PcmType.cpp - src/android/media/audio/common/AudioDeviceType.cpp - src/android/media/audio/common/AudioFlag.cpp - src/android/media/audio/common/AudioMode.cpp - src/android/media/audio/common/AudioGainMode.cpp - src/android/media/audio/common/AudioGain.cpp - src/android/media/audio/common/AudioConfig.cpp - src/android/media/audio/common/AudioHalCapCriterionV2.cpp - src/android/media/audio/common/MicrophoneDynamicInfo.cpp - src/android/media/audio/common/AudioConfigBase.cpp - src/android/media/audio/common/Float.cpp - src/android/media/audio/common/AudioAttributes.cpp - src/android/media/audio/common/Spatialization.cpp - src/android/media/audio/common/AudioUuid.cpp - src/android/media/audio/common/Double.cpp - src/android/media/audio/common/AudioMMapPolicyInfo.cpp - src/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp - src/android/media/audio/common/AudioIoFlags.cpp - src/android/media/audio/common/AudioDeviceDescription.cpp - src/android/media/audio/common/AudioHalVolumeCurve.cpp - src/android/media/audio/common/AudioEncapsulationMetadataType.cpp - src/android/media/audio/common/AudioHalCapParameter.cpp - src/android/media/audio/common/ExtraAudioDescriptor.cpp - src/android/media/audio/common/MicrophoneInfo.cpp - src/android/media/audio/common/AudioHalVolumeGroup.cpp - src/android/media/audio/common/AudioGainConfig.cpp - src/android/media/audio/common/AudioHalCapConfiguration.cpp - src/android/media/audio/common/AudioLatencyMode.cpp - src/android/media/audio/common/AudioEncapsulationMode.cpp - src/android/media/audio/common/AudioFormatType.cpp - src/android/media/audio/common/AudioPort.cpp - src/android/media/audio/common/Boolean.cpp - src/android/media/audio/common/AudioHalEngineConfig.cpp - src/android/media/audio/common/Int.cpp - src/android/media/audio/common/AudioHalAttributesGroup.cpp - src/android/media/audio/common/AudioStreamType.cpp - src/android/media/audio/common/AudioPortConfig.cpp - src/android/media/audio/common/Void.cpp - src/android/media/audio/common/Long.cpp - src/android/media/audio/common/AudioHalCapDomain.cpp - src/android/media/audio/common/Byte.cpp - src/android/media/audio/common/AudioHalCapRule.cpp - src/android/media/audio/common/AudioStandard.cpp - src/android/media/audio/common/AudioMMapPolicy.cpp - src/android/media/audio/common/AudioHalCapCriterionType.cpp - src/android/media/audio/common/AudioPortMixExt.cpp - src/android/media/audio/common/AudioOutputFlags.cpp - src/android/media/audio/common/AudioHalProductStrategy.cpp - src/android/media/audio/common/AudioChannelLayout.cpp - src/android/media/audio/common/AudioDevice.cpp - src/android/media/audio/common/AudioPlaybackRate.cpp - src/android/media/audio/common/AudioPortMixExtUseCase.cpp - src/android/media/audio/common/AudioEncapsulationType.cpp - src/android/media/audio/common/AudioOffloadInfo.cpp - src/android/media/audio/common/AudioProductStrategyType.cpp - src/android/media/audio/common/AudioContentType.cpp - src/android/media/audio/common/AudioInputFlags.cpp + generated/android/media/audio/eraser/Configuration.cpp + generated/android/media/audio/eraser/Classification.cpp + generated/android/media/audio/eraser/ClassificationConfig.cpp + generated/android/media/audio/eraser/Capability.cpp + generated/android/media/audio/eraser/SeparatorCapability.cpp + generated/android/media/audio/eraser/IEraserCallback.cpp + generated/android/media/audio/eraser/SoundClassification.cpp + generated/android/media/audio/eraser/RemixerCapability.cpp + generated/android/media/audio/eraser/Mode.cpp + generated/android/media/audio/eraser/ClassificationMetadataList.cpp + generated/android/media/audio/eraser/ClassifierCapability.cpp + generated/android/media/audio/eraser/ClassificationMetadata.cpp - src/android/media/audio/eraser/Configuration.cpp - src/android/media/audio/eraser/Classification.cpp - src/android/media/audio/eraser/ClassificationConfig.cpp - src/android/media/audio/eraser/Capability.cpp - src/android/media/audio/eraser/SeparatorCapability.cpp - src/android/media/audio/eraser/IEraserCallback.cpp - src/android/media/audio/eraser/SoundClassification.cpp - src/android/media/audio/eraser/RemixerCapability.cpp - src/android/media/audio/eraser/Mode.cpp - src/android/media/audio/eraser/ClassificationMetadataList.cpp - src/android/media/audio/eraser/ClassifierCapability.cpp - src/android/media/audio/eraser/ClassificationMetadata.cpp + generated/android/hardware/audio/effect/BassBoost.cpp + generated/android/hardware/audio/effect/AutomaticGainControlV2.cpp + generated/android/hardware/audio/effect/PresetReverb.cpp + generated/android/hardware/audio/effect/Descriptor.cpp + generated/android/hardware/audio/effect/Downmix.cpp + generated/android/hardware/audio/effect/Virtualizer.cpp + generated/android/hardware/audio/effect/Processing.cpp + generated/android/hardware/audio/effect/LoudnessEnhancer.cpp + generated/android/hardware/audio/effect/Range.cpp + generated/android/hardware/audio/effect/Volume.cpp + generated/android/hardware/audio/effect/AcousticEchoCanceler.cpp + generated/android/hardware/audio/effect/Capability.cpp + generated/android/hardware/audio/effect/VendorExtension.cpp + generated/android/hardware/audio/effect/Visualizer.cpp + generated/android/hardware/audio/effect/Flags.cpp + generated/android/hardware/audio/effect/NoiseSuppression.cpp + generated/android/hardware/audio/effect/CommandId.cpp + generated/android/hardware/audio/effect/AutomaticGainControlV1.cpp + generated/android/hardware/audio/effect/EnvironmentalReverb.cpp + generated/android/hardware/audio/effect/Equalizer.cpp + generated/android/hardware/audio/effect/Parameter.cpp + generated/android/hardware/audio/effect/HapticGenerator.cpp + generated/android/hardware/audio/effect/Eraser.cpp + generated/android/hardware/audio/effect/State.cpp + generated/android/hardware/audio/effect/IFactory.cpp + generated/android/hardware/audio/effect/Spatializer.cpp + generated/android/hardware/audio/effect/DynamicsProcessing.cpp + generated/android/hardware/audio/effect/DefaultExtension.cpp + generated/android/hardware/audio/effect/IEffect.cpp - src/android/hardware/audio/effect/BassBoost.cpp - src/android/hardware/audio/effect/AutomaticGainControlV2.cpp - src/android/hardware/audio/effect/PresetReverb.cpp - src/android/hardware/audio/effect/Descriptor.cpp - src/android/hardware/audio/effect/Downmix.cpp - src/android/hardware/audio/effect/Virtualizer.cpp - src/android/hardware/audio/effect/Processing.cpp - src/android/hardware/audio/effect/LoudnessEnhancer.cpp - src/android/hardware/audio/effect/Range.cpp - src/android/hardware/audio/effect/Volume.cpp - src/android/hardware/audio/effect/AcousticEchoCanceler.cpp - src/android/hardware/audio/effect/Capability.cpp - src/android/hardware/audio/effect/VendorExtension.cpp - src/android/hardware/audio/effect/Visualizer.cpp - src/android/hardware/audio/effect/Flags.cpp - src/android/hardware/audio/effect/NoiseSuppression.cpp - src/android/hardware/audio/effect/CommandId.cpp - src/android/hardware/audio/effect/AutomaticGainControlV1.cpp - src/android/hardware/audio/effect/EnvironmentalReverb.cpp - src/android/hardware/audio/effect/Equalizer.cpp - src/android/hardware/audio/effect/Parameter.cpp - src/android/hardware/audio/effect/HapticGenerator.cpp - src/android/hardware/audio/effect/Eraser.cpp - src/android/hardware/audio/effect/State.cpp - src/android/hardware/audio/effect/IFactory.cpp - src/android/hardware/audio/effect/Spatializer.cpp - src/android/hardware/audio/effect/DynamicsProcessing.cpp - src/android/hardware/audio/effect/DefaultExtension.cpp - src/android/hardware/audio/effect/IEffect.cpp + generated/android/hardware/audio/common/AudioOffloadMetadata.cpp + generated/android/hardware/audio/common/SinkMetadata.cpp + generated/android/hardware/audio/common/PlaybackTrackMetadata.cpp + generated/android/hardware/audio/common/SourceMetadata.cpp + generated/android/hardware/audio/common/RecordTrackMetadata.cpp - src/android/hardware/audio/common/AudioOffloadMetadata.cpp - src/android/hardware/audio/common/SinkMetadata.cpp - src/android/hardware/audio/common/PlaybackTrackMetadata.cpp - src/android/hardware/audio/common/SourceMetadata.cpp - src/android/hardware/audio/common/RecordTrackMetadata.cpp + generated/android/hardware/common/Ashmem.cpp + generated/android/hardware/common/NativeHandle.cpp + generated/android/hardware/common/MappableFile.cpp - src/android/hardware/common/Ashmem.cpp - src/android/hardware/common/NativeHandle.cpp - src/android/hardware/common/MappableFile.cpp - - src/android/hardware/common/fmq/MQDescriptor.cpp - src/android/hardware/common/fmq/SynchronizedReadWrite.cpp - src/android/hardware/common/fmq/GrantorDescriptor.cpp - src/android/hardware/common/fmq/UnsynchronizedWrite.cpp) + generated/android/hardware/common/fmq/MQDescriptor.cpp + generated/android/hardware/common/fmq/SynchronizedReadWrite.cpp + generated/android/hardware/common/fmq/GrantorDescriptor.cpp + generated/android/hardware/common/fmq/UnsynchronizedWrite.cpp) include_directories(generated/include) @@ -161,7 +159,6 @@ include_directories(src/include) set(FILES # Shim src/shim.cpp - src/AidlVersions.cpp # Main src/aidl/EffectThread.cpp diff --git a/src/android/hardware/audio/common/AudioOffloadMetadata.cpp b/generated/android/hardware/audio/common/AudioOffloadMetadata.cpp similarity index 100% rename from src/android/hardware/audio/common/AudioOffloadMetadata.cpp rename to generated/android/hardware/audio/common/AudioOffloadMetadata.cpp diff --git a/src/android/hardware/audio/common/PlaybackTrackMetadata.cpp b/generated/android/hardware/audio/common/PlaybackTrackMetadata.cpp similarity index 100% rename from src/android/hardware/audio/common/PlaybackTrackMetadata.cpp rename to generated/android/hardware/audio/common/PlaybackTrackMetadata.cpp diff --git a/src/android/hardware/audio/common/RecordTrackMetadata.cpp b/generated/android/hardware/audio/common/RecordTrackMetadata.cpp similarity index 100% rename from src/android/hardware/audio/common/RecordTrackMetadata.cpp rename to generated/android/hardware/audio/common/RecordTrackMetadata.cpp diff --git a/src/android/hardware/audio/common/SinkMetadata.cpp b/generated/android/hardware/audio/common/SinkMetadata.cpp similarity index 100% rename from src/android/hardware/audio/common/SinkMetadata.cpp rename to generated/android/hardware/audio/common/SinkMetadata.cpp diff --git a/src/android/hardware/audio/common/SourceMetadata.cpp b/generated/android/hardware/audio/common/SourceMetadata.cpp similarity index 100% rename from src/android/hardware/audio/common/SourceMetadata.cpp rename to generated/android/hardware/audio/common/SourceMetadata.cpp diff --git a/src/android/hardware/audio/effect/AcousticEchoCanceler.cpp b/generated/android/hardware/audio/effect/AcousticEchoCanceler.cpp similarity index 100% rename from src/android/hardware/audio/effect/AcousticEchoCanceler.cpp rename to generated/android/hardware/audio/effect/AcousticEchoCanceler.cpp diff --git a/src/android/hardware/audio/effect/AutomaticGainControlV1.cpp b/generated/android/hardware/audio/effect/AutomaticGainControlV1.cpp similarity index 100% rename from src/android/hardware/audio/effect/AutomaticGainControlV1.cpp rename to generated/android/hardware/audio/effect/AutomaticGainControlV1.cpp diff --git a/src/android/hardware/audio/effect/AutomaticGainControlV2.cpp b/generated/android/hardware/audio/effect/AutomaticGainControlV2.cpp similarity index 100% rename from src/android/hardware/audio/effect/AutomaticGainControlV2.cpp rename to generated/android/hardware/audio/effect/AutomaticGainControlV2.cpp diff --git a/src/android/hardware/audio/effect/BassBoost.cpp b/generated/android/hardware/audio/effect/BassBoost.cpp similarity index 100% rename from src/android/hardware/audio/effect/BassBoost.cpp rename to generated/android/hardware/audio/effect/BassBoost.cpp diff --git a/src/android/hardware/audio/effect/Capability.cpp b/generated/android/hardware/audio/effect/Capability.cpp similarity index 100% rename from src/android/hardware/audio/effect/Capability.cpp rename to generated/android/hardware/audio/effect/Capability.cpp diff --git a/src/android/hardware/audio/effect/CommandId.cpp b/generated/android/hardware/audio/effect/CommandId.cpp similarity index 100% rename from src/android/hardware/audio/effect/CommandId.cpp rename to generated/android/hardware/audio/effect/CommandId.cpp diff --git a/src/android/hardware/audio/effect/DefaultExtension.cpp b/generated/android/hardware/audio/effect/DefaultExtension.cpp similarity index 100% rename from src/android/hardware/audio/effect/DefaultExtension.cpp rename to generated/android/hardware/audio/effect/DefaultExtension.cpp diff --git a/src/android/hardware/audio/effect/Descriptor.cpp b/generated/android/hardware/audio/effect/Descriptor.cpp similarity index 100% rename from src/android/hardware/audio/effect/Descriptor.cpp rename to generated/android/hardware/audio/effect/Descriptor.cpp diff --git a/src/android/hardware/audio/effect/Downmix.cpp b/generated/android/hardware/audio/effect/Downmix.cpp similarity index 100% rename from src/android/hardware/audio/effect/Downmix.cpp rename to generated/android/hardware/audio/effect/Downmix.cpp diff --git a/src/android/hardware/audio/effect/DynamicsProcessing.cpp b/generated/android/hardware/audio/effect/DynamicsProcessing.cpp similarity index 100% rename from src/android/hardware/audio/effect/DynamicsProcessing.cpp rename to generated/android/hardware/audio/effect/DynamicsProcessing.cpp diff --git a/src/android/hardware/audio/effect/EnvironmentalReverb.cpp b/generated/android/hardware/audio/effect/EnvironmentalReverb.cpp similarity index 100% rename from src/android/hardware/audio/effect/EnvironmentalReverb.cpp rename to generated/android/hardware/audio/effect/EnvironmentalReverb.cpp diff --git a/src/android/hardware/audio/effect/Equalizer.cpp b/generated/android/hardware/audio/effect/Equalizer.cpp similarity index 100% rename from src/android/hardware/audio/effect/Equalizer.cpp rename to generated/android/hardware/audio/effect/Equalizer.cpp diff --git a/src/android/hardware/audio/effect/Eraser.cpp b/generated/android/hardware/audio/effect/Eraser.cpp similarity index 100% rename from src/android/hardware/audio/effect/Eraser.cpp rename to generated/android/hardware/audio/effect/Eraser.cpp diff --git a/src/android/hardware/audio/effect/Flags.cpp b/generated/android/hardware/audio/effect/Flags.cpp similarity index 100% rename from src/android/hardware/audio/effect/Flags.cpp rename to generated/android/hardware/audio/effect/Flags.cpp diff --git a/src/android/hardware/audio/effect/HapticGenerator.cpp b/generated/android/hardware/audio/effect/HapticGenerator.cpp similarity index 100% rename from src/android/hardware/audio/effect/HapticGenerator.cpp rename to generated/android/hardware/audio/effect/HapticGenerator.cpp diff --git a/src/android/hardware/audio/effect/IEffect.cpp b/generated/android/hardware/audio/effect/IEffect.cpp similarity index 100% rename from src/android/hardware/audio/effect/IEffect.cpp rename to generated/android/hardware/audio/effect/IEffect.cpp diff --git a/src/android/hardware/audio/effect/IFactory.cpp b/generated/android/hardware/audio/effect/IFactory.cpp similarity index 92% rename from src/android/hardware/audio/effect/IFactory.cpp rename to generated/android/hardware/audio/effect/IFactory.cpp index fde3ad2..da8cde4 100644 --- a/src/android/hardware/audio/effect/IFactory.cpp +++ b/generated/android/hardware/audio/effect/IFactory.cpp @@ -26,9 +26,9 @@ static binder_status_t _aidl_android_hardware_audio_effect_IFactory_onTransact(A std::shared_ptr _aidl_impl = std::static_pointer_cast(::ndk::ICInterface::asInterface(_aidl_binder)); switch (_aidl_code) { case (FIRST_CALL_TRANSACTION + 0 /*queryEffects*/): { - std::optional<::aidl::android::media::audio::common::v1::AudioUuid> in_type; - std::optional<::aidl::android::media::audio::common::v1::AudioUuid> in_implementation; - std::optional<::aidl::android::media::audio::common::v1::AudioUuid> in_proxy; + std::optional<::aidl::android::media::audio::common::AudioUuid> in_type; + std::optional<::aidl::android::media::audio::common::AudioUuid> in_implementation; + std::optional<::aidl::android::media::audio::common::AudioUuid> in_proxy; std::vector<::aidl::android::hardware::audio::effect::Descriptor> _aidl_return; _aidl_ret_status = ::ndk::AParcel_readNullableData(_aidl_in, &in_type); @@ -70,7 +70,7 @@ static binder_status_t _aidl_android_hardware_audio_effect_IFactory_onTransact(A break; } case (FIRST_CALL_TRANSACTION + 2 /*createEffect*/): { - ::aidl::android::media::audio::common::v1::AudioUuid in_implUuid; + ::aidl::android::media::audio::common::AudioUuid in_implUuid; std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> _aidl_return; _aidl_ret_status = ::ndk::AParcel_readData(_aidl_in, &in_implUuid); @@ -110,7 +110,7 @@ static AIBinder_Class* _g_aidl_android_hardware_audio_effect_IFactory_clazz = :: BpFactory::BpFactory(const ::ndk::SpAIBinder& binder) : BpCInterface(binder) {} BpFactory::~BpFactory() {} -::ndk::ScopedAStatus BpFactory::queryEffects(const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) { +::ndk::ScopedAStatus BpFactory::queryEffects(const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) { binder_status_t _aidl_ret_status = STATUS_OK; ::ndk::ScopedAStatus _aidl_status; ::ndk::ScopedAParcel _aidl_in; @@ -196,7 +196,7 @@ BpFactory::~BpFactory() {} _aidl_status_return: return _aidl_status; } -::ndk::ScopedAStatus BpFactory::createEffect(const ::aidl::android::media::audio::common::v1::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) { +::ndk::ScopedAStatus BpFactory::createEffect(const ::aidl::android::media::audio::common::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) { binder_status_t _aidl_ret_status = STATUS_OK; ::ndk::ScopedAStatus _aidl_status; ::ndk::ScopedAParcel _aidl_in; @@ -332,7 +332,7 @@ const std::shared_ptr& IFactory::getDefaultImpl() { return IFactory::default_impl; } std::shared_ptr IFactory::default_impl = nullptr; -::ndk::ScopedAStatus IFactoryDefault::queryEffects(const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& /*in_type*/, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& /*in_implementation*/, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& /*in_proxy*/, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* /*_aidl_return*/) { +::ndk::ScopedAStatus IFactoryDefault::queryEffects(const std::optional<::aidl::android::media::audio::common::AudioUuid>& /*in_type*/, const std::optional<::aidl::android::media::audio::common::AudioUuid>& /*in_implementation*/, const std::optional<::aidl::android::media::audio::common::AudioUuid>& /*in_proxy*/, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* /*_aidl_return*/) { ::ndk::ScopedAStatus _aidl_status; _aidl_status.set(AStatus_fromStatus(STATUS_UNKNOWN_TRANSACTION)); return _aidl_status; @@ -342,7 +342,7 @@ std::shared_ptr IFactory::default_impl = nullptr; _aidl_status.set(AStatus_fromStatus(STATUS_UNKNOWN_TRANSACTION)); return _aidl_status; } -::ndk::ScopedAStatus IFactoryDefault::createEffect(const ::aidl::android::media::audio::common::v1::AudioUuid& /*in_implUuid*/, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* /*_aidl_return*/) { +::ndk::ScopedAStatus IFactoryDefault::createEffect(const ::aidl::android::media::audio::common::AudioUuid& /*in_implUuid*/, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* /*_aidl_return*/) { ::ndk::ScopedAStatus _aidl_status; _aidl_status.set(AStatus_fromStatus(STATUS_UNKNOWN_TRANSACTION)); return _aidl_status; diff --git a/src/android/hardware/audio/effect/LoudnessEnhancer.cpp b/generated/android/hardware/audio/effect/LoudnessEnhancer.cpp similarity index 100% rename from src/android/hardware/audio/effect/LoudnessEnhancer.cpp rename to generated/android/hardware/audio/effect/LoudnessEnhancer.cpp diff --git a/src/android/hardware/audio/effect/NoiseSuppression.cpp b/generated/android/hardware/audio/effect/NoiseSuppression.cpp similarity index 100% rename from src/android/hardware/audio/effect/NoiseSuppression.cpp rename to generated/android/hardware/audio/effect/NoiseSuppression.cpp diff --git a/src/android/hardware/audio/effect/Parameter.cpp b/generated/android/hardware/audio/effect/Parameter.cpp similarity index 100% rename from src/android/hardware/audio/effect/Parameter.cpp rename to generated/android/hardware/audio/effect/Parameter.cpp diff --git a/src/android/hardware/audio/effect/PresetReverb.cpp b/generated/android/hardware/audio/effect/PresetReverb.cpp similarity index 100% rename from src/android/hardware/audio/effect/PresetReverb.cpp rename to generated/android/hardware/audio/effect/PresetReverb.cpp diff --git a/src/android/hardware/audio/effect/Processing.cpp b/generated/android/hardware/audio/effect/Processing.cpp similarity index 100% rename from src/android/hardware/audio/effect/Processing.cpp rename to generated/android/hardware/audio/effect/Processing.cpp diff --git a/src/android/hardware/audio/effect/Range.cpp b/generated/android/hardware/audio/effect/Range.cpp similarity index 100% rename from src/android/hardware/audio/effect/Range.cpp rename to generated/android/hardware/audio/effect/Range.cpp diff --git a/src/android/hardware/audio/effect/Spatializer.cpp b/generated/android/hardware/audio/effect/Spatializer.cpp similarity index 100% rename from src/android/hardware/audio/effect/Spatializer.cpp rename to generated/android/hardware/audio/effect/Spatializer.cpp diff --git a/src/android/hardware/audio/effect/State.cpp b/generated/android/hardware/audio/effect/State.cpp similarity index 100% rename from src/android/hardware/audio/effect/State.cpp rename to generated/android/hardware/audio/effect/State.cpp diff --git a/src/android/hardware/audio/effect/VendorExtension.cpp b/generated/android/hardware/audio/effect/VendorExtension.cpp similarity index 100% rename from src/android/hardware/audio/effect/VendorExtension.cpp rename to generated/android/hardware/audio/effect/VendorExtension.cpp diff --git a/src/android/hardware/audio/effect/Virtualizer.cpp b/generated/android/hardware/audio/effect/Virtualizer.cpp similarity index 100% rename from src/android/hardware/audio/effect/Virtualizer.cpp rename to generated/android/hardware/audio/effect/Virtualizer.cpp diff --git a/src/android/hardware/audio/effect/Visualizer.cpp b/generated/android/hardware/audio/effect/Visualizer.cpp similarity index 100% rename from src/android/hardware/audio/effect/Visualizer.cpp rename to generated/android/hardware/audio/effect/Visualizer.cpp diff --git a/src/android/hardware/audio/effect/Volume.cpp b/generated/android/hardware/audio/effect/Volume.cpp similarity index 100% rename from src/android/hardware/audio/effect/Volume.cpp rename to generated/android/hardware/audio/effect/Volume.cpp diff --git a/src/android/hardware/common/Ashmem.cpp b/generated/android/hardware/common/Ashmem.cpp similarity index 100% rename from src/android/hardware/common/Ashmem.cpp rename to generated/android/hardware/common/Ashmem.cpp diff --git a/src/android/hardware/common/MappableFile.cpp b/generated/android/hardware/common/MappableFile.cpp similarity index 100% rename from src/android/hardware/common/MappableFile.cpp rename to generated/android/hardware/common/MappableFile.cpp diff --git a/src/android/hardware/common/NativeHandle.cpp b/generated/android/hardware/common/NativeHandle.cpp similarity index 100% rename from src/android/hardware/common/NativeHandle.cpp rename to generated/android/hardware/common/NativeHandle.cpp diff --git a/src/android/hardware/common/fmq/GrantorDescriptor.cpp b/generated/android/hardware/common/fmq/GrantorDescriptor.cpp similarity index 100% rename from src/android/hardware/common/fmq/GrantorDescriptor.cpp rename to generated/android/hardware/common/fmq/GrantorDescriptor.cpp diff --git a/src/android/hardware/common/fmq/MQDescriptor.cpp b/generated/android/hardware/common/fmq/MQDescriptor.cpp similarity index 100% rename from src/android/hardware/common/fmq/MQDescriptor.cpp rename to generated/android/hardware/common/fmq/MQDescriptor.cpp diff --git a/src/android/hardware/common/fmq/SynchronizedReadWrite.cpp b/generated/android/hardware/common/fmq/SynchronizedReadWrite.cpp similarity index 100% rename from src/android/hardware/common/fmq/SynchronizedReadWrite.cpp rename to generated/android/hardware/common/fmq/SynchronizedReadWrite.cpp diff --git a/src/android/hardware/common/fmq/UnsynchronizedWrite.cpp b/generated/android/hardware/common/fmq/UnsynchronizedWrite.cpp similarity index 100% rename from src/android/hardware/common/fmq/UnsynchronizedWrite.cpp rename to generated/android/hardware/common/fmq/UnsynchronizedWrite.cpp diff --git a/src/android/media/audio/common/AudioAttributes.cpp b/generated/android/media/audio/common/AudioAttributes.cpp similarity index 100% rename from src/android/media/audio/common/AudioAttributes.cpp rename to generated/android/media/audio/common/AudioAttributes.cpp diff --git a/src/android/media/audio/common/AudioChannelLayout.cpp b/generated/android/media/audio/common/AudioChannelLayout.cpp similarity index 100% rename from src/android/media/audio/common/AudioChannelLayout.cpp rename to generated/android/media/audio/common/AudioChannelLayout.cpp diff --git a/src/android/media/audio/common/AudioConfig.cpp b/generated/android/media/audio/common/AudioConfig.cpp similarity index 100% rename from src/android/media/audio/common/AudioConfig.cpp rename to generated/android/media/audio/common/AudioConfig.cpp diff --git a/src/android/media/audio/common/AudioConfigBase.cpp b/generated/android/media/audio/common/AudioConfigBase.cpp similarity index 100% rename from src/android/media/audio/common/AudioConfigBase.cpp rename to generated/android/media/audio/common/AudioConfigBase.cpp diff --git a/src/android/media/audio/common/AudioContentType.cpp b/generated/android/media/audio/common/AudioContentType.cpp similarity index 100% rename from src/android/media/audio/common/AudioContentType.cpp rename to generated/android/media/audio/common/AudioContentType.cpp diff --git a/src/android/media/audio/common/AudioDevice.cpp b/generated/android/media/audio/common/AudioDevice.cpp similarity index 100% rename from src/android/media/audio/common/AudioDevice.cpp rename to generated/android/media/audio/common/AudioDevice.cpp diff --git a/src/android/media/audio/common/AudioDeviceAddress.cpp b/generated/android/media/audio/common/AudioDeviceAddress.cpp similarity index 100% rename from src/android/media/audio/common/AudioDeviceAddress.cpp rename to generated/android/media/audio/common/AudioDeviceAddress.cpp diff --git a/src/android/media/audio/common/AudioDeviceDescription.cpp b/generated/android/media/audio/common/AudioDeviceDescription.cpp similarity index 100% rename from src/android/media/audio/common/AudioDeviceDescription.cpp rename to generated/android/media/audio/common/AudioDeviceDescription.cpp diff --git a/src/android/media/audio/common/AudioDeviceType.cpp b/generated/android/media/audio/common/AudioDeviceType.cpp similarity index 100% rename from src/android/media/audio/common/AudioDeviceType.cpp rename to generated/android/media/audio/common/AudioDeviceType.cpp diff --git a/src/android/media/audio/common/AudioDualMonoMode.cpp b/generated/android/media/audio/common/AudioDualMonoMode.cpp similarity index 100% rename from src/android/media/audio/common/AudioDualMonoMode.cpp rename to generated/android/media/audio/common/AudioDualMonoMode.cpp diff --git a/src/android/media/audio/common/AudioEncapsulationMetadataType.cpp b/generated/android/media/audio/common/AudioEncapsulationMetadataType.cpp similarity index 100% rename from src/android/media/audio/common/AudioEncapsulationMetadataType.cpp rename to generated/android/media/audio/common/AudioEncapsulationMetadataType.cpp diff --git a/src/android/media/audio/common/AudioEncapsulationMode.cpp b/generated/android/media/audio/common/AudioEncapsulationMode.cpp similarity index 100% rename from src/android/media/audio/common/AudioEncapsulationMode.cpp rename to generated/android/media/audio/common/AudioEncapsulationMode.cpp diff --git a/src/android/media/audio/common/AudioEncapsulationType.cpp b/generated/android/media/audio/common/AudioEncapsulationType.cpp similarity index 100% rename from src/android/media/audio/common/AudioEncapsulationType.cpp rename to generated/android/media/audio/common/AudioEncapsulationType.cpp diff --git a/src/android/media/audio/common/AudioFlag.cpp b/generated/android/media/audio/common/AudioFlag.cpp similarity index 100% rename from src/android/media/audio/common/AudioFlag.cpp rename to generated/android/media/audio/common/AudioFlag.cpp diff --git a/src/android/media/audio/common/AudioFormatDescription.cpp b/generated/android/media/audio/common/AudioFormatDescription.cpp similarity index 100% rename from src/android/media/audio/common/AudioFormatDescription.cpp rename to generated/android/media/audio/common/AudioFormatDescription.cpp diff --git a/src/android/media/audio/common/AudioFormatType.cpp b/generated/android/media/audio/common/AudioFormatType.cpp similarity index 100% rename from src/android/media/audio/common/AudioFormatType.cpp rename to generated/android/media/audio/common/AudioFormatType.cpp diff --git a/src/android/media/audio/common/AudioGain.cpp b/generated/android/media/audio/common/AudioGain.cpp similarity index 100% rename from src/android/media/audio/common/AudioGain.cpp rename to generated/android/media/audio/common/AudioGain.cpp diff --git a/src/android/media/audio/common/AudioGainConfig.cpp b/generated/android/media/audio/common/AudioGainConfig.cpp similarity index 100% rename from src/android/media/audio/common/AudioGainConfig.cpp rename to generated/android/media/audio/common/AudioGainConfig.cpp diff --git a/src/android/media/audio/common/AudioGainMode.cpp b/generated/android/media/audio/common/AudioGainMode.cpp similarity index 100% rename from src/android/media/audio/common/AudioGainMode.cpp rename to generated/android/media/audio/common/AudioGainMode.cpp diff --git a/src/android/media/audio/common/AudioHalAttributesGroup.cpp b/generated/android/media/audio/common/AudioHalAttributesGroup.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalAttributesGroup.cpp rename to generated/android/media/audio/common/AudioHalAttributesGroup.cpp diff --git a/src/android/media/audio/common/AudioHalCapConfiguration.cpp b/generated/android/media/audio/common/AudioHalCapConfiguration.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalCapConfiguration.cpp rename to generated/android/media/audio/common/AudioHalCapConfiguration.cpp diff --git a/src/android/media/audio/common/AudioHalCapCriterion.cpp b/generated/android/media/audio/common/AudioHalCapCriterion.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalCapCriterion.cpp rename to generated/android/media/audio/common/AudioHalCapCriterion.cpp diff --git a/src/android/media/audio/common/AudioHalCapCriterionType.cpp b/generated/android/media/audio/common/AudioHalCapCriterionType.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalCapCriterionType.cpp rename to generated/android/media/audio/common/AudioHalCapCriterionType.cpp diff --git a/src/android/media/audio/common/AudioHalCapCriterionV2.cpp b/generated/android/media/audio/common/AudioHalCapCriterionV2.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalCapCriterionV2.cpp rename to generated/android/media/audio/common/AudioHalCapCriterionV2.cpp diff --git a/src/android/media/audio/common/AudioHalCapDomain.cpp b/generated/android/media/audio/common/AudioHalCapDomain.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalCapDomain.cpp rename to generated/android/media/audio/common/AudioHalCapDomain.cpp diff --git a/src/android/media/audio/common/AudioHalCapParameter.cpp b/generated/android/media/audio/common/AudioHalCapParameter.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalCapParameter.cpp rename to generated/android/media/audio/common/AudioHalCapParameter.cpp diff --git a/src/android/media/audio/common/AudioHalCapRule.cpp b/generated/android/media/audio/common/AudioHalCapRule.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalCapRule.cpp rename to generated/android/media/audio/common/AudioHalCapRule.cpp diff --git a/src/android/media/audio/common/AudioHalEngineConfig.cpp b/generated/android/media/audio/common/AudioHalEngineConfig.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalEngineConfig.cpp rename to generated/android/media/audio/common/AudioHalEngineConfig.cpp diff --git a/src/android/media/audio/common/AudioHalProductStrategy.cpp b/generated/android/media/audio/common/AudioHalProductStrategy.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalProductStrategy.cpp rename to generated/android/media/audio/common/AudioHalProductStrategy.cpp diff --git a/src/android/media/audio/common/AudioHalVolumeCurve.cpp b/generated/android/media/audio/common/AudioHalVolumeCurve.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalVolumeCurve.cpp rename to generated/android/media/audio/common/AudioHalVolumeCurve.cpp diff --git a/src/android/media/audio/common/AudioHalVolumeGroup.cpp b/generated/android/media/audio/common/AudioHalVolumeGroup.cpp similarity index 100% rename from src/android/media/audio/common/AudioHalVolumeGroup.cpp rename to generated/android/media/audio/common/AudioHalVolumeGroup.cpp diff --git a/src/android/media/audio/common/AudioInputFlags.cpp b/generated/android/media/audio/common/AudioInputFlags.cpp similarity index 100% rename from src/android/media/audio/common/AudioInputFlags.cpp rename to generated/android/media/audio/common/AudioInputFlags.cpp diff --git a/src/android/media/audio/common/AudioIoFlags.cpp b/generated/android/media/audio/common/AudioIoFlags.cpp similarity index 100% rename from src/android/media/audio/common/AudioIoFlags.cpp rename to generated/android/media/audio/common/AudioIoFlags.cpp diff --git a/src/android/media/audio/common/AudioLatencyMode.cpp b/generated/android/media/audio/common/AudioLatencyMode.cpp similarity index 100% rename from src/android/media/audio/common/AudioLatencyMode.cpp rename to generated/android/media/audio/common/AudioLatencyMode.cpp diff --git a/src/android/media/audio/common/AudioMMapPolicy.cpp b/generated/android/media/audio/common/AudioMMapPolicy.cpp similarity index 100% rename from src/android/media/audio/common/AudioMMapPolicy.cpp rename to generated/android/media/audio/common/AudioMMapPolicy.cpp diff --git a/src/android/media/audio/common/AudioMMapPolicyInfo.cpp b/generated/android/media/audio/common/AudioMMapPolicyInfo.cpp similarity index 100% rename from src/android/media/audio/common/AudioMMapPolicyInfo.cpp rename to generated/android/media/audio/common/AudioMMapPolicyInfo.cpp diff --git a/src/android/media/audio/common/AudioMMapPolicyType.cpp b/generated/android/media/audio/common/AudioMMapPolicyType.cpp similarity index 100% rename from src/android/media/audio/common/AudioMMapPolicyType.cpp rename to generated/android/media/audio/common/AudioMMapPolicyType.cpp diff --git a/src/android/media/audio/common/AudioMode.cpp b/generated/android/media/audio/common/AudioMode.cpp similarity index 100% rename from src/android/media/audio/common/AudioMode.cpp rename to generated/android/media/audio/common/AudioMode.cpp diff --git a/src/android/media/audio/common/AudioOffloadInfo.cpp b/generated/android/media/audio/common/AudioOffloadInfo.cpp similarity index 100% rename from src/android/media/audio/common/AudioOffloadInfo.cpp rename to generated/android/media/audio/common/AudioOffloadInfo.cpp diff --git a/src/android/media/audio/common/AudioOutputFlags.cpp b/generated/android/media/audio/common/AudioOutputFlags.cpp similarity index 100% rename from src/android/media/audio/common/AudioOutputFlags.cpp rename to generated/android/media/audio/common/AudioOutputFlags.cpp diff --git a/src/android/media/audio/common/AudioPlaybackRate.cpp b/generated/android/media/audio/common/AudioPlaybackRate.cpp similarity index 100% rename from src/android/media/audio/common/AudioPlaybackRate.cpp rename to generated/android/media/audio/common/AudioPlaybackRate.cpp diff --git a/src/android/media/audio/common/AudioPolicyForceUse.cpp b/generated/android/media/audio/common/AudioPolicyForceUse.cpp similarity index 100% rename from src/android/media/audio/common/AudioPolicyForceUse.cpp rename to generated/android/media/audio/common/AudioPolicyForceUse.cpp diff --git a/src/android/media/audio/common/AudioPort.cpp b/generated/android/media/audio/common/AudioPort.cpp similarity index 100% rename from src/android/media/audio/common/AudioPort.cpp rename to generated/android/media/audio/common/AudioPort.cpp diff --git a/src/android/media/audio/common/AudioPortConfig.cpp b/generated/android/media/audio/common/AudioPortConfig.cpp similarity index 100% rename from src/android/media/audio/common/AudioPortConfig.cpp rename to generated/android/media/audio/common/AudioPortConfig.cpp diff --git a/src/android/media/audio/common/AudioPortDeviceExt.cpp b/generated/android/media/audio/common/AudioPortDeviceExt.cpp similarity index 100% rename from src/android/media/audio/common/AudioPortDeviceExt.cpp rename to generated/android/media/audio/common/AudioPortDeviceExt.cpp diff --git a/src/android/media/audio/common/AudioPortExt.cpp b/generated/android/media/audio/common/AudioPortExt.cpp similarity index 100% rename from src/android/media/audio/common/AudioPortExt.cpp rename to generated/android/media/audio/common/AudioPortExt.cpp diff --git a/src/android/media/audio/common/AudioPortMixExt.cpp b/generated/android/media/audio/common/AudioPortMixExt.cpp similarity index 100% rename from src/android/media/audio/common/AudioPortMixExt.cpp rename to generated/android/media/audio/common/AudioPortMixExt.cpp diff --git a/src/android/media/audio/common/AudioPortMixExtUseCase.cpp b/generated/android/media/audio/common/AudioPortMixExtUseCase.cpp similarity index 100% rename from src/android/media/audio/common/AudioPortMixExtUseCase.cpp rename to generated/android/media/audio/common/AudioPortMixExtUseCase.cpp diff --git a/src/android/media/audio/common/AudioProductStrategyType.cpp b/generated/android/media/audio/common/AudioProductStrategyType.cpp similarity index 100% rename from src/android/media/audio/common/AudioProductStrategyType.cpp rename to generated/android/media/audio/common/AudioProductStrategyType.cpp diff --git a/src/android/media/audio/common/AudioProfile.cpp b/generated/android/media/audio/common/AudioProfile.cpp similarity index 100% rename from src/android/media/audio/common/AudioProfile.cpp rename to generated/android/media/audio/common/AudioProfile.cpp diff --git a/src/android/media/audio/common/AudioSource.cpp b/generated/android/media/audio/common/AudioSource.cpp similarity index 100% rename from src/android/media/audio/common/AudioSource.cpp rename to generated/android/media/audio/common/AudioSource.cpp diff --git a/src/android/media/audio/common/AudioStandard.cpp b/generated/android/media/audio/common/AudioStandard.cpp similarity index 100% rename from src/android/media/audio/common/AudioStandard.cpp rename to generated/android/media/audio/common/AudioStandard.cpp diff --git a/src/android/media/audio/common/AudioStreamType.cpp b/generated/android/media/audio/common/AudioStreamType.cpp similarity index 100% rename from src/android/media/audio/common/AudioStreamType.cpp rename to generated/android/media/audio/common/AudioStreamType.cpp diff --git a/src/android/media/audio/common/AudioUsage.cpp b/generated/android/media/audio/common/AudioUsage.cpp similarity index 100% rename from src/android/media/audio/common/AudioUsage.cpp rename to generated/android/media/audio/common/AudioUsage.cpp diff --git a/generated/android/media/audio/common/v1/AudioUuid.cpp b/generated/android/media/audio/common/AudioUuid.cpp similarity index 98% rename from generated/android/media/audio/common/v1/AudioUuid.cpp rename to generated/android/media/audio/common/AudioUuid.cpp index ccb4c6b..245e629 100644 --- a/generated/android/media/audio/common/v1/AudioUuid.cpp +++ b/generated/android/media/audio/common/AudioUuid.cpp @@ -2,7 +2,7 @@ * This file is auto-generated. DO NOT MODIFY. * Using: /home/iscle/Android/Sdk/build-tools/35.0.1/aidl --lang=ndk -o generated -h generated/include --structured --stability=vintf --min_sdk_version=31 -I hardware_interfaces/common/aidl/aidl_api/android.hardware.common/current/ -I hardware_interfaces/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/ -I hardware_interfaces/audio/aidl/aidl_api/android.hardware.audio.common/current/ -I hardware_interfaces/audio/aidl/aidl_api/android.hardware.audio.effect/current/ -I system_hardware_interfaces/media/aidl_api/android.media.audio.common.types/current/ -I system_hardware_interfaces/media/aidl_api/android.media.audio.eraser.types/current/ system_hardware_interfaces/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUuid.aidl */ -#include +#include "aidl/android/media/audio/common/AudioUuid.h" #include @@ -11,7 +11,6 @@ namespace android { namespace media { namespace audio { namespace common { -namespace v1 { const char* AudioUuid::descriptor = "android.media.audio.common.AudioUuid"; binder_status_t AudioUuid::readFromParcel(const AParcel* _aidl_parcel) { @@ -89,7 +88,6 @@ binder_status_t AudioUuid::writeToParcel(AParcel* _aidl_parcel) const { return _aidl_ret_status; } -} // namespace v1 } // namespace common } // namespace audio } // namespace media diff --git a/src/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp b/generated/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp similarity index 100% rename from src/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp rename to generated/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp diff --git a/src/android/media/audio/common/Boolean.cpp b/generated/android/media/audio/common/Boolean.cpp similarity index 100% rename from src/android/media/audio/common/Boolean.cpp rename to generated/android/media/audio/common/Boolean.cpp diff --git a/src/android/media/audio/common/Byte.cpp b/generated/android/media/audio/common/Byte.cpp similarity index 100% rename from src/android/media/audio/common/Byte.cpp rename to generated/android/media/audio/common/Byte.cpp diff --git a/src/android/media/audio/common/Double.cpp b/generated/android/media/audio/common/Double.cpp similarity index 100% rename from src/android/media/audio/common/Double.cpp rename to generated/android/media/audio/common/Double.cpp diff --git a/src/android/media/audio/common/ExtraAudioDescriptor.cpp b/generated/android/media/audio/common/ExtraAudioDescriptor.cpp similarity index 100% rename from src/android/media/audio/common/ExtraAudioDescriptor.cpp rename to generated/android/media/audio/common/ExtraAudioDescriptor.cpp diff --git a/src/android/media/audio/common/Float.cpp b/generated/android/media/audio/common/Float.cpp similarity index 100% rename from src/android/media/audio/common/Float.cpp rename to generated/android/media/audio/common/Float.cpp diff --git a/src/android/media/audio/common/HeadTracking.cpp b/generated/android/media/audio/common/HeadTracking.cpp similarity index 100% rename from src/android/media/audio/common/HeadTracking.cpp rename to generated/android/media/audio/common/HeadTracking.cpp diff --git a/src/android/media/audio/common/Int.cpp b/generated/android/media/audio/common/Int.cpp similarity index 100% rename from src/android/media/audio/common/Int.cpp rename to generated/android/media/audio/common/Int.cpp diff --git a/src/android/media/audio/common/Long.cpp b/generated/android/media/audio/common/Long.cpp similarity index 100% rename from src/android/media/audio/common/Long.cpp rename to generated/android/media/audio/common/Long.cpp diff --git a/src/android/media/audio/common/MicrophoneDynamicInfo.cpp b/generated/android/media/audio/common/MicrophoneDynamicInfo.cpp similarity index 100% rename from src/android/media/audio/common/MicrophoneDynamicInfo.cpp rename to generated/android/media/audio/common/MicrophoneDynamicInfo.cpp diff --git a/src/android/media/audio/common/MicrophoneInfo.cpp b/generated/android/media/audio/common/MicrophoneInfo.cpp similarity index 100% rename from src/android/media/audio/common/MicrophoneInfo.cpp rename to generated/android/media/audio/common/MicrophoneInfo.cpp diff --git a/src/android/media/audio/common/PcmType.cpp b/generated/android/media/audio/common/PcmType.cpp similarity index 100% rename from src/android/media/audio/common/PcmType.cpp rename to generated/android/media/audio/common/PcmType.cpp diff --git a/src/android/media/audio/common/Spatialization.cpp b/generated/android/media/audio/common/Spatialization.cpp similarity index 100% rename from src/android/media/audio/common/Spatialization.cpp rename to generated/android/media/audio/common/Spatialization.cpp diff --git a/src/android/media/audio/common/Void.cpp b/generated/android/media/audio/common/Void.cpp similarity index 100% rename from src/android/media/audio/common/Void.cpp rename to generated/android/media/audio/common/Void.cpp diff --git a/src/android/media/audio/eraser/Capability.cpp b/generated/android/media/audio/eraser/Capability.cpp similarity index 100% rename from src/android/media/audio/eraser/Capability.cpp rename to generated/android/media/audio/eraser/Capability.cpp diff --git a/src/android/media/audio/eraser/Classification.cpp b/generated/android/media/audio/eraser/Classification.cpp similarity index 100% rename from src/android/media/audio/eraser/Classification.cpp rename to generated/android/media/audio/eraser/Classification.cpp diff --git a/src/android/media/audio/eraser/ClassificationConfig.cpp b/generated/android/media/audio/eraser/ClassificationConfig.cpp similarity index 100% rename from src/android/media/audio/eraser/ClassificationConfig.cpp rename to generated/android/media/audio/eraser/ClassificationConfig.cpp diff --git a/src/android/media/audio/eraser/ClassificationMetadata.cpp b/generated/android/media/audio/eraser/ClassificationMetadata.cpp similarity index 100% rename from src/android/media/audio/eraser/ClassificationMetadata.cpp rename to generated/android/media/audio/eraser/ClassificationMetadata.cpp diff --git a/src/android/media/audio/eraser/ClassificationMetadataList.cpp b/generated/android/media/audio/eraser/ClassificationMetadataList.cpp similarity index 100% rename from src/android/media/audio/eraser/ClassificationMetadataList.cpp rename to generated/android/media/audio/eraser/ClassificationMetadataList.cpp diff --git a/src/android/media/audio/eraser/ClassifierCapability.cpp b/generated/android/media/audio/eraser/ClassifierCapability.cpp similarity index 100% rename from src/android/media/audio/eraser/ClassifierCapability.cpp rename to generated/android/media/audio/eraser/ClassifierCapability.cpp diff --git a/src/android/media/audio/eraser/Configuration.cpp b/generated/android/media/audio/eraser/Configuration.cpp similarity index 100% rename from src/android/media/audio/eraser/Configuration.cpp rename to generated/android/media/audio/eraser/Configuration.cpp diff --git a/src/android/media/audio/eraser/IEraserCallback.cpp b/generated/android/media/audio/eraser/IEraserCallback.cpp similarity index 100% rename from src/android/media/audio/eraser/IEraserCallback.cpp rename to generated/android/media/audio/eraser/IEraserCallback.cpp diff --git a/src/android/media/audio/eraser/Mode.cpp b/generated/android/media/audio/eraser/Mode.cpp similarity index 100% rename from src/android/media/audio/eraser/Mode.cpp rename to generated/android/media/audio/eraser/Mode.cpp diff --git a/src/android/media/audio/eraser/RemixerCapability.cpp b/generated/android/media/audio/eraser/RemixerCapability.cpp similarity index 100% rename from src/android/media/audio/eraser/RemixerCapability.cpp rename to generated/android/media/audio/eraser/RemixerCapability.cpp diff --git a/src/android/media/audio/eraser/SeparatorCapability.cpp b/generated/android/media/audio/eraser/SeparatorCapability.cpp similarity index 100% rename from src/android/media/audio/eraser/SeparatorCapability.cpp rename to generated/android/media/audio/eraser/SeparatorCapability.cpp diff --git a/src/android/media/audio/eraser/SoundClassification.cpp b/generated/android/media/audio/eraser/SoundClassification.cpp similarity index 100% rename from src/android/media/audio/eraser/SoundClassification.cpp rename to generated/android/media/audio/eraser/SoundClassification.cpp diff --git a/src/include/aidl/android/hardware/audio/common/AudioOffloadMetadata.h b/generated/include/aidl/android/hardware/audio/common/AudioOffloadMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/AudioOffloadMetadata.h rename to generated/include/aidl/android/hardware/audio/common/AudioOffloadMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BnAudioOffloadMetadata.h b/generated/include/aidl/android/hardware/audio/common/BnAudioOffloadMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BnAudioOffloadMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BnAudioOffloadMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BnPlaybackTrackMetadata.h b/generated/include/aidl/android/hardware/audio/common/BnPlaybackTrackMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BnPlaybackTrackMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BnPlaybackTrackMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BnRecordTrackMetadata.h b/generated/include/aidl/android/hardware/audio/common/BnRecordTrackMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BnRecordTrackMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BnRecordTrackMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BnSinkMetadata.h b/generated/include/aidl/android/hardware/audio/common/BnSinkMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BnSinkMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BnSinkMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BnSourceMetadata.h b/generated/include/aidl/android/hardware/audio/common/BnSourceMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BnSourceMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BnSourceMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BpAudioOffloadMetadata.h b/generated/include/aidl/android/hardware/audio/common/BpAudioOffloadMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BpAudioOffloadMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BpAudioOffloadMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BpPlaybackTrackMetadata.h b/generated/include/aidl/android/hardware/audio/common/BpPlaybackTrackMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BpPlaybackTrackMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BpPlaybackTrackMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BpRecordTrackMetadata.h b/generated/include/aidl/android/hardware/audio/common/BpRecordTrackMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BpRecordTrackMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BpRecordTrackMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BpSinkMetadata.h b/generated/include/aidl/android/hardware/audio/common/BpSinkMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BpSinkMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BpSinkMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/BpSourceMetadata.h b/generated/include/aidl/android/hardware/audio/common/BpSourceMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/BpSourceMetadata.h rename to generated/include/aidl/android/hardware/audio/common/BpSourceMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/PlaybackTrackMetadata.h b/generated/include/aidl/android/hardware/audio/common/PlaybackTrackMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/PlaybackTrackMetadata.h rename to generated/include/aidl/android/hardware/audio/common/PlaybackTrackMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/RecordTrackMetadata.h b/generated/include/aidl/android/hardware/audio/common/RecordTrackMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/RecordTrackMetadata.h rename to generated/include/aidl/android/hardware/audio/common/RecordTrackMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/SinkMetadata.h b/generated/include/aidl/android/hardware/audio/common/SinkMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/SinkMetadata.h rename to generated/include/aidl/android/hardware/audio/common/SinkMetadata.h diff --git a/src/include/aidl/android/hardware/audio/common/SourceMetadata.h b/generated/include/aidl/android/hardware/audio/common/SourceMetadata.h similarity index 100% rename from src/include/aidl/android/hardware/audio/common/SourceMetadata.h rename to generated/include/aidl/android/hardware/audio/common/SourceMetadata.h diff --git a/src/include/aidl/android/hardware/audio/effect/AcousticEchoCanceler.h b/generated/include/aidl/android/hardware/audio/effect/AcousticEchoCanceler.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/AcousticEchoCanceler.h rename to generated/include/aidl/android/hardware/audio/effect/AcousticEchoCanceler.h diff --git a/src/include/aidl/android/hardware/audio/effect/AutomaticGainControlV1.h b/generated/include/aidl/android/hardware/audio/effect/AutomaticGainControlV1.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/AutomaticGainControlV1.h rename to generated/include/aidl/android/hardware/audio/effect/AutomaticGainControlV1.h diff --git a/src/include/aidl/android/hardware/audio/effect/AutomaticGainControlV2.h b/generated/include/aidl/android/hardware/audio/effect/AutomaticGainControlV2.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/AutomaticGainControlV2.h rename to generated/include/aidl/android/hardware/audio/effect/AutomaticGainControlV2.h diff --git a/src/include/aidl/android/hardware/audio/effect/BassBoost.h b/generated/include/aidl/android/hardware/audio/effect/BassBoost.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BassBoost.h rename to generated/include/aidl/android/hardware/audio/effect/BassBoost.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnAcousticEchoCanceler.h b/generated/include/aidl/android/hardware/audio/effect/BnAcousticEchoCanceler.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnAcousticEchoCanceler.h rename to generated/include/aidl/android/hardware/audio/effect/BnAcousticEchoCanceler.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV1.h b/generated/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV1.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV1.h rename to generated/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV1.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV2.h b/generated/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV2.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV2.h rename to generated/include/aidl/android/hardware/audio/effect/BnAutomaticGainControlV2.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnBassBoost.h b/generated/include/aidl/android/hardware/audio/effect/BnBassBoost.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnBassBoost.h rename to generated/include/aidl/android/hardware/audio/effect/BnBassBoost.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnCapability.h b/generated/include/aidl/android/hardware/audio/effect/BnCapability.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnCapability.h rename to generated/include/aidl/android/hardware/audio/effect/BnCapability.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnCommandId.h b/generated/include/aidl/android/hardware/audio/effect/BnCommandId.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnCommandId.h rename to generated/include/aidl/android/hardware/audio/effect/BnCommandId.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnDefaultExtension.h b/generated/include/aidl/android/hardware/audio/effect/BnDefaultExtension.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnDefaultExtension.h rename to generated/include/aidl/android/hardware/audio/effect/BnDefaultExtension.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnDescriptor.h b/generated/include/aidl/android/hardware/audio/effect/BnDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnDescriptor.h rename to generated/include/aidl/android/hardware/audio/effect/BnDescriptor.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnDownmix.h b/generated/include/aidl/android/hardware/audio/effect/BnDownmix.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnDownmix.h rename to generated/include/aidl/android/hardware/audio/effect/BnDownmix.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnDynamicsProcessing.h b/generated/include/aidl/android/hardware/audio/effect/BnDynamicsProcessing.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnDynamicsProcessing.h rename to generated/include/aidl/android/hardware/audio/effect/BnDynamicsProcessing.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnEffect.h b/generated/include/aidl/android/hardware/audio/effect/BnEffect.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnEffect.h rename to generated/include/aidl/android/hardware/audio/effect/BnEffect.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnEnvironmentalReverb.h b/generated/include/aidl/android/hardware/audio/effect/BnEnvironmentalReverb.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnEnvironmentalReverb.h rename to generated/include/aidl/android/hardware/audio/effect/BnEnvironmentalReverb.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnEqualizer.h b/generated/include/aidl/android/hardware/audio/effect/BnEqualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnEqualizer.h rename to generated/include/aidl/android/hardware/audio/effect/BnEqualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnEraser.h b/generated/include/aidl/android/hardware/audio/effect/BnEraser.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnEraser.h rename to generated/include/aidl/android/hardware/audio/effect/BnEraser.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnFactory.h b/generated/include/aidl/android/hardware/audio/effect/BnFactory.h similarity index 83% rename from src/include/aidl/android/hardware/audio/effect/BnFactory.h rename to generated/include/aidl/android/hardware/audio/effect/BnFactory.h index eb7fac0..a1aa032 100644 --- a/src/include/aidl/android/hardware/audio/effect/BnFactory.h +++ b/generated/include/aidl/android/hardware/audio/effect/BnFactory.h @@ -33,13 +33,13 @@ public: explicit IFactoryDelegator(const std::shared_ptr &impl) : _impl(impl) { } - ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) override { + ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) override { return _impl->queryEffects(in_type, in_implementation, in_proxy, _aidl_return); } ::ndk::ScopedAStatus queryProcessing(const std::optional<::aidl::android::hardware::audio::effect::Processing::Type>& in_type, std::vector<::aidl::android::hardware::audio::effect::Processing>* _aidl_return) override { return _impl->queryProcessing(in_type, _aidl_return); } - ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::v1::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) override { + ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) override { return _impl->createEffect(in_implUuid, _aidl_return); } ::ndk::ScopedAStatus destroyEffect(const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>& in_handle) override { diff --git a/src/include/aidl/android/hardware/audio/effect/BnFlags.h b/generated/include/aidl/android/hardware/audio/effect/BnFlags.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnFlags.h rename to generated/include/aidl/android/hardware/audio/effect/BnFlags.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnHapticGenerator.h b/generated/include/aidl/android/hardware/audio/effect/BnHapticGenerator.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnHapticGenerator.h rename to generated/include/aidl/android/hardware/audio/effect/BnHapticGenerator.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnLoudnessEnhancer.h b/generated/include/aidl/android/hardware/audio/effect/BnLoudnessEnhancer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnLoudnessEnhancer.h rename to generated/include/aidl/android/hardware/audio/effect/BnLoudnessEnhancer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnNoiseSuppression.h b/generated/include/aidl/android/hardware/audio/effect/BnNoiseSuppression.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnNoiseSuppression.h rename to generated/include/aidl/android/hardware/audio/effect/BnNoiseSuppression.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnParameter.h b/generated/include/aidl/android/hardware/audio/effect/BnParameter.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnParameter.h rename to generated/include/aidl/android/hardware/audio/effect/BnParameter.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnPresetReverb.h b/generated/include/aidl/android/hardware/audio/effect/BnPresetReverb.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnPresetReverb.h rename to generated/include/aidl/android/hardware/audio/effect/BnPresetReverb.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnProcessing.h b/generated/include/aidl/android/hardware/audio/effect/BnProcessing.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnProcessing.h rename to generated/include/aidl/android/hardware/audio/effect/BnProcessing.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnRange.h b/generated/include/aidl/android/hardware/audio/effect/BnRange.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnRange.h rename to generated/include/aidl/android/hardware/audio/effect/BnRange.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnSpatializer.h b/generated/include/aidl/android/hardware/audio/effect/BnSpatializer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnSpatializer.h rename to generated/include/aidl/android/hardware/audio/effect/BnSpatializer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnState.h b/generated/include/aidl/android/hardware/audio/effect/BnState.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnState.h rename to generated/include/aidl/android/hardware/audio/effect/BnState.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnVendorExtension.h b/generated/include/aidl/android/hardware/audio/effect/BnVendorExtension.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnVendorExtension.h rename to generated/include/aidl/android/hardware/audio/effect/BnVendorExtension.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnVirtualizer.h b/generated/include/aidl/android/hardware/audio/effect/BnVirtualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnVirtualizer.h rename to generated/include/aidl/android/hardware/audio/effect/BnVirtualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnVisualizer.h b/generated/include/aidl/android/hardware/audio/effect/BnVisualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnVisualizer.h rename to generated/include/aidl/android/hardware/audio/effect/BnVisualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BnVolume.h b/generated/include/aidl/android/hardware/audio/effect/BnVolume.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BnVolume.h rename to generated/include/aidl/android/hardware/audio/effect/BnVolume.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpAcousticEchoCanceler.h b/generated/include/aidl/android/hardware/audio/effect/BpAcousticEchoCanceler.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpAcousticEchoCanceler.h rename to generated/include/aidl/android/hardware/audio/effect/BpAcousticEchoCanceler.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV1.h b/generated/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV1.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV1.h rename to generated/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV1.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV2.h b/generated/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV2.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV2.h rename to generated/include/aidl/android/hardware/audio/effect/BpAutomaticGainControlV2.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpBassBoost.h b/generated/include/aidl/android/hardware/audio/effect/BpBassBoost.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpBassBoost.h rename to generated/include/aidl/android/hardware/audio/effect/BpBassBoost.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpCapability.h b/generated/include/aidl/android/hardware/audio/effect/BpCapability.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpCapability.h rename to generated/include/aidl/android/hardware/audio/effect/BpCapability.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpCommandId.h b/generated/include/aidl/android/hardware/audio/effect/BpCommandId.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpCommandId.h rename to generated/include/aidl/android/hardware/audio/effect/BpCommandId.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpDefaultExtension.h b/generated/include/aidl/android/hardware/audio/effect/BpDefaultExtension.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpDefaultExtension.h rename to generated/include/aidl/android/hardware/audio/effect/BpDefaultExtension.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpDescriptor.h b/generated/include/aidl/android/hardware/audio/effect/BpDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpDescriptor.h rename to generated/include/aidl/android/hardware/audio/effect/BpDescriptor.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpDownmix.h b/generated/include/aidl/android/hardware/audio/effect/BpDownmix.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpDownmix.h rename to generated/include/aidl/android/hardware/audio/effect/BpDownmix.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpDynamicsProcessing.h b/generated/include/aidl/android/hardware/audio/effect/BpDynamicsProcessing.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpDynamicsProcessing.h rename to generated/include/aidl/android/hardware/audio/effect/BpDynamicsProcessing.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpEffect.h b/generated/include/aidl/android/hardware/audio/effect/BpEffect.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpEffect.h rename to generated/include/aidl/android/hardware/audio/effect/BpEffect.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpEnvironmentalReverb.h b/generated/include/aidl/android/hardware/audio/effect/BpEnvironmentalReverb.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpEnvironmentalReverb.h rename to generated/include/aidl/android/hardware/audio/effect/BpEnvironmentalReverb.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpEqualizer.h b/generated/include/aidl/android/hardware/audio/effect/BpEqualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpEqualizer.h rename to generated/include/aidl/android/hardware/audio/effect/BpEqualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpEraser.h b/generated/include/aidl/android/hardware/audio/effect/BpEraser.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpEraser.h rename to generated/include/aidl/android/hardware/audio/effect/BpEraser.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpFactory.h b/generated/include/aidl/android/hardware/audio/effect/BpFactory.h similarity index 79% rename from src/include/aidl/android/hardware/audio/effect/BpFactory.h rename to generated/include/aidl/android/hardware/audio/effect/BpFactory.h index 354ecf5..e06cbdf 100644 --- a/src/include/aidl/android/hardware/audio/effect/BpFactory.h +++ b/generated/include/aidl/android/hardware/audio/effect/BpFactory.h @@ -18,9 +18,9 @@ public: explicit BpFactory(const ::ndk::SpAIBinder& binder); virtual ~BpFactory(); - ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) override; + ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) override; ::ndk::ScopedAStatus queryProcessing(const std::optional<::aidl::android::hardware::audio::effect::Processing::Type>& in_type, std::vector<::aidl::android::hardware::audio::effect::Processing>* _aidl_return) override; - ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::v1::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) override; + ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) override; ::ndk::ScopedAStatus destroyEffect(const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>& in_handle) override; }; } // namespace effect diff --git a/src/include/aidl/android/hardware/audio/effect/BpFlags.h b/generated/include/aidl/android/hardware/audio/effect/BpFlags.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpFlags.h rename to generated/include/aidl/android/hardware/audio/effect/BpFlags.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpHapticGenerator.h b/generated/include/aidl/android/hardware/audio/effect/BpHapticGenerator.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpHapticGenerator.h rename to generated/include/aidl/android/hardware/audio/effect/BpHapticGenerator.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpLoudnessEnhancer.h b/generated/include/aidl/android/hardware/audio/effect/BpLoudnessEnhancer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpLoudnessEnhancer.h rename to generated/include/aidl/android/hardware/audio/effect/BpLoudnessEnhancer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpNoiseSuppression.h b/generated/include/aidl/android/hardware/audio/effect/BpNoiseSuppression.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpNoiseSuppression.h rename to generated/include/aidl/android/hardware/audio/effect/BpNoiseSuppression.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpParameter.h b/generated/include/aidl/android/hardware/audio/effect/BpParameter.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpParameter.h rename to generated/include/aidl/android/hardware/audio/effect/BpParameter.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpPresetReverb.h b/generated/include/aidl/android/hardware/audio/effect/BpPresetReverb.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpPresetReverb.h rename to generated/include/aidl/android/hardware/audio/effect/BpPresetReverb.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpProcessing.h b/generated/include/aidl/android/hardware/audio/effect/BpProcessing.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpProcessing.h rename to generated/include/aidl/android/hardware/audio/effect/BpProcessing.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpRange.h b/generated/include/aidl/android/hardware/audio/effect/BpRange.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpRange.h rename to generated/include/aidl/android/hardware/audio/effect/BpRange.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpSpatializer.h b/generated/include/aidl/android/hardware/audio/effect/BpSpatializer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpSpatializer.h rename to generated/include/aidl/android/hardware/audio/effect/BpSpatializer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpState.h b/generated/include/aidl/android/hardware/audio/effect/BpState.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpState.h rename to generated/include/aidl/android/hardware/audio/effect/BpState.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpVendorExtension.h b/generated/include/aidl/android/hardware/audio/effect/BpVendorExtension.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpVendorExtension.h rename to generated/include/aidl/android/hardware/audio/effect/BpVendorExtension.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpVirtualizer.h b/generated/include/aidl/android/hardware/audio/effect/BpVirtualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpVirtualizer.h rename to generated/include/aidl/android/hardware/audio/effect/BpVirtualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpVisualizer.h b/generated/include/aidl/android/hardware/audio/effect/BpVisualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpVisualizer.h rename to generated/include/aidl/android/hardware/audio/effect/BpVisualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/BpVolume.h b/generated/include/aidl/android/hardware/audio/effect/BpVolume.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/BpVolume.h rename to generated/include/aidl/android/hardware/audio/effect/BpVolume.h diff --git a/src/include/aidl/android/hardware/audio/effect/Capability.h b/generated/include/aidl/android/hardware/audio/effect/Capability.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Capability.h rename to generated/include/aidl/android/hardware/audio/effect/Capability.h diff --git a/src/include/aidl/android/hardware/audio/effect/CommandId.h b/generated/include/aidl/android/hardware/audio/effect/CommandId.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/CommandId.h rename to generated/include/aidl/android/hardware/audio/effect/CommandId.h diff --git a/src/include/aidl/android/hardware/audio/effect/DefaultExtension.h b/generated/include/aidl/android/hardware/audio/effect/DefaultExtension.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/DefaultExtension.h rename to generated/include/aidl/android/hardware/audio/effect/DefaultExtension.h diff --git a/src/include/aidl/android/hardware/audio/effect/Descriptor.h b/generated/include/aidl/android/hardware/audio/effect/Descriptor.h similarity index 96% rename from src/include/aidl/android/hardware/audio/effect/Descriptor.h rename to generated/include/aidl/android/hardware/audio/effect/Descriptor.h index eb97420..6aad20a 100644 --- a/src/include/aidl/android/hardware/audio/effect/Descriptor.h +++ b/generated/include/aidl/android/hardware/audio/effect/Descriptor.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #ifdef BINDER_STABILITY_SUPPORT #include #endif // BINDER_STABILITY_SUPPORT @@ -42,9 +42,9 @@ public: typedef std::false_type fixed_size; static const char* descriptor; - ::aidl::android::media::audio::common::v1::AudioUuid type; - ::aidl::android::media::audio::common::v1::AudioUuid uuid; - std::optional<::aidl::android::media::audio::common::v1::AudioUuid> proxy; + ::aidl::android::media::audio::common::AudioUuid type; + ::aidl::android::media::audio::common::AudioUuid uuid; + std::optional<::aidl::android::media::audio::common::AudioUuid> proxy; binder_status_t readFromParcel(const AParcel* parcel); binder_status_t writeToParcel(AParcel* parcel) const; diff --git a/src/include/aidl/android/hardware/audio/effect/Downmix.h b/generated/include/aidl/android/hardware/audio/effect/Downmix.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Downmix.h rename to generated/include/aidl/android/hardware/audio/effect/Downmix.h diff --git a/src/include/aidl/android/hardware/audio/effect/DynamicsProcessing.h b/generated/include/aidl/android/hardware/audio/effect/DynamicsProcessing.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/DynamicsProcessing.h rename to generated/include/aidl/android/hardware/audio/effect/DynamicsProcessing.h diff --git a/src/include/aidl/android/hardware/audio/effect/EnvironmentalReverb.h b/generated/include/aidl/android/hardware/audio/effect/EnvironmentalReverb.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/EnvironmentalReverb.h rename to generated/include/aidl/android/hardware/audio/effect/EnvironmentalReverb.h diff --git a/src/include/aidl/android/hardware/audio/effect/Equalizer.h b/generated/include/aidl/android/hardware/audio/effect/Equalizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Equalizer.h rename to generated/include/aidl/android/hardware/audio/effect/Equalizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/Eraser.h b/generated/include/aidl/android/hardware/audio/effect/Eraser.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Eraser.h rename to generated/include/aidl/android/hardware/audio/effect/Eraser.h diff --git a/src/include/aidl/android/hardware/audio/effect/Flags.h b/generated/include/aidl/android/hardware/audio/effect/Flags.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Flags.h rename to generated/include/aidl/android/hardware/audio/effect/Flags.h diff --git a/src/include/aidl/android/hardware/audio/effect/HapticGenerator.h b/generated/include/aidl/android/hardware/audio/effect/HapticGenerator.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/HapticGenerator.h rename to generated/include/aidl/android/hardware/audio/effect/HapticGenerator.h diff --git a/src/include/aidl/android/hardware/audio/effect/IEffect.h b/generated/include/aidl/android/hardware/audio/effect/IEffect.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/IEffect.h rename to generated/include/aidl/android/hardware/audio/effect/IEffect.h diff --git a/src/include/aidl/android/hardware/audio/effect/IFactory.h b/generated/include/aidl/android/hardware/audio/effect/IFactory.h similarity index 80% rename from src/include/aidl/android/hardware/audio/effect/IFactory.h rename to generated/include/aidl/android/hardware/audio/effect/IFactory.h index 234fb5f..bbcb5ae 100644 --- a/src/include/aidl/android/hardware/audio/effect/IFactory.h +++ b/generated/include/aidl/android/hardware/audio/effect/IFactory.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #ifdef BINDER_STABILITY_SUPPORT #include #endif // BINDER_STABILITY_SUPPORT @@ -50,18 +50,18 @@ public: static binder_status_t readFromParcel(const AParcel* parcel, std::shared_ptr* instance); static bool setDefaultImpl(const std::shared_ptr& impl); static const std::shared_ptr& getDefaultImpl(); - virtual ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) = 0; + virtual ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) = 0; virtual ::ndk::ScopedAStatus queryProcessing(const std::optional<::aidl::android::hardware::audio::effect::Processing::Type>& in_type, std::vector<::aidl::android::hardware::audio::effect::Processing>* _aidl_return) = 0; - virtual ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::v1::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) = 0; + virtual ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) = 0; virtual ::ndk::ScopedAStatus destroyEffect(const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>& in_handle) = 0; private: static std::shared_ptr default_impl; }; class IFactoryDefault : public IFactory { public: - ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::v1::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) override; + ::ndk::ScopedAStatus queryEffects(const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_type, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_implementation, const std::optional<::aidl::android::media::audio::common::AudioUuid>& in_proxy, std::vector<::aidl::android::hardware::audio::effect::Descriptor>* _aidl_return) override; ::ndk::ScopedAStatus queryProcessing(const std::optional<::aidl::android::hardware::audio::effect::Processing::Type>& in_type, std::vector<::aidl::android::hardware::audio::effect::Processing>* _aidl_return) override; - ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::v1::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) override; + ::ndk::ScopedAStatus createEffect(const ::aidl::android::media::audio::common::AudioUuid& in_implUuid, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>* _aidl_return) override; ::ndk::ScopedAStatus destroyEffect(const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>& in_handle) override; ::ndk::SpAIBinder asBinder() override; bool isRemote() override; diff --git a/src/include/aidl/android/hardware/audio/effect/LoudnessEnhancer.h b/generated/include/aidl/android/hardware/audio/effect/LoudnessEnhancer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/LoudnessEnhancer.h rename to generated/include/aidl/android/hardware/audio/effect/LoudnessEnhancer.h diff --git a/src/include/aidl/android/hardware/audio/effect/NoiseSuppression.h b/generated/include/aidl/android/hardware/audio/effect/NoiseSuppression.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/NoiseSuppression.h rename to generated/include/aidl/android/hardware/audio/effect/NoiseSuppression.h diff --git a/src/include/aidl/android/hardware/audio/effect/Parameter.h b/generated/include/aidl/android/hardware/audio/effect/Parameter.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Parameter.h rename to generated/include/aidl/android/hardware/audio/effect/Parameter.h diff --git a/src/include/aidl/android/hardware/audio/effect/PresetReverb.h b/generated/include/aidl/android/hardware/audio/effect/PresetReverb.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/PresetReverb.h rename to generated/include/aidl/android/hardware/audio/effect/PresetReverb.h diff --git a/src/include/aidl/android/hardware/audio/effect/Processing.h b/generated/include/aidl/android/hardware/audio/effect/Processing.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Processing.h rename to generated/include/aidl/android/hardware/audio/effect/Processing.h diff --git a/src/include/aidl/android/hardware/audio/effect/Range.h b/generated/include/aidl/android/hardware/audio/effect/Range.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Range.h rename to generated/include/aidl/android/hardware/audio/effect/Range.h diff --git a/src/include/aidl/android/hardware/audio/effect/Spatializer.h b/generated/include/aidl/android/hardware/audio/effect/Spatializer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Spatializer.h rename to generated/include/aidl/android/hardware/audio/effect/Spatializer.h diff --git a/src/include/aidl/android/hardware/audio/effect/State.h b/generated/include/aidl/android/hardware/audio/effect/State.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/State.h rename to generated/include/aidl/android/hardware/audio/effect/State.h diff --git a/src/include/aidl/android/hardware/audio/effect/VendorExtension.h b/generated/include/aidl/android/hardware/audio/effect/VendorExtension.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/VendorExtension.h rename to generated/include/aidl/android/hardware/audio/effect/VendorExtension.h diff --git a/src/include/aidl/android/hardware/audio/effect/Virtualizer.h b/generated/include/aidl/android/hardware/audio/effect/Virtualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Virtualizer.h rename to generated/include/aidl/android/hardware/audio/effect/Virtualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/Visualizer.h b/generated/include/aidl/android/hardware/audio/effect/Visualizer.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Visualizer.h rename to generated/include/aidl/android/hardware/audio/effect/Visualizer.h diff --git a/src/include/aidl/android/hardware/audio/effect/Volume.h b/generated/include/aidl/android/hardware/audio/effect/Volume.h similarity index 100% rename from src/include/aidl/android/hardware/audio/effect/Volume.h rename to generated/include/aidl/android/hardware/audio/effect/Volume.h diff --git a/src/include/aidl/android/hardware/common/Ashmem.h b/generated/include/aidl/android/hardware/common/Ashmem.h similarity index 100% rename from src/include/aidl/android/hardware/common/Ashmem.h rename to generated/include/aidl/android/hardware/common/Ashmem.h diff --git a/src/include/aidl/android/hardware/common/BnAshmem.h b/generated/include/aidl/android/hardware/common/BnAshmem.h similarity index 100% rename from src/include/aidl/android/hardware/common/BnAshmem.h rename to generated/include/aidl/android/hardware/common/BnAshmem.h diff --git a/src/include/aidl/android/hardware/common/BnMappableFile.h b/generated/include/aidl/android/hardware/common/BnMappableFile.h similarity index 100% rename from src/include/aidl/android/hardware/common/BnMappableFile.h rename to generated/include/aidl/android/hardware/common/BnMappableFile.h diff --git a/src/include/aidl/android/hardware/common/BnNativeHandle.h b/generated/include/aidl/android/hardware/common/BnNativeHandle.h similarity index 100% rename from src/include/aidl/android/hardware/common/BnNativeHandle.h rename to generated/include/aidl/android/hardware/common/BnNativeHandle.h diff --git a/src/include/aidl/android/hardware/common/BpAshmem.h b/generated/include/aidl/android/hardware/common/BpAshmem.h similarity index 100% rename from src/include/aidl/android/hardware/common/BpAshmem.h rename to generated/include/aidl/android/hardware/common/BpAshmem.h diff --git a/src/include/aidl/android/hardware/common/BpMappableFile.h b/generated/include/aidl/android/hardware/common/BpMappableFile.h similarity index 100% rename from src/include/aidl/android/hardware/common/BpMappableFile.h rename to generated/include/aidl/android/hardware/common/BpMappableFile.h diff --git a/src/include/aidl/android/hardware/common/BpNativeHandle.h b/generated/include/aidl/android/hardware/common/BpNativeHandle.h similarity index 100% rename from src/include/aidl/android/hardware/common/BpNativeHandle.h rename to generated/include/aidl/android/hardware/common/BpNativeHandle.h diff --git a/src/include/aidl/android/hardware/common/MappableFile.h b/generated/include/aidl/android/hardware/common/MappableFile.h similarity index 100% rename from src/include/aidl/android/hardware/common/MappableFile.h rename to generated/include/aidl/android/hardware/common/MappableFile.h diff --git a/src/include/aidl/android/hardware/common/NativeHandle.h b/generated/include/aidl/android/hardware/common/NativeHandle.h similarity index 100% rename from src/include/aidl/android/hardware/common/NativeHandle.h rename to generated/include/aidl/android/hardware/common/NativeHandle.h diff --git a/src/include/aidl/android/hardware/common/fmq/BnGrantorDescriptor.h b/generated/include/aidl/android/hardware/common/fmq/BnGrantorDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BnGrantorDescriptor.h rename to generated/include/aidl/android/hardware/common/fmq/BnGrantorDescriptor.h diff --git a/src/include/aidl/android/hardware/common/fmq/BnMQDescriptor.h b/generated/include/aidl/android/hardware/common/fmq/BnMQDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BnMQDescriptor.h rename to generated/include/aidl/android/hardware/common/fmq/BnMQDescriptor.h diff --git a/src/include/aidl/android/hardware/common/fmq/BnSynchronizedReadWrite.h b/generated/include/aidl/android/hardware/common/fmq/BnSynchronizedReadWrite.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BnSynchronizedReadWrite.h rename to generated/include/aidl/android/hardware/common/fmq/BnSynchronizedReadWrite.h diff --git a/src/include/aidl/android/hardware/common/fmq/BnUnsynchronizedWrite.h b/generated/include/aidl/android/hardware/common/fmq/BnUnsynchronizedWrite.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BnUnsynchronizedWrite.h rename to generated/include/aidl/android/hardware/common/fmq/BnUnsynchronizedWrite.h diff --git a/src/include/aidl/android/hardware/common/fmq/BpGrantorDescriptor.h b/generated/include/aidl/android/hardware/common/fmq/BpGrantorDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BpGrantorDescriptor.h rename to generated/include/aidl/android/hardware/common/fmq/BpGrantorDescriptor.h diff --git a/src/include/aidl/android/hardware/common/fmq/BpMQDescriptor.h b/generated/include/aidl/android/hardware/common/fmq/BpMQDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BpMQDescriptor.h rename to generated/include/aidl/android/hardware/common/fmq/BpMQDescriptor.h diff --git a/src/include/aidl/android/hardware/common/fmq/BpSynchronizedReadWrite.h b/generated/include/aidl/android/hardware/common/fmq/BpSynchronizedReadWrite.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BpSynchronizedReadWrite.h rename to generated/include/aidl/android/hardware/common/fmq/BpSynchronizedReadWrite.h diff --git a/src/include/aidl/android/hardware/common/fmq/BpUnsynchronizedWrite.h b/generated/include/aidl/android/hardware/common/fmq/BpUnsynchronizedWrite.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/BpUnsynchronizedWrite.h rename to generated/include/aidl/android/hardware/common/fmq/BpUnsynchronizedWrite.h diff --git a/src/include/aidl/android/hardware/common/fmq/GrantorDescriptor.h b/generated/include/aidl/android/hardware/common/fmq/GrantorDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/GrantorDescriptor.h rename to generated/include/aidl/android/hardware/common/fmq/GrantorDescriptor.h diff --git a/src/include/aidl/android/hardware/common/fmq/MQDescriptor.h b/generated/include/aidl/android/hardware/common/fmq/MQDescriptor.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/MQDescriptor.h rename to generated/include/aidl/android/hardware/common/fmq/MQDescriptor.h diff --git a/src/include/aidl/android/hardware/common/fmq/SynchronizedReadWrite.h b/generated/include/aidl/android/hardware/common/fmq/SynchronizedReadWrite.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/SynchronizedReadWrite.h rename to generated/include/aidl/android/hardware/common/fmq/SynchronizedReadWrite.h diff --git a/src/include/aidl/android/hardware/common/fmq/UnsynchronizedWrite.h b/generated/include/aidl/android/hardware/common/fmq/UnsynchronizedWrite.h similarity index 100% rename from src/include/aidl/android/hardware/common/fmq/UnsynchronizedWrite.h rename to generated/include/aidl/android/hardware/common/fmq/UnsynchronizedWrite.h diff --git a/src/include/aidl/android/media/audio/common/AudioAttributes.h b/generated/include/aidl/android/media/audio/common/AudioAttributes.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioAttributes.h rename to generated/include/aidl/android/media/audio/common/AudioAttributes.h diff --git a/src/include/aidl/android/media/audio/common/AudioChannelLayout.h b/generated/include/aidl/android/media/audio/common/AudioChannelLayout.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioChannelLayout.h rename to generated/include/aidl/android/media/audio/common/AudioChannelLayout.h diff --git a/src/include/aidl/android/media/audio/common/AudioConfig.h b/generated/include/aidl/android/media/audio/common/AudioConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioConfig.h rename to generated/include/aidl/android/media/audio/common/AudioConfig.h diff --git a/src/include/aidl/android/media/audio/common/AudioConfigBase.h b/generated/include/aidl/android/media/audio/common/AudioConfigBase.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioConfigBase.h rename to generated/include/aidl/android/media/audio/common/AudioConfigBase.h diff --git a/src/include/aidl/android/media/audio/common/AudioContentType.h b/generated/include/aidl/android/media/audio/common/AudioContentType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioContentType.h rename to generated/include/aidl/android/media/audio/common/AudioContentType.h diff --git a/src/include/aidl/android/media/audio/common/AudioDevice.h b/generated/include/aidl/android/media/audio/common/AudioDevice.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioDevice.h rename to generated/include/aidl/android/media/audio/common/AudioDevice.h diff --git a/src/include/aidl/android/media/audio/common/AudioDeviceAddress.h b/generated/include/aidl/android/media/audio/common/AudioDeviceAddress.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioDeviceAddress.h rename to generated/include/aidl/android/media/audio/common/AudioDeviceAddress.h diff --git a/src/include/aidl/android/media/audio/common/AudioDeviceDescription.h b/generated/include/aidl/android/media/audio/common/AudioDeviceDescription.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioDeviceDescription.h rename to generated/include/aidl/android/media/audio/common/AudioDeviceDescription.h diff --git a/src/include/aidl/android/media/audio/common/AudioDeviceType.h b/generated/include/aidl/android/media/audio/common/AudioDeviceType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioDeviceType.h rename to generated/include/aidl/android/media/audio/common/AudioDeviceType.h diff --git a/src/include/aidl/android/media/audio/common/AudioDualMonoMode.h b/generated/include/aidl/android/media/audio/common/AudioDualMonoMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioDualMonoMode.h rename to generated/include/aidl/android/media/audio/common/AudioDualMonoMode.h diff --git a/src/include/aidl/android/media/audio/common/AudioEncapsulationMetadataType.h b/generated/include/aidl/android/media/audio/common/AudioEncapsulationMetadataType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioEncapsulationMetadataType.h rename to generated/include/aidl/android/media/audio/common/AudioEncapsulationMetadataType.h diff --git a/src/include/aidl/android/media/audio/common/AudioEncapsulationMode.h b/generated/include/aidl/android/media/audio/common/AudioEncapsulationMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioEncapsulationMode.h rename to generated/include/aidl/android/media/audio/common/AudioEncapsulationMode.h diff --git a/src/include/aidl/android/media/audio/common/AudioEncapsulationType.h b/generated/include/aidl/android/media/audio/common/AudioEncapsulationType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioEncapsulationType.h rename to generated/include/aidl/android/media/audio/common/AudioEncapsulationType.h diff --git a/src/include/aidl/android/media/audio/common/AudioFlag.h b/generated/include/aidl/android/media/audio/common/AudioFlag.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioFlag.h rename to generated/include/aidl/android/media/audio/common/AudioFlag.h diff --git a/src/include/aidl/android/media/audio/common/AudioFormatDescription.h b/generated/include/aidl/android/media/audio/common/AudioFormatDescription.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioFormatDescription.h rename to generated/include/aidl/android/media/audio/common/AudioFormatDescription.h diff --git a/src/include/aidl/android/media/audio/common/AudioFormatType.h b/generated/include/aidl/android/media/audio/common/AudioFormatType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioFormatType.h rename to generated/include/aidl/android/media/audio/common/AudioFormatType.h diff --git a/src/include/aidl/android/media/audio/common/AudioGain.h b/generated/include/aidl/android/media/audio/common/AudioGain.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioGain.h rename to generated/include/aidl/android/media/audio/common/AudioGain.h diff --git a/src/include/aidl/android/media/audio/common/AudioGainConfig.h b/generated/include/aidl/android/media/audio/common/AudioGainConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioGainConfig.h rename to generated/include/aidl/android/media/audio/common/AudioGainConfig.h diff --git a/src/include/aidl/android/media/audio/common/AudioGainMode.h b/generated/include/aidl/android/media/audio/common/AudioGainMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioGainMode.h rename to generated/include/aidl/android/media/audio/common/AudioGainMode.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalAttributesGroup.h b/generated/include/aidl/android/media/audio/common/AudioHalAttributesGroup.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalAttributesGroup.h rename to generated/include/aidl/android/media/audio/common/AudioHalAttributesGroup.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalCapConfiguration.h b/generated/include/aidl/android/media/audio/common/AudioHalCapConfiguration.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalCapConfiguration.h rename to generated/include/aidl/android/media/audio/common/AudioHalCapConfiguration.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalCapCriterion.h b/generated/include/aidl/android/media/audio/common/AudioHalCapCriterion.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalCapCriterion.h rename to generated/include/aidl/android/media/audio/common/AudioHalCapCriterion.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalCapCriterionType.h b/generated/include/aidl/android/media/audio/common/AudioHalCapCriterionType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalCapCriterionType.h rename to generated/include/aidl/android/media/audio/common/AudioHalCapCriterionType.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalCapCriterionV2.h b/generated/include/aidl/android/media/audio/common/AudioHalCapCriterionV2.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalCapCriterionV2.h rename to generated/include/aidl/android/media/audio/common/AudioHalCapCriterionV2.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalCapDomain.h b/generated/include/aidl/android/media/audio/common/AudioHalCapDomain.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalCapDomain.h rename to generated/include/aidl/android/media/audio/common/AudioHalCapDomain.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalCapParameter.h b/generated/include/aidl/android/media/audio/common/AudioHalCapParameter.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalCapParameter.h rename to generated/include/aidl/android/media/audio/common/AudioHalCapParameter.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalCapRule.h b/generated/include/aidl/android/media/audio/common/AudioHalCapRule.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalCapRule.h rename to generated/include/aidl/android/media/audio/common/AudioHalCapRule.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalEngineConfig.h b/generated/include/aidl/android/media/audio/common/AudioHalEngineConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalEngineConfig.h rename to generated/include/aidl/android/media/audio/common/AudioHalEngineConfig.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalProductStrategy.h b/generated/include/aidl/android/media/audio/common/AudioHalProductStrategy.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalProductStrategy.h rename to generated/include/aidl/android/media/audio/common/AudioHalProductStrategy.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalVolumeCurve.h b/generated/include/aidl/android/media/audio/common/AudioHalVolumeCurve.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalVolumeCurve.h rename to generated/include/aidl/android/media/audio/common/AudioHalVolumeCurve.h diff --git a/src/include/aidl/android/media/audio/common/AudioHalVolumeGroup.h b/generated/include/aidl/android/media/audio/common/AudioHalVolumeGroup.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioHalVolumeGroup.h rename to generated/include/aidl/android/media/audio/common/AudioHalVolumeGroup.h diff --git a/src/include/aidl/android/media/audio/common/AudioInputFlags.h b/generated/include/aidl/android/media/audio/common/AudioInputFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioInputFlags.h rename to generated/include/aidl/android/media/audio/common/AudioInputFlags.h diff --git a/src/include/aidl/android/media/audio/common/AudioIoFlags.h b/generated/include/aidl/android/media/audio/common/AudioIoFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioIoFlags.h rename to generated/include/aidl/android/media/audio/common/AudioIoFlags.h diff --git a/src/include/aidl/android/media/audio/common/AudioLatencyMode.h b/generated/include/aidl/android/media/audio/common/AudioLatencyMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioLatencyMode.h rename to generated/include/aidl/android/media/audio/common/AudioLatencyMode.h diff --git a/src/include/aidl/android/media/audio/common/AudioMMapPolicy.h b/generated/include/aidl/android/media/audio/common/AudioMMapPolicy.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioMMapPolicy.h rename to generated/include/aidl/android/media/audio/common/AudioMMapPolicy.h diff --git a/src/include/aidl/android/media/audio/common/AudioMMapPolicyInfo.h b/generated/include/aidl/android/media/audio/common/AudioMMapPolicyInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioMMapPolicyInfo.h rename to generated/include/aidl/android/media/audio/common/AudioMMapPolicyInfo.h diff --git a/src/include/aidl/android/media/audio/common/AudioMMapPolicyType.h b/generated/include/aidl/android/media/audio/common/AudioMMapPolicyType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioMMapPolicyType.h rename to generated/include/aidl/android/media/audio/common/AudioMMapPolicyType.h diff --git a/src/include/aidl/android/media/audio/common/AudioMode.h b/generated/include/aidl/android/media/audio/common/AudioMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioMode.h rename to generated/include/aidl/android/media/audio/common/AudioMode.h diff --git a/src/include/aidl/android/media/audio/common/AudioOffloadInfo.h b/generated/include/aidl/android/media/audio/common/AudioOffloadInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioOffloadInfo.h rename to generated/include/aidl/android/media/audio/common/AudioOffloadInfo.h diff --git a/src/include/aidl/android/media/audio/common/AudioOutputFlags.h b/generated/include/aidl/android/media/audio/common/AudioOutputFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioOutputFlags.h rename to generated/include/aidl/android/media/audio/common/AudioOutputFlags.h diff --git a/src/include/aidl/android/media/audio/common/AudioPlaybackRate.h b/generated/include/aidl/android/media/audio/common/AudioPlaybackRate.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPlaybackRate.h rename to generated/include/aidl/android/media/audio/common/AudioPlaybackRate.h diff --git a/src/include/aidl/android/media/audio/common/AudioPolicyForceUse.h b/generated/include/aidl/android/media/audio/common/AudioPolicyForceUse.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPolicyForceUse.h rename to generated/include/aidl/android/media/audio/common/AudioPolicyForceUse.h diff --git a/src/include/aidl/android/media/audio/common/AudioPort.h b/generated/include/aidl/android/media/audio/common/AudioPort.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPort.h rename to generated/include/aidl/android/media/audio/common/AudioPort.h diff --git a/src/include/aidl/android/media/audio/common/AudioPortConfig.h b/generated/include/aidl/android/media/audio/common/AudioPortConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPortConfig.h rename to generated/include/aidl/android/media/audio/common/AudioPortConfig.h diff --git a/src/include/aidl/android/media/audio/common/AudioPortDeviceExt.h b/generated/include/aidl/android/media/audio/common/AudioPortDeviceExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPortDeviceExt.h rename to generated/include/aidl/android/media/audio/common/AudioPortDeviceExt.h diff --git a/src/include/aidl/android/media/audio/common/AudioPortExt.h b/generated/include/aidl/android/media/audio/common/AudioPortExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPortExt.h rename to generated/include/aidl/android/media/audio/common/AudioPortExt.h diff --git a/src/include/aidl/android/media/audio/common/AudioPortMixExt.h b/generated/include/aidl/android/media/audio/common/AudioPortMixExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPortMixExt.h rename to generated/include/aidl/android/media/audio/common/AudioPortMixExt.h diff --git a/src/include/aidl/android/media/audio/common/AudioPortMixExtUseCase.h b/generated/include/aidl/android/media/audio/common/AudioPortMixExtUseCase.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioPortMixExtUseCase.h rename to generated/include/aidl/android/media/audio/common/AudioPortMixExtUseCase.h diff --git a/src/include/aidl/android/media/audio/common/AudioProductStrategyType.h b/generated/include/aidl/android/media/audio/common/AudioProductStrategyType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioProductStrategyType.h rename to generated/include/aidl/android/media/audio/common/AudioProductStrategyType.h diff --git a/src/include/aidl/android/media/audio/common/AudioProfile.h b/generated/include/aidl/android/media/audio/common/AudioProfile.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioProfile.h rename to generated/include/aidl/android/media/audio/common/AudioProfile.h diff --git a/src/include/aidl/android/media/audio/common/AudioSource.h b/generated/include/aidl/android/media/audio/common/AudioSource.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioSource.h rename to generated/include/aidl/android/media/audio/common/AudioSource.h diff --git a/src/include/aidl/android/media/audio/common/AudioStandard.h b/generated/include/aidl/android/media/audio/common/AudioStandard.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioStandard.h rename to generated/include/aidl/android/media/audio/common/AudioStandard.h diff --git a/src/include/aidl/android/media/audio/common/AudioStreamType.h b/generated/include/aidl/android/media/audio/common/AudioStreamType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioStreamType.h rename to generated/include/aidl/android/media/audio/common/AudioStreamType.h diff --git a/src/include/aidl/android/media/audio/common/AudioUsage.h b/generated/include/aidl/android/media/audio/common/AudioUsage.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioUsage.h rename to generated/include/aidl/android/media/audio/common/AudioUsage.h diff --git a/generated/include/aidl/android/media/audio/common/v1/AudioUuid.h b/generated/include/aidl/android/media/audio/common/AudioUuid.h similarity index 98% rename from generated/include/aidl/android/media/audio/common/v1/AudioUuid.h rename to generated/include/aidl/android/media/audio/common/AudioUuid.h index 8ac843e..8fcfecb 100644 --- a/generated/include/aidl/android/media/audio/common/v1/AudioUuid.h +++ b/generated/include/aidl/android/media/audio/common/AudioUuid.h @@ -21,7 +21,6 @@ namespace android { namespace media { namespace audio { namespace common { -namespace v1 { class AudioUuid { public: typedef std::false_type fixed_size; @@ -68,7 +67,6 @@ public: return _aidl_os.str(); } }; -} // namespace v1 } // namespace common } // namespace audio } // namespace media diff --git a/src/include/aidl/android/media/audio/common/AudioVolumeGroupChangeEvent.h b/generated/include/aidl/android/media/audio/common/AudioVolumeGroupChangeEvent.h similarity index 100% rename from src/include/aidl/android/media/audio/common/AudioVolumeGroupChangeEvent.h rename to generated/include/aidl/android/media/audio/common/AudioVolumeGroupChangeEvent.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioAttributes.h b/generated/include/aidl/android/media/audio/common/BnAudioAttributes.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioAttributes.h rename to generated/include/aidl/android/media/audio/common/BnAudioAttributes.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioChannelLayout.h b/generated/include/aidl/android/media/audio/common/BnAudioChannelLayout.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioChannelLayout.h rename to generated/include/aidl/android/media/audio/common/BnAudioChannelLayout.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioConfig.h b/generated/include/aidl/android/media/audio/common/BnAudioConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioConfig.h rename to generated/include/aidl/android/media/audio/common/BnAudioConfig.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioConfigBase.h b/generated/include/aidl/android/media/audio/common/BnAudioConfigBase.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioConfigBase.h rename to generated/include/aidl/android/media/audio/common/BnAudioConfigBase.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioContentType.h b/generated/include/aidl/android/media/audio/common/BnAudioContentType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioContentType.h rename to generated/include/aidl/android/media/audio/common/BnAudioContentType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioDevice.h b/generated/include/aidl/android/media/audio/common/BnAudioDevice.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioDevice.h rename to generated/include/aidl/android/media/audio/common/BnAudioDevice.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioDeviceAddress.h b/generated/include/aidl/android/media/audio/common/BnAudioDeviceAddress.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioDeviceAddress.h rename to generated/include/aidl/android/media/audio/common/BnAudioDeviceAddress.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioDeviceDescription.h b/generated/include/aidl/android/media/audio/common/BnAudioDeviceDescription.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioDeviceDescription.h rename to generated/include/aidl/android/media/audio/common/BnAudioDeviceDescription.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioDeviceType.h b/generated/include/aidl/android/media/audio/common/BnAudioDeviceType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioDeviceType.h rename to generated/include/aidl/android/media/audio/common/BnAudioDeviceType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioDualMonoMode.h b/generated/include/aidl/android/media/audio/common/BnAudioDualMonoMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioDualMonoMode.h rename to generated/include/aidl/android/media/audio/common/BnAudioDualMonoMode.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioEncapsulationMetadataType.h b/generated/include/aidl/android/media/audio/common/BnAudioEncapsulationMetadataType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioEncapsulationMetadataType.h rename to generated/include/aidl/android/media/audio/common/BnAudioEncapsulationMetadataType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioEncapsulationMode.h b/generated/include/aidl/android/media/audio/common/BnAudioEncapsulationMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioEncapsulationMode.h rename to generated/include/aidl/android/media/audio/common/BnAudioEncapsulationMode.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioEncapsulationType.h b/generated/include/aidl/android/media/audio/common/BnAudioEncapsulationType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioEncapsulationType.h rename to generated/include/aidl/android/media/audio/common/BnAudioEncapsulationType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioFlag.h b/generated/include/aidl/android/media/audio/common/BnAudioFlag.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioFlag.h rename to generated/include/aidl/android/media/audio/common/BnAudioFlag.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioFormatDescription.h b/generated/include/aidl/android/media/audio/common/BnAudioFormatDescription.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioFormatDescription.h rename to generated/include/aidl/android/media/audio/common/BnAudioFormatDescription.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioFormatType.h b/generated/include/aidl/android/media/audio/common/BnAudioFormatType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioFormatType.h rename to generated/include/aidl/android/media/audio/common/BnAudioFormatType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioGain.h b/generated/include/aidl/android/media/audio/common/BnAudioGain.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioGain.h rename to generated/include/aidl/android/media/audio/common/BnAudioGain.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioGainConfig.h b/generated/include/aidl/android/media/audio/common/BnAudioGainConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioGainConfig.h rename to generated/include/aidl/android/media/audio/common/BnAudioGainConfig.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioGainMode.h b/generated/include/aidl/android/media/audio/common/BnAudioGainMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioGainMode.h rename to generated/include/aidl/android/media/audio/common/BnAudioGainMode.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalAttributesGroup.h b/generated/include/aidl/android/media/audio/common/BnAudioHalAttributesGroup.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalAttributesGroup.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalAttributesGroup.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalCapConfiguration.h b/generated/include/aidl/android/media/audio/common/BnAudioHalCapConfiguration.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalCapConfiguration.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalCapConfiguration.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalCapCriterion.h b/generated/include/aidl/android/media/audio/common/BnAudioHalCapCriterion.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalCapCriterion.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalCapCriterion.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalCapCriterionType.h b/generated/include/aidl/android/media/audio/common/BnAudioHalCapCriterionType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalCapCriterionType.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalCapCriterionType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalCapCriterionV2.h b/generated/include/aidl/android/media/audio/common/BnAudioHalCapCriterionV2.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalCapCriterionV2.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalCapCriterionV2.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalCapDomain.h b/generated/include/aidl/android/media/audio/common/BnAudioHalCapDomain.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalCapDomain.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalCapDomain.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalCapParameter.h b/generated/include/aidl/android/media/audio/common/BnAudioHalCapParameter.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalCapParameter.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalCapParameter.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalCapRule.h b/generated/include/aidl/android/media/audio/common/BnAudioHalCapRule.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalCapRule.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalCapRule.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalEngineConfig.h b/generated/include/aidl/android/media/audio/common/BnAudioHalEngineConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalEngineConfig.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalEngineConfig.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalProductStrategy.h b/generated/include/aidl/android/media/audio/common/BnAudioHalProductStrategy.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalProductStrategy.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalProductStrategy.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalVolumeCurve.h b/generated/include/aidl/android/media/audio/common/BnAudioHalVolumeCurve.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalVolumeCurve.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalVolumeCurve.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioHalVolumeGroup.h b/generated/include/aidl/android/media/audio/common/BnAudioHalVolumeGroup.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioHalVolumeGroup.h rename to generated/include/aidl/android/media/audio/common/BnAudioHalVolumeGroup.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioInputFlags.h b/generated/include/aidl/android/media/audio/common/BnAudioInputFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioInputFlags.h rename to generated/include/aidl/android/media/audio/common/BnAudioInputFlags.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioIoFlags.h b/generated/include/aidl/android/media/audio/common/BnAudioIoFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioIoFlags.h rename to generated/include/aidl/android/media/audio/common/BnAudioIoFlags.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioLatencyMode.h b/generated/include/aidl/android/media/audio/common/BnAudioLatencyMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioLatencyMode.h rename to generated/include/aidl/android/media/audio/common/BnAudioLatencyMode.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioMMapPolicy.h b/generated/include/aidl/android/media/audio/common/BnAudioMMapPolicy.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioMMapPolicy.h rename to generated/include/aidl/android/media/audio/common/BnAudioMMapPolicy.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioMMapPolicyInfo.h b/generated/include/aidl/android/media/audio/common/BnAudioMMapPolicyInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioMMapPolicyInfo.h rename to generated/include/aidl/android/media/audio/common/BnAudioMMapPolicyInfo.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioMMapPolicyType.h b/generated/include/aidl/android/media/audio/common/BnAudioMMapPolicyType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioMMapPolicyType.h rename to generated/include/aidl/android/media/audio/common/BnAudioMMapPolicyType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioMode.h b/generated/include/aidl/android/media/audio/common/BnAudioMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioMode.h rename to generated/include/aidl/android/media/audio/common/BnAudioMode.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioOffloadInfo.h b/generated/include/aidl/android/media/audio/common/BnAudioOffloadInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioOffloadInfo.h rename to generated/include/aidl/android/media/audio/common/BnAudioOffloadInfo.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioOutputFlags.h b/generated/include/aidl/android/media/audio/common/BnAudioOutputFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioOutputFlags.h rename to generated/include/aidl/android/media/audio/common/BnAudioOutputFlags.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPlaybackRate.h b/generated/include/aidl/android/media/audio/common/BnAudioPlaybackRate.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPlaybackRate.h rename to generated/include/aidl/android/media/audio/common/BnAudioPlaybackRate.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPolicyForceUse.h b/generated/include/aidl/android/media/audio/common/BnAudioPolicyForceUse.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPolicyForceUse.h rename to generated/include/aidl/android/media/audio/common/BnAudioPolicyForceUse.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPort.h b/generated/include/aidl/android/media/audio/common/BnAudioPort.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPort.h rename to generated/include/aidl/android/media/audio/common/BnAudioPort.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPortConfig.h b/generated/include/aidl/android/media/audio/common/BnAudioPortConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPortConfig.h rename to generated/include/aidl/android/media/audio/common/BnAudioPortConfig.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPortDeviceExt.h b/generated/include/aidl/android/media/audio/common/BnAudioPortDeviceExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPortDeviceExt.h rename to generated/include/aidl/android/media/audio/common/BnAudioPortDeviceExt.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPortExt.h b/generated/include/aidl/android/media/audio/common/BnAudioPortExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPortExt.h rename to generated/include/aidl/android/media/audio/common/BnAudioPortExt.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPortMixExt.h b/generated/include/aidl/android/media/audio/common/BnAudioPortMixExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPortMixExt.h rename to generated/include/aidl/android/media/audio/common/BnAudioPortMixExt.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioPortMixExtUseCase.h b/generated/include/aidl/android/media/audio/common/BnAudioPortMixExtUseCase.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioPortMixExtUseCase.h rename to generated/include/aidl/android/media/audio/common/BnAudioPortMixExtUseCase.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioProductStrategyType.h b/generated/include/aidl/android/media/audio/common/BnAudioProductStrategyType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioProductStrategyType.h rename to generated/include/aidl/android/media/audio/common/BnAudioProductStrategyType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioProfile.h b/generated/include/aidl/android/media/audio/common/BnAudioProfile.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioProfile.h rename to generated/include/aidl/android/media/audio/common/BnAudioProfile.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioSource.h b/generated/include/aidl/android/media/audio/common/BnAudioSource.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioSource.h rename to generated/include/aidl/android/media/audio/common/BnAudioSource.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioStandard.h b/generated/include/aidl/android/media/audio/common/BnAudioStandard.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioStandard.h rename to generated/include/aidl/android/media/audio/common/BnAudioStandard.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioStreamType.h b/generated/include/aidl/android/media/audio/common/BnAudioStreamType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioStreamType.h rename to generated/include/aidl/android/media/audio/common/BnAudioStreamType.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioUsage.h b/generated/include/aidl/android/media/audio/common/BnAudioUsage.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioUsage.h rename to generated/include/aidl/android/media/audio/common/BnAudioUsage.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioUuid.h b/generated/include/aidl/android/media/audio/common/BnAudioUuid.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioUuid.h rename to generated/include/aidl/android/media/audio/common/BnAudioUuid.h diff --git a/src/include/aidl/android/media/audio/common/BnAudioVolumeGroupChangeEvent.h b/generated/include/aidl/android/media/audio/common/BnAudioVolumeGroupChangeEvent.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnAudioVolumeGroupChangeEvent.h rename to generated/include/aidl/android/media/audio/common/BnAudioVolumeGroupChangeEvent.h diff --git a/src/include/aidl/android/media/audio/common/BnBoolean.h b/generated/include/aidl/android/media/audio/common/BnBoolean.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnBoolean.h rename to generated/include/aidl/android/media/audio/common/BnBoolean.h diff --git a/src/include/aidl/android/media/audio/common/BnByte.h b/generated/include/aidl/android/media/audio/common/BnByte.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnByte.h rename to generated/include/aidl/android/media/audio/common/BnByte.h diff --git a/src/include/aidl/android/media/audio/common/BnDouble.h b/generated/include/aidl/android/media/audio/common/BnDouble.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnDouble.h rename to generated/include/aidl/android/media/audio/common/BnDouble.h diff --git a/src/include/aidl/android/media/audio/common/BnExtraAudioDescriptor.h b/generated/include/aidl/android/media/audio/common/BnExtraAudioDescriptor.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnExtraAudioDescriptor.h rename to generated/include/aidl/android/media/audio/common/BnExtraAudioDescriptor.h diff --git a/src/include/aidl/android/media/audio/common/BnFloat.h b/generated/include/aidl/android/media/audio/common/BnFloat.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnFloat.h rename to generated/include/aidl/android/media/audio/common/BnFloat.h diff --git a/src/include/aidl/android/media/audio/common/BnHeadTracking.h b/generated/include/aidl/android/media/audio/common/BnHeadTracking.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnHeadTracking.h rename to generated/include/aidl/android/media/audio/common/BnHeadTracking.h diff --git a/src/include/aidl/android/media/audio/common/BnInt.h b/generated/include/aidl/android/media/audio/common/BnInt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnInt.h rename to generated/include/aidl/android/media/audio/common/BnInt.h diff --git a/src/include/aidl/android/media/audio/common/BnLong.h b/generated/include/aidl/android/media/audio/common/BnLong.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnLong.h rename to generated/include/aidl/android/media/audio/common/BnLong.h diff --git a/src/include/aidl/android/media/audio/common/BnMicrophoneDynamicInfo.h b/generated/include/aidl/android/media/audio/common/BnMicrophoneDynamicInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnMicrophoneDynamicInfo.h rename to generated/include/aidl/android/media/audio/common/BnMicrophoneDynamicInfo.h diff --git a/src/include/aidl/android/media/audio/common/BnMicrophoneInfo.h b/generated/include/aidl/android/media/audio/common/BnMicrophoneInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnMicrophoneInfo.h rename to generated/include/aidl/android/media/audio/common/BnMicrophoneInfo.h diff --git a/src/include/aidl/android/media/audio/common/BnPcmType.h b/generated/include/aidl/android/media/audio/common/BnPcmType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnPcmType.h rename to generated/include/aidl/android/media/audio/common/BnPcmType.h diff --git a/src/include/aidl/android/media/audio/common/BnSpatialization.h b/generated/include/aidl/android/media/audio/common/BnSpatialization.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnSpatialization.h rename to generated/include/aidl/android/media/audio/common/BnSpatialization.h diff --git a/src/include/aidl/android/media/audio/common/BnVoid.h b/generated/include/aidl/android/media/audio/common/BnVoid.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BnVoid.h rename to generated/include/aidl/android/media/audio/common/BnVoid.h diff --git a/src/include/aidl/android/media/audio/common/Boolean.h b/generated/include/aidl/android/media/audio/common/Boolean.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Boolean.h rename to generated/include/aidl/android/media/audio/common/Boolean.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioAttributes.h b/generated/include/aidl/android/media/audio/common/BpAudioAttributes.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioAttributes.h rename to generated/include/aidl/android/media/audio/common/BpAudioAttributes.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioChannelLayout.h b/generated/include/aidl/android/media/audio/common/BpAudioChannelLayout.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioChannelLayout.h rename to generated/include/aidl/android/media/audio/common/BpAudioChannelLayout.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioConfig.h b/generated/include/aidl/android/media/audio/common/BpAudioConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioConfig.h rename to generated/include/aidl/android/media/audio/common/BpAudioConfig.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioConfigBase.h b/generated/include/aidl/android/media/audio/common/BpAudioConfigBase.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioConfigBase.h rename to generated/include/aidl/android/media/audio/common/BpAudioConfigBase.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioContentType.h b/generated/include/aidl/android/media/audio/common/BpAudioContentType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioContentType.h rename to generated/include/aidl/android/media/audio/common/BpAudioContentType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioDevice.h b/generated/include/aidl/android/media/audio/common/BpAudioDevice.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioDevice.h rename to generated/include/aidl/android/media/audio/common/BpAudioDevice.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioDeviceAddress.h b/generated/include/aidl/android/media/audio/common/BpAudioDeviceAddress.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioDeviceAddress.h rename to generated/include/aidl/android/media/audio/common/BpAudioDeviceAddress.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioDeviceDescription.h b/generated/include/aidl/android/media/audio/common/BpAudioDeviceDescription.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioDeviceDescription.h rename to generated/include/aidl/android/media/audio/common/BpAudioDeviceDescription.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioDeviceType.h b/generated/include/aidl/android/media/audio/common/BpAudioDeviceType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioDeviceType.h rename to generated/include/aidl/android/media/audio/common/BpAudioDeviceType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioDualMonoMode.h b/generated/include/aidl/android/media/audio/common/BpAudioDualMonoMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioDualMonoMode.h rename to generated/include/aidl/android/media/audio/common/BpAudioDualMonoMode.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioEncapsulationMetadataType.h b/generated/include/aidl/android/media/audio/common/BpAudioEncapsulationMetadataType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioEncapsulationMetadataType.h rename to generated/include/aidl/android/media/audio/common/BpAudioEncapsulationMetadataType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioEncapsulationMode.h b/generated/include/aidl/android/media/audio/common/BpAudioEncapsulationMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioEncapsulationMode.h rename to generated/include/aidl/android/media/audio/common/BpAudioEncapsulationMode.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioEncapsulationType.h b/generated/include/aidl/android/media/audio/common/BpAudioEncapsulationType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioEncapsulationType.h rename to generated/include/aidl/android/media/audio/common/BpAudioEncapsulationType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioFlag.h b/generated/include/aidl/android/media/audio/common/BpAudioFlag.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioFlag.h rename to generated/include/aidl/android/media/audio/common/BpAudioFlag.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioFormatDescription.h b/generated/include/aidl/android/media/audio/common/BpAudioFormatDescription.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioFormatDescription.h rename to generated/include/aidl/android/media/audio/common/BpAudioFormatDescription.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioFormatType.h b/generated/include/aidl/android/media/audio/common/BpAudioFormatType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioFormatType.h rename to generated/include/aidl/android/media/audio/common/BpAudioFormatType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioGain.h b/generated/include/aidl/android/media/audio/common/BpAudioGain.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioGain.h rename to generated/include/aidl/android/media/audio/common/BpAudioGain.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioGainConfig.h b/generated/include/aidl/android/media/audio/common/BpAudioGainConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioGainConfig.h rename to generated/include/aidl/android/media/audio/common/BpAudioGainConfig.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioGainMode.h b/generated/include/aidl/android/media/audio/common/BpAudioGainMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioGainMode.h rename to generated/include/aidl/android/media/audio/common/BpAudioGainMode.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalAttributesGroup.h b/generated/include/aidl/android/media/audio/common/BpAudioHalAttributesGroup.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalAttributesGroup.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalAttributesGroup.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalCapConfiguration.h b/generated/include/aidl/android/media/audio/common/BpAudioHalCapConfiguration.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalCapConfiguration.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalCapConfiguration.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalCapCriterion.h b/generated/include/aidl/android/media/audio/common/BpAudioHalCapCriterion.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalCapCriterion.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalCapCriterion.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalCapCriterionType.h b/generated/include/aidl/android/media/audio/common/BpAudioHalCapCriterionType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalCapCriterionType.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalCapCriterionType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalCapCriterionV2.h b/generated/include/aidl/android/media/audio/common/BpAudioHalCapCriterionV2.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalCapCriterionV2.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalCapCriterionV2.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalCapDomain.h b/generated/include/aidl/android/media/audio/common/BpAudioHalCapDomain.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalCapDomain.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalCapDomain.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalCapParameter.h b/generated/include/aidl/android/media/audio/common/BpAudioHalCapParameter.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalCapParameter.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalCapParameter.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalCapRule.h b/generated/include/aidl/android/media/audio/common/BpAudioHalCapRule.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalCapRule.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalCapRule.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalEngineConfig.h b/generated/include/aidl/android/media/audio/common/BpAudioHalEngineConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalEngineConfig.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalEngineConfig.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalProductStrategy.h b/generated/include/aidl/android/media/audio/common/BpAudioHalProductStrategy.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalProductStrategy.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalProductStrategy.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalVolumeCurve.h b/generated/include/aidl/android/media/audio/common/BpAudioHalVolumeCurve.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalVolumeCurve.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalVolumeCurve.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioHalVolumeGroup.h b/generated/include/aidl/android/media/audio/common/BpAudioHalVolumeGroup.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioHalVolumeGroup.h rename to generated/include/aidl/android/media/audio/common/BpAudioHalVolumeGroup.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioInputFlags.h b/generated/include/aidl/android/media/audio/common/BpAudioInputFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioInputFlags.h rename to generated/include/aidl/android/media/audio/common/BpAudioInputFlags.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioIoFlags.h b/generated/include/aidl/android/media/audio/common/BpAudioIoFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioIoFlags.h rename to generated/include/aidl/android/media/audio/common/BpAudioIoFlags.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioLatencyMode.h b/generated/include/aidl/android/media/audio/common/BpAudioLatencyMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioLatencyMode.h rename to generated/include/aidl/android/media/audio/common/BpAudioLatencyMode.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioMMapPolicy.h b/generated/include/aidl/android/media/audio/common/BpAudioMMapPolicy.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioMMapPolicy.h rename to generated/include/aidl/android/media/audio/common/BpAudioMMapPolicy.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioMMapPolicyInfo.h b/generated/include/aidl/android/media/audio/common/BpAudioMMapPolicyInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioMMapPolicyInfo.h rename to generated/include/aidl/android/media/audio/common/BpAudioMMapPolicyInfo.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioMMapPolicyType.h b/generated/include/aidl/android/media/audio/common/BpAudioMMapPolicyType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioMMapPolicyType.h rename to generated/include/aidl/android/media/audio/common/BpAudioMMapPolicyType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioMode.h b/generated/include/aidl/android/media/audio/common/BpAudioMode.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioMode.h rename to generated/include/aidl/android/media/audio/common/BpAudioMode.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioOffloadInfo.h b/generated/include/aidl/android/media/audio/common/BpAudioOffloadInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioOffloadInfo.h rename to generated/include/aidl/android/media/audio/common/BpAudioOffloadInfo.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioOutputFlags.h b/generated/include/aidl/android/media/audio/common/BpAudioOutputFlags.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioOutputFlags.h rename to generated/include/aidl/android/media/audio/common/BpAudioOutputFlags.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPlaybackRate.h b/generated/include/aidl/android/media/audio/common/BpAudioPlaybackRate.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPlaybackRate.h rename to generated/include/aidl/android/media/audio/common/BpAudioPlaybackRate.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPolicyForceUse.h b/generated/include/aidl/android/media/audio/common/BpAudioPolicyForceUse.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPolicyForceUse.h rename to generated/include/aidl/android/media/audio/common/BpAudioPolicyForceUse.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPort.h b/generated/include/aidl/android/media/audio/common/BpAudioPort.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPort.h rename to generated/include/aidl/android/media/audio/common/BpAudioPort.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPortConfig.h b/generated/include/aidl/android/media/audio/common/BpAudioPortConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPortConfig.h rename to generated/include/aidl/android/media/audio/common/BpAudioPortConfig.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPortDeviceExt.h b/generated/include/aidl/android/media/audio/common/BpAudioPortDeviceExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPortDeviceExt.h rename to generated/include/aidl/android/media/audio/common/BpAudioPortDeviceExt.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPortExt.h b/generated/include/aidl/android/media/audio/common/BpAudioPortExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPortExt.h rename to generated/include/aidl/android/media/audio/common/BpAudioPortExt.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPortMixExt.h b/generated/include/aidl/android/media/audio/common/BpAudioPortMixExt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPortMixExt.h rename to generated/include/aidl/android/media/audio/common/BpAudioPortMixExt.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioPortMixExtUseCase.h b/generated/include/aidl/android/media/audio/common/BpAudioPortMixExtUseCase.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioPortMixExtUseCase.h rename to generated/include/aidl/android/media/audio/common/BpAudioPortMixExtUseCase.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioProductStrategyType.h b/generated/include/aidl/android/media/audio/common/BpAudioProductStrategyType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioProductStrategyType.h rename to generated/include/aidl/android/media/audio/common/BpAudioProductStrategyType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioProfile.h b/generated/include/aidl/android/media/audio/common/BpAudioProfile.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioProfile.h rename to generated/include/aidl/android/media/audio/common/BpAudioProfile.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioSource.h b/generated/include/aidl/android/media/audio/common/BpAudioSource.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioSource.h rename to generated/include/aidl/android/media/audio/common/BpAudioSource.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioStandard.h b/generated/include/aidl/android/media/audio/common/BpAudioStandard.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioStandard.h rename to generated/include/aidl/android/media/audio/common/BpAudioStandard.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioStreamType.h b/generated/include/aidl/android/media/audio/common/BpAudioStreamType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioStreamType.h rename to generated/include/aidl/android/media/audio/common/BpAudioStreamType.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioUsage.h b/generated/include/aidl/android/media/audio/common/BpAudioUsage.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioUsage.h rename to generated/include/aidl/android/media/audio/common/BpAudioUsage.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioUuid.h b/generated/include/aidl/android/media/audio/common/BpAudioUuid.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioUuid.h rename to generated/include/aidl/android/media/audio/common/BpAudioUuid.h diff --git a/src/include/aidl/android/media/audio/common/BpAudioVolumeGroupChangeEvent.h b/generated/include/aidl/android/media/audio/common/BpAudioVolumeGroupChangeEvent.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpAudioVolumeGroupChangeEvent.h rename to generated/include/aidl/android/media/audio/common/BpAudioVolumeGroupChangeEvent.h diff --git a/src/include/aidl/android/media/audio/common/BpBoolean.h b/generated/include/aidl/android/media/audio/common/BpBoolean.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpBoolean.h rename to generated/include/aidl/android/media/audio/common/BpBoolean.h diff --git a/src/include/aidl/android/media/audio/common/BpByte.h b/generated/include/aidl/android/media/audio/common/BpByte.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpByte.h rename to generated/include/aidl/android/media/audio/common/BpByte.h diff --git a/src/include/aidl/android/media/audio/common/BpDouble.h b/generated/include/aidl/android/media/audio/common/BpDouble.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpDouble.h rename to generated/include/aidl/android/media/audio/common/BpDouble.h diff --git a/src/include/aidl/android/media/audio/common/BpExtraAudioDescriptor.h b/generated/include/aidl/android/media/audio/common/BpExtraAudioDescriptor.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpExtraAudioDescriptor.h rename to generated/include/aidl/android/media/audio/common/BpExtraAudioDescriptor.h diff --git a/src/include/aidl/android/media/audio/common/BpFloat.h b/generated/include/aidl/android/media/audio/common/BpFloat.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpFloat.h rename to generated/include/aidl/android/media/audio/common/BpFloat.h diff --git a/src/include/aidl/android/media/audio/common/BpHeadTracking.h b/generated/include/aidl/android/media/audio/common/BpHeadTracking.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpHeadTracking.h rename to generated/include/aidl/android/media/audio/common/BpHeadTracking.h diff --git a/src/include/aidl/android/media/audio/common/BpInt.h b/generated/include/aidl/android/media/audio/common/BpInt.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpInt.h rename to generated/include/aidl/android/media/audio/common/BpInt.h diff --git a/src/include/aidl/android/media/audio/common/BpLong.h b/generated/include/aidl/android/media/audio/common/BpLong.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpLong.h rename to generated/include/aidl/android/media/audio/common/BpLong.h diff --git a/src/include/aidl/android/media/audio/common/BpMicrophoneDynamicInfo.h b/generated/include/aidl/android/media/audio/common/BpMicrophoneDynamicInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpMicrophoneDynamicInfo.h rename to generated/include/aidl/android/media/audio/common/BpMicrophoneDynamicInfo.h diff --git a/src/include/aidl/android/media/audio/common/BpMicrophoneInfo.h b/generated/include/aidl/android/media/audio/common/BpMicrophoneInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpMicrophoneInfo.h rename to generated/include/aidl/android/media/audio/common/BpMicrophoneInfo.h diff --git a/src/include/aidl/android/media/audio/common/BpPcmType.h b/generated/include/aidl/android/media/audio/common/BpPcmType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpPcmType.h rename to generated/include/aidl/android/media/audio/common/BpPcmType.h diff --git a/src/include/aidl/android/media/audio/common/BpSpatialization.h b/generated/include/aidl/android/media/audio/common/BpSpatialization.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpSpatialization.h rename to generated/include/aidl/android/media/audio/common/BpSpatialization.h diff --git a/src/include/aidl/android/media/audio/common/BpVoid.h b/generated/include/aidl/android/media/audio/common/BpVoid.h similarity index 100% rename from src/include/aidl/android/media/audio/common/BpVoid.h rename to generated/include/aidl/android/media/audio/common/BpVoid.h diff --git a/src/include/aidl/android/media/audio/common/Byte.h b/generated/include/aidl/android/media/audio/common/Byte.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Byte.h rename to generated/include/aidl/android/media/audio/common/Byte.h diff --git a/src/include/aidl/android/media/audio/common/Double.h b/generated/include/aidl/android/media/audio/common/Double.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Double.h rename to generated/include/aidl/android/media/audio/common/Double.h diff --git a/src/include/aidl/android/media/audio/common/ExtraAudioDescriptor.h b/generated/include/aidl/android/media/audio/common/ExtraAudioDescriptor.h similarity index 100% rename from src/include/aidl/android/media/audio/common/ExtraAudioDescriptor.h rename to generated/include/aidl/android/media/audio/common/ExtraAudioDescriptor.h diff --git a/src/include/aidl/android/media/audio/common/Float.h b/generated/include/aidl/android/media/audio/common/Float.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Float.h rename to generated/include/aidl/android/media/audio/common/Float.h diff --git a/src/include/aidl/android/media/audio/common/HeadTracking.h b/generated/include/aidl/android/media/audio/common/HeadTracking.h similarity index 100% rename from src/include/aidl/android/media/audio/common/HeadTracking.h rename to generated/include/aidl/android/media/audio/common/HeadTracking.h diff --git a/src/include/aidl/android/media/audio/common/Int.h b/generated/include/aidl/android/media/audio/common/Int.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Int.h rename to generated/include/aidl/android/media/audio/common/Int.h diff --git a/src/include/aidl/android/media/audio/common/Long.h b/generated/include/aidl/android/media/audio/common/Long.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Long.h rename to generated/include/aidl/android/media/audio/common/Long.h diff --git a/src/include/aidl/android/media/audio/common/MicrophoneDynamicInfo.h b/generated/include/aidl/android/media/audio/common/MicrophoneDynamicInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/MicrophoneDynamicInfo.h rename to generated/include/aidl/android/media/audio/common/MicrophoneDynamicInfo.h diff --git a/src/include/aidl/android/media/audio/common/MicrophoneInfo.h b/generated/include/aidl/android/media/audio/common/MicrophoneInfo.h similarity index 100% rename from src/include/aidl/android/media/audio/common/MicrophoneInfo.h rename to generated/include/aidl/android/media/audio/common/MicrophoneInfo.h diff --git a/src/include/aidl/android/media/audio/common/PcmType.h b/generated/include/aidl/android/media/audio/common/PcmType.h similarity index 100% rename from src/include/aidl/android/media/audio/common/PcmType.h rename to generated/include/aidl/android/media/audio/common/PcmType.h diff --git a/src/include/aidl/android/media/audio/common/Spatialization.h b/generated/include/aidl/android/media/audio/common/Spatialization.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Spatialization.h rename to generated/include/aidl/android/media/audio/common/Spatialization.h diff --git a/src/include/aidl/android/media/audio/common/Void.h b/generated/include/aidl/android/media/audio/common/Void.h similarity index 100% rename from src/include/aidl/android/media/audio/common/Void.h rename to generated/include/aidl/android/media/audio/common/Void.h diff --git a/src/include/aidl/android/media/audio/eraser/BnCapability.h b/generated/include/aidl/android/media/audio/eraser/BnCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnCapability.h rename to generated/include/aidl/android/media/audio/eraser/BnCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BnClassification.h b/generated/include/aidl/android/media/audio/eraser/BnClassification.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnClassification.h rename to generated/include/aidl/android/media/audio/eraser/BnClassification.h diff --git a/src/include/aidl/android/media/audio/eraser/BnClassificationConfig.h b/generated/include/aidl/android/media/audio/eraser/BnClassificationConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnClassificationConfig.h rename to generated/include/aidl/android/media/audio/eraser/BnClassificationConfig.h diff --git a/src/include/aidl/android/media/audio/eraser/BnClassificationMetadata.h b/generated/include/aidl/android/media/audio/eraser/BnClassificationMetadata.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnClassificationMetadata.h rename to generated/include/aidl/android/media/audio/eraser/BnClassificationMetadata.h diff --git a/src/include/aidl/android/media/audio/eraser/BnClassificationMetadataList.h b/generated/include/aidl/android/media/audio/eraser/BnClassificationMetadataList.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnClassificationMetadataList.h rename to generated/include/aidl/android/media/audio/eraser/BnClassificationMetadataList.h diff --git a/src/include/aidl/android/media/audio/eraser/BnClassifierCapability.h b/generated/include/aidl/android/media/audio/eraser/BnClassifierCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnClassifierCapability.h rename to generated/include/aidl/android/media/audio/eraser/BnClassifierCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BnConfiguration.h b/generated/include/aidl/android/media/audio/eraser/BnConfiguration.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnConfiguration.h rename to generated/include/aidl/android/media/audio/eraser/BnConfiguration.h diff --git a/src/include/aidl/android/media/audio/eraser/BnEraserCallback.h b/generated/include/aidl/android/media/audio/eraser/BnEraserCallback.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnEraserCallback.h rename to generated/include/aidl/android/media/audio/eraser/BnEraserCallback.h diff --git a/src/include/aidl/android/media/audio/eraser/BnMode.h b/generated/include/aidl/android/media/audio/eraser/BnMode.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnMode.h rename to generated/include/aidl/android/media/audio/eraser/BnMode.h diff --git a/src/include/aidl/android/media/audio/eraser/BnRemixerCapability.h b/generated/include/aidl/android/media/audio/eraser/BnRemixerCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnRemixerCapability.h rename to generated/include/aidl/android/media/audio/eraser/BnRemixerCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BnSeparatorCapability.h b/generated/include/aidl/android/media/audio/eraser/BnSeparatorCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnSeparatorCapability.h rename to generated/include/aidl/android/media/audio/eraser/BnSeparatorCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BnSoundClassification.h b/generated/include/aidl/android/media/audio/eraser/BnSoundClassification.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BnSoundClassification.h rename to generated/include/aidl/android/media/audio/eraser/BnSoundClassification.h diff --git a/src/include/aidl/android/media/audio/eraser/BpCapability.h b/generated/include/aidl/android/media/audio/eraser/BpCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpCapability.h rename to generated/include/aidl/android/media/audio/eraser/BpCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BpClassification.h b/generated/include/aidl/android/media/audio/eraser/BpClassification.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpClassification.h rename to generated/include/aidl/android/media/audio/eraser/BpClassification.h diff --git a/src/include/aidl/android/media/audio/eraser/BpClassificationConfig.h b/generated/include/aidl/android/media/audio/eraser/BpClassificationConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpClassificationConfig.h rename to generated/include/aidl/android/media/audio/eraser/BpClassificationConfig.h diff --git a/src/include/aidl/android/media/audio/eraser/BpClassificationMetadata.h b/generated/include/aidl/android/media/audio/eraser/BpClassificationMetadata.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpClassificationMetadata.h rename to generated/include/aidl/android/media/audio/eraser/BpClassificationMetadata.h diff --git a/src/include/aidl/android/media/audio/eraser/BpClassificationMetadataList.h b/generated/include/aidl/android/media/audio/eraser/BpClassificationMetadataList.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpClassificationMetadataList.h rename to generated/include/aidl/android/media/audio/eraser/BpClassificationMetadataList.h diff --git a/src/include/aidl/android/media/audio/eraser/BpClassifierCapability.h b/generated/include/aidl/android/media/audio/eraser/BpClassifierCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpClassifierCapability.h rename to generated/include/aidl/android/media/audio/eraser/BpClassifierCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BpConfiguration.h b/generated/include/aidl/android/media/audio/eraser/BpConfiguration.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpConfiguration.h rename to generated/include/aidl/android/media/audio/eraser/BpConfiguration.h diff --git a/src/include/aidl/android/media/audio/eraser/BpEraserCallback.h b/generated/include/aidl/android/media/audio/eraser/BpEraserCallback.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpEraserCallback.h rename to generated/include/aidl/android/media/audio/eraser/BpEraserCallback.h diff --git a/src/include/aidl/android/media/audio/eraser/BpMode.h b/generated/include/aidl/android/media/audio/eraser/BpMode.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpMode.h rename to generated/include/aidl/android/media/audio/eraser/BpMode.h diff --git a/src/include/aidl/android/media/audio/eraser/BpRemixerCapability.h b/generated/include/aidl/android/media/audio/eraser/BpRemixerCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpRemixerCapability.h rename to generated/include/aidl/android/media/audio/eraser/BpRemixerCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BpSeparatorCapability.h b/generated/include/aidl/android/media/audio/eraser/BpSeparatorCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpSeparatorCapability.h rename to generated/include/aidl/android/media/audio/eraser/BpSeparatorCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/BpSoundClassification.h b/generated/include/aidl/android/media/audio/eraser/BpSoundClassification.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/BpSoundClassification.h rename to generated/include/aidl/android/media/audio/eraser/BpSoundClassification.h diff --git a/src/include/aidl/android/media/audio/eraser/Capability.h b/generated/include/aidl/android/media/audio/eraser/Capability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/Capability.h rename to generated/include/aidl/android/media/audio/eraser/Capability.h diff --git a/src/include/aidl/android/media/audio/eraser/Classification.h b/generated/include/aidl/android/media/audio/eraser/Classification.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/Classification.h rename to generated/include/aidl/android/media/audio/eraser/Classification.h diff --git a/src/include/aidl/android/media/audio/eraser/ClassificationConfig.h b/generated/include/aidl/android/media/audio/eraser/ClassificationConfig.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/ClassificationConfig.h rename to generated/include/aidl/android/media/audio/eraser/ClassificationConfig.h diff --git a/src/include/aidl/android/media/audio/eraser/ClassificationMetadata.h b/generated/include/aidl/android/media/audio/eraser/ClassificationMetadata.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/ClassificationMetadata.h rename to generated/include/aidl/android/media/audio/eraser/ClassificationMetadata.h diff --git a/src/include/aidl/android/media/audio/eraser/ClassificationMetadataList.h b/generated/include/aidl/android/media/audio/eraser/ClassificationMetadataList.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/ClassificationMetadataList.h rename to generated/include/aidl/android/media/audio/eraser/ClassificationMetadataList.h diff --git a/src/include/aidl/android/media/audio/eraser/ClassifierCapability.h b/generated/include/aidl/android/media/audio/eraser/ClassifierCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/ClassifierCapability.h rename to generated/include/aidl/android/media/audio/eraser/ClassifierCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/Configuration.h b/generated/include/aidl/android/media/audio/eraser/Configuration.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/Configuration.h rename to generated/include/aidl/android/media/audio/eraser/Configuration.h diff --git a/src/include/aidl/android/media/audio/eraser/IEraserCallback.h b/generated/include/aidl/android/media/audio/eraser/IEraserCallback.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/IEraserCallback.h rename to generated/include/aidl/android/media/audio/eraser/IEraserCallback.h diff --git a/src/include/aidl/android/media/audio/eraser/Mode.h b/generated/include/aidl/android/media/audio/eraser/Mode.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/Mode.h rename to generated/include/aidl/android/media/audio/eraser/Mode.h diff --git a/src/include/aidl/android/media/audio/eraser/RemixerCapability.h b/generated/include/aidl/android/media/audio/eraser/RemixerCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/RemixerCapability.h rename to generated/include/aidl/android/media/audio/eraser/RemixerCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/SeparatorCapability.h b/generated/include/aidl/android/media/audio/eraser/SeparatorCapability.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/SeparatorCapability.h rename to generated/include/aidl/android/media/audio/eraser/SeparatorCapability.h diff --git a/src/include/aidl/android/media/audio/eraser/SoundClassification.h b/generated/include/aidl/android/media/audio/eraser/SoundClassification.h similarity index 100% rename from src/include/aidl/android/media/audio/eraser/SoundClassification.h rename to generated/include/aidl/android/media/audio/eraser/SoundClassification.h diff --git a/src/AidlVersions.cpp b/src/AidlVersions.cpp deleted file mode 100644 index e6fa127..0000000 --- a/src/AidlVersions.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "AidlVersions.h" -#include "log/log.h" -#include -#include - -void AidlVersions::init() { - char tmp[128]; - - ALOGD("AidlVersions::init()"); - - for (uint32_t i = ANDROID_HARDWARE_AUDIO_EFFECT_MAX_VERSION; i > 0; i--) { - snprintf(tmp, sizeof(tmp), "android.hardware.audio.effect-V%u-ndk.so", i); - void *handle = dlopen(tmp, RTLD_LAZY); - if (handle) { - ALOGD("Found android.hardware.audio.effect-V%u-ndk.so", i); - androidHardwareAudioEffectVersion = i; - dlclose(handle); - break; - } - } - if (androidHardwareAudioEffectVersion == 0) { - ALOGE("Failed to find android.hardware.audio.effect version!"); - } - - for (uint32_t i = ANDROID_HARDWARE_COMMON_MAX_VERSION; i > 0; i--) { - snprintf(tmp, sizeof(tmp), "android.hardware.common-V%u-ndk.so", i); - void *handle = dlopen(tmp, RTLD_LAZY); - if (handle) { - ALOGD("Found android.hardware.common-V%u-ndk.so", i); - androidHardwareCommonVersion = i; - dlclose(handle); - break; - } - } - if (androidHardwareCommonVersion == 0) { - ALOGE("Failed to find android.hardware.common version!"); - } - - for (uint32_t i = ANDROID_HARDWARE_COMMON_FMQ_MAX_VERSION; i > 0; i--) { - snprintf(tmp, sizeof(tmp), "android.hardware.common.fmq-V%u-ndk.so", i); - void *handle = dlopen(tmp, RTLD_LAZY); - if (handle) { - ALOGD("Found android.hardware.common.fmq-V%u-ndk.so", i); - androidHardwareCommonFmqVersion = i; - dlclose(handle); - break; - } - } - if (androidHardwareCommonFmqVersion == 0) { - ALOGE("Failed to find android.hardware.common.fmq version!"); - } - - for (uint32_t i = ANDROID_MEDIA_AUDIO_COMMON_TYPES_MAX_VERSION; i > 0; i--) { - snprintf(tmp, sizeof(tmp), "android.media.audio.common.types-V%u-ndk.so", i); - void *handle = dlopen(tmp, RTLD_LAZY); - if (handle) { - ALOGD("Found android.media.audio.common.types-V%u-ndk.so", i); - androidMediaAudioCommonTypesVersion = i; - dlclose(handle); - break; - } - } - if (androidMediaAudioCommonTypesVersion == 0) { - ALOGE("Failed to find android.media.audio.common.types version!"); - } -} - -__attribute__((constructor)) -void aidl_versions_init() { - AidlVersions::init(); -} diff --git a/src/AidlVersions.h b/src/AidlVersions.h deleted file mode 100644 index 743a11f..0000000 --- a/src/AidlVersions.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include - -class AidlVersions { -public: - const static uint32_t ANDROID_HARDWARE_AUDIO_COMMON_MAX_VERSION = 1; - const static uint32_t ANDROID_HARDWARE_AUDIO_EFFECT_MAX_VERSION = 3; - const static uint32_t ANDROID_HARDWARE_COMMON_MAX_VERSION = 1; - const static uint32_t ANDROID_HARDWARE_COMMON_FMQ_MAX_VERSION = 1; - const static uint32_t ANDROID_MEDIA_AUDIO_COMMON_TYPES_MAX_VERSION = 4; - const static uint32_t ANDROID_MEDIA_AUDIO_ERASER_TYPES_MAX_VERSION = 1; - - static void init(); - - static inline uint32_t androidHardwareAudioCommonVersion = 0; - static inline uint32_t androidHardwareAudioEffectVersion = 0; - static inline uint32_t androidHardwareCommonVersion = 0; - static inline uint32_t androidHardwareCommonFmqVersion = 0; - static inline uint32_t androidMediaAudioCommonTypesVersion = 0; - static inline uint32_t androidMediaAudioEraserTypesVersion = 0; -}; diff --git a/src/aidl/EffectTypes.h b/src/aidl/EffectTypes.h index 086dbdb..656ccd8 100644 --- a/src/aidl/EffectTypes.h +++ b/src/aidl/EffectTypes.h @@ -23,12 +23,12 @@ //#include typedef binder_exception_t (*EffectCreateFunctor)( - const ::aidl::android::media::audio::common::v1::AudioUuid*, + const ::aidl::android::media::audio::common::AudioUuid*, std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>*); typedef binder_exception_t (*EffectDestroyFunctor)( const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>&); typedef binder_exception_t (*EffectQueryFunctor)( - const ::aidl::android::media::audio::common::v1::AudioUuid*, + const ::aidl::android::media::audio::common::AudioUuid*, ::aidl::android::hardware::audio::effect::Descriptor*); struct effect_dl_interface_s { diff --git a/src/android/media/audio/common/AudioUuid.cpp b/src/android/media/audio/common/AudioUuid.cpp deleted file mode 100644 index aa215c5..0000000 --- a/src/android/media/audio/common/AudioUuid.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include -#include -#include - -namespace android::media::audio::common { -int32_t AudioUuid::timeLow() const { - switch (version) { - case 1: - return uuid_v1->timeLow; - default: - ALOGE("AudioUuid::timeLow: Unknown version"); - return 0; - } -} - -int32_t AudioUuid::timeMid() const { - switch (version) { - case 1: - return uuid_v1->timeMid; - default: - ALOGE("AudioUuid::timeMid: Unknown version"); - return 0; - } -} - -int32_t AudioUuid::timeHiAndVersion() const { - switch (version) { - case 1: - return uuid_v1->timeHiAndVersion; - default: - ALOGE("AudioUuid::timeHiAndVersion: Unknown version"); - return 0; - } -} - -int32_t AudioUuid::clockSeq() const { - switch (version) { - case 1: - return uuid_v1->clockSeq; - default: - ALOGE("AudioUuid::clockSeq: Unknown version"); - return 0; - } -} - -std::vector AudioUuid::node() const { - switch (version) { - case 1: - return uuid_v1->node; - default: - ALOGE("AudioUuid::node: Unknown version"); - return {}; - } -} - -AudioUuid& AudioUuid::operator=(const AudioUuid& _rhs) { - switch (version) { - case 1: - uuid_v1->timeLow = _rhs.timeLow(); - uuid_v1->timeMid = _rhs.timeMid(); - uuid_v1->timeHiAndVersion = _rhs.timeHiAndVersion(); - uuid_v1->clockSeq = _rhs.clockSeq(); - uuid_v1->node = _rhs.node(); - break; - default: - ALOGE("AudioUuid::operator=: Unknown version"); - break; - } - return *this; -} -} // namespace android::media::audio::common diff --git a/src/include/android/media/audio/common/AudioUuid.h b/src/include/android/media/audio/common/AudioUuid.h deleted file mode 100644 index 4c17040..0000000 --- a/src/include/android/media/audio/common/AudioUuid.h +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include "../../../../../AidlVersions.h" - -using namespace aidl::android::media::audio::common; - -namespace android::media::audio::common { -class AudioUuid { -public: - int32_t timeLow() const; - int32_t timeMid() const; - int32_t timeHiAndVersion() const; - int32_t clockSeq() const; - std::vector node() const; - - AudioUuid& operator=(const AudioUuid& _rhs); - - inline bool operator==(const AudioUuid& _rhs) const { - int32_t timeLow = this->timeLow(); - int32_t timeMid = this->timeMid(); - int32_t timeHiAndVersion = this->timeHiAndVersion(); - int32_t clockSeq = this->clockSeq(); - std::vector node = this->node(); - - int32_t rhsTimeLow = _rhs.timeLow(); - int32_t rhsTimeMid = _rhs.timeMid(); - int32_t rhsTimeHiAndVersion = _rhs.timeHiAndVersion(); - int32_t rhsClockSeq = _rhs.clockSeq(); - std::vector rhsNode = _rhs.node(); - - return std::tie(timeLow, timeMid, timeHiAndVersion, clockSeq, node) == std::tie(rhsTimeLow, rhsTimeMid, rhsTimeHiAndVersion, rhsClockSeq, rhsNode); - } - inline bool operator<(const AudioUuid& _rhs) const { - int32_t timeLow = this->timeLow(); - int32_t timeMid = this->timeMid(); - int32_t timeHiAndVersion = this->timeHiAndVersion(); - int32_t clockSeq = this->clockSeq(); - std::vector node = this->node(); - - int32_t rhsTimeLow = _rhs.timeLow(); - int32_t rhsTimeMid = _rhs.timeMid(); - int32_t rhsTimeHiAndVersion = _rhs.timeHiAndVersion(); - int32_t rhsClockSeq = _rhs.clockSeq(); - std::vector rhsNode = _rhs.node(); - - return std::tie(timeLow, timeMid, timeHiAndVersion, clockSeq, node) < std::tie(rhsTimeLow, rhsTimeMid, rhsTimeHiAndVersion, rhsClockSeq, rhsNode); - } - inline bool operator!=(const AudioUuid& _rhs) const { - return !(*this == _rhs); - } - inline bool operator>(const AudioUuid& _rhs) const { - return _rhs < *this; - } - inline bool operator>=(const AudioUuid& _rhs) const { - return !(*this < _rhs); - } - inline bool operator<=(const AudioUuid& _rhs) const { - return !(_rhs < *this); - } -private: - uint32_t version = AidlVersions::androidMediaAudioCommonTypesVersion; - v1::AudioUuid *uuid_v1 = (v1::AudioUuid *) this; -}; -} // namespace android::media::audio::common diff --git a/src/viper_aidl.cpp b/src/viper_aidl.cpp index 5ff57d2..f8587c1 100644 --- a/src/viper_aidl.cpp +++ b/src/viper_aidl.cpp @@ -3,8 +3,6 @@ #include #include -#include - using aidl::android::hardware::audio::effect::CommandId; using aidl::android::hardware::audio::effect::Descriptor; using aidl::android::hardware::audio::effect::Flags; @@ -12,7 +10,7 @@ using aidl::android::hardware::audio::effect::IEffect; using aidl::android::hardware::audio::effect::Parameter; using aidl::android::hardware::audio::effect::RetCode; using aidl::android::hardware::audio::effect::State; -using android::media::audio::common::AudioUuid; +using aidl::android::media::audio::common::AudioUuid; using aidl::android::media::audio::common::PcmType; using android::hardware::EventFlag; @@ -22,8 +20,8 @@ using android::hardware::EventFlag; */ static constexpr uint32_t kEventFlagDataMqNotEmpty = 0x1 << 11; -inline android::media::audio::common::AudioUuid stringToUuid(const char* str) { - android::media::audio::common::AudioUuid uuid{}; +inline AudioUuid stringToUuid(const char* str) { + AudioUuid uuid{}; uint32_t tmp[10]; if (!str || sscanf(str, "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x", tmp, tmp + 1, tmp + 2, tmp + 3, tmp + 4, tmp + 5, tmp + 6, @@ -31,22 +29,22 @@ inline android::media::audio::common::AudioUuid stringToUuid(const char* str) { return uuid; } -// uuid.timeLow = (uint32_t)tmp[0]; -// uuid.timeMid = (uint16_t)tmp[1]; -// uuid.timeHiAndVersion = (uint16_t)tmp[2]; -// uuid.clockSeq = (uint16_t)tmp[3]; -// uuid.node.insert(uuid.node.end(), {(uint8_t)tmp[4], (uint8_t)tmp[5], (uint8_t)tmp[6], -// (uint8_t)tmp[7], (uint8_t)tmp[8], (uint8_t)tmp[9]}); + uuid.timeLow = (uint32_t)tmp[0]; + uuid.timeMid = (uint16_t)tmp[1]; + uuid.timeHiAndVersion = (uint16_t)tmp[2]; + uuid.clockSeq = (uint16_t)tmp[3]; + uuid.node.insert(uuid.node.end(), {(uint8_t)tmp[4], (uint8_t)tmp[5], (uint8_t)tmp[6], + (uint8_t)tmp[7], (uint8_t)tmp[8], (uint8_t)tmp[9]}); return uuid; } -const android::media::audio::common::AudioUuid kType = stringToUuid("b9bc100c-26cd-42e6-acb6-cad8c3f778de"); -const android::media::audio::common::AudioUuid kUuid = stringToUuid("90380da3-8536-4744-a6a3-5731970e640f"); +const AudioUuid kType = stringToUuid("b9bc100c-26cd-42e6-acb6-cad8c3f778de"); +const AudioUuid kUuid = stringToUuid("90380da3-8536-4744-a6a3-5731970e640f"); const Descriptor kDescriptor = { .common = { .id = { -// .type = kType, -// .uuid = kUuid, + .type = kType, + .uuid = kUuid, .proxy = std::nullopt }, .flags = { @@ -306,7 +304,7 @@ void ViPER4AndroidAIDL::process() { ALOGD("process called"); } -extern "C" binder_exception_t createEffect(const android::media::audio::common::AudioUuid *audio_uuid, std::shared_ptr *instance) { +extern "C" binder_exception_t createEffect(const AudioUuid *audio_uuid, std::shared_ptr *instance) { if (audio_uuid == nullptr || instance == nullptr) { ALOGE("createEffect called with null arguments"); return EX_ILLEGAL_ARGUMENT; @@ -321,7 +319,7 @@ extern "C" binder_exception_t destroyEffect(const std::shared_ptr &inst return EX_ILLEGAL_STATE; } -extern "C" binder_exception_t queryEffect(const android::media::audio::common::AudioUuid *audio_uuid, Descriptor *descriptor) { +extern "C" binder_exception_t queryEffect(const AudioUuid *audio_uuid, Descriptor *descriptor) { if (audio_uuid == nullptr || descriptor == nullptr) { ALOGE("queryEffect called with null arguments"); return EX_ILLEGAL_ARGUMENT;