diff --git a/common/test/unittest/common/utils/BUILD.gn b/common/test/unittest/common/utils/BUILD.gn index f53e98fe142e19b3497f5154e7c4011ea368e8ce..87a44bf29d899e6a08b628db7f67a86b0a53c3f5 100644 --- a/common/test/unittest/common/utils/BUILD.gn +++ b/common/test/unittest/common/utils/BUILD.gn @@ -42,11 +42,7 @@ ohos_unittest("CommonUtilsTest") { configs = [ ":module_private_config" ] - deps = [ - "${common_path}:distributed_camera_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${common_path}:distributed_camera_utils" ] cflags = [ "-fPIC", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbackonnotifyresourceinfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbackonnotifyresourceinfo_fuzzer/BUILD.gn index 7cb5ed5cee66b807cee0f914f06bf5a89ec89bd4..092c8b0c3631d254146d1df16da2f609f5cb9ce0 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbackonnotifyresourceinfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbackonnotifyresourceinfo_fuzzer/BUILD.gn @@ -24,10 +24,7 @@ ohos_fuzztest("CallbackOnNotifyResourceInfoFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/callbackonnotifyresourceinfo_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_sink/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp/camera_sink/include/callback" ] include_dirs += [ "include", @@ -60,6 +57,7 @@ ohos_fuzztest("CallbackOnNotifyResourceInfoFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbacksinkonremoterequest_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbacksinkonremoterequest_fuzzer/BUILD.gn index f235f416d725e7e136667c3751b6f6188edceab6..cc975c70befa879eb1d290c8b193e83672d803ca 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbacksinkonremoterequest_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/callbacksinkonremoterequest_fuzzer/BUILD.gn @@ -24,10 +24,7 @@ ohos_fuzztest("CallbackSinkOnRemoteRequestFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/callbacksinkonremoterequest_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_sink/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp/camera_sink/include/callback" ] include_dirs += [ "include", @@ -62,6 +59,7 @@ ohos_fuzztest("CallbackSinkOnRemoteRequestFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn index 267c4a991e533c8be869c88f22a72f91cb9ca4ee..d84aba612fe1b04a5dd274412a3c8e4ca8d85200 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn @@ -23,12 +23,7 @@ ohos_fuzztest("EncodeOnInputBufferAvailableFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", - "${graphicsurface_path}/surface/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/data_process/include/interfaces", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn index 09e260c529a5701b8770719c0009f3da5f49f1e5..11e53327594d708a0e9aae60fa79907ca1d690de 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn @@ -23,12 +23,7 @@ ohos_fuzztest("EncodeOnOutputBufferAvailableFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", - "${graphicsurface_path}/surface/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/data_process/include/interfaces", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn index 77369f04a55d6d5fd3afcf6a618d550f3cbf0ef8..e361bd27347438a70c4cbb9e89c9854df7c4384b 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn @@ -24,11 +24,6 @@ ohos_fuzztest("OnSinkLocalCamSrvDiedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer" include_dirs = [ - "${fwk_utils_path}/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -58,6 +53,7 @@ ohos_fuzztest("OnSinkLocalCamSrvDiedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn index b2938b94f203e8df0dbce85b92108e799f4e9116..e4cb20079c181b49658255ae50e184125adec952 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn @@ -23,10 +23,7 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -58,6 +55,7 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn index d9a222b29334b288c0ae74bea3df22965811d5e6..c6411aa6e4bc6fd5cb97ef368c2401ba566f2b7d 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn @@ -25,10 +25,7 @@ ohos_fuzztest("SinkHandlerPauseDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlerpausedistributedhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -60,6 +57,7 @@ ohos_fuzztest("SinkHandlerPauseDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn index b081a381d018766d248143b9af7dbee43208e521..fdb9d5001d2e1e1ea4642f549f9f9201960c8e30 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn @@ -25,10 +25,7 @@ ohos_fuzztest("SinkHandlerRegisterPrivacyResourcesFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlerregisterprivacyresources_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -61,6 +58,7 @@ ohos_fuzztest("SinkHandlerRegisterPrivacyResourcesFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerreleasesink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerreleasesink_fuzzer/BUILD.gn index 2ee5a06c6f7dde21928640266811b1bd8027625e..fd18170c53a793ee3419885127c3dbebea8bee56 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerreleasesink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerreleasesink_fuzzer/BUILD.gn @@ -24,10 +24,7 @@ ohos_fuzztest("SinkHandlerReleaseSinkFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlerreleasesink_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -59,6 +56,7 @@ ohos_fuzztest("SinkHandlerReleaseSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn index f0230b7055ad4a4b8e63e37e94f93b5ea27b42b1..f1a21f846a6d93e831cbf8cab6f40c5258708f05 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn @@ -25,10 +25,7 @@ ohos_fuzztest("SinkHandlerResumeDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlerresumedistributedhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -60,6 +57,7 @@ ohos_fuzztest("SinkHandlerResumeDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn index 7b8bf515a9db2c5d62e9807a8827c9215e6e6979..9daebfa9b4c24e1dac07bd3376a0b0c36bdbc29f 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn @@ -25,10 +25,7 @@ ohos_fuzztest("SinkHandlerStopDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlerstopdistributedhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -60,6 +57,7 @@ ohos_fuzztest("SinkHandlerStopDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn index 36edf7b40aff549a5c206fa89498fa7277f82a6d..5d68c7eaacc18b0990dc9a7f0a94509caa1c73df 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn @@ -23,10 +23,7 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -58,6 +55,7 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn index 7e9fc98a9e885ad170c60268dd5242d95994d112..7033aa4b96f71a8571ad7fb60325e5d8691739bf 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn @@ -24,10 +24,7 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${innerkits_path}/native_cpp" ] include_dirs += [ "include", @@ -59,6 +56,7 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn index acad83286ea442372037b2ec6e81c6023635909d..2faef0298489629d4e9a51211e51a115ce74bc45 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -52,6 +50,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn index bf85f322a3cd58d036494edf7059b034bdcb622b..c3e49b820e6c41678d5683a6c2a3c652b5f70cbb 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -53,6 +51,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn index 2143eaffa13e494f8fc00295f0e9f7cd2a3b3bc8..bdabd840d9b72079b9ea2f1d20e0e238621c0813 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkProxyChannelNegFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -55,6 +53,7 @@ ohos_fuzztest("SinkProxyChannelNegFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn index 076585a0526efc85b87047256a3b3d2640957b2a..8be84c8c5acf6ef304a3f0ff27ed039db5ac3987 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkProxyCloseChannelFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -55,6 +53,7 @@ ohos_fuzztest("SinkProxyCloseChannelFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn index 6c647d09549e2721b9f56801d196e0364c0e6237..b2dcd5d8026b343d567e473da7a38a0406189db0 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkProxyGetCameraInfoFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -55,6 +53,7 @@ ohos_fuzztest("SinkProxyGetCameraInfoFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn index ab22df71f8628b1e2b8a13aaea257f97c76e8ec4..88d93b6b6468291fc2bceb8b9341a4cc7e13285c 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn @@ -24,9 +24,7 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -56,6 +54,7 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn index e79429657a9cbc4536fed56a19dec1e6cdaca040..390f70043cfa7b30324bd78cdb812029be93b5d6 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkProxyOpenChannelFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -55,6 +53,7 @@ ohos_fuzztest("SinkProxyOpenChannelFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyreleasesink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyreleasesink_fuzzer/BUILD.gn index 8f4598eeedae1040d9c4dddd98d1227eab428ef1..dcb6d33d411d8e10568fa1d6616db638ba6fb267 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyreleasesink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyreleasesink_fuzzer/BUILD.gn @@ -24,9 +24,7 @@ ohos_fuzztest("SinkProxyReleaseSinkFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxyreleasesink_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -56,6 +54,7 @@ ohos_fuzztest("SinkProxyReleaseSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn index ba130ef6a23b17fdceacaa2bd06ec5e2804c3244..41d470c04b6513860dbbf4c837461c207061d86d 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkProxyStopCaptureFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -55,6 +53,7 @@ ohos_fuzztest("SinkProxyStopCaptureFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn index 060a1a072e22ab743c5015bf5df78b7bb272da1b..500c885b217eb2d406f2015f37ca222db6c7841b 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -55,6 +53,7 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn index 9e7a88838bafbad7664ff93f3ee557a6c432f538..2ffc990f3a6c342365d7e67a7af110da8ce8d600 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn @@ -23,9 +23,7 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -55,6 +53,7 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn index e9e3129771f6dff15ac0fa74a56a8cbaf24ad02f..f0b888ed9592e3066bdd2f04aeb0364734aee098 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceChannelNegFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceChannelNegFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -71,6 +67,7 @@ ohos_fuzztest("SinkServiceChannelNegFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn index 75054e3e7d99968df764a995c2af9e9f818eabde..0c168f5d181f260b94e7f4abc700e736c8275dd7 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceCloseChannelFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${innerkits_path}/native_cpp/test/include", @@ -41,7 +38,6 @@ ohos_fuzztest("SinkServiceCloseChannelFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn index c1d8c636606ae6d4b5bed5b8e149c221adb66f80..87433d99a624eae1ed0ea3610a65644371fc7f15 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceGetCameraInfoFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceGetCameraInfoFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn index e924c9db5f4b0edebd8933effdcdbbfd51c0349a..2e64169c5cb23cdadcabf4528e5efbc02dea9748 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceInitSinkFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceInitSinkFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn index 3d2843400e8c289bcde427b975e036a2f3ff4f14..c3cc220b6e3313ab105b061e399f848b0a94d01c 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceOpenChannelFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceOpenChannelFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -71,6 +67,7 @@ ohos_fuzztest("SinkServiceOpenChannelFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn index 24db5a9688b261bbfa9938c362a8e2c3509b11b4..f121c80fd598d190b2b91d5ffe24bd9ac6e05b6b 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServicePauseDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServicePauseDistributedHardwareFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -70,6 +66,7 @@ ohos_fuzztest("SinkServicePauseDistributedHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn index 18b05e21341ba9835b91f82753106c7c96c96c02..0fe7541a78bfac4e8304dfeb788681280817211f 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -71,6 +67,7 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn index df13b8d9caaa84eaee518556446fd0cb928a8cab..31d22cc38c474d72e4eb3a7714960b623c66a941 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceResumeDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceResumeDistributedHardwareFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -70,6 +66,7 @@ ohos_fuzztest("SinkServiceResumeDistributedHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn index d6aaddc3a28b3e6701bcb138965365fde3916846..1e924a70181610ea37d0c63b5ac7d75e8aaec44b 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceStopCaptureFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceStopCaptureFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn index 7b655a4bc33bc57dd58c1efff6e1a532b9b77f75..7e88022a197442faa75896def9aa159647e1a738 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceStopDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceStopDistributedHardwareFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -70,6 +66,7 @@ ohos_fuzztest("SinkServiceStopDistributedHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn index 83aab437cd5bde7411c67ebb55959b985b7e524e..96d5b8f61bec28ad49667032ae162309696f4466 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn @@ -23,13 +23,10 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -40,7 +37,6 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -71,6 +67,7 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn index 5de12d6308cebb3cd59fb67b563a9ca1c93f3322..e2d0ecb8b5318f4d3d731462e2951a2ba8b699e0 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn @@ -24,13 +24,10 @@ ohos_fuzztest("SinkServiceUnsubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${graphicsurface_path}/surface/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -41,7 +38,6 @@ ohos_fuzztest("SinkServiceUnsubscribeLocalHardwareFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/utils", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] @@ -72,6 +68,7 @@ ohos_fuzztest("SinkServiceUnsubscribeLocalHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn index a8ca55043147a6b20f7435fa0c3c1b45982c4fed..1e89f2f63fa15c2b02bfc5a522a0e72de27a716f 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSinkBytesReceivedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -63,6 +58,7 @@ ohos_fuzztest("SoftbusOnSinkBytesReceivedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn index 904fe4089b2c1d329b5098c5e631a4bef0f97323..0c8a90effc547a4d70de8efde532ba18b9081880 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSinkMessageReceivedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -61,6 +56,7 @@ ohos_fuzztest("SoftbusOnSinkMessageReceivedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn index 93119391bc00be46e8e6d480bfc9a968798764b6..225e19efb56056d676e8e3cd4d23f93a6caa192f 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSinkSessionClosedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -61,6 +56,7 @@ ohos_fuzztest("SoftbusOnSinkSessionClosedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn index 6215b1a326be00de6e247831af5f684d701fa2b3..cf76f9fa7638e6289bbfd0ca4fc5efb0dd1ae6f3 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSinkSessionOpenedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -61,6 +56,7 @@ ohos_fuzztest("SoftbusOnSinkSessionOpenedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn index abdbed769d7bb08c873cc6ebd36bbea6b4ea7219..765cd3fafc5521bbe26627af57102d4a96d5c798 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSinkStreamReceivedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -63,6 +58,7 @@ ohos_fuzztest("SoftbusOnSinkStreamReceivedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn index d8b5682d9a45bb19c2c5689f221ae6a42d0331ba..b0dd7531dd54449788d7ecf3fdb65341c53fa47b 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("CallbackOnNotifyRegResultFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -59,6 +57,7 @@ ohos_fuzztest("CallbackOnNotifyRegResultFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn index b9106c55776037b396748163e1ee46c64c40b14a..edb9085175ee680a3ff1c5386f0b284bdbac2ffb 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("CallbackOnNotifyUnRegResultFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -59,6 +57,7 @@ ohos_fuzztest("CallbackOnNotifyUnRegResultFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn index 73432eafdf4485718118873def6a52060a917ca6..79515e79ff8d06673d284dc4d03a792a8ac79fd3 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("CallbackOnRemoteRequestFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -58,6 +56,7 @@ ohos_fuzztest("CallbackOnRemoteRequestFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn index 65eaf6185a3bca7e5deb988f95c5e7ae05813345..0ddd8476f487abfc320202132ca4f2f8edd38857 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn @@ -23,12 +23,7 @@ ohos_fuzztest("DecodeOnInputBufferAvailableFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", - "${graphicsurface_path}/surface/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/data_process/include/interfaces", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn index bd841912cea22faa080c0741f580d557c5639843..f01a4ea07bc2c9624f61636fe3ec06caeb6ee128 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn @@ -23,12 +23,7 @@ ohos_fuzztest("DecodeOnOutputBufferAvailableFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", - "${graphicsurface_path}/surface/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/data_process/include/interfaces", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn index d7c235d37fe140f68218d0fb96a1afd8f7690d55..f8fb3fa8aaf8f43c090b614f173908cee350f7f0 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("OnSourceLocalCamSrvDiedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -57,6 +55,7 @@ ohos_fuzztest("OnSourceLocalCamSrvDiedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusadapter_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusadapter_fuzzer/BUILD.gn index 5973d5dbef47d78630b81cfba9e6e2744c095b63..e0afce0a3c8429ab83f0e2dce4f4a57091247f61 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusadapter_fuzzer/BUILD.gn @@ -25,17 +25,12 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/softbusadapter_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -65,6 +60,7 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn index 58f06335117ddbd0b160cd489219f9e2a03d0582..1ca006258f67856a508a890dff8cf7bf01cfd631 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSourceBytesReceivedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -63,6 +58,7 @@ ohos_fuzztest("SoftbusOnSourceBytesReceivedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn index a36430159cfe7bee501f5c90d609e1f1231bd262..3b45ab3859068d665f2a63d14e6ffb44c8811a42 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSourceMessageReceivedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -61,6 +56,7 @@ ohos_fuzztest("SoftbusOnSourceMessageReceivedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn index 8b2eac410d627129361ad31b425d2be590209d33..6c4a70633ac00773b2cf9ef646a8d1c4e52610ea 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSourceSessionClosedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -61,6 +56,7 @@ ohos_fuzztest("SoftbusOnSourceSessionClosedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn index ab6e8a74ffc711d93fbabfeee88acff70c8dc3a6..c4a47c13b97c0488b9fbcb138aff8adf35596000 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSourceSessionOpenedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -61,6 +56,7 @@ ohos_fuzztest("SoftbusOnSourceSessionOpenedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn index 1c324c080a9588aa92e89af2b79fdeb50dbc9dd5..6ed6aba878ea6b13c3d7eccd7b6be042dd32c8cb 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn @@ -23,17 +23,12 @@ ohos_fuzztest("SoftbusOnSourceStreamReceivedFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer" - include_dirs = [ - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] + include_dirs = [ "${services_path}/cameraservice/base/include" ] include_dirs += [ "${services_path}/channel/include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -63,6 +58,7 @@ ohos_fuzztest("SoftbusOnSourceStreamReceivedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn index e70740ef74991ebc72f98253254f05cadfa5f858..1ce4b94da6ea201f3f42b3da9f2b802169556deb 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn @@ -28,7 +28,6 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { "include", "${common_path}/include", "${common_path}/include/constants", - "${fwk_common_path}/utils/include", "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_source/include/callback", ] @@ -54,6 +53,7 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn index 450cec3b8f4a490d672f147447fab4c9a08ee788..23a2a1fbb82d6d4e05279e5ca53ba34ffa9ed9d3 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn @@ -27,7 +27,6 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { "include", "${common_path}/include", "${common_path}/include/constants", - "${fwk_common_path}/utils/include", "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_source/include/callback", ] @@ -53,6 +52,7 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn index c946ac114315dfba060e1f7146297c50e6133054..eadf74ef293fee04757f68c755b75d317002a49e 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn @@ -24,9 +24,7 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -56,6 +54,7 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn index 890e9533f600330c1c4857c2d026af830f3bbea3..c2da36f80ca5d1199f2fefaf246e249b077f4ae5 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn @@ -24,9 +24,7 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer" - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${common_path}/include/constants", @@ -56,6 +54,7 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn index e8a6468e095408cb48d50c54ae28041985616160..486275fec2e47f7f729a590d0266acf33b768c64 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -56,6 +54,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn index ea3ee3339ddef538425c328b015cb5d3fa3d7963..6b1ef6339d71c36e9eaa70771cac8e4ecabaeff2 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -56,6 +54,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn index e98099cca3c9eeb44d33bc8f6245672dafa67005..5d5e88ad451b743a8b1c37ceabb2893b2bec3e50 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("SourceProxyDCameraNotifyFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -57,6 +55,7 @@ ohos_fuzztest("SourceProxyDCameraNotifyFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn index 4d8a9270b15876e0b48a349bb8f49ec3ce50b057..607b0efeb7de1b67007c49c5331435fe8a50a499 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -57,6 +55,7 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn index 56fa1822a97a2c1d4b51044603ddddc96874f99e..f9b6c6cc2869f2013f6cbbf23b5e5e466b2fbee7 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn @@ -24,10 +24,8 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -58,6 +56,7 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn index 0e8f69ec56161feafa1dafc09002ca20e740c296..ea5d6f560d5dd32782b938fe4f03c574279f07ed 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn @@ -24,10 +24,8 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -58,6 +56,7 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn index 362ec6b3efeb816c8f907aa2ff53b273e5452dd0..11d80a9d89ee857cc42bf8bf4b4d3f03b15ef0b2 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("SourceServiceDCameraNotifyFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -42,10 +40,6 @@ ohos_fuzztest("SourceServiceDCameraNotifyFuzzTest") { "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate", - - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", - "${fwk_common_path}/utils/include", ] cflags = [ @@ -71,6 +65,7 @@ ohos_fuzztest("SourceServiceDCameraNotifyFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn index ccf77c8a790ac9b7081e751e6c0ae63a052e0836..1efaf08e545dc86092f4419f6383b9f4073b7e75 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -42,10 +40,6 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate", - - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", - "${fwk_common_path}/utils/include", ] cflags = [ @@ -72,6 +66,7 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn index 338cd95aadd75bf662c1e085f4e35569c1c1985c..3455117978b87242d3beaae363430afcdba6b3ac 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn @@ -24,10 +24,8 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -43,10 +41,6 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate", - - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", - "${fwk_common_path}/utils/include", ] cflags = [ @@ -72,6 +66,7 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn index 61586747aab765ae85cc11543494c667e50912b7..2a0b09adc24f7d7c0b52a45cee693900872da071 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -42,10 +40,6 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate", - - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", - "${fwk_common_path}/utils/include", ] cflags = [ @@ -71,6 +65,7 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn index ed97eb4cad2f509b15124eef400e6b3526b52dab..f71373fcf94f1308e9e22657884e19d9631d2ee5 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn @@ -24,10 +24,8 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer" - include_dirs = [ - "${innerkits_path}/native_cpp/camera_source/include/callback", - "${fwk_common_path}/utils/include", - ] + include_dirs = + [ "${innerkits_path}/native_cpp/camera_source/include/callback" ] include_dirs += [ "include", @@ -43,10 +41,6 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface", "${services_path}/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate", - - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", - "${fwk_common_path}/utils/include", ] cflags = [ @@ -72,6 +66,7 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn index eed46b0fe8385e6f059ce112089fd429c14694c9..f34c1b8ea8b7b3eba7c81fe8660a704936a9965a 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn @@ -26,7 +26,6 @@ config("module_private_config") { "${common_path}/include/utils", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", - "${fwk_common_path}/utils/include", ] } @@ -51,6 +50,7 @@ ohos_unittest("DCameraSinkHandlerTest") { "access_token:libnativetoken_shared", "access_token:libtokensetproc_shared", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn index a18ec9e7a15a6812b2a9321460653d6f9febca98..8556c3398ab6f3f1ee2d2de5f495718bbf9123cd 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn @@ -28,7 +28,6 @@ config("module_private_config") { "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_source/include/callback", "${innerkits_path}/native_cpp/test/include", - "${fwk_common_path}/utils/include", ] } @@ -50,6 +49,7 @@ ohos_unittest("DCameraSourceHandlerTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/services/cameraservice/base/test/unittest/common/base/BUILD.gn b/services/cameraservice/base/test/unittest/common/base/BUILD.gn index 91e06b71ce9d7a680a1d3cafe6464c8c13f4594d..5c824bffe4934402b8807414a3e070f4e2feb6ba 100755 --- a/services/cameraservice/base/test/unittest/common/base/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/base/BUILD.gn @@ -19,14 +19,8 @@ module_out_path = "distributed_camera/dcamera_services_base_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - ] - include_dirs += [ + include_dirs = [ "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_source/include/callback", @@ -54,15 +48,14 @@ ohos_unittest("DCameraServicesBaseTest") { deps = [ "${common_path}:distributed_camera_utils", - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/channel:distributed_camera_channel", - "//third_party/googletest:gtest_main", ] external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "dsoftbus:softbus_client", "hilog:libhilog", diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index 7dc97714dbb8f50fbbf5f6f452818cbe4415adb6..9304e814f6493bbd17cf623f6247fa1085089ce0 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -19,21 +19,8 @@ module_out_path = "distributed_camera/dcamera_client_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include", - ] - include_dirs += [ + include_dirs = [ "${common_path}/include/constants", "${common_path}/include/utils", "${feeding_smoother_path}/base", @@ -60,12 +47,10 @@ ohos_unittest("DCameraClientTest") { configs = [ ":module_private_config" ] deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -74,6 +59,8 @@ ohos_unittest("DCameraClientTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", + "camera_framework:camera_framework", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:libbuffer_handle_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:libmap_data_sequenceable_1.0", diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn index 8d6a72030782298b3590c80a49b0c71375d6ad37..d1521dc0939ff5910c0d5331a586ff8cdbb242a4 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -19,21 +19,8 @@ module_out_path = "distributed_camera/dcamera_handler_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include", - ] - include_dirs += [ + include_dirs = [ "${common_path}/include/constants", "${common_path}/include/utils", "${services_path}/cameraservice/base/include", @@ -50,10 +37,8 @@ ohos_unittest("DCameraHandlerTest") { configs = [ ":module_private_config" ] deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -62,6 +47,8 @@ ohos_unittest("DCameraHandlerTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", + "camera_framework:camera_framework", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 6a428d6f3f00221a343a8e15880d416ff25fa953..619311f433c00ae6d73e7ea93b5ac11acac488e3 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -19,22 +19,10 @@ module_out_path = "distributed_camera/dcamera_sink_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", - ] - include_dirs += [ + include_dirs = [ "${common_path}/include/constants", "${common_path}/include/utils", - "${fwk_common_path}/utils/include", "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", "${services_path}/cameraservice/base/include", @@ -46,7 +34,6 @@ config("module_private_config") { "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/eventbus", "${services_path}/data_process/include/eventbus", "${services_path}/channel/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", ] } @@ -69,12 +56,10 @@ ohos_unittest("DistributedCameraSinkServiceTest") { configs = [ ":module_private_config" ] deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -83,6 +68,8 @@ ohos_unittest("DistributedCameraSinkServiceTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", + "camera_framework:camera_framework", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 619b6abeff2a35cd5865c0b85cd996fc172cc33e..46a7a94a0123a194189f7530bf1a85ee97d87f6f 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -20,15 +20,6 @@ module_out_path = "distributed_camera/dcamera_sink_mgr_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/callback", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", @@ -46,7 +37,6 @@ config("module_private_config") { "${innerkits_path}/native_cpp/camera_source/include/callback", "${innerkits_path}/native_cpp/camera_sink/include/callback", - "${fwk_common_path}/utils/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", @@ -78,7 +68,6 @@ ohos_unittest("DCameraSinkMgrTest") { configs = [ ":module_private_config" ] deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", @@ -94,7 +83,9 @@ ohos_unittest("DCameraSinkMgrTest") { "av_codec:av_codec_client", "cJSON:cjson", "c_utils:utils", + "camera_framework:camera_framework", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn index b342819abcf5d1f60f18fe9617f05332eb25365a..ac6bba897c8916dc77e32a2a4fab933cebfbaa7d 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn @@ -40,12 +40,6 @@ config("module_private_config") { "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_source/include/callback", "${innerkits_path}/native_cpp/camera_sink/include", - - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", - "${fwk_common_path}/utils/include", - "//drivers/peripheral/base/", - "${graphicsurface_path}/surface/include", ] } @@ -77,7 +71,6 @@ ohos_unittest("DCameraSourceTest") { "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/channel:distributed_camera_channel", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -86,6 +79,7 @@ ohos_unittest("DCameraSourceTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index 96fdd28cb30ea27a7f58622bda6b5fe90a8a4877..0a05c6ad0cc381d35e9167bc86666d4f6452485f 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -42,11 +42,6 @@ config("module_private_config") { "${innerkits_path}/native_cpp/camera_sink/include", "${innerkits_path}/native_cpp/camera_sink/include/callback", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", - "${fwk_common_path}/utils/include", - "//drivers/peripheral/base/", - "${graphicsurface_path}/surface/include", "${feeding_smoother_path}", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", @@ -84,7 +79,6 @@ ohos_unittest("DCameraSourceMgrTest") { "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/channel:distributed_camera_channel", "${services_path}/data_process:distributed_camera_data_process", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -93,6 +87,7 @@ ohos_unittest("DCameraSourceMgrTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/channel/test/unittest/common/channel/BUILD.gn b/services/channel/test/unittest/common/channel/BUILD.gn index 511e05f01e94fd21d1387c5fef592b2940b22a0d..66aed6c0b2699d5f9d11c83bdb819fbe490975cf 100644 --- a/services/channel/test/unittest/common/channel/BUILD.gn +++ b/services/channel/test/unittest/common/channel/BUILD.gn @@ -23,9 +23,6 @@ config("module_private_config") { "include", "${common_path}/include/constants", "${common_path}/include/utils", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/eventbus", "${services_path}/cameraservice/base/include", "${services_path}/channel/include", "${services_path}/channel/test/unittest/common/channel", @@ -47,7 +44,6 @@ config("module_private_config") { "${services_path}/data_process/include/utils", "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_source/include/callback", - "${graphicsurface_path}/surface/include", "${feeding_smoother_path}/base", ] } @@ -83,6 +79,7 @@ ohos_unittest("DCameraChannelTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/data_process/test/unittest/common/pipeline/BUILD.gn b/services/data_process/test/unittest/common/pipeline/BUILD.gn index d0b20684a98c649201c1c51d1a8fa07f4cb7718b..b7bdd7a703cb767fab518429a3e44a1f4f93e4a1 100644 --- a/services/data_process/test/unittest/common/pipeline/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline/BUILD.gn @@ -32,8 +32,6 @@ config("module_private_config") { "${common_path}/include/constants", "${common_path}/include/utils", "${innerkits_path}/native_cpp/camera_source/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", "${services_path}/cameraservice/base/include", ] @@ -66,6 +64,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "ffmpeg:libohosffmpeg", "graphic_surface:surface", diff --git a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn index ca85ed77c3ec50f2c4474b58df8dd3e899fadf21..fa69c43bb58152d328aa7da76c5fc4e3cb67ab3f 100644 --- a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn @@ -32,8 +32,6 @@ config("module_private_config") { "${common_path}/include/constants", "${common_path}/include/utils", "${innerkits_path}/native_cpp/camera_source/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", "${feeding_smoother_path}/base", "${services_path}/cameraservice/base/include", ] @@ -68,6 +66,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "ffmpeg:libohosffmpeg",