From 94973a939c79307782d3de4b3ac99f9382b54b70 Mon Sep 17 00:00:00 2001 From: cuiruibin Date: Mon, 11 Mar 2024 16:35:45 +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: cuiruibin --- bundle.json | 9 ++++++--- frameworks/native/backup_ext/BUILD.gn | 11 +++-------- interfaces/innerkits/native/BUILD.gn | 15 ++++++--------- interfaces/kits/js/BUILD.gn | 2 +- services/backup_sa/BUILD.gn | 2 +- tests/unittests/backup_ext/BUILD.gn | 4 ++-- tests/unittests/backup_sa/module_ipc/BUILD.gn | 6 +++--- tests/unittests/backup_tools/BUILD.gn | 4 ++-- tests/unittests/backup_utils/BUILD.gn | 6 +++--- tools/backup_tool/BUILD.gn | 2 +- utils/BUILD.gn | 9 ++++----- 11 files changed, 32 insertions(+), 38 deletions(-) diff --git a/bundle.json b/bundle.json index ad8744a25..480370ef3 100644 --- a/bundle.json +++ b/bundle.json @@ -23,6 +23,7 @@ "ability_base", "ability_runtime", "access_token", + "ace_napi", "bundle_framework", "build_framework", "common_event_service", @@ -36,16 +37,18 @@ "hilog", "ipc", "init", + "jsoncpp", + "json", "napi", + "napi_common", "safwk", "samgr", "storage_service", - "sandbox_manager" + "sandbox_manager", + "openssl" ], "third_party": [ "bounds_checking_function", - "jsoncpp", - "openssl" ] }, "adapted_system_type": [ diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index eb044ee94..0f455ac5f 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -40,18 +40,11 @@ ohos_shared_library("backup_extension_ability_native") { "LOG_TAG=\"BackupExt\"", ] - include_dirs = [ - "include", - "${path_napi}/native_engine", - "${path_ability_runtime}/services/common/include", - "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common", - "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime", - ] + include_dirs = [ "include" ] deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -60,6 +53,7 @@ ohos_shared_library("backup_extension_ability_native") { "ability_runtime:abilitykit_native", "ability_runtime:app_context", "ability_runtime:appkit_native", + "ability_runtime:napi_common", "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", @@ -67,6 +61,7 @@ ohos_shared_library("backup_extension_ability_native") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", ] diff --git a/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn index 36fe53212..feb7c09a2 100644 --- a/interfaces/innerkits/native/BUILD.gn +++ b/interfaces/innerkits/native/BUILD.gn @@ -18,7 +18,6 @@ config("file_share_config") { visibility = [ ":*" ] include_dirs = [ "file_share/include", - "//third_party/json/include", "../../common/include", ] } @@ -27,7 +26,6 @@ config("file_uri_config") { visibility = [ ":*" ] include_dirs = [ "file_uri/include", - "//third_party/json/include", "../../common/include", ] } @@ -62,6 +60,7 @@ ohos_shared_library("fileshare_native") { "file_api:filemgmt_libn", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "napi:ace_napi", ] defines = [] @@ -91,10 +90,10 @@ ohos_shared_library("fileuri_native") { "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", + "json:nlohmann_json_static", "samgr:samgr_proxy", ] - innerapi_tags = [ "platformsdk" ] part_name = "app_file_service" subsystem_name = "filemanagement" } @@ -117,10 +116,7 @@ config("remote_file_share_config") { visibility = [ ":*" ] include_dirs = [ "include", - "${utils_system_safwk_path}/native/include", "remote_file_share/include", - "//third_party/json/include", - "${path_base}/include", "../../common/include", ".", ] @@ -139,6 +135,8 @@ ohos_shared_library("remote_file_share_native") { "ability_base:zuri", "c_utils:utils", "hilog:libhilog", + "init:libbegetutil", + "json:nlohmann_json_static", ] if (defined(global_parts_info) && @@ -156,9 +154,6 @@ config("sandbox_helper_config") { visibility = [ ":*" ] include_dirs = [ "include", - "${utils_system_safwk_path}/native/include", - "//third_party/json/include", - "${path_base}/include", "../../common/include", ".", ] @@ -176,6 +171,8 @@ ohos_shared_library("sandbox_helper_native") { "ability_base:zuri", "c_utils:utils", "hilog:libhilog", + "init:libbegetutil", + "json:nlohmann_json_static", ] innerapi_tags = [ "platformsdk_indirect" ] diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 2573f0e06..7d2104f25 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -127,7 +127,6 @@ ohos_shared_library("backup") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -136,6 +135,7 @@ ohos_shared_library("backup") { "file_api:filemgmt_libn", "hilog:libhilog", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", ] } diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index d4d08d4d3..716541f37 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -56,7 +56,6 @@ ohos_shared_library("backup_sa") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -71,6 +70,7 @@ ohos_shared_library("backup_sa") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index da0bb4a7e..3c7384cec 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -47,7 +47,6 @@ ohos_unittest("tar_file_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -66,6 +65,7 @@ ohos_unittest("tar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] @@ -116,7 +116,6 @@ ohos_unittest("untar_file_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -135,6 +134,7 @@ ohos_unittest("untar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 071568250..f4c1e24ac 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -98,7 +98,6 @@ ohos_unittest("backup_service_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -111,6 +110,7 @@ ohos_unittest("backup_service_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -162,7 +162,6 @@ ohos_unittest("backup_service_session_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -175,6 +174,7 @@ ohos_unittest("backup_service_session_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -271,7 +271,6 @@ ohos_unittest("backup_restore_deps_manager_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -284,6 +283,7 @@ ohos_unittest("backup_restore_deps_manager_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn index 862387a27..01383ce88 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -47,7 +47,6 @@ ohos_unittest("backup_tool_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -61,6 +60,7 @@ ohos_unittest("backup_tool_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] @@ -104,7 +104,6 @@ ohos_unittest("backup_tool_restore_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -118,6 +117,7 @@ ohos_unittest("backup_tool_restore_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index b67e7a51e..0a2bf8f5c 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -57,12 +57,12 @@ ohos_unittest("b_file_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] use_exceptions = true @@ -117,12 +117,12 @@ ohos_unittest("b_json_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] sanitize = { @@ -219,11 +219,11 @@ ohos_unittest("b_process_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] use_exceptions = true diff --git a/tools/backup_tool/BUILD.gn b/tools/backup_tool/BUILD.gn index f86768293..87c7cfd5d 100644 --- a/tools/backup_tool/BUILD.gn +++ b/tools/backup_tool/BUILD.gn @@ -31,7 +31,6 @@ ohos_executable("backup_tool") { deps += [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", ] sources += [ @@ -51,6 +50,7 @@ ohos_executable("backup_tool") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", ] defines += [ "BACKUP_TOOL_ENABLE=1" ] diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 5893b725e..f48d111a9 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -25,7 +25,6 @@ config("utils_public_config") { include_dirs = [ "include", "include/b_hilog", - "${path_base}/include", ] } @@ -99,6 +98,7 @@ ohos_shared_library("backup_utils") { configs = [ ":utils_private_config" ] public_configs = [ ":utils_public_config" ] + public_external_deps = [ "c_utils:utilsbase" ] external_deps = [ "cJSON:cjson", @@ -107,12 +107,13 @@ ohos_shared_library("backup_utils") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", + "openssl:libcrypto_shared", ] include_dirs = [ - "${path_init}/interfaces/innerkits/include/syspara", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", - "${path_rust}/crates/cxx/include", "${target_gen_dir}/rust/src", ] @@ -120,8 +121,6 @@ ohos_shared_library("backup_utils") { ":backup_cxx_cppdeps", ":backup_cxx_gen", ":backup_cxx_rust", - "${path_jsoncpp}:jsoncpp", - "//third_party/openssl:libcrypto_shared", ] use_exceptions = true -- Gitee From 9c8a2721380e40057258b6b9ce9e158df29a60c7 Mon Sep 17 00:00:00 2001 From: cuiruibin Date: Mon, 11 Mar 2024 16:35:45 +0800 Subject: [PATCH 2/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: cuiruibin --- bundle.json | 9 ++++++--- frameworks/native/backup_ext/BUILD.gn | 11 +++-------- interfaces/innerkits/native/BUILD.gn | 15 ++++++--------- interfaces/kits/js/BUILD.gn | 4 +--- services/backup_sa/BUILD.gn | 2 +- tests/unittests/backup_ext/BUILD.gn | 4 ++-- tests/unittests/backup_sa/module_ipc/BUILD.gn | 6 +++--- tests/unittests/backup_tools/BUILD.gn | 4 ++-- tests/unittests/backup_utils/BUILD.gn | 6 +++--- tools/backup_tool/BUILD.gn | 2 +- utils/BUILD.gn | 9 ++++----- 11 files changed, 32 insertions(+), 40 deletions(-) diff --git a/bundle.json b/bundle.json index ad8744a25..480370ef3 100644 --- a/bundle.json +++ b/bundle.json @@ -23,6 +23,7 @@ "ability_base", "ability_runtime", "access_token", + "ace_napi", "bundle_framework", "build_framework", "common_event_service", @@ -36,16 +37,18 @@ "hilog", "ipc", "init", + "jsoncpp", + "json", "napi", + "napi_common", "safwk", "samgr", "storage_service", - "sandbox_manager" + "sandbox_manager", + "openssl" ], "third_party": [ "bounds_checking_function", - "jsoncpp", - "openssl" ] }, "adapted_system_type": [ diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index eb044ee94..0f455ac5f 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -40,18 +40,11 @@ ohos_shared_library("backup_extension_ability_native") { "LOG_TAG=\"BackupExt\"", ] - include_dirs = [ - "include", - "${path_napi}/native_engine", - "${path_ability_runtime}/services/common/include", - "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common", - "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime", - ] + include_dirs = [ "include" ] deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -60,6 +53,7 @@ ohos_shared_library("backup_extension_ability_native") { "ability_runtime:abilitykit_native", "ability_runtime:app_context", "ability_runtime:appkit_native", + "ability_runtime:napi_common", "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", @@ -67,6 +61,7 @@ ohos_shared_library("backup_extension_ability_native") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", ] diff --git a/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn index 36fe53212..feb7c09a2 100644 --- a/interfaces/innerkits/native/BUILD.gn +++ b/interfaces/innerkits/native/BUILD.gn @@ -18,7 +18,6 @@ config("file_share_config") { visibility = [ ":*" ] include_dirs = [ "file_share/include", - "//third_party/json/include", "../../common/include", ] } @@ -27,7 +26,6 @@ config("file_uri_config") { visibility = [ ":*" ] include_dirs = [ "file_uri/include", - "//third_party/json/include", "../../common/include", ] } @@ -62,6 +60,7 @@ ohos_shared_library("fileshare_native") { "file_api:filemgmt_libn", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "napi:ace_napi", ] defines = [] @@ -91,10 +90,10 @@ ohos_shared_library("fileuri_native") { "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", + "json:nlohmann_json_static", "samgr:samgr_proxy", ] - innerapi_tags = [ "platformsdk" ] part_name = "app_file_service" subsystem_name = "filemanagement" } @@ -117,10 +116,7 @@ config("remote_file_share_config") { visibility = [ ":*" ] include_dirs = [ "include", - "${utils_system_safwk_path}/native/include", "remote_file_share/include", - "//third_party/json/include", - "${path_base}/include", "../../common/include", ".", ] @@ -139,6 +135,8 @@ ohos_shared_library("remote_file_share_native") { "ability_base:zuri", "c_utils:utils", "hilog:libhilog", + "init:libbegetutil", + "json:nlohmann_json_static", ] if (defined(global_parts_info) && @@ -156,9 +154,6 @@ config("sandbox_helper_config") { visibility = [ ":*" ] include_dirs = [ "include", - "${utils_system_safwk_path}/native/include", - "//third_party/json/include", - "${path_base}/include", "../../common/include", ".", ] @@ -176,6 +171,8 @@ ohos_shared_library("sandbox_helper_native") { "ability_base:zuri", "c_utils:utils", "hilog:libhilog", + "init:libbegetutil", + "json:nlohmann_json_static", ] innerapi_tags = [ "platformsdk_indirect" ] diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 2573f0e06..960d22b80 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -108,8 +108,6 @@ ohos_shared_library("backup") { subsystem_name = "filemanagement" part_name = "app_file_service" - include_dirs = [ "${path_napi}/interfaces/kits" ] - defines = [ "LOG_DOMAIN=0xD004306", "LOG_TAG=\"BackupNAPI\"", @@ -127,7 +125,6 @@ ohos_shared_library("backup") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -136,6 +133,7 @@ ohos_shared_library("backup") { "file_api:filemgmt_libn", "hilog:libhilog", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", ] } diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index d4d08d4d3..716541f37 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -56,7 +56,6 @@ ohos_shared_library("backup_sa") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -71,6 +70,7 @@ ohos_shared_library("backup_sa") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index da0bb4a7e..3c7384cec 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -47,7 +47,6 @@ ohos_unittest("tar_file_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -66,6 +65,7 @@ ohos_unittest("tar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] @@ -116,7 +116,6 @@ ohos_unittest("untar_file_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -135,6 +134,7 @@ ohos_unittest("untar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 071568250..f4c1e24ac 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -98,7 +98,6 @@ ohos_unittest("backup_service_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -111,6 +110,7 @@ ohos_unittest("backup_service_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -162,7 +162,6 @@ ohos_unittest("backup_service_session_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -175,6 +174,7 @@ ohos_unittest("backup_service_session_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -271,7 +271,6 @@ ohos_unittest("backup_restore_deps_manager_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -284,6 +283,7 @@ ohos_unittest("backup_restore_deps_manager_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn index 862387a27..01383ce88 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -47,7 +47,6 @@ ohos_unittest("backup_tool_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -61,6 +60,7 @@ ohos_unittest("backup_tool_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] @@ -104,7 +104,6 @@ ohos_unittest("backup_tool_restore_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -118,6 +117,7 @@ ohos_unittest("backup_tool_restore_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index b67e7a51e..0a2bf8f5c 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -57,12 +57,12 @@ ohos_unittest("b_file_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] use_exceptions = true @@ -117,12 +117,12 @@ ohos_unittest("b_json_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] sanitize = { @@ -219,11 +219,11 @@ ohos_unittest("b_process_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] use_exceptions = true diff --git a/tools/backup_tool/BUILD.gn b/tools/backup_tool/BUILD.gn index f86768293..87c7cfd5d 100644 --- a/tools/backup_tool/BUILD.gn +++ b/tools/backup_tool/BUILD.gn @@ -31,7 +31,6 @@ ohos_executable("backup_tool") { deps += [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", ] sources += [ @@ -51,6 +50,7 @@ ohos_executable("backup_tool") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", ] defines += [ "BACKUP_TOOL_ENABLE=1" ] diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 5893b725e..f48d111a9 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -25,7 +25,6 @@ config("utils_public_config") { include_dirs = [ "include", "include/b_hilog", - "${path_base}/include", ] } @@ -99,6 +98,7 @@ ohos_shared_library("backup_utils") { configs = [ ":utils_private_config" ] public_configs = [ ":utils_public_config" ] + public_external_deps = [ "c_utils:utilsbase" ] external_deps = [ "cJSON:cjson", @@ -107,12 +107,13 @@ ohos_shared_library("backup_utils") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", + "openssl:libcrypto_shared", ] include_dirs = [ - "${path_init}/interfaces/innerkits/include/syspara", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", - "${path_rust}/crates/cxx/include", "${target_gen_dir}/rust/src", ] @@ -120,8 +121,6 @@ ohos_shared_library("backup_utils") { ":backup_cxx_cppdeps", ":backup_cxx_gen", ":backup_cxx_rust", - "${path_jsoncpp}:jsoncpp", - "//third_party/openssl:libcrypto_shared", ] use_exceptions = true -- Gitee