From b8f0bab164c4a31ec80ec2e0a6d92539a3e0fb30 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:12:10 +0000 Subject: [PATCH 1/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- services/script/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/script/BUILD.gn b/services/script/BUILD.gn index 07c8254d..7d118f45 100644 --- a/services/script/BUILD.gn +++ b/services/script/BUILD.gn @@ -65,6 +65,7 @@ config("libupdaterscript_exported_headers") { "${updater_path}/services/script/script_interpreter", "${updater_path}/services/script/script_manager", "${updater_path}/services/script/threadpool", + "${updater_path}/services/script", ] } -- Gitee From 785f3543a518373e4efc820228e65852f3a1db52 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:13:48 +0000 Subject: [PATCH 2/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- services/script/script_instruction/script_updateprocesser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/script/script_instruction/script_updateprocesser.cpp b/services/script/script_instruction/script_updateprocesser.cpp index 9c24ee2d..99ecde21 100644 --- a/services/script/script_instruction/script_updateprocesser.cpp +++ b/services/script/script_instruction/script_updateprocesser.cpp @@ -17,7 +17,7 @@ #include "script_instruction.h" #include "script_manager.h" #include "script_utils.h" -#include "thread_pool.h" +#include "threadpool/thread_pool.h" using namespace Uscript; -- Gitee From d031ce84df9b8eb436e1cdffae31c4f583e3b6a0 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:15:08 +0000 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- services/script/script_manager/script_manager_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/script/script_manager/script_manager_impl.h b/services/script/script_manager/script_manager_impl.h index 6bbf2117..65229936 100644 --- a/services/script/script_manager/script_manager_impl.h +++ b/services/script/script_manager/script_manager_impl.h @@ -21,7 +21,7 @@ #include "pkg_manager.h" #include "script_instruction.h" #include "script_manager.h" -#include "thread_pool.h" +#include "threadpool/thread_pool.h" namespace Uscript { class ScriptInstructionHelper; -- Gitee From 7e01d87143c481383dd0b0d6491f2eb4349deb82 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:16:48 +0000 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- test/unittest/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 8bab0d7e..04dce2ce 100755 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -127,7 +127,7 @@ ohos_unittest("updater_unittest") { "${updater_path}/services/script/script_instruction", "${updater_path}/services/script/script_interpreter", "${updater_path}/services/script/script_manager", - "${updater_path}/services/script/threadpool", + "${updater_path}/services/script", "$root_out_dir/updater/updater/yacc", "${updater_path}/services/package/pkg_algorithm", "${updater_path}/services/package/pkg_manager", -- Gitee From 9e30a3e7a30511dc83f8b6cef4a1891ec0f9736c Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:22:59 +0000 Subject: [PATCH 5/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- test/unittest/flashd_test/BUILD.gn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/unittest/flashd_test/BUILD.gn b/test/unittest/flashd_test/BUILD.gn index 0c117b73..79a5273b 100644 --- a/test/unittest/flashd_test/BUILD.gn +++ b/test/unittest/flashd_test/BUILD.gn @@ -69,8 +69,6 @@ ohos_unittest("flashd_unittest") { "flashd_unittest.cpp", ] include_dirs = [ - "${HDC_PATH}/daemon", - "${HDC_PATH}/common", "${updater_path}/services", "${updater_path}/services/common", "${updater_path}/services/flashd", @@ -117,7 +115,10 @@ ohos_unittest("flashd_unittest") { ] if (updater_zlib_enable) { external_deps += [ "zlib:libz" ] - } + ｝ + if (updater_hdc_depend) ｛ + external_deps += [ "hdc:hdc_updater" ] + ｝ configs = [ "${updater_path}/test/unittest:utest_config" ] install_enable = true part_name = "updater" -- Gitee From 60bcaae2276caee759a8d4034b9e8e021ece1962 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:25:03 +0000 Subject: [PATCH 6/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- test/unittest/script/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/script/BUILD.gn b/test/unittest/script/BUILD.gn index e6db1be8..9aa58ee5 100644 --- a/test/unittest/script/BUILD.gn +++ b/test/unittest/script/BUILD.gn @@ -63,7 +63,7 @@ ohos_unittest("script_unittest") { "${updater_path}/services/script/script_instruction", "${updater_path}/services/script/script_interpreter", "${updater_path}/services/script/script_manager", - "${updater_path}/services/script/threadpool", + "${updater_path}/services/script", "$root_out_dir/updater/updater/yacc", "${updater_path}/test/unittest", "${updater_path}/utils/include", -- Gitee From dfdd5b98254780150aff432dc057848f7a4420de Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:27:31 +0000 Subject: [PATCH 7/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- test/unittest/script/threadpool_unittest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/script/threadpool_unittest.cpp b/test/unittest/script/threadpool_unittest.cpp index 5e13faca..42d63bca 100755 --- a/test/unittest/script/threadpool_unittest.cpp +++ b/test/unittest/script/threadpool_unittest.cpp @@ -25,7 +25,7 @@ #include "script_instruction.h" #include "script_manager.h" #include "script_utils.h" -#include "thread_pool.h" +#include "threadpool/thread_pool.h" #include "unittest_comm.h" using namespace std; -- Gitee From f29655bee3af8a12317e34f9b5151d995a93e66b Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 27 Mar 2025 09:33:30 +0000 Subject: [PATCH 8/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcan42 --- test/unittest/flashd_test/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unittest/flashd_test/BUILD.gn b/test/unittest/flashd_test/BUILD.gn index 79a5273b..1caa6c7c 100644 --- a/test/unittest/flashd_test/BUILD.gn +++ b/test/unittest/flashd_test/BUILD.gn @@ -115,10 +115,10 @@ ohos_unittest("flashd_unittest") { ] if (updater_zlib_enable) { external_deps += [ "zlib:libz" ] - ｝ - if (updater_hdc_depend) ｛ + } + if (updater_hdc_depend) { external_deps += [ "hdc:hdc_updater" ] - ｝ + } configs = [ "${updater_path}/test/unittest:utest_config" ] install_enable = true part_name = "updater" -- Gitee