aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2018-07-19 17:30:57 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-08-01 10:41:45 +0000
commit08ed35041eeb20cfb0349dfaead0461a2efe0e1a (patch)
treeb8df5f3738f225571423d3c40cecb37abd293681
parentb6141a90bcf736fee859efcbae9693b895094394 (diff)
agl-demo: add 4A as a dependency and a separate agl-demo-soundmanager
When running aglsetup with feature 'agl-demo', 4A is now enabled. The feature 'agl-audio-4a-framework' is added to the feature deps. For the agl-audio-soundmanager framework use agl-demo-soundmanager. Discussed in SAT meeting on 20180719. Bug-AGL: SPEC-1234 Bug-AGL: SPEC-1598 Change-Id: Ief75404c6ab818e58394b3ab55f221f823363362 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh> Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc5
-rw-r--r--templates/feature/agl-demo-soundmanager/50_local.conf.inc2
-rw-r--r--templates/feature/agl-demo-soundmanager/included.dep1
-rw-r--r--templates/feature/agl-demo/included.dep2
4 files changed, 9 insertions, 1 deletions
diff --git a/templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc b/templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc
new file mode 100644
index 000000000..7e85c574e
--- /dev/null
+++ b/templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+# This layer contains the WIP feature/demo code only
+#---------------------------------------------------
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl-demo \
+"
diff --git a/templates/feature/agl-demo-soundmanager/50_local.conf.inc b/templates/feature/agl-demo-soundmanager/50_local.conf.inc
new file mode 100644
index 000000000..76626243c
--- /dev/null
+++ b/templates/feature/agl-demo-soundmanager/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl-demo/conf/include/agl-demo.inc
+require conf/include/agl-demo.inc
diff --git a/templates/feature/agl-demo-soundmanager/included.dep b/templates/feature/agl-demo-soundmanager/included.dep
new file mode 100644
index 000000000..b0b942853
--- /dev/null
+++ b/templates/feature/agl-demo-soundmanager/included.dep
@@ -0,0 +1 @@
+agl-appfw-smack agl-hmi-framework agl-profile-graphical-qt5 agl-audio-soundmanager-framework
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
index d8774985c..a5d532410 100644
--- a/templates/feature/agl-demo/included.dep
+++ b/templates/feature/agl-demo/included.dep
@@ -1 +1 @@
-agl-appfw-smack agl-hmi-framework agl-profile-graphical-qt5
+agl-appfw-smack agl-hmi-framework agl-profile-graphical-qt5 agl-audio-4a-framework