From 26e52880bdf9abbeaee4cf5450f8071fa7676ff1 Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 20:35:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A1=86=E6=9E=B6gn?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: CrazyRong --- aw/cxx/distributed/BUILD.gn | 4 ++-- aw/cxx/hwext/BUILD.gn | 17 ++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/aw/cxx/distributed/BUILD.gn b/aw/cxx/distributed/BUILD.gn index 58fa639..bf63e95 100644 --- a/aw/cxx/distributed/BUILD.gn +++ b/aw/cxx/distributed/BUILD.gn @@ -15,7 +15,6 @@ import("//build/ohos.gni") config("distributedtest_config") { include_dirs = [ - "//commonlibrary/c_utils/base/include", ".", "utils/", ] @@ -28,15 +27,16 @@ ohos_static_library("distributedtest_lib") { "distributed_cfg.cpp", "distributed_major.cpp", ] - deps = [ "//third_party/googletest:gtest" ] if (is_standard_system) { external_deps = [ "c_utils:utils", + "googletest:gtest", "hilog:libhilog", ] } else { external_deps = [ "c_utils:utils", + "googletest:gtest" "hilog:libhilog", ] } diff --git a/aw/cxx/hwext/BUILD.gn b/aw/cxx/hwext/BUILD.gn index cfef1a3..f99f183 100755 --- a/aw/cxx/hwext/BUILD.gn +++ b/aw/cxx/hwext/BUILD.gn @@ -13,20 +13,15 @@ import("//build/ohos.gni") -config("performance_test_config") { - include_dirs = [ - ".", - "//commonlibrary/c_utils/base/include", - ] -} - ohos_static_library("performance_test_static") { testonly = true sources = [ "perf.cpp" ] - deps = [ "//third_party/googletest:gtest" ] - public_deps = [ "//third_party/libxml2:libxml2" ] - public_configs = [ ":performance_test_config" ] + include_dirs = [ "." ] subsystem_name = "testfwk" part_name = "developer_test" - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "googletest:gtest", + "libxml2:libxml2", + ] } -- Gitee From 510ab2a5eac1b8d6a1a0b0e7eec5cd5091adf72f Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 20:51:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A1=86=E6=9E=B6gn?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: CrazyRong --- aw/cxx/distributed/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw/cxx/distributed/BUILD.gn b/aw/cxx/distributed/BUILD.gn index bf63e95..c6290ea 100644 --- a/aw/cxx/distributed/BUILD.gn +++ b/aw/cxx/distributed/BUILD.gn @@ -36,7 +36,7 @@ ohos_static_library("distributedtest_lib") { } else { external_deps = [ "c_utils:utils", - "googletest:gtest" + "googletest:gtest", "hilog:libhilog", ] } -- Gitee