Update Audio mixin for audio hidl one image

Update Audio mixin for audio hidl one image Tracked-On: OAM-128617 Signed-off-by: Martin, Chen <[email protected]>
projectceladon · Dec 29, 2024 · bc4c465 · bc4c465
1 parent 36a76ea
commit bc4c465
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml b/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml
@@ -5,7 +5,7 @@
     <Mixer Card="avsrt56401" MixerPath="/vendor/etc/mixer_paths_0.xml"/>
   </Stream>
 -->
-  <Property UsbAudio="false"/>
+  <Property UsbAudio="true"/>
 
   <Stream Address="bus0_media_out" Direction="playback" Mmap="false">
     <Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="1024" PeriodCount="4" StartThreshhold="4096" AdditionalOutputDeviceDelay="5"/>

diff --git a/groups/audio/audio_base_aaos/default/policy/set_board_prop.sh b/groups/audio/audio_base_aaos/default/policy/set_board_prop.sh
@@ -0,0 +1,13 @@
+#!/vendor/bin/sh
+
+board_type=`getprop ro.boot.audio_type | cut -d, -f1`
+board_name=`getprop ro.boot.audio_type | cut -d, -f2`
+
+if [ -z "$board_name" ]
+then
+        setprop vendor.audio.board_type "celadon"
+else
+        setprop vendor.audio.board_type $board_type
+fi
+
+setprop vendor.audio.board_name "$board_name"
diff --git a/groups/audio/audio_base_aaos/init.rc b/groups/audio/audio_base_aaos/init.rc
@@ -49,6 +49,9 @@ on post-fs && property:vendor.intel.enable.audio=sof-hda
     insmod /vendor/lib/modules/snd-soc-skl_hda_dsp.ko
     insmod /vendor/lib/modules/snd-sof-pci-intel-tgl.ko
 
+on post-fs-data
+     exec - system system -- /vendor/bin/set_board_prop.sh
+
 on boot
     insmod /vendor/lib/modules/snd.ko
     insmod /vendor/lib/modules/snd-timer.ko

diff --git a/groups/audio/audio_base_aaos/product.mk b/groups/audio/audio_base_aaos/product.mk
@@ -19,9 +19,12 @@ PRODUCT_PACKAGES += meta.package.audio
 PRODUCT_PACKAGES += \
        sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
 
-# Audio Primary HAL
-PRODUCT_PACKAGES += \
-       audio.primary.$(TARGET_BOARD_PLATFORM)
+# Audio hidl
+MK := $(shell find vendor/intel/audio/audio_aaos -name product.mk)
+$(foreach mk, $(MK), $(call inherit-product, $(mk)))
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/audio/default/policy/set_board_prop.sh:vendor/bin/set_board_prop.sh
 
 # Extended Audio HALs
 PRODUCT_PACKAGES += \