From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Thu, 14 Jun 2018 01:16:51 +0000 (+0200)
Subject: agl-service-audio-4a: adjust binder startup for new hals
X-Git-Tag: 5.1.0~12
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F14419%2F1;p=AGL%2Fmeta-agl-devel.git

agl-service-audio-4a: adjust binder startup for new hals

With changes on 4a-hal-generic and 4a-softmixer, the --ldpath
argument used when starting 4A binder must be adjusted to match
new HALs. Also, the binder name now matters as the high level
API will look for the policy file using 'policy-4a-*.json'.

Change-Id: I5f848eb330a5917569f6f25f9bc15abef0ea4b2e
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
---

diff --git a/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb b/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb
index ec48749b..a07a465b 100644
--- a/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb
@@ -31,7 +31,11 @@ done
 sed -i '/\[Unit\]/ a Before=pulseaudio.service' $svcfile;
 sed -i '/\[Unit\]/ a ConditionPathExistsGlob=/dev/snd/control*' $svcfile;
 
-sed -i -e 's|/usr/bin/afb-daemon\>|& --ldpath=/usr/libexec/agl/afb-aaaa/lib:/usr/libexec/agl/4a-alsa-core/lib|' $svcfile
+sed -i -e 's|/usr/bin/afb-daemon\>|& --ldpath=/usr/libexec/agl/4a-alsa-core/lib:/usr/libexec/agl/4a-hal/lib:/usr/libexec/agl/afb-aaaa/lib:/usr/libexec/agl/smixer/lib|' $svcfile
+
+# binder name matters: it must match "afbd-4a-*" => the config file (controller json file) that will be searched will be "policy-4a-*.json"
+sed -i -e 's|--name afbd-agl-\(.*\)|--name afbd-4a-\1|' $svcfile
+
 echo "-- TMP 4A INSTALL FIX END"
 
 EOF