From 75cfbee004a98be8101d19c2f945dedbfec65727 Mon Sep 17 00:00:00 2001 From: Bobie Date: Tue, 13 Jun 2023 12:09:25 +0800 Subject: [PATCH 1/2] fix config of bundle.json Signed-off-by: Bobie --- audiohandler/BUILD.gn | 3 +-- bundle.json | 18 ++++++++++++------ hdf_interfaces/distributed_audio/bundle.json | 18 ++++++++++++++++-- hdf_service/distributed_audio/bundle.json | 5 +++-- .../hdi_service/audio/v1_0/BUILD.gn | 10 +++++----- .../test/fuzztest/captureframe_fuzzer/BUILD.gn | 2 ++ .../fuzztest/createcapture_fuzzer/BUILD.gn | 2 ++ .../test/fuzztest/createrender_fuzzer/BUILD.gn | 2 ++ .../fuzztest/destroycapture_fuzzer/BUILD.gn | 6 +++++- .../fuzztest/destroyrender_fuzzer/BUILD.gn | 6 +++++- .../fuzztest/getalladapters_fuzzer/BUILD.gn | 2 ++ .../fuzztest/getextraparams_fuzzer/BUILD.gn | 6 +++++- .../test/fuzztest/loadadapter_fuzzer/BUILD.gn | 2 ++ .../test/fuzztest/renderframe_fuzzer/BUILD.gn | 2 ++ .../fuzztest/setextraparams_fuzzer/BUILD.gn | 6 +++++- .../fuzztest/unloadadapter_fuzzer/BUILD.gn | 2 ++ .../unittest/audio_adapter_interface/BUILD.gn | 2 ++ .../unittest/audio_capture_interface/BUILD.gn | 2 ++ .../unittest/audio_manager_interface/BUILD.gn | 2 ++ .../unittest/audio_render_interface/BUILD.gn | 2 ++ .../hdi_service/audio_ext/v1_0/BUILD.gn | 5 ++++- .../test/fuzztest/notifyevent_fuzzer/BUILD.gn | 7 +++---- .../registeraudiodevice_fuzzer/BUILD.gn | 7 +++---- .../unregisteraudiodevice_fuzzer/BUILD.gn | 7 +++---- .../audio_ext/v1_0/test/unittest/BUILD.gn | 3 ++- 25 files changed, 94 insertions(+), 35 deletions(-) diff --git a/audiohandler/BUILD.gn b/audiohandler/BUILD.gn index 30b394ea..6e4fdad3 100644 --- a/audiohandler/BUILD.gn +++ b/audiohandler/BUILD.gn @@ -19,8 +19,6 @@ ohos_shared_library("distributed_audio_handler") { include_dirs = [ "//third_party/json/include", "${fwk_common_path}/utils/include", - "${mediastandard_path}/interfaces/inner_api/native", - "${mediastandard_path}/services/utils/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", "${mediastandardfwk_path}/audiocapturer/include", @@ -44,6 +42,7 @@ ohos_shared_library("distributed_audio_handler") { "audio_framework:audio_client", "c_utils:utils", "multimedia_image_framework:image_native", + "player_framework:media_client", ] defines = [ diff --git a/bundle.json b/bundle.json index 5724ad9e..7d9f88dc 100755 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "license":"Apache License 2.0", "publishAs":"code-segment", "segment":{ - "destPath":"foundation/distributedhardware/distributed_audio/" + "destPath":"foundation/distributedhardware/distributed_audio" }, "dirs":{}, "scripts":{}, @@ -29,15 +29,21 @@ "deps":{ "components":[ "appexecfwk_standard", + "audio_framework", + "c_utils", + "distributed_hardware_fwk", + "drivers_interface_audio", + "dsoftbus", "eventhandler", + "hdf_core", + "hisysevent_native", + "hitrace_native", "hiviewdfx_hilog_native", "ipc", + "multimedia_image_framework", + "player_framework", "safwk", - "samgr", - "dsoftbus", - "c_utils", - "distributed_hardware_fwk", - "player_framework" + "samgr" ], "third_party":[ "json" diff --git a/hdf_interfaces/distributed_audio/bundle.json b/hdf_interfaces/distributed_audio/bundle.json index a339e95e..37db323b 100644 --- a/hdf_interfaces/distributed_audio/bundle.json +++ b/hdf_interfaces/distributed_audio/bundle.json @@ -36,7 +36,14 @@ "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_proxy_1.0", "header": { "header_files": [ - + ], + "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio" + } + }, + { + "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_stub_1.0", + "header": { + "header_files": [ ], "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio" } @@ -45,7 +52,14 @@ "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_proxy_1.0", "header": { "header_files": [ - + ], + "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext" + } + }, + { + "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_stub_1.0", + "header": { + "header_files": [ ], "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext" } diff --git a/hdf_service/distributed_audio/bundle.json b/hdf_service/distributed_audio/bundle.json index 37f64fc0..28fbeb5a 100644 --- a/hdf_service/distributed_audio/bundle.json +++ b/hdf_service/distributed_audio/bundle.json @@ -16,10 +16,11 @@ "ram": "8000KB", "deps": { "components": [ - "ipc", + "c_utils", + "drivers_interface_distributed_audio", "hdf_core", "hiviewdfx_hilog_native", - "c_utils" + "ipc" ], "third_party": [ "bounds_checking_function" diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn index 6fbd906b..535a2053 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn @@ -42,14 +42,12 @@ ohos_shared_library("libaudio_manager_daudio_primary_service_1.0") { ] } - public_deps = [ - "${hdf_interfaces_path}/audio/v1_0:libdaudio_stub_1.0", - "${hdf_interfaces_path}/audioext/v1_0:libdaudioext_stub_1.0", - "${hdf_service_path}/hdi_service/common:libdaudio_hdf_utils", - ] + public_deps = [ "${hdf_service_path}/hdi_service/common:libdaudio_hdf_utils" ] external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "hdf_core:libhdf_utils", "hiviewdfx_hilog_native:libhilog", @@ -79,6 +77,8 @@ ohos_shared_library("libdaudio_primary_driver") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/captureframe_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/captureframe_fuzzer/BUILD.gn index 2355d324..e268f723 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/captureframe_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/captureframe_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("CaptureFrameFuzzTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createcapture_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createcapture_fuzzer/BUILD.gn index ff0e6053..bb6d543f 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createcapture_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createcapture_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("CreateCaptureFuzzTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createrender_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createrender_fuzzer/BUILD.gn index 7d35e8f6..7638ff96 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createrender_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/createrender_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("CreateRenderFuzzTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroycapture_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroycapture_fuzzer/BUILD.gn index 6d0edba6..1c7bb928 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroycapture_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroycapture_fuzzer/BUILD.gn @@ -43,7 +43,11 @@ ohos_fuzztest("DestroyCaptureFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroyrender_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroyrender_fuzzer/BUILD.gn index ef2baede..7b56240f 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroyrender_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/destroyrender_fuzzer/BUILD.gn @@ -43,7 +43,11 @@ ohos_fuzztest("DestroyRenderFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getalladapters_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getalladapters_fuzzer/BUILD.gn index 5b24b91b..41db6f19 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getalladapters_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getalladapters_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("GetAllAdaptersFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] external_deps = [ + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getextraparams_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getextraparams_fuzzer/BUILD.gn index d02deb80..f458e4e5 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getextraparams_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/getextraparams_fuzzer/BUILD.gn @@ -43,7 +43,11 @@ ohos_fuzztest("GetExtraParamsFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/loadadapter_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/loadadapter_fuzzer/BUILD.gn index 1b978b2e..4200c0b2 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/loadadapter_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/loadadapter_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("LoadAdapterFuzzTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/renderframe_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/renderframe_fuzzer/BUILD.gn index b1e2ff88..4c63ad9e 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/renderframe_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/renderframe_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("RenderFrameFuzzTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/setextraparams_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/setextraparams_fuzzer/BUILD.gn index 413c9be2..ce3e5249 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/setextraparams_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/setextraparams_fuzzer/BUILD.gn @@ -43,7 +43,11 @@ ohos_fuzztest("SetExtraParamsFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/unloadadapter_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/unloadadapter_fuzzer/BUILD.gn index 49c4d108..4086a58c 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/unloadadapter_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/fuzztest/unloadadapter_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("UnloadAdapterFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] external_deps = [ + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/BUILD.gn index 47a93d83..196096b3 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/BUILD.gn @@ -48,6 +48,8 @@ ohos_unittest("HDIServiceAudioAdapterTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "ipc:ipc_core", ] } diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_capture_interface/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_capture_interface/BUILD.gn index cd59d35c..e746cff2 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_capture_interface/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_capture_interface/BUILD.gn @@ -47,6 +47,8 @@ ohos_unittest("HDIServiceCaptureTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "ipc:ipc_core", ] } diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_manager_interface/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_manager_interface/BUILD.gn index 138e852e..246aa584 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_manager_interface/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_manager_interface/BUILD.gn @@ -47,6 +47,8 @@ ohos_unittest("HDIServiceManagerTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/BUILD.gn index 5b6e36a8..3b872ee1 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/BUILD.gn @@ -48,6 +48,8 @@ ohos_unittest("HDIServiceRenderTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "ipc:ipc_core", ] } diff --git a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn index a8c2b3b7..b9d63ec6 100644 --- a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn @@ -27,13 +27,14 @@ ohos_shared_library("libdaudio_manager_daudio_ext_service_1.0") { sources = [ "./src/daudio_manager_interface_impl.cpp" ] public_deps = [ - "${hdf_interfaces_path}/audioext/v1_0:libdaudioext_stub_1.0", "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0", "${hdf_service_path}/hdi_service/common:libdaudio_hdf_utils", ] external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "hdf_core:libhdf_utils", "hiviewdfx_hilog_native:libhilog", @@ -59,6 +60,8 @@ ohos_shared_library("libdaudio_ext_driver") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", diff --git a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/notifyevent_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/notifyevent_fuzzer/BUILD.gn index 5d3043c1..65a49d17 100644 --- a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/notifyevent_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/notifyevent_fuzzer/BUILD.gn @@ -42,13 +42,12 @@ ohos_fuzztest("NotifyEventFuzzTest") { "${common_path}/include", ] - deps = [ - "${hdf_interfaces_path}/audioext/v1_0:libdaudioext_stub_1.0", - "${hdf_ser_aud_ext_path}:libdaudio_manager_daudio_ext_service_1.0", - ] + deps = [ "${hdf_ser_aud_ext_path}:libdaudio_manager_daudio_ext_service_1.0" ] external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/registeraudiodevice_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/registeraudiodevice_fuzzer/BUILD.gn index e77961e3..1c19630c 100644 --- a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/registeraudiodevice_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/registeraudiodevice_fuzzer/BUILD.gn @@ -43,13 +43,12 @@ ohos_fuzztest("RegisterAudioDeviceFuzzTest") { "${common_path}/include", ] - deps = [ - "${hdf_interfaces_path}/audioext/v1_0:libdaudioext_stub_1.0", - "${hdf_ser_aud_ext_path}:libdaudio_manager_daudio_ext_service_1.0", - ] + deps = [ "${hdf_ser_aud_ext_path}:libdaudio_manager_daudio_ext_service_1.0" ] external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/unregisteraudiodevice_fuzzer/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/unregisteraudiodevice_fuzzer/BUILD.gn index 2f587e4d..429c90ed 100644 --- a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/unregisteraudiodevice_fuzzer/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/fuzztest/unregisteraudiodevice_fuzzer/BUILD.gn @@ -43,13 +43,12 @@ ohos_fuzztest("UnRegisterAudioDeviceFuzzTest") { "${common_path}/include", ] - deps = [ - "${hdf_interfaces_path}/audioext/v1_0:libdaudioext_stub_1.0", - "${hdf_ser_aud_ext_path}:libdaudio_manager_daudio_ext_service_1.0", - ] + deps = [ "${hdf_ser_aud_ext_path}:libdaudio_manager_daudio_ext_service_1.0" ] external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] diff --git a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/unittest/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/unittest/BUILD.gn index c3b4fbe6..e966cc5e 100644 --- a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/unittest/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/unittest/BUILD.gn @@ -40,7 +40,6 @@ ohos_unittest("HDIServiceDaudioExtTest") { configs = [ ":module_private_config" ] public_deps = [ - "${hdf_interfaces_path}/audioext/v1_0:libdaudioext_stub_1.0", "${hdf_ser_aud_ext_path}:libdaudio_manager_daudio_ext_service_1.0", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", @@ -48,6 +47,8 @@ ohos_unittest("HDIServiceDaudioExtTest") { external_deps = [ "c_utils:utils", + "drivers_interface_distributed_audio:libdaudio_stub_1.0", + "drivers_interface_distributed_audio:libdaudioext_stub_1.0", "hdf_core:libhdf_host", "ipc:ipc_core", ] -- Gitee From 0ef4658417f0b37993a8380dffca65694fdf845a Mon Sep 17 00:00:00 2001 From: Bobie Date: Wed, 14 Jun 2023 20:55:28 +0800 Subject: [PATCH 2/2] fix the subsystem name Signed-off-by: Bobie --- hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn | 2 +- hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn | 2 +- hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn | 4 ++-- .../distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn | 4 ++-- hdf_service/distributed_audio/hdi_service/common/BUILD.gn | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn b/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn index 333eb216..05f1c7e2 100644 --- a/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn +++ b/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn @@ -24,6 +24,6 @@ hdi("daudio") { ] language = "cpp" root = "ohos.hdi://foundation/distributedhardware/distributed_audio/hdf_interfaces/" - subsystem_name = "hdf" + subsystem_name = "distributedhardware" part_name = "drivers_interface_distributed_audio" } diff --git a/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn b/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn index 22a30fba..7c8160df 100644 --- a/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn +++ b/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn @@ -21,6 +21,6 @@ hdi("daudioext") { ] language = "cpp" root = "ohos.hdi://foundation/distributedhardware/distributed_audio/hdf_interfaces/" - subsystem_name = "hdf" + subsystem_name = "distributedhardware" part_name = "drivers_interface_distributed_audio" } diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn index 535a2053..5e89299e 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn @@ -64,7 +64,7 @@ ohos_shared_library("libaudio_manager_daudio_primary_service_1.0") { ] install_images = [ chipset_base_dir ] - subsystem_name = "hdf" + subsystem_name = "distributedhardware" part_name = "drivers_peripheral_distributed_audio" } @@ -89,7 +89,7 @@ ohos_shared_library("libdaudio_primary_driver") { shlib_type = "hdi" install_images = [ chipset_base_dir ] - subsystem_name = "hdf" + subsystem_name = "distributedhardware" part_name = "drivers_peripheral_distributed_audio" } diff --git a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn index b9d63ec6..9cd6649d 100644 --- a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn @@ -47,7 +47,7 @@ ohos_shared_library("libdaudio_manager_daudio_ext_service_1.0") { ] install_images = [ chipset_base_dir ] - subsystem_name = "hdf" + subsystem_name = "distributedhardware" part_name = "drivers_peripheral_distributed_audio" } @@ -72,7 +72,7 @@ ohos_shared_library("libdaudio_ext_driver") { shlib_type = "hdi" install_images = [ chipset_base_dir ] - subsystem_name = "hdf" + subsystem_name = "distributedhardware" part_name = "drivers_peripheral_distributed_audio" } diff --git a/hdf_service/distributed_audio/hdi_service/common/BUILD.gn b/hdf_service/distributed_audio/hdi_service/common/BUILD.gn index 42b4b1a7..393cd53d 100644 --- a/hdf_service/distributed_audio/hdi_service/common/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/common/BUILD.gn @@ -38,6 +38,6 @@ ohos_shared_library("libdaudio_hdf_utils") { ] install_images = [ chipset_base_dir ] - subsystem_name = "hdf" + subsystem_name = "distributedhardware" part_name = "drivers_peripheral_distributed_audio" } -- Gitee