summaryrefslogtreecommitdiffstats
path: root/meta-speech-framework/conf
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-02-11 17:37:54 -0500
committerScott Murray <scott.murray@konsulko.com>2020-02-11 17:47:57 -0500
commit2938eb34a55ebb4cb0427314151b30fd97ef6e78 (patch)
tree254e12e5cd5d23825da468f3fc63d4536b8504ee /meta-speech-framework/conf
parentdacf072f08c4be318715f769558136a58862edde (diff)
meta-speech-framework: enable building Alexa voiceagent against zeus
Changes: - Tweak LAYERSERIES_COMPAT variable for alexa-auto-sdk's meta-aac layer to append zeus, since it's unclear when Amazon will get around to a new release that adds zeus support and it's straightforward to get it to build against zeus. - Add BBMASK for nghttp2 recipe in meta-aac to avoid overlaying the one for the same version now available in meta-networking. This avoids rebuilding a bunch of dependencies when reconfiguring to enable agl-voiceagent-alexa. - Add bbappend for avs-device-sdk to add a patch to disable -Werror for new g++ 9 "deprecated-copy" warning in the packaged copy of googletest, which avoids a build failure. Bug-AGL: SPEC-2932 Change-Id: I469d07bafd8a4faf625191eb553ab7f762efb480 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-speech-framework/conf')
-rw-r--r--meta-speech-framework/conf/include/agl-voiceagent-alexa.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
index 10df0926..21da324e 100644
--- a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
+++ b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
@@ -2,6 +2,11 @@
# from meta-aac to avoid triggering rebuilds of all curl dependencies when
# agl-voiceagent-alexa is configured.
BBMASK += "meta-aac/recipes-support/curl/curl_%.bbappend"
+# Mask out the nghttp2 recipe in meta-aac as well, since the same version
+# is available in meta-networking, and due to meta-aac having a higher
+# layer priority, rebuilds will be triggered when the voiceagent feature
+# is configured and the layer is added.
+BBMASK += "meta-aac/recipes-connectivity/nghttp2"
PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config"