未验证 提交 afaa18ad 编写于 作者: O openharmony_ci 提交者: Gitee

!4711 switch path deps on utils to commonlibrary in xts_acts

Merge pull request !4711 from JokerXD_liu/changepath
...@@ -20,7 +20,7 @@ ohos_moduletest_suite("ActsZlibTest") { ...@@ -20,7 +20,7 @@ ohos_moduletest_suite("ActsZlibTest") {
configs = [ "//third_party/zlib:zlib_config" ] configs = [ "//third_party/zlib:zlib_config" ]
public_configs = [ "//third_party/zlib:zlib_public_config" ] public_configs = [ "//third_party/zlib:zlib_public_config" ]
deps = [ "//third_party/zlib:libz" ] deps = [ "//third_party/zlib:libz" ]
external_deps = [ "utils_base:utils" ] external_deps = [ "c_utils:utils" ]
subsystem_name = "bundlemanager" subsystem_name = "bundlemanager"
part_name = "bundle_framework" part_name = "bundle_framework"
} }
...@@ -45,8 +45,8 @@ ohos_moduletest_suite("GraphicNapiDrawingTest") { ...@@ -45,8 +45,8 @@ ohos_moduletest_suite("GraphicNapiDrawingTest") {
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",
"//utils/native/base:utils",
] ]
} }
...@@ -19,7 +19,7 @@ module_output_path = "hit/HiAppEventCPPTest" ...@@ -19,7 +19,7 @@ module_output_path = "hit/HiAppEventCPPTest"
config("hilogtest_config") { config("hilogtest_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//utils/native/base/include/", "//commonlibrary/c_utils/base/include/",
"../../utils/native", "../../utils/native",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//base/hiviewdfx/hiappevent/interfaces/native/kits/include/hiappevent", "//base/hiviewdfx/hiappevent/interfaces/native/kits/include/hiappevent",
...@@ -34,8 +34,8 @@ ohos_moduletest_suite("HiAppEventCPPTest") { ...@@ -34,8 +34,8 @@ ohos_moduletest_suite("HiAppEventCPPTest") {
"//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",
"//utils/native/base:utils",
] ]
configs = [ ":hilogtest_config" ] configs = [ ":hilogtest_config" ]
} }
...@@ -18,7 +18,7 @@ config("hilogndktest_config") { ...@@ -18,7 +18,7 @@ config("hilogndktest_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/kits/include", "//base/hiviewdfx/hilog/interfaces/native/kits/include",
"//utils/native/base/include/", "//commonlibrary/c_utils/base/include/",
] ]
} }
ohos_moduletest_suite("hilogndktest") { ohos_moduletest_suite("hilogndktest") {
...@@ -27,8 +27,8 @@ ohos_moduletest_suite("hilogndktest") { ...@@ -27,8 +27,8 @@ ohos_moduletest_suite("hilogndktest") {
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",
"//utils/native/base:utils",
] ]
configs = [ ":hilogndktest_config" ] configs = [ ":hilogndktest_config" ]
} }
...@@ -20,7 +20,7 @@ config("utils_config") { ...@@ -20,7 +20,7 @@ config("utils_config") {
include_dirs = [ include_dirs = [
"//third_party/cJSON/", "//third_party/cJSON/",
"//third_party/zlib/", "//third_party/zlib/",
"//utils/native/base/", "//commonlibrary/c_utils/base/",
] ]
} }
...@@ -33,6 +33,6 @@ ohos_static_library("utilskit") { ...@@ -33,6 +33,6 @@ ohos_static_library("utilskit") {
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",
"//utils/native/base:utils", "//commonlibrary/c_utils/base:utils",
] ]
} }
...@@ -22,7 +22,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") { ...@@ -22,7 +22,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") {
sources += DEVICEAUTH_BASIC_DEPS_SOURCE sources += DEVICEAUTH_BASIC_DEPS_SOURCE
include_dirs = [ include_dirs = [
"//utils/native/base/include", "//commonlibrary/c_utils/base/include",
"//utils/native/lite/include", "//utils/native/lite/include",
"//test/xts/tools/lite/hctest/include", "//test/xts/tools/lite/hctest/include",
"//third_party/unity/src", "//third_party/unity/src",
......
...@@ -46,7 +46,7 @@ static_library("huks_test_common") { ...@@ -46,7 +46,7 @@ static_library("huks_test_common") {
deps = [] deps = []
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",
#"unittest/include", #"unittest/include",
......
...@@ -40,7 +40,7 @@ hcpptest_suite("ActsHuksLiteFunctionTest") { ...@@ -40,7 +40,7 @@ hcpptest_suite("ActsHuksLiteFunctionTest") {
] ]
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",
"../common/include", "../common/include",
] ]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册