From 052884f79b5daa2d2286e80eba1c8bd6db796709 Mon Sep 17 00:00:00 2001 From: hongtao Date: Thu, 21 Jul 2022 10:46:05 +0800 Subject: [PATCH] change utils path Signed-off-by: hongtao Change-Id: I74271708670cdce74d9d23796e35e9ad6b76db78 --- common/BUILD.gn | 8 +++----- interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn | 4 ++-- interfaces/inner_kits/native_cpp/camera_source/BUILD.gn | 4 ++-- .../test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn | 4 ++-- .../test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn | 2 +- .../sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn | 2 +- .../sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn | 2 +- .../fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn | 2 +- .../sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn | 2 +- .../sinkproxysubscribelocalhardware_fuzzer/BUILD.gn | 2 +- .../sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../sourceonloadsystemabilityfail_fuzzer/BUILD.gn | 2 +- .../sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn | 2 +- .../fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../base/test/unittest/common/dcameraprotocol/BUILD.gn | 4 ++-- services/cameraservice/cameraoperator/client/BUILD.gn | 4 ++-- .../cameraoperator/client/test/sample/BUILD.gn | 4 ++-- .../client/test/unittest/common/cameraoperator/BUILD.gn | 4 ++-- services/cameraservice/cameraoperator/handler/BUILD.gn | 4 ++-- .../handler/test/unittest/common/dcamerahandler/BUILD.gn | 4 ++-- services/cameraservice/sinkservice/BUILD.gn | 4 ++-- .../test/unittest/common/distributedcamera/BUILD.gn | 4 ++-- .../test/unittest/common/distributedcameramgr/BUILD.gn | 2 +- services/cameraservice/sourceservice/BUILD.gn | 4 ++-- .../test/unittest/common/distributedcameramgr/BUILD.gn | 4 ++-- services/channel/BUILD.gn | 4 ++-- services/data_process/BUILD.gn | 4 ++-- 41 files changed, 58 insertions(+), 60 deletions(-) diff --git a/common/BUILD.gn b/common/BUILD.gn index 7d320a2e..36fd64d6 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -17,7 +17,7 @@ import( ohos_shared_library("distributed_camera_utils") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include/", @@ -48,10 +48,7 @@ ohos_shared_library("distributed_camera_utils") { "src/utils/dcamera_utils_tools.cpp", ] - deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "//utils/native/base:utils", - ] + deps = [ "${fwk_utils_path}:distributedhardwareutils" ] defines = [ "HI_LOG_ENABLE", @@ -60,6 +57,7 @@ ohos_shared_library("distributed_camera_utils") { ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", "graphic_chipsetsdk:buffer_handle", "hisysevent_native:libhisysevent", diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 08504b1b..bd8eed05 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -17,7 +17,7 @@ import( ohos_shared_library("distributed_camera_sink_sdk") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", @@ -41,7 +41,6 @@ ohos_shared_library("distributed_camera_sink_sdk") { deps = [ "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", - "//utils/native/base:utils", ] defines = [ @@ -51,6 +50,7 @@ ohos_shared_library("distributed_camera_sink_sdk") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index 756242d9..bf2210d2 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -17,7 +17,7 @@ import( ohos_shared_library("distributed_camera_source_sdk") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", @@ -44,7 +44,6 @@ ohos_shared_library("distributed_camera_source_sdk") { deps = [ "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", - "//utils/native/base:utils", ] defines = [ @@ -54,6 +53,7 @@ ohos_shared_library("distributed_camera_source_sdk") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn index 02e9a404..40bc302e 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn @@ -25,7 +25,7 @@ ohos_fuzztest("OnSinkLocalDmsDiedFuzzTest") { "${innerkits_path}/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", @@ -52,7 +52,6 @@ ohos_fuzztest("OnSinkLocalDmsDiedFuzzTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -62,6 +61,7 @@ ohos_fuzztest("OnSinkLocalDmsDiedFuzzTest") { ] external_deps = [ + "c_utils:utils", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn index 6d9d072a..1fb4941d 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn @@ -51,7 +51,6 @@ ohos_fuzztest("OnSourceLocalDmsDiedFuzzTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -61,6 +60,7 @@ ohos_fuzztest("OnSourceLocalDmsDiedFuzzTest") { ] external_deps = [ + "c_utils:utils", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn index 4848a783..fe2c040a 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn @@ -49,7 +49,6 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -59,6 +58,7 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn index dfb620de..57299e9d 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn index 00187382..ae03e0a3 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn index c98aaa46..96215284 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -57,6 +56,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn index 54b16ed7..e875ffe6 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -57,6 +56,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn index 0ccfeaf9..d50a3cf4 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkProxyChannelNegFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkProxyChannelNegFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn index f1f82eaf..411db9b5 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkProxyCloseChannelFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkProxyCloseChannelFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn index 5cc5197d..334d4394 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkProxyGetCameraInfoFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkProxyGetCameraInfoFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn index f05f7333..dabe2ff0 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn index 42bab4e1..0096b5c7 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkProxyOpenChannelFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkProxyOpenChannelFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn index 59a19017..c6654dea 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SinkProxyStopCaptureFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SinkProxyStopCaptureFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn index 198e8549..8242806f 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -57,6 +56,7 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn index 5046b316..0be7e85e 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//utils/native/base:utils", ] defines = [ @@ -57,6 +56,7 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn index 28b35b09..c2e3e070 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn @@ -50,7 +50,6 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { "${fwk_services_path}/distributedhardwarefwkserviceimpl/:distributedhardwarefwksvr_impl", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -60,6 +59,7 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn index 1aced34d..267c9848 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn @@ -50,7 +50,6 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { "${fwk_services_path}/distributedhardwarefwkserviceimpl/:distributedhardwarefwksvr_impl", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -60,6 +59,7 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn index b100dc5e..743d74b1 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn @@ -51,7 +51,6 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { "${fwk_services_path}/distributedhardwarefwkserviceimpl/:distributedhardwarefwksvr_impl", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -61,6 +60,7 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn index 2b106da6..59718884 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn @@ -51,7 +51,6 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { "${fwk_services_path}/distributedhardwarefwkserviceimpl/:distributedhardwarefwksvr_impl", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -61,6 +60,7 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn index 5f68d8a9..ce8a5074 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn index 3312c6ec..c93dda76 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn index f9874015..a7616821 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SourceProxyDCameraNotifyFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SourceProxyDCameraNotifyFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn index 53b891b2..bfe7e723 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn @@ -49,7 +49,6 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -59,6 +58,7 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn index f1faabbd..da56c8e4 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -58,6 +57,7 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn index ec271786..e492bb88 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn @@ -49,7 +49,6 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { deps = [ "${common_path}:distributed_camera_utils", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", - "//utils/native/base:utils", ] defines = [ @@ -59,6 +58,7 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn index fef1333e..6c5de5fc 100644 --- a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_camera/dcamera_protocol_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//drivers/peripheral/base", "${fwk_common_path}/log/include", @@ -52,10 +52,10 @@ ohos_unittest("DCameraProtocolTest") { "${services_path}/cameraservice/sourceservice:distributed_camera_source", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index 879511f6..e1499591 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -21,7 +21,7 @@ ohos_shared_library("distributed_camera_client") { "${camera_hdf_path}/camera/interfaces/metadata/include", "${camera_hdf_path}/camera/interfaces/include", "${camera_hdf_path}/camera/interfaces/hdi_ipc", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -78,7 +78,6 @@ ohos_shared_library("distributed_camera_client") { "${graphicstandard_path}:libsurface", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] defines = [ @@ -88,6 +87,7 @@ ohos_shared_library("distributed_camera_client") { ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index 861a0fec..6ef68575 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -20,7 +20,7 @@ config("module_private_config") { include_dirs = [ "//drivers/peripheral/camera/interfaces/metadata/include", "//third_party/jsoncpp/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -66,10 +66,10 @@ ohos_executable("dcamera_client_demo") { "${services_path}/cameraservice/sinkservice:distributed_camera_sink", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", 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 08c9981d..e1a2138a 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -22,7 +22,7 @@ config("module_private_config") { include_dirs = [ "//drivers/peripheral/camera/interfaces/metadata/include", "//third_party/jsoncpp/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -68,10 +68,10 @@ ohos_unittest("DCameraClientTest") { "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 6a61f095..3d08333c 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -20,7 +20,7 @@ ohos_shared_library("distributed_camera_handler") { include_dirs = [ "//drivers/peripheral/camera/interfaces/metadata/include", "//third_party/jsoncpp/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -60,7 +60,6 @@ ohos_shared_library("distributed_camera_handler") { "${graphicstandard_path}:libsurface", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] defines = [ @@ -70,6 +69,7 @@ ohos_shared_library("distributed_camera_handler") { ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", 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 f459f094..f1b3c09b 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -21,7 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//drivers/peripheral/camera/interfaces/metadata/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -63,10 +63,10 @@ ohos_unittest("DCameraHandlerTest") { "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index 6780bc1a..6629610c 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -18,7 +18,7 @@ import( ohos_shared_library("distributed_camera_sink") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//drivers/peripheral/camera/interfaces/metadata/include", "${graphicstandard_path}/frameworks/surface/include", @@ -107,7 +107,6 @@ ohos_shared_library("distributed_camera_sink") { "${services_path}/data_process:distributed_camera_data_process", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] defines = [ @@ -117,6 +116,7 @@ ohos_shared_library("distributed_camera_sink") { ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 8c30a5d9..b8ddb69e 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -22,7 +22,7 @@ config("module_private_config") { include_dirs = [ "//drivers/peripheral/camera/interfaces/metadata/include", "//third_party/jsoncpp/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -65,10 +65,10 @@ ohos_unittest("DistributedCameraSinkServiceTest") { "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 06587a6c..09727383 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -81,10 +81,10 @@ ohos_unittest("DCameraSinkMgrTest") { "${services_path}/channel:distributed_camera_channel", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index 1929f4e8..34af0254 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -18,7 +18,7 @@ import( ohos_shared_library("distributed_camera_source") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -91,7 +91,6 @@ ohos_shared_library("distributed_camera_source") { "${services_path}/channel:distributed_camera_channel", "${services_path}/data_process:distributed_camera_data_process", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] defines = [ @@ -101,6 +100,7 @@ ohos_shared_library("distributed_camera_source") { ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "hdf_core:libhdf_utils", diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index c9f1e981..bd994e78 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -46,7 +46,7 @@ config("module_private_config") { "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//third_party/jsoncpp/include", "//drivers/peripheral/base/", @@ -67,10 +67,10 @@ ohos_unittest("DCameraSourceMgrTest") { "${services_path}/channel:distributed_camera_channel", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 75cab6f2..0bb243a9 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -18,7 +18,7 @@ import( ohos_shared_library("distributed_camera_channel") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -42,7 +42,6 @@ ohos_shared_library("distributed_camera_channel") { deps = [ "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", - "//utils/native/base:utils", ] defines = [ @@ -52,6 +51,7 @@ ohos_shared_library("distributed_camera_channel") { ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index 72e5e377..d774358c 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -19,7 +19,7 @@ import( ohos_shared_library("distributed_camera_data_process") { include_dirs = [ "//third_party/ffmpeg/", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//foundation/graphic/graphic_2d/interfaces/innerkits/common", "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", @@ -76,7 +76,6 @@ ohos_shared_library("distributed_camera_data_process") { "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/graphic/graphic_2d/frameworks/surface:surface", - "//utils/native/base:utils", ] defines = [ @@ -86,6 +85,7 @@ ohos_shared_library("distributed_camera_data_process") { ] external_deps = [ + "c_utils:utils", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", -- Gitee