summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2017-11-11 19:12:32 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-11-12 06:32:51 +0000
commite0e2b0cdb3e208a4914a04d43eced5d9668e5b66 (patch)
treeba991b38f90120d2d8b1c04e4834fb15b5872886
parent3cd7f84105c6e52b54d9aeca7fa4e898d84bf61c (diff)
Introduce new 4A audio framework conditionnaly to feature 'agl-audio-4a-framework'
If feature 'agl-audio-4a-framework' is set by aglsetup, the new 4A (AGL Advanced Audio Agent) framework will be pulled in demo. Otherwise (by default), the legacy 'audiomanager' package is pulled in. Change-Id: I62b62025be6589e3b5dd0b964830e431ffa56e8c Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
-rw-r--r--recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bbappend1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo.bb6
2 files changed, 6 insertions, 1 deletions
diff --git a/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bbappend b/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bbappend
index dfc6edac0..e470ab2b3 100644
--- a/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bbappend
+++ b/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bbappend
@@ -1,4 +1,3 @@
RDEPENDS_${PN} += "\
- audiomanager \
virtual/pulseaudio-config \
"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 186280e12..3f1cc28bb 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -19,10 +19,16 @@ HOMESCREEN-OLD = "homescreen"
# packages from hmi-framework aka homescreen-2017
HOMESCREEN-NEW = "packagegroup-hmi-framework packagegroup-hmi-framework-dev"
+# old audio package
+AUDIO-OLD = "audiomanager"
+# packages from new 4A framework
+AUDIO-NEW = "packagegroup-agl-audio"
+
RDEPENDS_${PN} += "\
packagegroup-agl-appfw \
libqtappfw \
${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', '${HOMESCREEN-NEW}', '${HOMESCREEN-OLD}', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \
udisks \
${SMARTDEVICELINK} \
"