From 2938eb34a55ebb4cb0427314151b30fd97ef6e78 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 11 Feb 2020 17:37:54 -0500 Subject: 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 --- meta-speech-framework/conf/include/agl-voiceagent-alexa.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta-speech-framework/conf') 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" -- cgit 1.2.3-korg