From 0b95edea783c3daf1714a399eb10fc0382b9ca2c Mon Sep 17 00:00:00 2001
From: shihchienc <shihchienc@google.com>
Date: Thu, 22 Sep 2022 07:02:44 +0000
Subject: [PATCH] Change config path for LE Audio Capabilities file

Since there is no different setting for sub project under same prohject,
we will change the setting file from `bluetooth/project/` to
`bluetooth/` to simplify the file structure.

Bug: 238983662
Test: make sure file added in config folder can be copied into devices
Change-Id: I1b0d6a2107f5d69fd7bf650bad314e920810c156
Merged-In: I1b0d6a2107f5d69fd7bf650bad314e920810c156
(cherry picked from commit 6f30806b7829bed67896194f8bfe43dbcea21e31)
---
 .../le_audio_codec_capabilities.xml           |  0
 .../panther/le_audio_codec_capabilities.xml   | 73 -------------------
 device-cheetah.mk                             |  2 +-
 device-panther.mk                             |  2 +-
 4 files changed, 2 insertions(+), 75 deletions(-)
 rename bluetooth/{cheetah => }/le_audio_codec_capabilities.xml (100%)
 delete mode 100644 bluetooth/panther/le_audio_codec_capabilities.xml

diff --git a/bluetooth/cheetah/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml
similarity index 100%
rename from bluetooth/cheetah/le_audio_codec_capabilities.xml
rename to bluetooth/le_audio_codec_capabilities.xml
diff --git a/bluetooth/panther/le_audio_codec_capabilities.xml b/bluetooth/panther/le_audio_codec_capabilities.xml
deleted file mode 100644
index a836273..0000000
--- a/bluetooth/panther/le_audio_codec_capabilities.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!---
-  This is an example to configure LE Audio hardware offload supported capability settings
-  codecConfigurationList:
-    Supported codec capability along with its parameter setting
-
-  strategyConfigurationList:
-     ASE Configuration strategies
-
-  configurationList:
-    For each configuration, there are two attributes
-      - codecConfiguration
-      - strategyConfiguration
-
-  scenarioList:
-    There would be only one `scenarios` group
-    For each scenario, the are two attributes
-      - encode
-      - decode
-    If a scenario is unidirectional, mark another direction as `invalid`
-    The configuration should be chosen from `configurationList`
--->
-<leAudioOffloadSetting>
-  <scenarioList>
-    <!-- encode only -->
-    <scenario encode="OneChanMono_16_1" decode="invalid"/>
-    <scenario encode="TwoChanStereo_16_1" decode="invalid"/>
-    <scenario encode="OneChanStereo_16_1" decode="invalid"/>
-    <scenario encode="OneChanMono_16_2" decode="invalid"/>
-    <scenario encode="TwoChanStereo_16_2" decode="invalid"/>
-    <scenario encode="OneChanStereo_16_2" decode="invalid"/>
-    <scenario encode="OneChanMono_24_2" decode="invalid"/>
-    <scenario encode="TwoChanStereo_24_2" decode="invalid"/>
-    <scenario encode="OneChanStereo_24_2" decode="invalid"/>
-    <scenario encode="OneChanMono_48_4" decode="invalid"/>
-    <scenario encode="TwoChanStereo_48_4" decode="invalid"/>
-    <scenario encode="OneChanStereo_48_4" decode="invalid"/>
-    <!-- encode and decode -->
-    <scenario encode="OneChanStereo_16_1" decode="OneChanStereo_16_1"/>
-    <scenario encode="OneChanStereo_16_1" decode="OneChanMono_16_1"/>
-    <scenario encode="TwoChanStereo_16_1" decode="OneChanMono_16_1"/>
-    <scenario encode="OneChanMono_16_1" decode="OneChanMono_16_1"/>
-    <scenario encode="OneChanStereo_16_2" decode="OneChanStereo_16_2"/>
-    <scenario encode="OneChanStereo_16_2" decode="OneChanMono_16_2"/>
-    <scenario encode="TwoChanStereo_16_2" decode="OneChanMono_16_2"/>
-    <scenario encode="OneChanMono_16_2" decode="OneChanMono_16_2"/>
-  </scenarioList>
-  <configurationList>
-    <configuration name="OneChanMono_16_1" codecConfiguration="LC3_16k_1" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="TwoChanStereo_16_1" codecConfiguration="LC3_16k_1" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
-    <configuration name="OneChanStereo_16_1" codecConfiguration="LC3_16k_1" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="OneChanMono_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="TwoChanStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
-    <configuration name="OneChanStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="OneChanMono_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="TwoChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
-    <configuration name="OneChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
-    <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
-  </configurationList>
-  <codecConfigurationList>
-    <codecConfiguration name="LC3_16k_1" codec="LC3" samplingFrequency="16000" frameDurationUs="7500" octetsPerCodecFrame="30"/>
-    <codecConfiguration name="LC3_16k_2" codec="LC3" samplingFrequency="16000" frameDurationUs="10000" octetsPerCodecFrame="40"/>
-    <codecConfiguration name="LC3_24k_2" codec="LC3" samplingFrequency="24000" frameDurationUs="10000" octetsPerCodecFrame="60"/>
-    <codecConfiguration name="LC3_48k_4" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="120"/>
-  </codecConfigurationList>
-  <strategyConfigurationList>
-    <strategyConfiguration name="STEREO_ONE_CIS_PER_DEVICE" audioLocation="STEREO" connectedDevice="2" channelCount="1"/>
-    <strategyConfiguration name="STEREO_TWO_CISES_PER_DEVICE" audioLocation="STEREO" connectedDevice="1" channelCount="2"/>
-    <strategyConfiguration name="MONO_ONE_CIS_PER_DEVICE" audioLocation="MONO" connectedDevice="1" channelCount="1"/>
-  </strategyConfigurationList>
-</leAudioOffloadSetting>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 38e0dcf..f62be6d 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -290,7 +290,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # LE Auido Offload Capabilities setting
 PRODUCT_COPY_FILES += \
-    device/google/pantah/bluetooth/cheetah/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
+    device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
 
 # Bluetooth EWP test tool
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/device-panther.mk b/device-panther.mk
index eabed52..efe59c3 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -278,7 +278,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # LE Auido Offload Capabilities setting
 PRODUCT_COPY_FILES += \
-    device/google/pantah/bluetooth/panther/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
+    device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
 
 # Bluetooth EWP test tool
 PRODUCT_PACKAGES_DEBUG += \