From bb420c95deded88f728c87aa89e4bc3c5759f626 Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Thu, 2 Mar 2023 11:28:34 -0800 Subject: [PATCH] zephyr: Update GOOGLE_RTC_AUDIO_PROCESSING Unbreak the Zephyr build when this is enabled, and add the needed bits to produce a working executable. This is mostly just a recapitulation of the existing integration, which means that it's manually pulling in bits from the Cadence toolchain it needs. SOF isn't yet using the Zephyr C++ integration (which isn't xt-clang aware yet), nor does it really want to as SOF itself includes no such code. Zephyr doesn't have a "C++ binary linkage only" feature yet. Signed-off-by: Andy Ross --- zephyr/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 783d5c7e41ff..f63d647fe108 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -751,6 +751,17 @@ zephyr_library_sources_ifdef(CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK ${SOF_AUDIO_PATH}/google/google_rtc_audio_processing_mock.c ) +if(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING AND NOT CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK) + zephyr_include_directories(../third_party/include) + target_link_directories(SOF INTERFACE ../third_party/lib) + target_link_libraries(SOF INTERFACE google_rtc_audio_processing) + target_link_libraries(SOF INTERFACE c++) + target_link_libraries(SOF INTERFACE c++abi) + target_link_libraries(SOF INTERFACE m) + target_link_libraries(SOF INTERFACE c) + target_link_libraries(SOF INTERFACE gcc) +endif() + zephyr_library_sources_ifdef(CONFIG_COMP_IGO_NR ${SOF_AUDIO_PATH}/igo_nr/igo_nr.c )