diff --git a/audio/cheetah/aidl_config/audio_platform_configuration.xml b/audio/cheetah/aidl_config/audio_platform_configuration.xml
new file mode 100644
index 0000000..a3144da
--- /dev/null
+++ b/audio/cheetah/aidl_config/audio_platform_configuration.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.01
+ 0.02
+ 0.04
+ 0.10
+ 0.21
+ 0.47
+ 1.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MIC
+ CAMCORDER
+ VOICE_RECOGNITION
+
+
+ MIC
+ CAMCORDER
+ VOICE_RECOGNITION
+
+
+
+
+
+
diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
deleted file mode 100644
index 912b4aa..0000000
--- a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk
index b9d5e0f..1f74dcf 100644
--- a/audio/cheetah/audio-tables.mk
+++ b/audio/cheetah/audio-tables.mk
@@ -22,7 +22,7 @@ AUDIO_TABLE_FOLDER := cheetah
ifeq ($(BUILD_AUDIO_AIDL_VERSION),true)
# AIDL HAL configs are in the *config_aidl* folder
PRODUCT_COPY_FILES += \
- device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml
else
diff --git a/audio/panther/aidl_config/audio_platform_configuration.xml b/audio/panther/aidl_config/audio_platform_configuration.xml
new file mode 100644
index 0000000..a3144da
--- /dev/null
+++ b/audio/panther/aidl_config/audio_platform_configuration.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.01
+ 0.02
+ 0.04
+ 0.10
+ 0.21
+ 0.47
+ 1.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MIC
+ CAMCORDER
+ VOICE_RECOGNITION
+
+
+ MIC
+ CAMCORDER
+ VOICE_RECOGNITION
+
+
+
+
+
+
diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
deleted file mode 100644
index 912b4aa..0000000
--- a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk
index 3dbc52e..108b800 100644
--- a/audio/panther/audio-tables.mk
+++ b/audio/panther/audio-tables.mk
@@ -22,7 +22,7 @@ AUDIO_TABLE_FOLDER := panther
ifeq ($(BUILD_AUDIO_AIDL_VERSION),true)
# AIDL HAL configs are in the *aidl_config* folder
PRODUCT_COPY_FILES += \
- device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml
else