Revert "audio: Parse module configurations from the APM XML files"
Revert submission 2770886-AidlAudioHalModuleConfig
Reason for revert: Breaks BluetoothInstrumentationTests on main downstream
Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig
Bug: 305291602
Change-Id: I0076c88877943d9498f90c477e78a2be5d390150
diff --git a/audio/aidl/default/android.hardware.audio.service-aidl.xml b/audio/aidl/default/android.hardware.audio.service-aidl.xml
index 57f61c9..9db6061 100644
--- a/audio/aidl/default/android.hardware.audio.service-aidl.xml
+++ b/audio/aidl/default/android.hardware.audio.service-aidl.xml
@@ -12,17 +12,6 @@
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>1</version>
- <fqname>IModule/bluetooth</fqname>
- </hal>
- <hal format="aidl">
- <name>android.hardware.audio.core</name>
- <version>1</version>
- <fqname>IConfig/default</fqname>
- </hal>
- <!-- Uncomment when these modules present in the configuration
- <hal format="aidl">
- <name>android.hardware.audio.core</name>
- <version>1</version>
<fqname>IModule/stub</fqname>
</hal>
<hal format="aidl">
@@ -30,5 +19,14 @@
<version>1</version>
<fqname>IModule/usb</fqname>
</hal>
- -->
+ <hal format="aidl">
+ <name>android.hardware.audio.core</name>
+ <version>1</version>
+ <fqname>IModule/bluetooth</fqname>
+ </hal>
+ <hal format="aidl">
+ <name>android.hardware.audio.core</name>
+ <version>1</version>
+ <fqname>IConfig/default</fqname>
+ </hal>
</manifest>