From 33ea55ed049489f42fcd4e30257fc05922b38895 Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 22 Apr 2025 12:54:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- interfaces/api/js/napi/backup_ext/BUILD.gn | 2 +- interfaces/api/js/napi/backup_ext_context/BUILD.gn | 2 +- test/fuzztest/fileshare_fuzzer/BUILD.gn | 1 + test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn | 2 ++ tests/unittests/backup_api/backup_impl/BUILD.gn | 1 + tests/unittests/backup_sa/module_external/BUILD.gn | 1 + tests/unittests/backup_sa/module_ipc/BUILD.gn | 1 + tests/unittests/backup_utils/BUILD.gn | 5 ++++- tests/utils/BUILD.gn | 1 + 9 files changed, 13 insertions(+), 3 deletions(-) diff --git a/interfaces/api/js/napi/backup_ext/BUILD.gn b/interfaces/api/js/napi/backup_ext/BUILD.gn index 04ca0cb37..f3ab4f82e 100644 --- a/interfaces/api/js/napi/backup_ext/BUILD.gn +++ b/interfaces/api/js/napi/backup_ext/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni") +import("//build/config/components/ets_frontend/es2abc_config.gni") import("//build/ohos.gni") import("//foundation/filemanagement/app_file_service/backup.gni") diff --git a/interfaces/api/js/napi/backup_ext_context/BUILD.gn b/interfaces/api/js/napi/backup_ext_context/BUILD.gn index fbcecb500..1d6fff540 100644 --- a/interfaces/api/js/napi/backup_ext_context/BUILD.gn +++ b/interfaces/api/js/napi/backup_ext_context/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni") +import("//build/config/components/ets_frontend/es2abc_config.gni") import("//build/ohos.gni") import("//foundation/filemanagement/app_file_service/backup.gni") diff --git a/test/fuzztest/fileshare_fuzzer/BUILD.gn b/test/fuzztest/fileshare_fuzzer/BUILD.gn index d9f20cbec..8ea69eb4a 100644 --- a/test/fuzztest/fileshare_fuzzer/BUILD.gn +++ b/test/fuzztest/fileshare_fuzzer/BUILD.gn @@ -45,5 +45,6 @@ ohos_fuzztest("FileShareFuzzTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", ] } diff --git a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn index 749cdcc05..ad1cd813c 100644 --- a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn @@ -43,8 +43,10 @@ ohos_fuzztest("SvcRestoreDepsManagerFuzzTest") { external_deps = [ "bounds_checking_function:libsec_shared", + "c_utils:utils", "hilog:libhilog", "jsoncpp:jsoncpp", + "ipc:ipc_core", ] defines = [ diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn index f0ca34c4e..4e786fa21 100644 --- a/tests/unittests/backup_api/backup_impl/BUILD.gn +++ b/tests/unittests/backup_api/backup_impl/BUILD.gn @@ -80,6 +80,7 @@ ohos_unittest("backup_sa_impl_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "samgr:dynamic_cache", "samgr:samgr_proxy", ] diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn index 8ada8a2a2..bc93e53c7 100644 --- a/tests/unittests/backup_sa/module_external/BUILD.gn +++ b/tests/unittests/backup_sa/module_external/BUILD.gn @@ -55,6 +55,7 @@ ohos_unittest("bms_adapter_test") { "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "samgr:dynamic_cache", "storage_service:storage_manager_sa_proxy", ] diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 9fec3e011..c5d413791 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -281,6 +281,7 @@ ohos_unittest("backup_service_session_test") { "ipc:ipc_core", "jsoncpp:jsoncpp", "safwk:system_ability_fwk", + "samgr:dynamic_cache", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", ] diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index 79370309e..9a1d70671 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -57,7 +57,10 @@ ohos_unittest("b_error_test") { "${path_backup}/utils/:backup_utils", ] - external_deps = [ "hilog:libhilog" ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + ] defines = [ "private = public" ] diff --git a/tests/utils/BUILD.gn b/tests/utils/BUILD.gn index ca63cd1ca..999fea459 100644 --- a/tests/utils/BUILD.gn +++ b/tests/utils/BUILD.gn @@ -38,6 +38,7 @@ ohos_static_library("backup_test_utils") { deps = [ "${path_backup}/utils:backup_utils" ] external_deps = [ + "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", -- Gitee From 21c7dbc7ed9e86538a8bde11b68a436930b2809a Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 22 Apr 2025 15:14:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- test/fuzztest/fileshare_fuzzer/BUILD.gn | 2 +- test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn | 2 +- tests/unittests/backup_sa/module_external/BUILD.gn | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/fuzztest/fileshare_fuzzer/BUILD.gn b/test/fuzztest/fileshare_fuzzer/BUILD.gn index 8ea69eb4a..f2a854d5b 100644 --- a/test/fuzztest/fileshare_fuzzer/BUILD.gn +++ b/test/fuzztest/fileshare_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("FileShareFuzzTest") { external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libnativetoken", - "access_token:libtoken_setproc", "access_token:libnativetoken_shared", + "access_token:libtoken_setproc", ] } diff --git a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn index ad1cd813c..15294692a 100644 --- a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn @@ -45,8 +45,8 @@ ohos_fuzztest("SvcRestoreDepsManagerFuzzTest") { "bounds_checking_function:libsec_shared", "c_utils:utils", "hilog:libhilog", - "jsoncpp:jsoncpp", "ipc:ipc_core", + "jsoncpp:jsoncpp", ] defines = [ diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn index bc93e53c7..a161cb536 100644 --- a/tests/unittests/backup_sa/module_external/BUILD.gn +++ b/tests/unittests/backup_sa/module_external/BUILD.gn @@ -54,8 +54,8 @@ ohos_unittest("bms_adapter_test") { "ipc:ipc_core", "jsoncpp:jsoncpp", "safwk:system_ability_fwk", - "samgr:samgr_proxy", "samgr:dynamic_cache", + "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", ] -- Gitee