diff --git a/audiohandler/BUILD.gn b/audiohandler/BUILD.gn index c792c7274969743b9bd8dc970567b1b601103a1d..c1f92b8f6fda830deaeb006b9324026f5f2e4bf2 100644 --- a/audiohandler/BUILD.gn +++ b/audiohandler/BUILD.gn @@ -17,9 +17,7 @@ import("../distributedaudio.gni") ohos_shared_library("distributed_audio_handler") { include_dirs = [ - "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//third_party/json/include", - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/utils/include", "${mediastandard_path}/interfaces/inner_api/native", "${mediastandard_path}/services/utils/include", @@ -45,6 +43,9 @@ ohos_shared_library("distributed_audio_handler") { "audio_framework:audio_capturer", "audio_framework:audio_client", "c_utils:utils", + "multimedia_audio_framework:audio_capturer", + "multimedia_audio_framework:audio_client", + "multimedia_image_framework:image_native", ] defines = [ diff --git a/audiohandler/test/unittest/BUILD.gn b/audiohandler/test/unittest/BUILD.gn index 3e17b3bed5f5364baa1d9fad5180f37bb94e53eb..d8260f3fee94c08d792836dd0a1b24ee7192eb44 100644 --- a/audiohandler/test/unittest/BUILD.gn +++ b/audiohandler/test/unittest/BUILD.gn @@ -20,9 +20,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//third_party/json/include", - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/utils/include", "${mediastandard_path}/interfaces/inner_api/native", "${mediastandard_path}/services/utils/include", @@ -51,6 +49,11 @@ ohos_unittest("AudioHandlerTest") { "${distributedaudio_path}/audiohandler:distributed_audio_handler", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "c_utils:utils", + "multimedia_image_framework:image_native", + ] } group("audio_handler_test") { diff --git a/common/dfx_utils/test/unittest/BUILD.gn b/common/dfx_utils/test/unittest/BUILD.gn index 04c9a8e1ded0c27b25f8790f78a9363b42b3c02b..192799d7fe53dfea6cb4058abbed65d95e499841 100644 --- a/common/dfx_utils/test/unittest/BUILD.gn +++ b/common/dfx_utils/test/unittest/BUILD.gn @@ -52,16 +52,8 @@ config("module_private_config") { "${services_path}/common/audioeventcallback", "${services_path}/audiomanager/managersource/include", "${softbusadapter_path}/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//commonlibrary/c_utils/base/include", "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/multimedia/audio_framework/frameworks/native/common/include", - "//foundation/multinedia/audio_framework/interfaces/inner_api/native/audiocapturer/include", "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", @@ -86,6 +78,15 @@ ohos_unittest("DAudioDfxTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hitrace_native:hitrace_meter", + "ipc:ipc_core", + "multimedia_audio_framework:audio_capturer", + "samgr:samgr_proxy", + ] } group("daudio_dfx_test") { diff --git a/hdf_service/distributed_audio/BUILD.gn b/hdf_service/distributed_audio/BUILD.gn index a3c91b6885f6e1f3ea570ae47514f9c5fa93d26c..d2f597c869a22ddd65dfd5f8ed67bf2200a5003f 100644 --- a/hdf_service/distributed_audio/BUILD.gn +++ b/hdf_service/distributed_audio/BUILD.gn @@ -20,8 +20,8 @@ if (defined(ohos_lite)) { deps = [ "./hdi_service/audio/v1_0:hdf_daudio_primary_service", "./hdi_service/audio_ext/v1_0:hdf_daudio_ext_service", - "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:daudio_idl_target", - "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:daudioext_idl_target", + "./../../audio/v1_0:daudio_idl_target", + "./../../hdf_interfaces/distributed_audio/audioext/v1_0:daudioext_idl_target", ] } } 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 5c859b2f7179a403aeba4f0fcf608c762eab2643..2355d3244567cd099fa75332f6840feed4eeccd7 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 @@ -34,7 +34,6 @@ ohos_fuzztest("CaptureFrameFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,7 +43,10 @@ ohos_fuzztest("CaptureFrameFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", 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 87945bf87c91d99a064dcc8b04e920208bcbb10f..ff0e6053984303f4cdbac796f6b75430b52c1388 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 @@ -34,7 +34,6 @@ ohos_fuzztest("CreateCaptureFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,7 +43,10 @@ ohos_fuzztest("CreateCaptureFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", 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 e9631e98406e73540c63c72cfa7b930bed0b4013..7d35e8f64457808ad478750ed0efc7f06b85c84d 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 @@ -34,7 +34,6 @@ ohos_fuzztest("CreateRenderFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,7 +43,10 @@ ohos_fuzztest("CreateRenderFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", 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 77260e36cf7c0db132f6e38beaac90a574e50b9c..e5dd47b98ded283becd216e5f75994b01eaca053 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 @@ -34,7 +34,6 @@ ohos_fuzztest("DestroyCaptureFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,6 +43,10 @@ ohos_fuzztest("DestroyCaptureFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] + external_deps = [ + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"DestroyCaptureFuzzTest\"", 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 e5dc01a86fd99fdf5de4c9e14d0c7496fc5a31ca..0a0c005477270688bfc69057cdd61eea1c29d86d 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 @@ -34,7 +34,6 @@ ohos_fuzztest("DestroyRenderFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,6 +43,10 @@ ohos_fuzztest("DestroyRenderFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] + external_deps = [ + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"DestroyRenderFuzzTest\"", 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 fb62e07104ab9888546e8019a8991cba8d4442fc..5b24b91b5b8fb48898092b9d2ac43bb9a40bf1d1 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 @@ -34,7 +34,6 @@ ohos_fuzztest("GetAllAdaptersFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -43,7 +42,12 @@ ohos_fuzztest("GetAllAdaptersFuzzTest") { ] deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "hdf_core:libhdf_host" ] + + external_deps = [ + "hdf_core:libhdf_host", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"GetAllAdaptersFuzzTest\"", 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 1bc568b760fb98400e568c6d512fc717b4e7251e..79954c27e09ba7715b00d11044e69c56fd1a687f 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 @@ -34,7 +34,6 @@ ohos_fuzztest("GetExtraParamsFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,6 +43,10 @@ ohos_fuzztest("GetExtraParamsFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] + external_deps = [ + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"GetExtraParamsFuzzTest\"", 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 78c854ac2ee865ce467499fa4024e2aea047f6f7..1b978b2ed053e7966fd02b1f7bef0a533892f84e 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 @@ -34,7 +34,6 @@ ohos_fuzztest("LoadAdapterFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -47,6 +46,7 @@ ohos_fuzztest("LoadAdapterFuzzTest") { external_deps = [ "c_utils:utils", "hdf_core:libhdf_host", + "ipc:ipc_core", ] defines = [ 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 71e85638e576cb095671b8562dee62027f22d738..b1e2ff88bd39b0b655686882595cfa36eb10f593 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 @@ -34,7 +34,6 @@ ohos_fuzztest("RenderFrameFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,7 +43,10 @@ ohos_fuzztest("RenderFrameFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] defines = [ "HI_LOG_ENABLE", 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 b1b8675a8690e2e489a65a0088e1877febf58daa..e232488bfdb7264718c1b28af7086fbdc43c1045 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 @@ -34,7 +34,6 @@ ohos_fuzztest("SetExtraParamsFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -44,6 +43,10 @@ ohos_fuzztest("SetExtraParamsFuzzTest") { deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] + external_deps = [ + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SetExtraParamsFuzzTest\"", 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 bdaadad4449e3f874c25e00ee1a2bd27be11407e..49c4d108fc64457e8cc48713739f57bbec1292f3 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 @@ -34,7 +34,6 @@ ohos_fuzztest("UnloadAdapterFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -43,7 +42,12 @@ ohos_fuzztest("UnloadAdapterFuzzTest") { ] deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ] - external_deps = [ "hdf_core:libhdf_host" ] + + external_deps = [ + "hdf_core:libhdf_host", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"UnloadAdapterFuzzTest\"", 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 ecf0139210f1364efe386c217d39e9a86c33ba10..a9ce60bde79d367c7f262d1411afde0c5253d82c 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 @@ -29,7 +29,6 @@ config("module_private_config") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -47,7 +46,10 @@ ohos_unittest("HDIServiceAudioAdapterTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } group("hdi_service_audio_adapter_test") { 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 723de98054473a55873bfdfc945ea7e63ae49dcf..e8985fbf6991f959db98b8c502edf23e22257fdd 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 @@ -28,7 +28,6 @@ config("module_private_config") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -46,7 +45,10 @@ ohos_unittest("HDIServiceCaptureTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } group("hdi_service_audio_capture_test") { 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 25415052388dcc803d72de0d721a91ce0e353a16..138e852eea2a166ee90413be124666d7d9788367 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 @@ -28,7 +28,6 @@ config("module_private_config") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -49,6 +48,7 @@ ohos_unittest("HDIServiceManagerTest") { external_deps = [ "c_utils:utils", "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 f9dfad9d1bfb9b6e0359652319ee40fe2b15a7d8..b593b1505ed6ecbd128f1f2fd6813014c12f051e 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 @@ -28,7 +28,6 @@ config("module_private_config") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -47,7 +46,10 @@ ohos_unittest("HDIServiceRenderTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } group("hdi_service_audio_render_test") { 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 358427f377a0a5389edc98aaa23045819cc0a741..5d3043c1367657570c8b0b9921132d7876035c11 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 @@ -35,7 +35,6 @@ ohos_fuzztest("NotifyEventFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -51,6 +50,7 @@ ohos_fuzztest("NotifyEventFuzzTest") { external_deps = [ "c_utils:utils", "hdf_core:libhdf_host", + "ipc:ipc_core", ] defines = [ 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 d7b8c5ec12c1a387683de3e26eff0044b5ff576f..e77961e3e1d82caad5fd406338231e8738e865a6 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 @@ -36,7 +36,6 @@ ohos_fuzztest("RegisterAudioDeviceFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -52,6 +51,7 @@ ohos_fuzztest("RegisterAudioDeviceFuzzTest") { external_deps = [ "c_utils:utils", "hdf_core:libhdf_host", + "ipc:ipc_core", ] defines = [ 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 a8996453373a147f29f64c88e24d1f609d0c2c8c..2f587e4d148cd19272d0e3fd7da6dd399d842462 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 @@ -36,7 +36,6 @@ ohos_fuzztest("UnRegisterAudioDeviceFuzzTest") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -52,6 +51,7 @@ ohos_fuzztest("UnRegisterAudioDeviceFuzzTest") { external_deps = [ "c_utils:utils", "hdf_core:libhdf_host", + "ipc:ipc_core", ] defines = [ 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 56e45be12425107bc001273820899c14a8c150f2..c3b4fbe62b394ab0c294c80da4217725911c100b 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 @@ -28,7 +28,6 @@ config("module_private_config") { "${hdf_service_path}/hdi_service/common/include", "${hdf_service_path}/hdi_service/common/log/include", "${hdf_service_path}/hdi_service/common/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -50,6 +49,7 @@ ohos_unittest("HDIServiceDaudioExtTest") { external_deps = [ "c_utils:utils", "hdf_core:libhdf_host", + "ipc:ipc_core", ] } diff --git a/hdf_service/distributed_audio/mfc_test/BUILD.gn b/hdf_service/distributed_audio/mfc_test/BUILD.gn index f2732b6cc628b82671ba8942deb0179084f135be..6429b2d2ce2d9636141ddd82420c0d6607ba34ad 100644 --- a/hdf_service/distributed_audio/mfc_test/BUILD.gn +++ b/hdf_service/distributed_audio/mfc_test/BUILD.gn @@ -19,15 +19,15 @@ ohos_executable("audio_test_distributed_fifo") { include_dirs = [ "./include", "//drivers/peripheral/audio/interfaces/include", - "//foundation/distributedhardware/distributed_audio/services/hdfaudioclient/include", - "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/common/include", + "./../../../services/hdfaudioclient/include", + "./../../../hdf_service/distributed_audio/hdi_service/common/include", ] sources = [ "distributedaudiotest.cpp" ] deps = [ "$hdf_uhdf_path/utils:libhdf_utils", - "//foundation/distributedhardware/distributed_audio/services/hdfaudioclient:daudio_client", + "./../../../services/hdfaudioclient:daudio_client", ] external_deps = [ diff --git a/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn index 934cd42e71c857d6481d305242af7eee17d8fcf2..1eb556ce4d83d235c61e54b21cf74e5b5698679b 100755 --- a/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn @@ -17,9 +17,6 @@ import("../../../../distributedaudio.gni") ohos_shared_library("distributed_audio_sink_sdk") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/utils/include", "//third_party/json/include", ] @@ -40,6 +37,7 @@ ohos_shared_library("distributed_audio_sink_sdk") { external_deps = [ "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn b/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn index 2898b1eb7de7808293401f1b3efbe74c448962db..0de75c98a30e9ce7fc390b693e9760c291485a02 100755 --- a/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn @@ -17,9 +17,6 @@ import("../../../../distributedaudio.gni") ohos_shared_library("distributed_audio_source_sdk") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/utils/include", "//third_party/json/include", ] @@ -42,6 +39,7 @@ ohos_shared_library("distributed_audio_source_sdk") { external_deps = [ "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn index 8cb74d667d43da1c32d35105d03fcc9d9fef4902..4d3a0fe429da8fc149aa0c453024243ccd2f7828 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn @@ -31,13 +31,10 @@ ohos_fuzztest("OnRemoteSinkSvrDiedFuzzTest") { sources = [ "onremotesinksvrdied_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -57,6 +54,7 @@ ohos_fuzztest("OnRemoteSinkSvrDiedFuzzTest") { external_deps = [ "c_utils:utils", + "ipc:ipc_core", "samgr:samgr_proxy", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn index f55439c35e65c9e7e53f237dbb05903cfa4a7b4d..5b811441a9bb99e3ab5288819a4d4ef0ca4e4fde 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn @@ -31,13 +31,10 @@ ohos_fuzztest("OnRemoteSourceSvrDiedFuzzTest") { sources = [ "onremotesourcesvrdied_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -58,6 +55,7 @@ ohos_fuzztest("OnRemoteSourceSvrDiedFuzzTest") { external_deps = [ "c_utils:utils", + "ipc:ipc_core", "samgr:samgr_proxy", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn index 7607a317c13b67edbaada89bf1ee00d2d564f308..37e33567fb830b496effe6c9f599855b7de54676 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn @@ -30,13 +30,10 @@ ohos_fuzztest("SinkHandlerFinishStartSAFuzzTest") { sources = [ "sinkhandlerfinishstartsa_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -56,6 +53,7 @@ ohos_fuzztest("SinkHandlerFinishStartSAFuzzTest") { external_deps = [ "c_utils:utils", + "ipc:ipc_core", "samgr:samgr_proxy", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn index 236fd0b2151a2f9ca50b14b7f09cb64e265b83b9..88562579ba0d64905d6350f355e08090edff8a51 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn @@ -31,13 +31,10 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { sources = [ "sinkhandlerinitsink_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -49,6 +46,10 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] + external_deps = [ + "c_utils:utils", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SinkHandlerInitSinkFuzzTest\"", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn index 778453fb72ad5e7071ae87f3d7ce0220abde25cb..929a4d0b4972c18b4dd7f49a6a6ccdb0db60d545 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn @@ -30,13 +30,10 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { sources = [ "sinkhandlersubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -48,6 +45,11 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SinkHandlerSubscribeLocalHardwareFuzzTest\"", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn index c0a7115f76cacc217bba404523d4fca12566a0aa..39cf7a4c359ea70fc8bbade57b0bfddaf54d04bf 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn @@ -30,13 +30,10 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { sources = [ "sinkhandlerunsubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -48,6 +45,11 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SinkHandlerUnsubscribeLocalHardwareFuzzTest\"", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn index ba31a5da624248b356eb91afbb083b19a3ad0926..b9ef3e3d7b8cf970ab4d40c3db2b6058e7bb3208 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { sources = [ "sinkonloadsystemabilityfail_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn index e96df5cd3d9e2129a9d5525c5c9e04f367bfefa1..f28ada6f99551c3b33cbe94755135c8318ad5163 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { sources = [ "sinkonloadsystemabilitysuccess_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn index 7e62e86230b6c4c776018e08a387399522feda74..a185325cc88b55ab8a6070240edc700f4e418599 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn @@ -31,8 +31,6 @@ ohos_fuzztest("SinkProxyDAudioNotifyFuzzTest") { sources = [ "sinkproxydaudionotify_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn index 193da854e2580c95ba1a8f8576e97b3010052eb8..4a8b1298c06b6447ea9bd652dcdcc69f633663f2 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn @@ -31,8 +31,6 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { sources = [ "sinkproxyinitsink_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn index fe592476752409f8b5e0a8e86b556f12a58fe4f9..1bb9fbcb82aaeb47193c1a5425a6a18f358f9b7d 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { sources = [ "sinkproxysubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn index 81adb7ef6b06afc7085ead9a297c2db559ac3762..474b0f86ea840771fcb7697aa89c9f9d30f95516 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { sources = [ "sinkproxyunsubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn index f62c86372c4b8ed440b8640adcb90e4196f743d9..8871b1862b58e4352cce710b2d687a41a45aca9d 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn @@ -30,13 +30,10 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { sources = [ "sourcehandlerconfigdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -49,6 +46,11 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { "${innerkits_path}/native_cpp/audio_source:distributed_audio_source_sdk", ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SourceHandlerConfigDistributedHardwareFuzzTest\"", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn index a17da76350de39ec584e0cc3f3bfabc9e637899f..44efd046c91d22c390a25ab2ba989ed586f66892 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn @@ -30,13 +30,10 @@ ohos_fuzztest("SourceHandlerFinishStartSAFuzzTest") { sources = [ "sourcehandlerfinishstartsa_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -57,6 +54,7 @@ ohos_fuzztest("SourceHandlerFinishStartSAFuzzTest") { external_deps = [ "c_utils:utils", + "ipc:ipc_core", "samgr:samgr_proxy", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn index af8191b9c8a81a48185585fa6e30c47e6f453118..34200f70dc8c1114517fc8a0d4fa29455fa0464e 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn @@ -30,13 +30,10 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { sources = [ "sourcehandlerinitsource_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -49,6 +46,11 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { "${innerkits_path}/native_cpp/audio_source:distributed_audio_source_sdk", ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SourceHandlerInitSourceFuzzTest\"", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn index 5673ecb6791c288b157e168c40981a207d4a00ef..073c3393da2fc7f131d9e0c9c31de25d547d5ce8 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn @@ -30,13 +30,10 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { sources = [ "sourcehandlerregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -52,6 +49,11 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { "${innerkits_path}/native_cpp/audio_source:distributed_audio_source_sdk", ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SourceHandlerRegisterDistributedHardwareFuzzTest\"", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn index c216334db505a5b03b27fcfc75aadf520429d770..9e16e368b74f5c44fb3ffeee391a9e8950496357 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,10 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { sources = [ "sourcehandlerunregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ @@ -53,6 +50,11 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { "${innerkits_path}/native_cpp/audio_source:distributed_audio_source_sdk", ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"SourceHandlerUnregisterDistributedHardwareFuzzTest\"", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn index db63745959d76dc5b1a997af69b0a35041b5bd5e..fdd640b3da5d39d1abe91f39806c67c008d2866f 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceIpcCallbackOnNotifyRegResultFuzzTest") { sources = [ "sourceipccallbackonnotifyregresult_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn index 2725c60b629a471fc281f24395ed7a04f9f7b034..3626682942fc9b39eaaac21b186f34e96e939c06 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceIpcCallbackOnNotifyUnregResultFuzzTest") { sources = [ "sourceipccallbackonnotifyunregresult_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn index 53531f6f0caff288ec830cbba8b1aa52c8994534..c65e84baf5d21b763d66813636051b189c572df4 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { sources = [ "sourceonloadsystemabilityfail_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn index 1df137cf937dbdb036422d459373e4d86c91fdd0..feea7683cc70cc402837a099f57cbd3f1ee4eee5 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { sources = [ "sourceonloadsystemabilitysuccess_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn index 06d00bc531e01273740ef560f03558c3973f0e40..2270ad2029aa137dfe45bb35461f1ad628e07ecb 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceProxyConfigDistributedHardwareFuzzTest") { sources = [ "sourceproxyconfigdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn index d605aa8eabb1ce6f497cd8d4f89ffc477c88b29b..8f4c0eed002a812f63524b37a6537226a2a48e9b 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceProxyDAudioNotifyFuzzTest") { sources = [ "sourceproxydaudionotify_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn index e1ea532b21797e72466f9c31b4a2831e58e75f60..15b61b4083de782dfbada21be113e0336e4ae20e 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn @@ -31,8 +31,6 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { sources = [ "sourceproxyinitsource_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn index 2bbd43559fca08adfe11b19efb1cff7783b8b4e1..78671f57fd5374e5b5002d0099176257ad85a959 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { sources = [ "sourceproxyregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn index a903e1bb3ddc99d0ab98a08f8197ab2b3c5fff1a..9fb1a54530a966c9ec168ea58c808c230f4a28f7 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { sources = [ "sourceproxyunregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn index 38c3bf0857cb9314ee1edf1a25a16f56ce45097d..7e1afd538129e703692fd111de6bfc056c21311d 100755 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] include_dirs += [ diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn index 1eb00aa9ee144bad97f2b5ae401d63f02e4a1c9a..4b921210df0cece0a6ab486b88dc2b01f8247192 100755 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn @@ -20,12 +20,9 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_common_path}/log/include", ] diff --git a/services/audioclient/test/unittest/micclient/BUILD.gn b/services/audioclient/test/unittest/micclient/BUILD.gn index cac585047d888623b8845d5cf8c9cc73fc2f4e32..df265bb461ebeca89f3adc260420d119f5b3dbd8 100644 --- a/services/audioclient/test/unittest/micclient/BUILD.gn +++ b/services/audioclient/test/unittest/micclient/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/audio_framework/frameworks/native/common/include", - "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", ] @@ -64,6 +62,10 @@ ohos_unittest("MicClientTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "multimedia_audio_framework:audio_capturer", + ] } group("mic_client_test") { diff --git a/services/audioclient/test/unittest/spkclient/BUILD.gn b/services/audioclient/test/unittest/spkclient/BUILD.gn index a5d21277141161dce7cfd14919cf705d5276b9a4..5bd362ed25abb1593e3eff6fa4a328400d22d090 100644 --- a/services/audioclient/test/unittest/spkclient/BUILD.gn +++ b/services/audioclient/test/unittest/spkclient/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/audio_framework/services/audio_service/client/include", - "//foundation/multimedia/audio_framework/frameworks/native/common/include", "//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include", "${mediastandardfwk_path}/audiocommon/include", "${mediastandardfwk_path}/audiomanager/include", @@ -69,6 +67,10 @@ ohos_unittest("SpeakerClientTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "multimedia_audio_framework:audio_client", + ] } group("spk_client_test") { diff --git a/services/audiocontrol/test/unittest/controlsink/BUILD.gn b/services/audiocontrol/test/unittest/controlsink/BUILD.gn index c4a29abbaad302bb431aecb8d8abbb15236ff1e7..f9ef844faad0c47c03a9c4cb32f86f0661a71b13 100644 --- a/services/audiocontrol/test/unittest/controlsink/BUILD.gn +++ b/services/audiocontrol/test/unittest/controlsink/BUILD.gn @@ -20,7 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/utils/include", ] @@ -52,6 +51,10 @@ ohos_unittest("ControlSinkTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "c_utils:utils", + ] } group("control_sink_test") { diff --git a/services/audiocontrol/test/unittest/controlsource/BUILD.gn b/services/audiocontrol/test/unittest/controlsource/BUILD.gn index ca355a23cfcc6e37c7fcacc21df174ab101a62fd..9e70b2bfce55a3346e2e8660079ffddeffbd815b 100644 --- a/services/audiocontrol/test/unittest/controlsource/BUILD.gn +++ b/services/audiocontrol/test/unittest/controlsource/BUILD.gn @@ -20,7 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/utils/include", ] @@ -36,9 +35,6 @@ config("module_private_config") { "${audio_transport_path}/audioctrltransport/interface", "${audio_control_path}/controlsource/include", "${audio_control_path}/test/unittest/audiocontrolutils/inlcude", - "//base/security/access_token/interfaces/innerkits/token_setproc/include", - "//base/security/access_token/interfaces/innerkits/nativetoken/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] } @@ -57,6 +53,7 @@ ohos_unittest("ControlSourceTest") { ] external_deps = [ + "c_utils:utils", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn index 3843e266905ad4f942204ccaeac593226d10fe7d..7f07e30b0984e134437f14987d5bfa7948e393dd 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn @@ -30,7 +30,6 @@ config("module_private_config") { "${services_path}/common/audioparam", "${services_path}/common/audiodata/include", "${services_path}/audiohdiproxy/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -49,7 +48,10 @@ ohos_unittest("DAudioHdiHandlerTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } group("daudio_hdi_handler_test") { diff --git a/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn b/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn index d0f72d8224ca8fca12c1a0a05a2434faea8472dd..64312074c072f698ade5cbd2f1a83c36d7859450 100644 --- a/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn +++ b/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn @@ -34,7 +34,6 @@ config("module_private_config") { "${services_path}/common/audiodata/include", "${services_path}/common/audioparam", "${services_path}/common/audiodata/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -54,7 +53,10 @@ ohos_unittest("DAudioManagerCallbackTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } group("daudio_manager_callback_test") { diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn index fe6ca41a789b5f3ebbf9fcd3197fa50b9ea44747..3a6f127afdcc1c2b210639235dc4a91c082d66d5 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -17,16 +17,8 @@ import("../../../distributedaudio.gni") ohos_shared_library("distributed_audio_sink") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//commonlibrary/c_utils/base/include", "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/multimedia/audio_framework/frameworks/native/common/include", - "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include", "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", ] @@ -89,6 +81,7 @@ ohos_shared_library("distributed_audio_sink") { "drivers_interface_audio:libaudio_proxy_1.0", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index 838ae15a47d10c345143fb454d381cde0de24b83..ae7f7f08f6d4fcd8a28e5404428f96582e1dc573 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -17,14 +17,9 @@ import("../../../distributedaudio.gni") ohos_shared_library("distributed_audio_source") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//drivers/peripheral/audio/interfaces/include", - "//commonlibrary/c_utils/base/include", "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", @@ -95,6 +90,7 @@ ohos_shared_library("distributed_audio_source") { external_deps = [ "c_utils:utils", "hdf_core:libhdi", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "ipc:ipc_single", diff --git a/services/audiomanager/test/unittest/managersink/BUILD.gn b/services/audiomanager/test/unittest/managersink/BUILD.gn index ba09ee125d9c5d0c498fe736794fc0c53dc6b365..7b91891bbee6696dae384c9f342aaf3e280d4207 100644 --- a/services/audiomanager/test/unittest/managersink/BUILD.gn +++ b/services/audiomanager/test/unittest/managersink/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { include_dirs = [ "//third_party/json/include", - "//foundation/multimedia/audio_framework/services/audio_service/client/include", "${audio_framework_path}/audiopolicy/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", diff --git a/services/audiomanager/test/unittest/servicesink/BUILD.gn b/services/audiomanager/test/unittest/servicesink/BUILD.gn index b0a44732fa130971f3dee98ce8460da05779abe2..13771b467c88890ed7238f07ebe41117d9f6ceff 100644 --- a/services/audiomanager/test/unittest/servicesink/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesink/BUILD.gn @@ -22,19 +22,9 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/audio_framework/services/audio_service/client/include", "${audio_framework_path}/audiopolicy/include", - - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//commonlibrary/c_utils/base/include", "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/multimedia/audio_framework/frameworks/native/common/include", - "//foundation/multinedia/audio_framework/interfaces/inner_api/native/audiocapturer/include", "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", @@ -93,6 +83,7 @@ ohos_unittest("DaudioSinkServiceTest") { "audio_framework:audio_client", "audio_framework:audio_renderer", "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/unittest/servicesource/BUILD.gn b/services/audiomanager/test/unittest/servicesource/BUILD.gn index f6b3f55ec84841a74af791255cacf5812c394191..f5b42b866966e327bdc3e598407120208b4402d8 100644 --- a/services/audiomanager/test/unittest/servicesource/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesource/BUILD.gn @@ -22,20 +22,10 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/audio_framework/services/audio_service/client/include", "${audio_framework_path}/audiopolicy/include", - - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//drivers/peripheral/audio/interfaces/include", - "//commonlibrary/c_utils/base/include", "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/multimedia/audio_framework/frameworks/native/common/include", - "//foundation/multinedia/audio_framework/interfaces/inner_api/native/audiocapturer/include", "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", @@ -103,6 +93,7 @@ ohos_unittest("DaudioSourceServiceTest") { "audio_framework:audio_client", "audio_framework:audio_renderer", "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/unittest/source_device/BUILD.gn b/services/audiomanager/test/unittest/source_device/BUILD.gn index 5fd18fc6d1bedb360f5ca2cdd3ad730a5dd60411..85a8dd9381e50625039079bad7e65f2d75a6af0a 100644 --- a/services/audiomanager/test/unittest/source_device/BUILD.gn +++ b/services/audiomanager/test/unittest/source_device/BUILD.gn @@ -20,13 +20,10 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", "//drivers/peripheral/audio/interfaces/include", "//foundation/communication/dsoftbus/interfaces/kits/transport", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", @@ -78,6 +75,11 @@ ohos_unittest("DaudioSourceDevTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "c_utils:utils", + "samgr:samgr_proxy", + ] } ## UnitTest daudio_source_dev_test @@ -95,6 +97,10 @@ ohos_unittest("DMicDevTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "samgr:samgr_proxy", + ] } ## UnitTest daudio_source_dev_test @@ -112,6 +118,10 @@ ohos_unittest("DSpeakerDevTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "samgr:samgr_proxy", + ] } group("daudio_source_dev_test") { diff --git a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn index 7083d45c664c3374ca8c292e32c91d952f9642a3..2c9eed3a581210f2b1d3af60fc38970a06689f2b 100644 --- a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn @@ -20,13 +20,9 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", "//drivers/peripheral/audio/interfaces/include", "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", diff --git a/services/audiotransport/audioctrltransport/BUILD.gn b/services/audiotransport/audioctrltransport/BUILD.gn index 863e5953dc1046c3f4b4ba0d88319e25222cd599..acd8629c77c9a9e12d6caae2106f522aa5fef63b 100644 --- a/services/audiotransport/audioctrltransport/BUILD.gn +++ b/services/audiotransport/audioctrltransport/BUILD.gn @@ -18,8 +18,6 @@ import("../../../distributedaudio.gni") ohos_shared_library("distributed_audio_control") { include_dirs = [ "//third_party/json/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", ] @@ -48,6 +46,7 @@ ohos_shared_library("distributed_audio_control") { external_deps = [ "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] diff --git a/services/audiotransport/decodetransport/BUILD.gn b/services/audiotransport/decodetransport/BUILD.gn index 2d14492f9f737f146521bf7fff40eb3ffac98654..4125bcec0f90fe08f53ddfc31e87e05587be1cfc 100644 --- a/services/audiotransport/decodetransport/BUILD.gn +++ b/services/audiotransport/decodetransport/BUILD.gn @@ -29,8 +29,6 @@ config("decode_transport_pub_config") { ohos_shared_library("distributed_audio_decode_transport") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", "${mediastandard_path}/interfaces/innerkits/native/media/include", @@ -75,6 +73,7 @@ ohos_shared_library("distributed_audio_decode_transport") { external_deps = [ "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "multimedia_player_framework:media_client", ] diff --git a/services/audiotransport/encodetransport/BUILD.gn b/services/audiotransport/encodetransport/BUILD.gn index cd3eb0209c0b33948476c081e0a2a61863b4fcc3..896976de2e8d1fdee5af6bbf91042ad525608e6e 100644 --- a/services/audiotransport/encodetransport/BUILD.gn +++ b/services/audiotransport/encodetransport/BUILD.gn @@ -29,9 +29,6 @@ config("encode_transport_pub_config") { ohos_shared_library("distributed_audio_encode_transport") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", "${mediastandard_path}/interfaces/innerkits/native/media/include", "${mediastandardfwk_path}/audiocommon/include", @@ -75,6 +72,8 @@ ohos_shared_library("distributed_audio_encode_transport") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "multimedia_player_framework:media_client", ] diff --git a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn index 98a9b97996f724ec4aa5cd1eda6403d86edbfc2a..cbbcd0a0f021652d7282ff7423c131dbceee0697 100644 --- a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn +++ b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] @@ -54,6 +53,10 @@ ohos_unittest("AudioCtrlTransportTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "graphic_standard:surface", + ] } group("audio_ctrl_transport_test") { diff --git a/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn b/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn index 144688b1bab6290f71c4f96ff2cb5f4cb87b5ab3..326799cd00ff00a0a829913f3093dd3ea9eee38f 100644 --- a/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn +++ b/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] @@ -54,6 +53,10 @@ ohos_unittest("AudioDataChannelTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "graphic_standard:surface", + ] } group("audio_data_channel_test") { diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 6fe124dfdd8279ab7ed7305dd0ebe358aa87b237..c5b7f2e23019bb03ae3626a7f8aa43bda628ce12 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -27,9 +27,6 @@ config("daudio_common_pub_config") { config("daudio_common_private_config") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", ] diff --git a/services/common/test/unittest/audiodata/BUILD.gn b/services/common/test/unittest/audiodata/BUILD.gn index e8a3953aacbfc12e02c5b45240356d21e66bd5eb..4637f731c0913350a090643e9bb488282fc4e3d0 100644 --- a/services/common/test/unittest/audiodata/BUILD.gn +++ b/services/common/test/unittest/audiodata/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { include_dirs = [ "./include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", "${services_path}/common/audiodata/include", "${common_path}/include", diff --git a/services/hdfaudioclient/test/unittest/BUILD.gn b/services/hdfaudioclient/test/unittest/BUILD.gn index 0c714fb02fbf85c556a46504e106d547bd110a76..5b6292ebe7facfef3586f14e0c7420fb64e80869 100644 --- a/services/hdfaudioclient/test/unittest/BUILD.gn +++ b/services/hdfaudioclient/test/unittest/BUILD.gn @@ -25,7 +25,6 @@ config("module_private_config") { "${common_path}/include", "${services_path}/hdfaudioclient/include", "audio_adapter_internal/", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] } @@ -42,6 +41,8 @@ ohos_unittest("AudioAdapterHdiTest") { "//third_party/googletest:gtest_main", ] + external_deps = [ "ipc:ipc_core" ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"unittest\"", diff --git a/services/softbusadapter/BUILD.gn b/services/softbusadapter/BUILD.gn index 811ce50ebe73d6ea0a199e6f7e8fcbdd23265a5e..eb042afac99bbeaacb584bc8f00a884ec0fa7ac8 100644 --- a/services/softbusadapter/BUILD.gn +++ b/services/softbusadapter/BUILD.gn @@ -17,7 +17,6 @@ import("../../distributedaudio.gni") ohos_shared_library("distributed_audio_softbus_adapter") { include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//foundation/communication/dsoftbus/interfaces/kits/common", "${fwk_common_path}/utils/include", "//third_party/json/include", diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 7d8641afa2cdd8151576979bf3e7cdbacf088881..12eefecb55152daed0b4476c12e4fec5eaca3879 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] @@ -48,6 +47,8 @@ ohos_unittest("SoftBusAdapterTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ "graphic_standard:surface" ] } group("audio_soft_bus_adapter_test") {