Skip to content

Commit 191abcf

Browse files
committed
cmake/zephyr: unify cmake rules for src/audio/mic_privacy
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/mic_privacy instead. Link: #8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 8bbe7c6 commit 191abcf

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

src/audio/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
105105
add_subdirectory(codec)
106106
endif()
107107
add_subdirectory(google)
108+
if(CONFIG_INTEL_ADSP_MIC_PRIVACY)
109+
add_subdirectory(mic_privacy_manager)
110+
endif()
108111
if(CONFIG_ZEPHYR_NATIVE_DRIVERS)
109112
list(APPEND base_files host-zephyr.c)
110113
sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-zephyr.c)
@@ -143,9 +146,6 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
143146
dai-legacy.c
144147
)
145148
endif()
146-
if(CONFIG_INTEL_ADSP_MIC_PRIVACY)
147-
add_subdirectory(mic_privacy_manager)
148-
endif()
149149

150150
return()
151151
endif()

zephyr/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ cmake_path(SET sof_top_dir NORMALIZE "${CMAKE_CURRENT_SOURCE_DIR}/..")
134134
set(SOF_SRC_PATH "${sof_top_dir}/src")
135135

136136
set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform")
137-
set(SOF_AUDIO_PATH "${SOF_SRC_PATH}/audio")
138137
set(SOF_SAMPLES_PATH "${SOF_SRC_PATH}/samples")
139138
set(SOF_LIB_PATH "${SOF_SRC_PATH}/lib")
140139
set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/drivers")
@@ -571,10 +570,6 @@ zephyr_library_sources_ifdef(CONFIG_SHELL
571570
sof_shell.c
572571
)
573572

574-
zephyr_library_sources_ifdef(CONFIG_INTEL_ADSP_MIC_PRIVACY
575-
${SOF_AUDIO_PATH}/mic_privacy_manager/mic_privacy_manager_intel.c
576-
)
577-
578573
zephyr_library_link_libraries(SOF)
579574
target_link_libraries(SOF INTERFACE zephyr_interface)
580575

0 commit comments

Comments
 (0)