From 9a84d9406909962995b295301f5dc87023a272db Mon Sep 17 00:00:00 2001 From: zhangtao666 <“zhangtao472@h-partners.com”> Date: Sun, 23 Apr 2023 15:52:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91gn=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9=20Sign?= =?UTF-8?q?ed-off-by:=20zhangtao666=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- audiohandler/BUILD.gn | 3 +-- audiohandler/test/unittest/BUILD.gn | 8 ++++++-- common/dfx_utils/test/unittest/BUILD.gn | 17 +++++++++-------- hdf_service/distributed_audio/BUILD.gn | 4 ++-- .../test/fuzztest/captureframe_fuzzer/BUILD.gn | 6 ++++-- .../test/fuzztest/createcapture_fuzzer/BUILD.gn | 6 ++++-- .../test/fuzztest/createrender_fuzzer/BUILD.gn | 6 ++++-- .../fuzztest/destroycapture_fuzzer/BUILD.gn | 5 ++++- .../test/fuzztest/destroyrender_fuzzer/BUILD.gn | 5 ++++- .../fuzztest/getalladapters_fuzzer/BUILD.gn | 8 ++++++-- .../fuzztest/getextraparams_fuzzer/BUILD.gn | 5 ++++- .../test/fuzztest/loadadapter_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/renderframe_fuzzer/BUILD.gn | 6 ++++-- .../fuzztest/setextraparams_fuzzer/BUILD.gn | 5 ++++- .../test/fuzztest/unloadadapter_fuzzer/BUILD.gn | 8 ++++++-- .../unittest/audio_adapter_interface/BUILD.gn | 6 ++++-- .../unittest/audio_capture_interface/BUILD.gn | 6 ++++-- .../unittest/audio_manager_interface/BUILD.gn | 2 +- .../unittest/audio_render_interface/BUILD.gn | 6 ++++-- .../test/fuzztest/notifyevent_fuzzer/BUILD.gn | 2 +- .../registeraudiodevice_fuzzer/BUILD.gn | 2 +- .../unregisteraudiodevice_fuzzer/BUILD.gn | 2 +- .../audio_ext/v1_0/test/unittest/BUILD.gn | 2 +- hdf_service/distributed_audio/mfc_test/BUILD.gn | 6 +++--- .../inner_kits/native_cpp/audio_sink/BUILD.gn | 4 +--- .../inner_kits/native_cpp/audio_source/BUILD.gn | 4 +--- .../onremotesinksvrdied_fuzzer/BUILD.gn | 4 +--- .../onremotesourcesvrdied_fuzzer/BUILD.gn | 4 +--- .../sinkhandlerfinishstartsa_fuzzer/BUILD.gn | 4 +--- .../sinkhandlerinitsink_fuzzer/BUILD.gn | 7 ++++--- .../BUILD.gn | 8 +++++--- .../BUILD.gn | 8 +++++--- .../sinkonloadsystemabilityfail_fuzzer/BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../sinkproxydaudionotify_fuzzer/BUILD.gn | 2 -- .../fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../BUILD.gn | 8 +++++--- .../sourcehandlerfinishstartsa_fuzzer/BUILD.gn | 4 +--- .../sourcehandlerinitsource_fuzzer/BUILD.gn | 8 +++++--- .../BUILD.gn | 8 +++++--- .../BUILD.gn | 8 +++++--- .../BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../sourceproxydaudionotify_fuzzer/BUILD.gn | 2 -- .../sourceproxyinitsource_fuzzer/BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../BUILD.gn | 2 -- .../test/unittest/audiosinktest/BUILD.gn | 1 - .../test/unittest/audiosourcetest/BUILD.gn | 3 --- .../test/unittest/micclient/BUILD.gn | 6 ++++-- .../test/unittest/spkclient/BUILD.gn | 6 ++++-- .../test/unittest/controlsink/BUILD.gn | 5 ++++- .../test/unittest/controlsource/BUILD.gn | 5 +---- .../test/unittest/daudio_hdi_handler/BUILD.gn | 7 +++++-- .../unittest/daudio_manager_callback/BUILD.gn | 6 ++++-- services/audiomanager/servicesink/BUILD.gn | 9 +-------- services/audiomanager/servicesource/BUILD.gn | 6 +----- .../test/unittest/managersink/BUILD.gn | 1 - .../test/unittest/servicesink/BUILD.gn | 11 +---------- .../test/unittest/servicesource/BUILD.gn | 11 +---------- .../test/unittest/source_device/BUILD.gn | 16 +++++++++++++--- .../test/unittest/sourcemanager/BUILD.gn | 4 ---- .../audiotransport/audioctrltransport/BUILD.gn | 3 +-- .../audiotransport/decodetransport/BUILD.gn | 3 +-- .../audiotransport/encodetransport/BUILD.gn | 5 ++--- .../test/unittest/audioctrltransport/BUILD.gn | 5 ++++- .../test/unittest/audiodatachannel/BUILD.gn | 5 ++++- services/common/BUILD.gn | 3 --- .../common/test/unittest/audiodata/BUILD.gn | 1 - services/hdfaudioclient/test/unittest/BUILD.gn | 3 ++- services/softbusadapter/BUILD.gn | 1 - services/softbusadapter/test/unittest/BUILD.gn | 3 ++- 77 files changed, 178 insertions(+), 188 deletions(-) diff --git a/audiohandler/BUILD.gn b/audiohandler/BUILD.gn index a31af79f..9850d16f 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,7 @@ ohos_shared_library("distributed_audio_handler") { "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 3e17b3be..56cd850c 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,12 @@ 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 04c9a8e1..192799d7 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 a3c91b68..d2f597c8 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 5c859b2f..2355d324 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 87945bf8..ff0e6053 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 e9631e98..7d35e8f6 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 77260e36..e5dd47b9 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 e5dc01a8..0a0c0054 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 fb62e071..5b24b91b 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 1bc568b7..79954c27 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 78c854ac..1b978b2e 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 71e85638..b1e2ff88 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 b1b8675a..e232488b 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 bdaadad4..49c4d108 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 ecf01392..a9ce60bd 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 723de980..e8985fbf 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 25415052..138e852e 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 f9dfad9d..b593b150 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 358427f3..5d3043c1 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 d7b8c5ec..e77961e3 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 a8996453..2f587e4d 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 56e45be1..c3b4fbe6 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 f2732b6c..6429b2d2 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 934cd42e..1eb556ce 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 2898b1eb..0de75c98 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 8cb74d66..4d3a0fe4 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 f55439c3..5b811441 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 7607a317..37e33567 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 236fd0b2..88562579 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 778453fb..929a4d0b 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 c0a7115f..39cf7a4c 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 ba31a5da..b9ef3e3d 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 e96df5cd..f28ada6f 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 7e62e862..a185325c 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 193da854..4a8b1298 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 fe592476..1bb9fbcb 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 81adb7ef..474b0f86 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 f62c8637..8871b186 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 a17da763..44efd046 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 af8191b9..34200f70 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 5673ecb6..073c3393 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 c216334d..9e16e368 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 db637459..fdd640b3 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 2725c60b..36266829 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 53531f6f..c65e84ba 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 1df137cf..feea7683 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 06d00bc5..2270ad20 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 d605aa8e..8f4c0eed 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 e1ea532b..15b61b40 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 2bbd4355..78671f57 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 a903e1bb..9fb1a545 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 38c3bf08..7e1afd53 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 1eb00aa9..4b921210 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 cac58504..df265bb4 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 a5d21277..5bd362ed 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 c4a29abb..f9ef844f 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 ca355a23..9e70b2bf 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 3843e266..9dc9595c 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,11 @@ 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 d0f72d82..64312074 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 a84ec228..8f9159f6 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", ] @@ -86,6 +78,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", "multimedia_audio_framework:audio_capturer", diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index 838ae15a..ae7f7f08 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 7bc416d7..9b44a016 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 dadbe725..c53991b3 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", @@ -90,6 +80,7 @@ ohos_unittest("DaudioSinkServiceTest") { external_deps = [ "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "multimedia_audio_framework:audio_capturer", diff --git a/services/audiomanager/test/unittest/servicesource/BUILD.gn b/services/audiomanager/test/unittest/servicesource/BUILD.gn index cd9bcd62..c83fe3c0 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", @@ -100,6 +90,7 @@ ohos_unittest("DaudioSourceServiceTest") { external_deps = [ "c_utils:utils", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "multimedia_audio_framework:audio_capturer", diff --git a/services/audiomanager/test/unittest/source_device/BUILD.gn b/services/audiomanager/test/unittest/source_device/BUILD.gn index 5fd18fc6..85a8dd93 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 7083d45c..2c9eed3a 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 863e5953..acd8629c 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 077491ab..1c4b39f2 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", @@ -73,6 +71,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 f302209f..6262dd41 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", @@ -73,6 +70,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 98a9b979..cbbcd0a0 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 144688b1..326799cd 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 6fe124df..c5b7f2e2 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 e8a3953a..4637f731 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 0c714fb0..5b6292eb 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 811ce50e..eb042afa 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 7d8641af..12eefecb 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") { -- Gitee From f67cef31378185826b8550427d72a1c4ac19b434 Mon Sep 17 00:00:00 2001 From: zhangtao666 <“zhangtao472@h-partners.com”> Date: Mon, 24 Apr 2023 17:23:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?gn=20format=E4=BF=AE=E6=94=B9=20Signed-off-?= =?UTF-8?q?by:=20zhangtao666=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- audiohandler/test/unittest/BUILD.gn | 1 - services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn | 1 - 2 files changed, 2 deletions(-) diff --git a/audiohandler/test/unittest/BUILD.gn b/audiohandler/test/unittest/BUILD.gn index 56cd850c..d8260f3f 100644 --- a/audiohandler/test/unittest/BUILD.gn +++ b/audiohandler/test/unittest/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("AudioHandlerTest") { "c_utils:utils", "multimedia_image_framework:image_native", ] - } group("audio_handler_test") { diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn index 9dc9595c..7f07e30b 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("DAudioHdiHandlerTest") { "c_utils:utils", "ipc:ipc_core", ] - } group("daudio_hdi_handler_test") { -- Gitee