From 63be2c9283e036c24d822cf82a8e7497c42e7114 Mon Sep 17 00:00:00 2001 From: zhouoaoteng Date: Thu, 5 Dec 2024 22:04:20 +0800 Subject: [PATCH] fix:gn Signed-off-by: zhouoaoteng --- app_file_service.gni | 1 - backup.gni | 1 - bundle.json | 6 +++--- frameworks/native/backup_ext/BUILD.gn | 10 ++-------- interfaces/api/js/napi/backup_ext/BUILD.gn | 2 +- interfaces/api/js/napi/backup_ext_context/BUILD.gn | 2 +- interfaces/innerkits/native/BUILD.gn | 8 +++----- interfaces/kits/js/BUILD.gn | 4 ++-- services/backup_sa/BUILD.gn | 2 +- .../fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn | 2 +- test/unittest/remote_file_share/BUILD.gn | 2 +- tests/unittests/backup_ext/BUILD.gn | 10 +++++----- tests/unittests/backup_sa/module_ipc/BUILD.gn | 12 ++++++------ tests/unittests/backup_tools/BUILD.gn | 4 ++-- tests/unittests/backup_utils/BUILD.gn | 14 +++++++------- tools/backup_tool/BUILD.gn | 2 +- utils/BUILD.gn | 5 ++--- 17 files changed, 38 insertions(+), 49 deletions(-) diff --git a/app_file_service.gni b/app_file_service.gni index 8a4903504..af510f1a3 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 3b07587da..49270a3da 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 d81e5f73a..b8d6fb7fd 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 77549cf68..78b5cf529 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", "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 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/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn index 208520875..4ca8a0815 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 5fb4dfb18..705a28a6e 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 b7ba886e9..a2e53df34 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 d091bc2ca..875364ac4 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 13ca80d73..afad4d938 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 849943f24..964982b74 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", "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -165,7 +165,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" ] @@ -184,6 +183,7 @@ ohos_unittest("tar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] @@ -241,7 +241,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" ] @@ -260,6 +259,7 @@ ohos_unittest("untar_file_sup_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] @@ -314,7 +314,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" ] @@ -333,6 +332,7 @@ ohos_unittest("untar_file_test") { "c_utils:utils", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "samgr:samgr_proxy", ] @@ -366,7 +366,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 = [ @@ -383,6 +382,7 @@ ohos_unittest("ext_backup_js_test") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 400061e87..b32710f00 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", @@ -192,7 +192,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 = [ @@ -207,6 +206,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", @@ -261,7 +261,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 = [ @@ -274,6 +273,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", @@ -377,7 +377,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 = [ @@ -392,6 +391,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", @@ -437,7 +437,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 = [ @@ -452,6 +451,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", @@ -508,7 +508,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 = [ @@ -523,6 +522,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 0a0c1d50a..3c242f8e4 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 2b543823f..806bec9a7 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -61,12 +61,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 @@ -88,13 +88,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 @@ -127,13 +127,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 = [ @@ -238,11 +238,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 @@ -270,13 +270,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 = [ @@ -310,13 +310,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 = [ @@ -351,13 +351,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 a9e232cb3..5368c9de7 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 95b58a5ad..1c8873856 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 = [ -- Gitee