diff --git a/services/script/BUILD.gn b/services/script/BUILD.gn index 07c8254dbbee8144e4972c1fe985b3032e82b981..7d118f45f81ce6ab6ddaa14246301482bd1cf84a 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", ] } diff --git a/services/script/script_instruction/script_updateprocesser.cpp b/services/script/script_instruction/script_updateprocesser.cpp index 9c24ee2dce8acc57591ac2af455632a4110e06fd..99ecde211540a017a74b5da3e762e3270a9a1572 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; diff --git a/services/script/script_manager/script_manager_impl.h b/services/script/script_manager/script_manager_impl.h index 6bbf21176d41d20a5a2157eb771c527e9bf9a63f..652299361c23f8f98126ffd8f66090696fed7a8c 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; diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 8bab0d7e403a0b17f3fc113fe6e4cacbc73d97eb..04dce2ce1e19f5f73675ddeca3baa0a68506d71f 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", diff --git a/test/unittest/flashd_test/BUILD.gn b/test/unittest/flashd_test/BUILD.gn index 0c117b730eaaf9eb660461636e5cc7fc0b820046..1caa6c7c3053ee3c6682d92d09a17ff5590ee370 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", @@ -118,6 +116,9 @@ 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" diff --git a/test/unittest/script/BUILD.gn b/test/unittest/script/BUILD.gn index e6db1be8775fcaa8152cdd454a27c51dabce8b1d..9aa58ee5bd9dea1249baf0d5e5b69d4d88cd5499 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", diff --git a/test/unittest/script/threadpool_unittest.cpp b/test/unittest/script/threadpool_unittest.cpp index 5e13faca0f584d262ada8cb10d810ebd4f4aec00..42d63bcad410081e059b4140e36bc3e594933731 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;