diff --git a/common/BUILD.gn b/common/BUILD.gn index 7d320a2e8b53bcf8287da73f52930f3613548e3f..36fd64d62df275c619c16da133baa913ca0e41bf 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 08504b1b7e4b829978e98fbf094df006c46e6d65..bd8eed05006305e06497978b3cc5e6d5529d8997 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 756242d97d1765544c214514984528bc7bf52740..bf2210d2759887c3e4610cfbbfb6867edaa1e9c4 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 02e9a40479b8e8254688563db52d3511cbda8e71..40bc302eecf1f9de0e6c9b0f24af74e874464a44 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 6d9d072aac82985872c1265aab5cb9e167d5dcf2..1fb4941d2ef06c553f8d0f880f3a1dc07f25f132 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 4848a7836b7b38a19afbf715c34e60b20a137fac..fe2c040ade93f096e9d4a187657aff4f7d382f3e 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 dfb620de88ffe0f679b90cd6005a234975397bbb..57299e9d08047f9616121aedcf4b24867979255c 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 00187382a739f902b9babb38307e456086388bb8..ae03e0a327a57f582199ca79acb7a892d5c5a724 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 c98aaa462860c596c4effb583d7526d94bfc28d8..96215284bddd655eaabd7d6dd7fdb11a5fe62780 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 54b16ed78f00a63d323e14699bd184639e8fba61..e875ffe66e4c6daa99df0ab73ff6bc48a72187de 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 0ccfeaf98db448bb0c1564fab34af50d413cbbb1..d50a3cf4da5e51d42bcf9a705854674918525b96 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 f1f82eafae6907b873dc79b7fbcd2c612632a4d8..411db9b53bdc9e26194a74768ef13e07822f8aee 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 5cc5197dce1c873b492475754174c6eb488e8e17..334d4394a6aaa48f4237f719be091592114292f9 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 f05f7333c7eb9264f565751c0569432f037613d0..dabe2ff00e951b8a6c5e515beb5011dc075190b4 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 42bab4e1bff3169bd225bba83a28947b5392bd1d..0096b5c7f9a927fb7c72048ce70d0131e5aedb2b 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 59a190170daed706bfc70624b20a6489de0a091d..c6654dea2116d0c5402dcb9be585af77069d5adf 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 198e8549a71fe82a87a7559aa395934fd4884df4..8242806fe559463c13ec60437049e7eed74f264a 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 5046b3162684b3bfd011175c3cdaf68f97bf19be..0be7e85e851ac766e3c1d135c28c3712abbe1a2d 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 28b35b098e58308e0bcb34ef7eec08288c661150..c2e3e070e3de3556c69f448d6368b1b2f6739e27 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 1aced34de342e59c148fe54b60937fb1c45a7429..267c9848972a1d469cc92e37ceba1381ea78b8e4 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 b100dc5e7903d2cfff56ef2f0495ebbc9d867f77..743d74b17d6555334514d879c9508b33131f0c61 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 2b106da69c1776892447e1b23cf2252782e9e45e..59718884484c0bbf1a8114f58cc6507734b909f7 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 5f68d8a9dd12867084e46aeb4728f5ec390061c6..ce8a507479ddaf66d154c6a790a293ed272e359d 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 3312c6ec3c2c433439d60b38b645bcafed4f9200..c93dda765bb26618f04cf31ab3de182849bfc330 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 f9874015845ade41750127b1f2ee26cc3a6e43ad..a76168217be410822fc6062a5b601f80fd83bcdd 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 53b891b29cf4afe337c390780fee32a7e0663ef4..bfe7e723fd934dc54941604102063eb53acb8df5 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 f1faabbd1d4d8c7ef15656ed16f0a98d665d7f03..da56c8e4c6c99e5763998b83a327f9d0710191d3 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 ec271786eb577c81a358cb93f10c4e1b0e56b45d..e492bb88f075bdd71ece121977ed6a89e97f906a 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 fef1333e39a1b721371ace27501da653f925b58d..6c5de5fcf3aaa33431ddb8e16dbdf0eac1b3a457 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 879511f68f85de81a39deeb1afc23685c6d28602..e1499591a81224c13b9ea231adb4083a9846e5b8 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 861a0fec054b108c430d16bc415abfd4ec5532f9..6ef685751e7f9a8f38c230bd4e872dede85eba69 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 08c9981d0905f99c76b0209e18117b2d459a1f3a..e1a2138a6f38c734a4b18aa4e60626d59276f000 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 6a61f09528f3d131b403877c353934a9dde7f86d..3d08333ccdafd0e751e6fdf0d36df0746c4dc789 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 f459f0943d0794270eda20123d4fbf31273f1095..f1b3c09bf2f28665e270cc04158fa8ab90b8910f 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 6780bc1a88896cc22d072b0b530a87a73baa5767..6629610ce233e38ba24f351d3b5815d0f86ea592 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 8c30a5d9d7844a22b9be0bc6601b06e4a3d50b76..b8ddb69e83b3bf65090f0c655136c83e8478bb10 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 06587a6ccc9954daae0b19c5be5b58a50c479bd9..097273838e179b5537ee6c6693cf9cc2763ea468 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 1929f4e8edea4b04e72cb5d73fe86a75ff20d616..34af0254ed13733b63e5699a41e61d6eeba3931b 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 c9f1e981aa5f407d18f07bcb83ea9ca9d2f9a703..bd994e782c132f077a478aba934927f665cc7538 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 75cab6f2d604420d519801815528e4e8e52a4e00..0bb243a971ceb82aaac51ae69d64aba73a7eb90d 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 72e5e377d5af72c9746bc1171a4c89efb74b1c65..d774358c134d9d6a64525d842634896afa8a41d7 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",