diff --git a/audiohandler/BUILD.gn b/audiohandler/BUILD.gn index 30b394ea802d87410dcceda0f108a9a3f38f4b20..6e4fdad33de348e995bee8f5ee0daa6be00116fd 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 5724ad9e3bb204db47822159102cc761c9cc5a75..7d9f88dc36271480ac82659044ad281ab1d23157 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/audio/v1_0/BUILD.gn b/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn index 333eb2161c47519c655cc4698aeb70904a4ba81b..05f1c7e2f3b5a8eaa00919fd932e900d43823213 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 22a30fba844e41d93103da71e304a69cd99b38c4..7c8160df54e5aa0139ef663746e39d69fa7d25e0 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_interfaces/distributed_audio/bundle.json b/hdf_interfaces/distributed_audio/bundle.json index a339e95ed5cde8f60b3229a1c038611708b26026..37db323b0df3e145e8ba5738c978d165d0a34b6f 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 37f64fc0e8dc973e2f275cfe6fa4acbe58d18229..28fbeb5a480efa98a083b007fca69b65543663d6 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 6fbd906bb9006b8514f907243f898e5f6687d860..5e89299e42ef3ca1153eba3629b4b0659f64418c 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", @@ -66,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" } @@ -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", @@ -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/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 2355d3244567cd099fa75332f6840feed4eeccd7..e268f7232d951937e4e8b12cd9aef64004263286 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 ff0e6053984303f4cdbac796f6b75430b52c1388..bb6d543f2b0cefe042fab9506ad5e7970b13b098 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 7d35e8f64457808ad478750ed0efc7f06b85c84d..7638ff96fa55512d40296ac50844a6e2ef4894a2 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 6d0edba66065368780a9e82772fafc5b10836e6e..1c7bb9283d8b968584c485e45c8c717351dffdfd 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 ef2baedef945c72fd3a306e93e1bda33dffe297f..7b56240f970b005d3fe0548b64c0c8e8796cb16e 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 5b24b91b5b8fb48898092b9d2ac43bb9a40bf1d1..41db6f1944480b09c51a7ec2526f63072f2c47c5 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 d02deb800e9095ef8122c96b39021a58342d8474..f458e4e5843d9919acaa99d4b5e0c3da853732bc 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 1b978b2ed053e7966fd02b1f7bef0a533892f84e..4200c0b26aff249beb9e8f722d5ab4fd9dfb2b01 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 b1e2ff88bd39b0b655686882595cfa36eb10f593..4c63ad9ecc673218b5143ce08c8430f5d6a34907 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 413c9be2b503129ec4fefd48a8c51e1f1a6832bc..ce3e5249577a15c2c24af5ff39a9469b8d34ea77 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 49c4d108fc64457e8cc48713739f57bbec1292f3..4086a58cfa6632485db4af5199fb6adab2229c26 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 47a93d83562865f11c36a65c08ee94414660ac17..196096b356a0760f0eed0ef596fc283ae99d6313 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 cd59d35c8ee205b978f81c61de4145cb76565e99..e746cff22b9c904bcc854bd6e198b9cd4760d4b1 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 138e852eea2a166ee90413be124666d7d9788367..246aa584bf992359a0b755ecae5676677d6d2be2 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 5b6e36a8b536a78ae030fae01413741921811a2a..3b872ee1bd1bbacd90dc003f21dca401a01eca0c 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 a8c2b3b77e63095be1d10571fa76f05eec9604a3..9cd6649d4624bbda8ae09f991d5eeb2c5de8e301 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", @@ -46,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" } @@ -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", @@ -69,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/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 5d3043c1367657570c8b0b9921132d7876035c11..65a49d173ee6b49d02c0687af3663203478d655e 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 e77961e3e1d82caad5fd406338231e8738e865a6..1c19630cbb853a74729eb2b197afb4239414c846 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 2f587e4d148cd19272d0e3fd7da6dd399d842462..429c90ed3aa4711296e1f3b87f72a8b1e676bf8e 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 c3b4fbe62b394ab0c294c80da4217725911c100b..e966cc5eaecea87d2c0c88ea1a3659bedd4b0d4f 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", ] diff --git a/hdf_service/distributed_audio/hdi_service/common/BUILD.gn b/hdf_service/distributed_audio/hdi_service/common/BUILD.gn index 42b4b1a739be874c74323eb61f7a9bdffaa725d3..393cd53df9a74f87ce178377d783d18e7e49abdf 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" }