switch path deps on utils to commonlibrary

Signed-off-by: liujialiang <liujialiang10@huawei.com>
This commit is contained in:
liujialiang 2022-07-29 21:05:40 +08:00
parent d351653b81
commit 2c8a86564d
5 changed files with 23 additions and 29 deletions

View File

@ -11,7 +11,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
group("make_temp_test") {
testonly = true
deps = []

View File

@ -15,7 +15,7 @@ import("//build/ohos.gni")
config("distributedtest_config") {
include_dirs = [
"//utils/native/base/include",
"//commonlibrary/c_utils/base/include",
".",
"utils/",
]
@ -28,14 +28,17 @@ ohos_static_library("distributedtest_lib") {
"distributed_cfg.cpp",
"distributed_major.cpp",
]
deps = [
"//third_party/googletest:gtest",
"//utils/native/base:utils",
]
deps = [ "//third_party/googletest:gtest" ]
if (is_standard_system) {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
]
} else {
external_deps = [ "hilog:libhilog" ]
external_deps = [
"hilog:libhilog",
"utils_base:utils",
]
}
public_configs = [ ":distributedtest_config" ]
}

View File

@ -16,19 +16,17 @@ import("//build/ohos.gni")
config("performance_test_config") {
include_dirs = [
".",
"//utils/native/base/include",
"//commonlibrary/c_utils/base/include",
]
}
ohos_static_library("performance_test_static") {
testonly = true
sources = [ "perf.cpp" ]
deps = [
"//third_party/googletest:gtest",
"//utils/native/base:utils",
]
deps = [ "//third_party/googletest:gtest" ]
public_deps = [ "//third_party/libxml2:libxml2" ]
public_configs = [ ":performance_test_config" ]
subsystem_name = "developertest"
part_name = "developertest"
external_deps = [ "c_utils:utils" ]
}

View File

@ -20,7 +20,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//utils/native/base/include",
"//commonlibrary/c_utils/base/include",
"//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/include",
"//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src",
"//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/app_distributeddata/include",
@ -44,6 +44,7 @@ ohos_distributedtest("DistributeDemo") {
configs = [ ":module_private_config" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
@ -54,7 +55,6 @@ ohos_distributedtest("DistributeDemo") {
"//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/:distributeddata_inner",
"//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
"//third_party/googletest:gtest",
"//utils/native/base:utils",
]
}
@ -66,6 +66,7 @@ ohos_distributedtest("DistributeDemoAgent") {
configs = [ ":module_private_config" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
@ -76,7 +77,6 @@ ohos_distributedtest("DistributeDemoAgent") {
"//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/:distributeddata_inner",
"//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
"//third_party/googletest:gtest",
"//utils/native/base:utils",
]
}

View File

@ -23,8 +23,8 @@ config("gtest_config") {
static_library("gtest") {
#testonly = true
public = [
"//third_party/googletest/googletest/include/gtest/gtest.h",
"//third_party/googletest/googletest/include/gtest/gtest-spi.h",
"//third_party/googletest/googletest/include/gtest/gtest.h",
]
sources = [
"//third_party/googletest/googletest/include/gtest/gtest-death-test.h",
@ -35,6 +35,10 @@ static_library("gtest") {
"//third_party/googletest/googletest/include/gtest/gtest-typed-test.h",
"//third_party/googletest/googletest/include/gtest/gtest_pred_impl.h",
"//third_party/googletest/googletest/include/gtest/gtest_prod.h",
"//third_party/googletest/googletest/include/gtest/hwext/gtest-ext.h",
"//third_party/googletest/googletest/include/gtest/hwext/gtest-filter.h",
"//third_party/googletest/googletest/include/gtest/hwext/gtest-tag.h",
"//third_party/googletest/googletest/include/gtest/hwext/utils.h",
"//third_party/googletest/googletest/include/gtest/internal/custom/gtest-port.h",
"//third_party/googletest/googletest/include/gtest/internal/custom/gtest-printers.h",
"//third_party/googletest/googletest/include/gtest/internal/custom/gtest.h",
@ -49,10 +53,6 @@ static_library("gtest") {
"//third_party/googletest/googletest/include/gtest/internal/gtest-string.h",
"//third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h",
"//third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h",
"//third_party/googletest/googletest/include/gtest/hwext/gtest-ext.h",
"//third_party/googletest/googletest/include/gtest/hwext/gtest-filter.h",
"//third_party/googletest/googletest/include/gtest/hwext/gtest-tag.h",
"//third_party/googletest/googletest/include/gtest/hwext/utils.h",
"//third_party/googletest/googletest/src/gtest-death-test.cc",
"//third_party/googletest/googletest/src/gtest-filepath.cc",
"//third_party/googletest/googletest/src/gtest-internal-inl.h",
@ -73,12 +73,6 @@ static_library("gtest") {
static_library("gtest_main") {
#testonly = true
sources = [
"//third_party/googletest/googletest/src/gtest_main.cc",
]
public_deps = [
":gtest",
]
sources = [ "//third_party/googletest/googletest/src/gtest_main.cc" ]
public_deps = [ ":gtest" ]
}