Skip to content

Commit

Permalink
zephyr: Update GOOGLE_RTC_AUDIO_PROCESSING
Browse files Browse the repository at this point in the history
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 <andyross@google.com>
  • Loading branch information
andyross authored and kv2019i committed Jan 8, 2024
1 parent b2909e9 commit e802aa7
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,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
)
Expand Down

0 comments on commit e802aa7

Please sign in to comment.