From 62120e2944b15834fa576b42ac7f3d6c2efce217 Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 11:01:15 +0800 Subject: [PATCH 1/6] =?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 | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/aw/cxx/distributed/BUILD.gn b/aw/cxx/distributed/BUILD.gn index 58fa639..e3f3fe4 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,16 +27,17 @@ 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", "hilog:libhilog", + "googletest:gtest", ] } else { external_deps = [ "c_utils:utils", "hilog:libhilog", + "googletest:gtest", ] } public_configs = [ ":distributedtest_config" ] diff --git a/aw/cxx/hwext/BUILD.gn b/aw/cxx/hwext/BUILD.gn index cfef1a3..6500de8 100755 --- a/aw/cxx/hwext/BUILD.gn +++ b/aw/cxx/hwext/BUILD.gn @@ -16,17 +16,18 @@ 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" ] subsystem_name = "testfwk" part_name = "developer_test" - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "libxml2:libxml2", + "googletest:gtest", + ] } -- Gitee From 911197075a341973ad57e21768100e33e70d7365 Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 15:29:46 +0800 Subject: [PATCH 2/6] =?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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aw/cxx/distributed/BUILD.gn b/aw/cxx/distributed/BUILD.gn index e3f3fe4..ae0daed 100644 --- a/aw/cxx/distributed/BUILD.gn +++ b/aw/cxx/distributed/BUILD.gn @@ -30,15 +30,15 @@ ohos_static_library("distributedtest_lib") { if (is_standard_system) { external_deps = [ "c_utils:utils", - "hilog:libhilog", "googletest:gtest", + "hilog:libhilog", ] } else { external_deps = [ "c_utils:utils", - "hilog:libhilog", "googletest:gtest", + "hilog:libhilog", ] } public_configs = [ ":distributedtest_config" ] -} +} \ No newline at end of file -- Gitee From cf4bf50d829a32552a9a077e698f605d709e9021 Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 15:38:43 +0800 Subject: [PATCH 3/6] =?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/hwext/BUILD.gn | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aw/cxx/hwext/BUILD.gn b/aw/cxx/hwext/BUILD.gn index 6500de8..d1230e1 100755 --- a/aw/cxx/hwext/BUILD.gn +++ b/aw/cxx/hwext/BUILD.gn @@ -14,9 +14,7 @@ import("//build/ohos.gni") config("performance_test_config") { - include_dirs = [ - ".", - ] + include_dirs = [ "." ] } ohos_static_library("performance_test_static") { @@ -27,7 +25,7 @@ ohos_static_library("performance_test_static") { part_name = "developer_test" external_deps = [ "c_utils:utils", - "libxml2:libxml2", "googletest:gtest", + "libxml2:libxml2", ] } -- Gitee From 59e8e056e82811fa15d2695c28d23c0434a9f390 Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 15:42:24 +0800 Subject: [PATCH 4/6] =?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 | 1 + 1 file changed, 1 insertion(+) diff --git a/aw/cxx/distributed/BUILD.gn b/aw/cxx/distributed/BUILD.gn index ae0daed..7f2f680 100644 --- a/aw/cxx/distributed/BUILD.gn +++ b/aw/cxx/distributed/BUILD.gn @@ -27,6 +27,7 @@ ohos_static_library("distributedtest_lib") { "distributed_cfg.cpp", "distributed_major.cpp", ] + if (is_standard_system) { external_deps = [ "c_utils:utils", -- Gitee From 60ecc6379219f4b3c5e33524422eeceb69dd00fd Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 16:13:17 +0800 Subject: [PATCH 5/6] =?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 | 1 - 1 file changed, 1 deletion(-) diff --git a/aw/cxx/distributed/BUILD.gn b/aw/cxx/distributed/BUILD.gn index 7f2f680..ae0daed 100644 --- a/aw/cxx/distributed/BUILD.gn +++ b/aw/cxx/distributed/BUILD.gn @@ -27,7 +27,6 @@ ohos_static_library("distributedtest_lib") { "distributed_cfg.cpp", "distributed_major.cpp", ] - if (is_standard_system) { external_deps = [ "c_utils:utils", -- Gitee From c5b631c444a4f4e3f008e09d0411ea195f6928b6 Mon Sep 17 00:00:00 2001 From: CrazyRong Date: Thu, 8 Aug 2024 16:22:28 +0800 Subject: [PATCH 6/6] =?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 | 1 + 1 file changed, 1 insertion(+) diff --git a/aw/cxx/distributed/BUILD.gn b/aw/cxx/distributed/BUILD.gn index ae0daed..7f2f680 100644 --- a/aw/cxx/distributed/BUILD.gn +++ b/aw/cxx/distributed/BUILD.gn @@ -27,6 +27,7 @@ ohos_static_library("distributedtest_lib") { "distributed_cfg.cpp", "distributed_major.cpp", ] + if (is_standard_system) { external_deps = [ "c_utils:utils", -- Gitee