From 1042ef92382699bcbe7d90154680f1c16b47d4e0 Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Thu, 23 May 2024 02:55:12 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!974=20:?= =?UTF-8?q?=20=20binary=E4=BE=9D=E8=B5=96=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=9D=99=E6=80=81=E5=BA=93'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/kits/misc_info/BUILD.gn | 3 +-- interfaces/kits/packages/BUILD.gn | 4 +++- interfaces/kits/updaterkits/BUILD.gn | 5 ++--- services/BUILD.gn | 13 ++++++------- services/applypatch/BUILD.gn | 3 +-- services/diffpatch/patch_shared/BUILD.gn | 4 ++-- services/flashd/BUILD.gn | 8 ++++---- services/flow_update/update_bin/BUILD.gn | 4 ++-- services/fs_manager/BUILD.gn | 4 ++-- services/hdi/server/BUILD.gn | 10 ---------- services/package/BUILD.gn | 2 -- services/ptable_parse/BUILD.gn | 8 +++----- services/script/BUILD.gn | 2 +- services/sdcard_update/BUILD.gn | 2 +- services/updater_binary/BUILD.gn | 11 +++-------- .../fuzztest/UpdaterFormatPartition_fuzzer/BUILD.gn | 2 +- test/fuzztest/UpdaterMountForPath_fuzzer/BUILD.gn | 2 +- .../UpdaterStartUpdaterProc_fuzzer/BUILD.gn | 2 +- test/fuzztest/applypatch_fuzzer/BUILD.gn | 2 +- test/fuzztest/binflow_fuzzer/BUILD.gn | 2 +- test/fuzztest/dopartitions_fuzzer/BUILD.gn | 2 +- test/fuzztest/getupdatepackageinfo_fuzzer/BUILD.gn | 2 +- test/fuzztest/package_fuzzer/BUILD.gn | 2 +- test/fuzztest/readfstabfromfile_fuzzer/BUILD.gn | 2 +- .../rebootandinstallupgradepackage_fuzzer/BUILD.gn | 2 +- test/fuzztest/updaterfactoryreset_fuzzer/BUILD.gn | 2 +- test/fuzztest/updatermain_fuzzer/BUILD.gn | 2 +- test/fuzztest/updaterutils_fuzzer/BUILD.gn | 2 +- test/fuzztest/writeupdatermsg_fuzzer/BUILD.gn | 2 +- test/unittest/BUILD.gn | 2 +- test/unittest/applypatch_test/BUILD.gn | 2 +- test/unittest/flashd_test/BUILD.gn | 4 ++-- test/unittest/flow_update/update_bin/BUILD.gn | 2 +- test/unittest/service_test/BUILD.gn | 2 +- test/unittest/updater_binary/BUILD.gn | 2 +- test/unittest/utils/BUILD.gn | 2 +- utils/BUILD.gn | 11 +++++------ 37 files changed, 58 insertions(+), 80 deletions(-) diff --git a/interfaces/kits/misc_info/BUILD.gn b/interfaces/kits/misc_info/BUILD.gn index c7e15eb7..c0400830 100755 --- a/interfaces/kits/misc_info/BUILD.gn +++ b/interfaces/kits/misc_info/BUILD.gn @@ -40,8 +40,7 @@ ohos_static_library("libmiscinfo") { external_deps = [ "bounds_checking_function:libsec_static", - "init:libbegetutil_static", - "init:libfsmanager_static_real", + "init:libbegetutil", ] subsystem_name = "updater" diff --git a/interfaces/kits/packages/BUILD.gn b/interfaces/kits/packages/BUILD.gn index 73dc1383..0de947ca 100755 --- a/interfaces/kits/packages/BUILD.gn +++ b/interfaces/kits/packages/BUILD.gn @@ -75,7 +75,9 @@ ohos_static_library("libpackageExt") { external_deps = [ "bounds_checking_function:libsec_static", "lz4:liblz4_static", - "openssl:libcrypto_static", + "openssl:libcrypto_shared", + "openssl:libssl_shared", + "zlib:libz", ] subsystem_name = "updater" part_name = "updater" diff --git a/interfaces/kits/updaterkits/BUILD.gn b/interfaces/kits/updaterkits/BUILD.gn index 1669b652..e0b2b329 100755 --- a/interfaces/kits/updaterkits/BUILD.gn +++ b/interfaces/kits/updaterkits/BUILD.gn @@ -34,8 +34,7 @@ ohos_shared_library("libupdater_shared") { external_deps = [ "bounds_checking_function:libsec_shared", - "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", "lz4:liblz4_static", "openssl:libcrypto_shared", "openssl:libssl_shared", @@ -73,7 +72,7 @@ ohos_static_library("libupdaterkits") { external_deps = [ "bounds_checking_function:libsec_static", - "init:libbegetutil_static", + "init:libbegetutil", ] subsystem_name = "updater" part_name = "updater" diff --git a/services/BUILD.gn b/services/BUILD.gn index 13ade8ea..588e428c 100755 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -45,7 +45,6 @@ updater_common_deps = [ updater_gen("updater") { deps = [ "${updater_path}/services:libupdater_static" ] - external_deps = [ "hilog:libhilog" ] # force link flashd library ldflags = [ @@ -94,7 +93,7 @@ ohos_static_library("libupdater_static") { "bounds_checking_function:libsec_static", "bzip2:libbz2", "cJSON:cjson", - "init:libbegetutil_static", + "init:libbegetutil", "libdrm:libdrm", "openssl:libcrypto_shared", "openssl:libssl_shared", @@ -110,8 +109,8 @@ ohos_static_library("libupdater_static") { if (build_selinux) { external_deps += [ - "selinux:libselinux_static", - "selinux_adapter:librestorecon_static", + "selinux:libselinux", + "selinux_adapter:librestorecon", ] cflags = [ "-DWITH_SELINUX" ] } @@ -171,7 +170,7 @@ ohos_static_library("libupdater") { "bounds_checking_function:libsec_static", "bzip2:libbz2", "cJSON:cjson", - "init:libbegetutil_static", + "init:libbegetutil", "openssl:libcrypto_shared", "openssl:libssl_shared", "zlib:libz", @@ -192,8 +191,8 @@ ohos_static_library("libupdater") { if (build_selinux) { external_deps += [ - "selinux:libselinux_static", - "selinux_adapter:librestorecon_static", + "selinux:libselinux", + "selinux_adapter:librestorecon", ] cflags = [ "-DWITH_SELINUX" ] } diff --git a/services/applypatch/BUILD.gn b/services/applypatch/BUILD.gn index 9fd0b799..03a9f633 100644 --- a/services/applypatch/BUILD.gn +++ b/services/applypatch/BUILD.gn @@ -51,8 +51,7 @@ ohos_static_library("libapplypatch") { external_deps = [ "bounds_checking_function:libsec_static", "bzip2:libbz2", - "init:libbegetutil_static", - "init:libfsmanager_static_real", + "init:libbegetutil", "openssl:libcrypto_static", "zlib:libz", ] diff --git a/services/diffpatch/patch_shared/BUILD.gn b/services/diffpatch/patch_shared/BUILD.gn index 3b26f4cb..c2e21f1f 100644 --- a/services/diffpatch/patch_shared/BUILD.gn +++ b/services/diffpatch/patch_shared/BUILD.gn @@ -56,8 +56,8 @@ ohos_shared_library("libupdater_patch_shared") { ] external_deps = [ - "init:libbegetutil_static", - "init:libfsmanager_static_real", + "init:libbegetutil", + "init:libfsmanager_static", ] output_extension = "so" diff --git a/services/flashd/BUILD.gn b/services/flashd/BUILD.gn index f0a55538..aad0f9d2 100644 --- a/services/flashd/BUILD.gn +++ b/services/flashd/BUILD.gn @@ -110,7 +110,7 @@ ohos_static_library("flashd_deamon") { } if (use_musl) { - external_deps += [ "init:libbegetutil_static" ] + external_deps += [ "init:libbegetutil" ] } include_dirs = [ @@ -130,7 +130,7 @@ ohos_static_library("flashd_deamon") { ] if (build_selinux) { - external_deps += [ "selinux:libselinux_static" ] + external_deps += [ "selinux:libselinux" ] defines += [ "SURPPORT_SELINUX", "UPDATER_MODE", @@ -217,7 +217,7 @@ ohos_static_library("libflashd") { "bzip2:libbz2", "cJSON:cjson", "c_utils:utils", - "init:libbegetutil_static", + "init:libbegetutil", "libuv:uv", "lz4:liblz4_static", "openssl:libcrypto_shared", @@ -229,7 +229,7 @@ ohos_static_library("libflashd") { } if (build_selinux) { - external_deps += [ "selinux:libselinux_static" ] + external_deps += [ "selinux:libselinux" ] defines += [ "SURPPORT_SELINUX" ] } diff --git a/services/flow_update/update_bin/BUILD.gn b/services/flow_update/update_bin/BUILD.gn index aac107bc..903a3575 100644 --- a/services/flow_update/update_bin/BUILD.gn +++ b/services/flow_update/update_bin/BUILD.gn @@ -48,8 +48,8 @@ ohos_static_library("libBinFlowUpdate") { ] external_deps = [ "bounds_checking_function:libsec_static", - "init:libbegetutil_static", - "init:libfsmanager_static_real", + "init:libbegetutil", + "init:libfsmanager_static", "openssl:libcrypto_static", ] if (defined(use_ptable)) { diff --git a/services/fs_manager/BUILD.gn b/services/fs_manager/BUILD.gn index d39aecba..46788c02 100644 --- a/services/fs_manager/BUILD.gn +++ b/services/fs_manager/BUILD.gn @@ -42,8 +42,8 @@ ohos_static_library("libfsmanager") { external_deps = [ "bounds_checking_function:libsec_static", - "init:libbegetutil_static", - "init:libfsmanager_static_real", + "init:libbegetutil", + "init:libfsmanager_static", ] subsystem_name = "updater" part_name = "updater" diff --git a/services/hdi/server/BUILD.gn b/services/hdi/server/BUILD.gn index 08015f3e..0022bba1 100644 --- a/services/hdi/server/BUILD.gn +++ b/services/hdi/server/BUILD.gn @@ -25,13 +25,3 @@ ohos_shared_library("libupdate_hdi_impl") { subsystem_name = "updater" part_name = "updater" } - -ohos_static_library("libupdate_hdi_impl_static") { - sources = [ "update_hdi_impl.cpp" ] - - include_dirs = [ "${updater_path}/interfaces/kits/include" ] - - deps = [] - subsystem_name = "updater" - part_name = "updater" -} diff --git a/services/package/BUILD.gn b/services/package/BUILD.gn index 61704279..82cbf484 100644 --- a/services/package/BUILD.gn +++ b/services/package/BUILD.gn @@ -41,10 +41,8 @@ config("package_config") { config("libupdaterpackage_exported_headers") { visibility = [ ":*" ] include_dirs = [ - "${updater_path}/services", "${updater_path}/services/include/package", "${updater_path}/services/include", - "${updater_path}/services/package", "${updater_path}/services/package/pkg_manager", "${updater_path}/services/package/pkg_verify", "${updater_path}/services/include/script", diff --git a/services/ptable_parse/BUILD.gn b/services/ptable_parse/BUILD.gn index b54c369e..06ce6264 100644 --- a/services/ptable_parse/BUILD.gn +++ b/services/ptable_parse/BUILD.gn @@ -33,10 +33,7 @@ config("updater_config") { config("libptableparse_exported_headers") { visibility = [ ":*" ] - include_dirs = [ - "${updater_path}/services/include", - "${updater_path}/services", - ] + include_dirs = [ "${updater_path}/services/include" ] } ohos_static_library("libptableparse") { @@ -62,7 +59,8 @@ ohos_static_library("libptableparse") { external_deps = [ "bounds_checking_function:libsec_static", "bzip2:libbz2", - "cJSON:cjson_static", + "cJSON:cjson", + "zlib:libz", ] part_name = "updater" diff --git a/services/script/BUILD.gn b/services/script/BUILD.gn index 07c8254d..f235fe47 100644 --- a/services/script/BUILD.gn +++ b/services/script/BUILD.gn @@ -112,7 +112,7 @@ ohos_static_library("libupdaterscript") { external_deps = [ "bounds_checking_function:libsec_static", - "c_utils:utilsbase", + "c_utils:utils", ] deps = [ "${updater_path}/services/script:gen_yacc", diff --git a/services/sdcard_update/BUILD.gn b/services/sdcard_update/BUILD.gn index e8c032ea..6f424b5e 100644 --- a/services/sdcard_update/BUILD.gn +++ b/services/sdcard_update/BUILD.gn @@ -32,7 +32,7 @@ ohos_static_library("libsdupdate") { deps = [ "${updater_path}/utils:libutils" ] external_deps = [ "bounds_checking_function:libsec_static", - "init:libbegetutil_static", + "init:libbegetutil", ] subsystem_name = "updater" part_name = "updater" diff --git a/services/updater_binary/BUILD.gn b/services/updater_binary/BUILD.gn index cfc4651e..54637276 100644 --- a/services/updater_binary/BUILD.gn +++ b/services/updater_binary/BUILD.gn @@ -32,14 +32,9 @@ config("updater_config") { ] } -config("updater_binary_lc++") { - ldflags = [ "-lc++" ] -} - updater_gen("updater_binary") { - static_link = true deps = [ "${updater_path}/services/updater_binary:libupdater_binary" ] - configs = [ ":updater_binary_lc++" ] + part_name = "updater" subsystem_name = "updater" } @@ -81,8 +76,8 @@ ohos_static_library("libupdater_binary") { "bounds_checking_function:libsec_static", "bzip2:libbz2", "cJSON:cjson_static", - "init:libbegetutil_static", - "init:libfsmanager_static_real", + "init:libbegetutil", + "init:libfsmanager_static", "lz4:liblz4_static", "openssl:libcrypto_static", "openssl:libssl_static", diff --git a/test/fuzztest/UpdaterFormatPartition_fuzzer/BUILD.gn b/test/fuzztest/UpdaterFormatPartition_fuzzer/BUILD.gn index 28885034..06bc213c 100644 --- a/test/fuzztest/UpdaterFormatPartition_fuzzer/BUILD.gn +++ b/test/fuzztest/UpdaterFormatPartition_fuzzer/BUILD.gn @@ -47,7 +47,7 @@ ohos_fuzztest("UpdaterFormatPartitionFuzzTest") { "${updater_path}/utils:libutils", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] cflags = [ "-g", diff --git a/test/fuzztest/UpdaterMountForPath_fuzzer/BUILD.gn b/test/fuzztest/UpdaterMountForPath_fuzzer/BUILD.gn index 33e446a0..bd56e601 100644 --- a/test/fuzztest/UpdaterMountForPath_fuzzer/BUILD.gn +++ b/test/fuzztest/UpdaterMountForPath_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("UpdaterMountForPathFuzzTest") { "${updater_path}/services/log:libupdaterlog", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] cflags = [ "-g", diff --git a/test/fuzztest/UpdaterStartUpdaterProc_fuzzer/BUILD.gn b/test/fuzztest/UpdaterStartUpdaterProc_fuzzer/BUILD.gn index ba2419b4..99d7bc1d 100644 --- a/test/fuzztest/UpdaterStartUpdaterProc_fuzzer/BUILD.gn +++ b/test/fuzztest/UpdaterStartUpdaterProc_fuzzer/BUILD.gn @@ -70,7 +70,7 @@ ohos_fuzztest("UpdaterStartUpdaterProcFuzzTest") { "//third_party/zlib:libz", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] if (updater_ui_support) { external_deps += [ "ui_lite:libupdater_layout" ] } diff --git a/test/fuzztest/applypatch_fuzzer/BUILD.gn b/test/fuzztest/applypatch_fuzzer/BUILD.gn index 3819d902..7065fd70 100644 --- a/test/fuzztest/applypatch_fuzzer/BUILD.gn +++ b/test/fuzztest/applypatch_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("ApplyPatchFuzzTest") { external_deps = [ "c_utils:utils", - "init:libbegetutil_static", + "init:libbegetutil", ] cflags = [ diff --git a/test/fuzztest/binflow_fuzzer/BUILD.gn b/test/fuzztest/binflow_fuzzer/BUILD.gn index 6528da80..b60a0ecd 100644 --- a/test/fuzztest/binflow_fuzzer/BUILD.gn +++ b/test/fuzztest/binflow_fuzzer/BUILD.gn @@ -75,7 +75,7 @@ ohos_fuzztest("BinFlowFuzzTest") { ] external_deps = [ "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", ] cflags = [ diff --git a/test/fuzztest/dopartitions_fuzzer/BUILD.gn b/test/fuzztest/dopartitions_fuzzer/BUILD.gn index 8b260cd1..f1fa8354 100644 --- a/test/fuzztest/dopartitions_fuzzer/BUILD.gn +++ b/test/fuzztest/dopartitions_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("DoPartitionsFuzzTest") { external_deps = [ "c_utils:utils", - "init:libbegetutil_static", + "init:libbegetutil", ] cflags = [ diff --git a/test/fuzztest/getupdatepackageinfo_fuzzer/BUILD.gn b/test/fuzztest/getupdatepackageinfo_fuzzer/BUILD.gn index 3a920e43..ae6db5af 100644 --- a/test/fuzztest/getupdatepackageinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/getupdatepackageinfo_fuzzer/BUILD.gn @@ -50,7 +50,7 @@ ohos_fuzztest("GetUpdatePackageInfoFuzzTest") { external_deps = [ "c_utils:utils", - "init:libbegetutil_static", + "init:libbegetutil", ] cflags = [ diff --git a/test/fuzztest/package_fuzzer/BUILD.gn b/test/fuzztest/package_fuzzer/BUILD.gn index 3cc949c6..13d5ef6e 100644 --- a/test/fuzztest/package_fuzzer/BUILD.gn +++ b/test/fuzztest/package_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("PackageFuzzTest") { external_deps = [ "c_utils:utils", - "init:libbegetutil_static", + "init:libbegetutil", ] cflags = [ diff --git a/test/fuzztest/readfstabfromfile_fuzzer/BUILD.gn b/test/fuzztest/readfstabfromfile_fuzzer/BUILD.gn index 80807e39..01703bb0 100644 --- a/test/fuzztest/readfstabfromfile_fuzzer/BUILD.gn +++ b/test/fuzztest/readfstabfromfile_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("ReadFstabFromFileFuzzTest") { "${updater_path}/services/log:libupdaterlog", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] cflags = [ "-g", diff --git a/test/fuzztest/rebootandinstallupgradepackage_fuzzer/BUILD.gn b/test/fuzztest/rebootandinstallupgradepackage_fuzzer/BUILD.gn index eae493f5..139913cc 100644 --- a/test/fuzztest/rebootandinstallupgradepackage_fuzzer/BUILD.gn +++ b/test/fuzztest/rebootandinstallupgradepackage_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("RebootAndInstallUpgradePackageFuzzTest") { external_deps = [ "c_utils:utils", - "init:libbegetutil_static", + "init:libbegetutil", ] cflags = [ diff --git a/test/fuzztest/updaterfactoryreset_fuzzer/BUILD.gn b/test/fuzztest/updaterfactoryreset_fuzzer/BUILD.gn index ea0baaf6..b0f75d44 100644 --- a/test/fuzztest/updaterfactoryreset_fuzzer/BUILD.gn +++ b/test/fuzztest/updaterfactoryreset_fuzzer/BUILD.gn @@ -68,7 +68,7 @@ ohos_fuzztest("UpdaterFactoryResetFuzzTest") { "//third_party/zlib:libz", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] if (updater_ui_support) { external_deps += [ "ui_lite:libupdater_layout" ] } diff --git a/test/fuzztest/updatermain_fuzzer/BUILD.gn b/test/fuzztest/updatermain_fuzzer/BUILD.gn index a950608a..9d396b27 100644 --- a/test/fuzztest/updatermain_fuzzer/BUILD.gn +++ b/test/fuzztest/updatermain_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("UpdaterMainFuzzTest") { "//third_party/zlib:libz", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] cflags = [ "-g", diff --git a/test/fuzztest/updaterutils_fuzzer/BUILD.gn b/test/fuzztest/updaterutils_fuzzer/BUILD.gn index 0297128b..f4c3365e 100644 --- a/test/fuzztest/updaterutils_fuzzer/BUILD.gn +++ b/test/fuzztest/updaterutils_fuzzer/BUILD.gn @@ -39,7 +39,7 @@ ohos_fuzztest("UpdaterUtilsFuzzTest") { external_deps = [ "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", ] deps = [ diff --git a/test/fuzztest/writeupdatermsg_fuzzer/BUILD.gn b/test/fuzztest/writeupdatermsg_fuzzer/BUILD.gn index b354cfe6..963d8b37 100644 --- a/test/fuzztest/writeupdatermsg_fuzzer/BUILD.gn +++ b/test/fuzztest/writeupdatermsg_fuzzer/BUILD.gn @@ -39,7 +39,7 @@ ohos_fuzztest("WriteUpdaterMsgFuzzTest") { "//third_party/bounds_checking_function:libsec_static", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] cflags = [ "-g", diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 2e2a3018..14014f62 100755 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -197,7 +197,7 @@ ohos_unittest("updater_unittest") { external_deps = [ "hilog:libhilog_base", - "init:libbegetutil_static", + "init:libbegetutil", ] public_configs = [ ":utest_config" ] diff --git a/test/unittest/applypatch_test/BUILD.gn b/test/unittest/applypatch_test/BUILD.gn index 5209f50a..8349c83f 100644 --- a/test/unittest/applypatch_test/BUILD.gn +++ b/test/unittest/applypatch_test/BUILD.gn @@ -71,7 +71,7 @@ ohos_unittest("applypatch_unittest") { "//third_party/openssl:libcrypto_shared", "//third_party/openssl:libssl_shared", ] - external_deps = [ "init:libbegetutil_static" ] + external_deps = [ "init:libbegetutil" ] configs = [ "${updater_path}/test/unittest:utest_config" ] install_enable = true part_name = "updater" diff --git a/test/unittest/flashd_test/BUILD.gn b/test/unittest/flashd_test/BUILD.gn index de4ed389..e6e2aef5 100644 --- a/test/unittest/flashd_test/BUILD.gn +++ b/test/unittest/flashd_test/BUILD.gn @@ -105,7 +105,7 @@ ohos_unittest("flashd_unittest") { external_deps = [ "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", ] configs = [ "${updater_path}/test/unittest:utest_config" ] install_enable = true @@ -134,7 +134,7 @@ ohos_unittest("flashd_util_unittest") { external_deps = [ "c_utils:utils", "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", ] deps = [ "//third_party/libuv:uv" ] configs = [ "${updater_path}/test/unittest:utest_config" ] diff --git a/test/unittest/flow_update/update_bin/BUILD.gn b/test/unittest/flow_update/update_bin/BUILD.gn index 80be7137..6d2d9dc6 100644 --- a/test/unittest/flow_update/update_bin/BUILD.gn +++ b/test/unittest/flow_update/update_bin/BUILD.gn @@ -73,7 +73,7 @@ ohos_unittest("bin_flow_update_test") { ] external_deps = [ "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", ] defines = [ "UPDATER_UT" ] configs = [ "${updater_path}/test/unittest:utest_config" ] diff --git a/test/unittest/service_test/BUILD.gn b/test/unittest/service_test/BUILD.gn index 319a287f..4d7380b5 100644 --- a/test/unittest/service_test/BUILD.gn +++ b/test/unittest/service_test/BUILD.gn @@ -74,7 +74,7 @@ ohos_unittest("updater_service_unittest") { external_deps = [ "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", "ui_lite:libupdater_layout", ] configs = [ "${updater_path}/test/unittest:utest_config" ] diff --git a/test/unittest/updater_binary/BUILD.gn b/test/unittest/updater_binary/BUILD.gn index 534b09ee..3e9a9a3a 100644 --- a/test/unittest/updater_binary/BUILD.gn +++ b/test/unittest/updater_binary/BUILD.gn @@ -78,7 +78,7 @@ ohos_unittest("binary_unittest") { external_deps = [ "c_utils:utils", "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", ] install_enable = true part_name = "updater" diff --git a/test/unittest/utils/BUILD.gn b/test/unittest/utils/BUILD.gn index 7f5523eb..f3154d4c 100644 --- a/test/unittest/utils/BUILD.gn +++ b/test/unittest/utils/BUILD.gn @@ -43,7 +43,7 @@ ohos_unittest("utils_test") { ] external_deps = [ "hilog:libhilog", - "init:libbegetutil_static", + "init:libbegetutil", ] deps = [ "${updater_path}/interfaces/kits/misc_info:libmiscinfo", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 336a1f72..e3a30245 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -46,15 +46,14 @@ ohos_static_library("libutils") { deps = [] external_deps = [ "bounds_checking_function:libsec_static", - "cJSON:cjson_static", - "init:libbegetutil_static", - "init:libfsmanager_static_real", + "cJSON:cjson", + "init:libbegetutil", ] if (build_selinux) { external_deps += [ - "selinux:libselinux_static", - "selinux_adapter:librestorecon_static", + "selinux:libselinux", + "selinux_adapter:librestorecon", ] cflags = [ "-DWITH_SELINUX" ] } @@ -119,7 +118,7 @@ ohos_executable("write_updater") { deps = [ "${updater_path}/interfaces/kits/misc_info:libmiscinfo" ] external_deps = [ "bounds_checking_function:libsec_static", - "init:libbegetutil_static", + "init:libbegetutil", ] install_enable = true -- Gitee