提交 c10f836e 编写于 作者: L lijiahao

switch path deps on utils to commonlibrary

Signed-off-by: Nlijiahao <lijiahao36@huawei.com>
上级 6ab516e0
...@@ -53,7 +53,7 @@ hcpptest_suite("ActsAbilityMgrTest") { ...@@ -53,7 +53,7 @@ hcpptest_suite("ActsAbilityMgrTest") {
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/cJSON", "//third_party/cJSON",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite", "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite",
"//foundation/graphic/ui/interfaces/kits", "//foundation/graphic/ui/interfaces/kits",
"//foundation/graphic/utils/interfaces/innerkits", "//foundation/graphic/utils/interfaces/innerkits",
......
...@@ -44,7 +44,7 @@ hcpptest_suite("ActsAiEngineTest") { ...@@ -44,7 +44,7 @@ hcpptest_suite("ActsAiEngineTest") {
"//foundation/ai/engine/services/algorithmsdk", "//foundation/ai/engine/services/algorithmsdk",
"//foundation/ai/engine/services/server/plugin", "//foundation/ai/engine/services/server/plugin",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"//kernel/liteos-a/kernel/include", "//kernel/liteos-a/kernel/include",
"//kernel/liteos-a/kernel/common", "//kernel/liteos-a/kernel/common",
"//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry",
......
...@@ -29,7 +29,7 @@ hcpptest_suite("ActsBundleMgrTest") { ...@@ -29,7 +29,7 @@ hcpptest_suite("ActsBundleMgrTest") {
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
"//third_party/googletest/googletest/include", "//third_party/googletest/googletest/include",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"${aafwk_lite_path}/interfaces/innerkits/intent_lite", "${aafwk_lite_path}/interfaces/innerkits/intent_lite",
"//third_party/cJSON", "//third_party/cJSON",
] ]
......
...@@ -21,7 +21,7 @@ hctest_suite("ActsKitFwkApiTest") { ...@@ -21,7 +21,7 @@ hctest_suite("ActsKitFwkApiTest") {
include_dirs = [ include_dirs = [
"//test/xts/tools/lite/hctest/include", "//test/xts/tools/lite/hctest/include",
"//third_party/unity/src", "//third_party/unity/src",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//third_party/bounds_checking_function/include/", "//third_party/bounds_checking_function/include/",
"//third_party/mbedtls/include/", "//third_party/mbedtls/include/",
......
...@@ -19,7 +19,7 @@ import("//test/xts/tools/build/suite.gni") ...@@ -19,7 +19,7 @@ import("//test/xts/tools/build/suite.gni")
config("module_private_config") { config("module_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//utils/native/base/include", "//commonlibrary/c_utils/base/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/musl/porting/linux/user/include", "//third_party/musl/porting/linux/user/include",
"//test/xts/acts/security_lite/huks/common/include", "//test/xts/acts/security_lite/huks/common/include",
...@@ -39,7 +39,7 @@ ohos_moduletest_suite("ActToolChainTest") { ...@@ -39,7 +39,7 @@ ohos_moduletest_suite("ActToolChainTest") {
] ]
include_dirs = [ include_dirs = [
"//utils/native/base/include", "//commonlibrary/c_utils/base/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/musl/porting/linux/user/include/", "//third_party/musl/porting/linux/user/include/",
"//third_party/musl/porting/linux/user/src/sched", "//third_party/musl/porting/linux/user/src/sched",
...@@ -47,8 +47,6 @@ ohos_moduletest_suite("ActToolChainTest") { ...@@ -47,8 +47,6 @@ ohos_moduletest_suite("ActToolChainTest") {
"./include", "./include",
] ]
deps = [ external_deps = [ "c_utils:utils" ]
"//third_party/bounds_checking_function:libsec_static", deps = [ "//third_party/bounds_checking_function:libsec_static" ]
"//utils/native/base:utils",
]
} }
...@@ -22,7 +22,7 @@ hctest_suite("ActsUtilsFileTest") { ...@@ -22,7 +22,7 @@ hctest_suite("ActsUtilsFileTest") {
include_dirs = [ include_dirs = [
"src", "src",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
} }
...@@ -25,7 +25,7 @@ hcpptest_suite("ActsDMSTest") { ...@@ -25,7 +25,7 @@ hcpptest_suite("ActsDMSTest") {
include_dirs = [ include_dirs = [
"src", "src",
"src/utils", "src/utils",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include",
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
......
...@@ -23,7 +23,7 @@ hctest_suite("ActsKvStoreTest") { ...@@ -23,7 +23,7 @@ hctest_suite("ActsKvStoreTest") {
include_dirs = [ include_dirs = [
"src", "src",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"//base/iothardware/peripheral/interfaces/inner_api", "//base/iothardware/peripheral/interfaces/inner_api",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -21,7 +21,7 @@ hcpptest_suite("ActsKvStoreTest") { ...@@ -21,7 +21,7 @@ hcpptest_suite("ActsKvStoreTest") {
"src", "src",
"//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store/include", "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
] ]
deps = [ "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store" ] deps = [ "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store" ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -45,9 +45,9 @@ ohos_moduletest_suite("ActsGraphicNapiDrawingTest") { ...@@ -45,9 +45,9 @@ ohos_moduletest_suite("ActsGraphicNapiDrawingTest") {
"//third_party/googletest/googletest/include", "//third_party/googletest/googletest/include",
] ]
external_deps = [ "c_utils:utils" ]
deps = [ deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//commonlibrary/c_utils/base:utils",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics", "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gtest_main", "//third_party/googletest:gtest_main",
] ]
......
...@@ -29,12 +29,12 @@ config("hilogtest_config") { ...@@ -29,12 +29,12 @@ config("hilogtest_config") {
ohos_moduletest_suite("ActsHiAppEventCPPTest") { ohos_moduletest_suite("ActsHiAppEventCPPTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "HiAppEventCPPTest.cpp" ] sources = [ "HiAppEventCPPTest.cpp" ]
external_deps = [ "c_utils:utils" ]
deps = [ deps = [
"../../utils/native:utilskit", "../../utils/native:utilskit",
"//base/hiviewdfx/hiappevent/frameworks/native/libhiappevent:libhiappevent_base", "//base/hiviewdfx/hiappevent/frameworks/native/libhiappevent:libhiappevent_base",
"//base/hiviewdfx/hiappevent/frameworks/native/ndk:hiappevent_ndk", "//base/hiviewdfx/hiappevent/frameworks/native/ndk:hiappevent_ndk",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//commonlibrary/c_utils/base:utils",
"//third_party/googletest:gtest_main", "//third_party/googletest:gtest_main",
] ]
configs = [ ":hilogtest_config" ] configs = [ ":hilogtest_config" ]
......
...@@ -24,10 +24,10 @@ config("hilogndktest_config") { ...@@ -24,10 +24,10 @@ config("hilogndktest_config") {
ohos_moduletest_suite("ActsHilogndkTest") { ohos_moduletest_suite("ActsHilogndkTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "hilogndktest.cpp" ] sources = [ "hilogndktest.cpp" ]
external_deps = [ "c_utils:utils" ]
deps = [ deps = [
"//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk", "//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk",
"//base/hiviewdfx/hilog/interfaces/native/kits:libhilog_ndk", "//base/hiviewdfx/hilog/interfaces/native/kits:libhilog_ndk",
"//commonlibrary/c_utils/base:utils",
"//third_party/googletest:gtest_main", "//third_party/googletest:gtest_main",
] ]
configs = [ ":hilogndktest_config" ] configs = [ ":hilogndktest_config" ]
......
...@@ -30,9 +30,9 @@ ohos_static_library("utilskit") { ...@@ -30,9 +30,9 @@ ohos_static_library("utilskit") {
configs = [ ":utils_config" ] configs = [ ":utils_config" ]
#external_deps = [ "hilog:libhilog" ] #external_deps = [ "hilog:libhilog" ]
external_deps = [ "c_utils:utils" ]
deps = [ deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//base/hiviewdfx/hiview/base:hiviewbase", "//base/hiviewdfx/hiview/base:hiviewbase",
"//commonlibrary/c_utils/base:utils",
] ]
} }
...@@ -29,7 +29,7 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") { ...@@ -29,7 +29,7 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") {
"videoDecEncNdk/include", "videoDecEncNdk/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include", "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/player_framework/interfaces/kits/c", "//foundation/multimedia/player_framework/interfaces/kits/c",
"//utils/native/base/include", "//commonlibrary/c_utils/base/include",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
] ]
...@@ -51,6 +51,7 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") { ...@@ -51,6 +51,7 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") {
"", "",
] ]
external_deps = [ "c_utils:utils" ]
deps = [ deps = [
"//foundation/graphic/graphic_2d/frameworks/surface:surface", "//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//foundation/multimedia/player_framework/interfaces/kits/c:native_media_adec", "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_adec",
...@@ -59,7 +60,6 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") { ...@@ -59,7 +60,6 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") {
"//foundation/multimedia/player_framework/interfaces/kits/c:native_media_core", "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_core",
"//foundation/multimedia/player_framework/interfaces/kits/c:native_media_vdec", "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_vdec",
"//foundation/multimedia/player_framework/interfaces/kits/c:native_media_venc", "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_venc",
"//utils/native/base:utils",
] ]
subsystem_name = "multimedia" subsystem_name = "multimedia"
......
...@@ -23,7 +23,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") { ...@@ -23,7 +23,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") {
include_dirs = [ include_dirs = [
"//commonlibrary/c_utils/base/include", "//commonlibrary/c_utils/base/include",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"//test/xts/tools/lite/hctest/include", "//test/xts/tools/lite/hctest/include",
"//third_party/unity/src", "//third_party/unity/src",
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
......
...@@ -31,7 +31,7 @@ hcpptest_suite("ActsPMSTest") { ...@@ -31,7 +31,7 @@ hcpptest_suite("ActsPMSTest") {
include_dirs = [ include_dirs = [
"src", "src",
"include", "include",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
"//base/security/permission_lite/interfaces/innerkits", "//base/security/permission_lite/interfaces/innerkits",
......
...@@ -20,7 +20,7 @@ hcpptest_suite("ActsUpdateTest") { ...@@ -20,7 +20,7 @@ hcpptest_suite("ActsUpdateTest") {
include_dirs = [ include_dirs = [
"//base/update/ota_lite/interfaces/kits", "//base/update/ota_lite/interfaces/kits",
"//base/update/ota_lite/hals", "//base/update/ota_lite/hals",
"//utils/native/lite/include", "//commonlibrary/utils_lite/include",
] ]
deps = [ deps = [
"$ohos_third_party_dir/mbedtls:mbedtls_static", "$ohos_third_party_dir/mbedtls:mbedtls_static",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册