diff --git a/app_file_service.gni b/app_file_service.gni index 8a49035045e68705ecf5eaa89a6d1a304a0184e9..af510f1a35d829e303fa6fbaa6eb213d922a0bd8 100644 --- a/app_file_service.gni +++ b/app_file_service.gni @@ -12,7 +12,6 @@ # limitations under the License. third_party_path = "//third_party" -utils_system_safwk_path = "//utils/system/safwk" path_base = "//commonlibrary/c_utils/base" path_napi = "//foundation/arkui/napi" app_file_service_path = "//foundation/filemanagement/app_file_service" diff --git a/backup.gni b/backup.gni index 3b07587daed90cb5f72e23289b33596f1e44f92c..49270a3da5423d107d3de8f1709f86dc94a4f801 100644 --- a/backup.gni +++ b/backup.gni @@ -23,7 +23,6 @@ path_faultloggerd = "//base/hiviewdfx/faultloggerd" path_file_api = "//foundation/filemanagement/file_api" path_googletest = "//third_party/googletest" path_ipc = "//foundation/communication/ipc" -path_jsoncpp = "//third_party/jsoncpp" path_rust = "//third_party/rust" path_napi = "//foundation/arkui/napi" path_samgr = "//foundation/systemabilitymgr/samgr" diff --git a/bundle.json b/bundle.json index d81e5f73a9067cf8bbc51de3e9539ff9991670e6..b8d6fb7fd727ca9b48cd0bc433c0944583e75ba2 100644 --- a/bundle.json +++ b/bundle.json @@ -36,7 +36,9 @@ "hisysevent", "ipc", "init", + "jsoncpp", "napi", + "openssl", "safwk", "samgr", "storage_service", @@ -44,9 +46,7 @@ "zlib" ], "third_party": [ - "bounds_checking_function", - "jsoncpp", - "openssl" + "bounds_checking_function" ] }, "adapted_system_type": [ diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index ec60d87cd3bd9daefbf3ce130e531ec2dbe684c4..b3d8f02802052aa3502e3e70bbb62d363cf6e549 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -44,19 +44,12 @@ 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}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -74,6 +67,7 @@ ohos_shared_library("backup_extension_ability_native") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/interfaces/api/js/napi/backup_ext/BUILD.gn b/interfaces/api/js/napi/backup_ext/BUILD.gn index 04ca0cb3767ad7241b801797419b547c9be1a438..f3ab4f82e5315703c4d6434c9892def8df8f35e0 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 fbcecb500f13f9abb2c36e32dd50060a0a6f4d91..1d6fff54097f600aa8dfccc553e3f420076dbf6c 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/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn index 2085208753003dd53c303ea281a18a6210ec6c04..4ca8a081539ead5386467032d81f6c4408db4724 100644 --- a/interfaces/innerkits/native/BUILD.gn +++ b/interfaces/innerkits/native/BUILD.gn @@ -135,10 +135,8 @@ 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", + "remote_file_share/include", "../../common/include", ".", ] @@ -165,6 +163,7 @@ ohos_shared_library("remote_file_share_native") { "ability_base:zuri", "c_utils:utils", "hilog:libhilog", + "safwk:system_ability_fwk", ] if (defined(global_parts_info) && @@ -182,9 +181,7 @@ config("sandbox_helper_config") { visibility = [ ":*" ] include_dirs = [ "include", - "${utils_system_safwk_path}/native/include", "//third_party/json/include", - "${path_base}/include", "../../common/include", ".", ] @@ -210,6 +207,7 @@ ohos_shared_library("sandbox_helper_native") { "ability_base:zuri", "c_utils:utils", "hilog:libhilog", + "safwk:system_ability_fwk", ] innerapi_tags = [ "platformsdk_indirect" ] diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 5fb4dfb18fd0464b2bd5d3d442d12f722116611a..705a28a6e4169ff421a688b2303721178ca49908 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -139,7 +139,7 @@ ohos_shared_library("backup") { subsystem_name = "filemanagement" part_name = "app_file_service" - include_dirs = [ "${path_napi}/interfaces/kits" ] + include_dirs = [] defines = [ "LOG_DOMAIN=0xD004306", @@ -159,7 +159,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", ] cflags_cc = [ @@ -178,6 +177,7 @@ ohos_shared_library("backup") { "file_api:filemgmt_libn", "hilog:libhilog", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index b7ba886e93253f812d44cef4599d0214624bccc8..a2e53df3490e7c3f55bea8770654f249f20cb2cc 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -59,7 +59,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 = [ @@ -77,6 +76,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/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn index d091bc2ca7aac872ca61a246abff82fa08058d83..875364ac47c9b20be0abed805aa5021b3cfbe6d5 100644 --- a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn @@ -38,12 +38,12 @@ ohos_fuzztest("SvcRestoreDepsManagerFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "bounds_checking_function:libsec_shared", "hilog:libhilog", + "jsoncpp:jsoncpp", ] defines = [ diff --git a/test/unittest/remote_file_share/BUILD.gn b/test/unittest/remote_file_share/BUILD.gn index 13ca80d731ae785ee3a156467c9e5a0abb6e8815..afad4d938e95079a6613a6f415f1af572817ca45 100644 --- a/test/unittest/remote_file_share/BUILD.gn +++ b/test/unittest/remote_file_share/BUILD.gn @@ -34,7 +34,6 @@ ohos_unittest("remote_file_share_test") { "include", "../../../interfaces/innerkits/native/remote_file_share/include", "../../../interfaces/innerkits/native/remote_file_share/src", - "${utils_system_safwk_path}/native/include", "${path_base}/include", ] @@ -51,6 +50,7 @@ ohos_unittest("remote_file_share_test") { "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] } diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index aa8aa131721fa88c64b501c21696ca0fa93d05a2..3413f235d4061d133ec9e15b0d74b2ae9067794a 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -42,7 +42,6 @@ ohos_unittest("ext_extension_test") { deps = [ "${path_backup}/utils:backup_utils", - "${path_jsoncpp}:jsoncpp", "//third_party/googletest:gtest_main", ] @@ -59,6 +58,7 @@ ohos_unittest("ext_extension_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "ipc:ipc_napi", "napi:ace_napi", "safwk:system_ability_fwk", @@ -166,7 +166,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" ] @@ -185,6 +184,7 @@ ohos_unittest("tar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", @@ -243,7 +243,6 @@ ohos_unittest("untar_file_sup_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] cflags = [ "--coverage" ] @@ -262,6 +261,7 @@ ohos_unittest("untar_file_sup_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", @@ -317,7 +317,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" ] @@ -336,6 +335,7 @@ ohos_unittest("untar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", @@ -370,7 +370,6 @@ ohos_unittest("ext_backup_js_test") { "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", "${path_googletest}:gtest_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -387,6 +386,7 @@ ohos_unittest("ext_backup_js_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "ipc:ipc_napi", "napi:ace_napi", "safwk:system_ability_fwk", diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index d6891417596a7b6efac3dbc69dfaa91b4bec65c2..0d7785cec77d485b6d0b219e1ca9c434dbbb0141 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -117,7 +117,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 = [ @@ -132,6 +131,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", @@ -198,7 +198,6 @@ ohos_unittest("backup_service_throw_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -213,6 +212,7 @@ ohos_unittest("backup_service_throw_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -267,7 +267,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 = [ @@ -280,6 +279,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", @@ -383,7 +383,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 = [ @@ -398,6 +397,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", @@ -443,7 +443,6 @@ ohos_unittest("backup_service_incremental_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -458,6 +457,7 @@ ohos_unittest("backup_service_incremental_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -514,7 +514,6 @@ ohos_unittest("backup_service_other_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -529,6 +528,7 @@ ohos_unittest("backup_service_other_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 0a0c1d50a5090e3fa56cf0a24ab54176d2790ff6..3c242f8e47cd32bab5b1bfb1eb6a868d5a968cda 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -53,7 +53,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" ] @@ -67,6 +66,7 @@ ohos_unittest("backup_tool_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] @@ -115,7 +115,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" ] @@ -129,6 +128,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 4a16ef68cc82112f2fd75758e5f3cca2ca2b088a..fe9a7b8b8eb25412cdcd3520d6c4109c95b2c84d 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -86,12 +86,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 @@ -113,13 +113,13 @@ ohos_unittest("b_jsonutil_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "cJSON:cjson", "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] use_exceptions = true @@ -152,13 +152,13 @@ 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 = [ "cJSON:cjson", "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] defines = [ @@ -263,11 +263,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 @@ -295,13 +295,13 @@ ohos_unittest("b_json_other_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "cJSON:cjson", "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] defines = [ @@ -335,13 +335,13 @@ ohos_unittest("b_jsonutil_other_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "cJSON:cjson", "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] defines = [ @@ -376,13 +376,13 @@ ohos_unittest("b_json_clear_data_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", "${path_googletest}:gmock_main", - "${path_jsoncpp}:jsoncpp", ] external_deps = [ "cJSON:cjson", "c_utils:utils", "hilog:libhilog", + "jsoncpp:jsoncpp", ] defines = [ diff --git a/tools/backup_tool/BUILD.gn b/tools/backup_tool/BUILD.gn index a9e232cb3e7501268d80e340673648dc7fb8bc5f..5368c9de7b34f25c9b951954f58afef1aabd4788 100644 --- a/tools/backup_tool/BUILD.gn +++ b/tools/backup_tool/BUILD.gn @@ -39,7 +39,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 += [ @@ -59,6 +58,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 95b58a5ad5851f63727e2c5192bfc25fc293c607..1c8873856a3142f627e9cc57f2e2345ca7c1e363 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", ] } @@ -98,6 +97,8 @@ ohos_shared_library("backup_utils") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", + "openssl:libcrypto_shared", "zlib:shared_libz", ] @@ -110,8 +111,6 @@ ohos_shared_library("backup_utils") { deps = [ ":backup_cxx_cppdeps", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", - "${path_jsoncpp}:jsoncpp", - "//third_party/openssl:libcrypto_shared", ] cflags_cc = [