diff --git a/bundle.json b/bundle.json index 1e6faf8c3f792dd74a7ed047e982dc073f0e3443..4f207e9fb04b7ea660bb2035019c74687cf08fcd 100644 --- a/bundle.json +++ b/bundle.json @@ -32,7 +32,7 @@ "distributeddatamgr", "eventhandler", "hitrace_native", - "utils_base", + "c_utils", "hiviewdfx_hilog_native", "startup_l2", "bundle_framework", diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 977bec65ed67616e7cb19f482ee52b964ab3921f..faef09305ad85e3dee45f6557b091a30377ce843 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -18,7 +18,7 @@ import( ohos_shared_library("distributedhardwarefwksvr") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "include", "include/accessmanager", @@ -80,7 +80,6 @@ ohos_shared_library("distributedhardwarefwksvr") { "//foundation/ability/ability_runtime/services/abilitymgr:abilityms", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", ] defines = [ @@ -92,6 +91,7 @@ ohos_shared_library("distributedhardwarefwksvr") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 73d776c3eab77d6ef75e3cc6464a48999b6bca7e..3276f8e1ae9d606d85e484377cb02c5898fed1bc 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/device_manager/common/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn index dc1d0474737e94625fcbe2986c7abe0cc1c3199c..d7e6d1d7709cf67198a5b8eb8ff65a6c3e6d9993 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -32,7 +32,7 @@ ohos_fuzztest("ComponentmanagerFuzzTest") { "${common_path}/utils/include", "${common_path}/log/include", "//third_party/json/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] cflags = [ "-g", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index d8e72fe5998a7b4eb49f7c9c93b0e1db9fea32fe..0a56fb36af8c7f0273886a4747a82255badd69af 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -31,9 +31,9 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", ] cflags = [ @@ -47,7 +47,6 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", - "//utils/native/base:utils", ] defines = [ @@ -59,6 +58,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 0720b0e01f84918f1acc21fb26bd0314e8bed8c0..4d4217acffabb8581649752c79ff8c1ebcb63bf2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -19,7 +19,7 @@ module_out_path = "distributed_hardware_fwk/access_manager_test" config("module_private_config") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/device_manager/common/include", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn index 0a4b154592e449381c42f398bfdca4b6ba36214c..41ef7950e4c61b28ead2b1fb2dc3ce49153a8f8e 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn @@ -30,7 +30,7 @@ config("module_private_config") { "${common_path}/utils/include", "${common_path}/log/include", "//third_party/json/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn index 3e6f9d50cd9de6141e899904043229cb669dff90..1027b08582d3aed33837eb4900f43da1f21dc16f 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -30,7 +30,7 @@ config("module_private_config") { "${services_path}/distributedhardwarefwkservice/include/task", "${services_path}/distributedhardwarefwkservice/include/utils", "//third_party/json/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 2bac3db2ab0d2af0c37073150e365ab50eb53190..4b045cbda0798f69d7992a672b40bb2059e31558 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -29,9 +29,9 @@ config("module_private_config") { "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", ] } @@ -48,12 +48,12 @@ ohos_unittest("ResourceManagerTest") { "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn index 1c81e8a68fea2c404062e18700ae12211c6d679a..c837f278eedbcbd3dc21ccd08a3f5d5fd039d4fe 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn @@ -29,7 +29,7 @@ config("module_private_config") { "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn index c7eec91925f8ac47bda6758e192bf3d5a813b307..40515f7efada62317a798ff8ff850f0c23208eba 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn @@ -32,7 +32,7 @@ config("module_private_config") { "${common_path}/utils/include", "${common_path}/log/include", "//third_party/json/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] } diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 4abac824e973eaffe933ec6803589a8794e11887..0ebf69589cc883f3095ce0fff207f384b4e35950 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -18,7 +18,7 @@ import( ohos_shared_library("distributedhardwareutils") { include_dirs = [ "//third_party/openssl:libcrypto_static", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/log/include", "${common_path}/utils/include", @@ -35,10 +35,7 @@ ohos_shared_library("distributedhardwareutils") { "src/log/dh_log.cpp", ] - deps = [ - "//third_party/openssl:libcrypto_static", - "//utils/native/base:utils", - ] + deps = [ "//third_party/openssl:libcrypto_static" ] defines = [ "HI_LOG_ENABLE", @@ -49,6 +46,7 @@ ohos_shared_library("distributedhardwareutils") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", diff --git a/utils/test/fuzztest/utils_fuzzer/BUILD.gn b/utils/test/fuzztest/utils_fuzzer/BUILD.gn index fb65842d7f9525582d9a06d3b30716a0c7b537eb..57c7f42bce3afbe434e8ce60bda0d9c33f4cf26f 100644 --- a/utils/test/fuzztest/utils_fuzzer/BUILD.gn +++ b/utils/test/fuzztest/utils_fuzzer/BUILD.gn @@ -26,7 +26,7 @@ ohos_fuzztest("UtilsFuzzTest") { "${utils_path}/include", "${utils_path}/include/log", "${common_path}/utils/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] cflags = [ "-g", diff --git a/utils/test/unittest/common/eventbus/BUILD.gn b/utils/test/unittest/common/eventbus/BUILD.gn index c85bc2c4a5317cd3991f7c073809518d25db2bc1..6025ffbf5710a677310a96ddce045907df89ea61 100644 --- a/utils/test/unittest/common/eventbus/BUILD.gn +++ b/utils/test/unittest/common/eventbus/BUILD.gn @@ -25,7 +25,7 @@ config("module_private_config") { "${utils_path}/include", "${utils_path}/include/log", "${utils_path}/include/eventbus", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] } diff --git a/utils/test/unittest/common/utilstool/BUILD.gn b/utils/test/unittest/common/utilstool/BUILD.gn index 3287ca4337a5ea1cbc6c1e91f0ef9eb73cb99531..2371d935b35b2d8a5563dbbea693cd875d311a60 100644 --- a/utils/test/unittest/common/utilstool/BUILD.gn +++ b/utils/test/unittest/common/utilstool/BUILD.gn @@ -24,7 +24,7 @@ config("module_private_config") { "${utils_path}/include", "${utils_path}/include/log", "${common_path}/utils/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] }