Revert "More stupid stuff"

This reverts commit d4f8e87.

Author: iscle

CMakeLists.txt

@@ -23,135 +23,133 @@ include_directories(
 
 # AIDL
 set(AIDL_SRC
-        generated/android/media/audio/common/v1/AudioUuid.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
-
-        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
-
-        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
-
-        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
-
-        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/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
+
+        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
+
+        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
+
+        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
+
+        generated/android/hardware/common/Ashmem.cpp
+        generated/android/hardware/common/NativeHandle.cpp
+        generated/android/hardware/common/MappableFile.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