From 18e635996be298409b91fcf7bf3955dd8255da87 Mon Sep 17 00:00:00 2001 From: sunjiakun Date: Thu, 14 Nov 2024 10:51:51 +0800 Subject: [PATCH] TDD alarm modification Signed-off-by: sunjiakun --- bundle.json | 10 ++++- .../common_appexecfwk_log_test/BUILD.gn | 7 +++- .../common_perf_profile_test/BUILD.gn | 3 +- interfaces/kits/js/zip/test/BUILD.gn | 6 +-- .../bms_ability_manager_helper_test/BUILD.gn | 3 +- .../bms_app_control_proxy_test/BUILD.gn | 2 +- .../bms_bundle_accesstokenid_test/BUILD.gn | 7 ++-- .../unittest/bms_bundle_aot_test/BUILD.gn | 6 +-- .../bms_bundle_app_control_test/BUILD.gn | 16 +++---- .../BUILD.gn | 7 ++-- .../bms_bundle_clone_app_test/BUILD.gn | 8 ++-- .../bms_bundle_clone_installer_test/BUILD.gn | 7 ++-- .../unittest/bms_bundle_common_test/BUILD.gn | 8 ++-- .../bms_bundle_crowdtesting_test/BUILD.gn | 7 ++-- .../bms_bundle_data_group_test/BUILD.gn | 3 +- .../bms_bundle_data_storage_test/BUILD.gn | 2 +- .../bms_bundle_default_app_test/BUILD.gn | 15 +++---- .../bms_bundle_dependencies_test/BUILD.gn | 7 ++-- .../BUILD.gn | 7 ++-- .../bms_bundle_free_install_test/BUILD.gn | 26 +++++------- .../bms_bundle_hap_verify_test/BUILD.gn | 7 ++-- .../unittest/bms_bundle_hsp_test/BUILD.gn | 21 ++++------ .../BUILD.gn | 14 +++---- .../bms_bundle_installer_proxy_test/BUILD.gn | 2 +- .../bms_bundle_installer_test/BUILD.gn | 42 +++++++++---------- .../bms_bundle_installers_test/BUILD.gn | 3 +- .../bms_bundle_kit_service_base_test/BUILD.gn | 11 +++-- .../bms_bundle_kit_service_test/BUILD.gn | 9 ++-- .../unittest/bms_bundle_manager_test/BUILD.gn | 3 +- .../bms_bundle_mgr_proxy_test/BUILD.gn | 2 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../bms_bundle_navigation_test/BUILD.gn | 8 ++-- .../unittest/bms_bundle_overlay_test/BUILD.gn | 30 ++++++------- .../bms_bundle_permission_grant_test/BUILD.gn | 18 +++++--- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 7 ++-- .../BUILD.gn | 11 +++-- .../bms_bundle_quick_fix_query_test/BUILD.gn | 7 ++-- .../BUILD.gn | 3 +- .../bms_bundle_quick_fix_test/BUILD.gn | 7 ++-- .../bms_bundle_rdb_data_manager_test/BUILD.gn | 4 +- .../bms_bundle_resource_info_test/BUILD.gn | 6 +-- .../bms_bundle_resource_manager_test/BUILD.gn | 7 ++-- .../bms_bundle_resource_test/BUILD.gn | 9 ++-- .../bms_bundle_sandbox_app_test/BUILD.gn | 6 ++- .../bms_bundle_uninstaller_test/BUILD.gn | 3 +- .../unittest/bms_bundle_updater_test/BUILD.gn | 3 +- .../bms_bundle_verifymanager_test/BUILD.gn | 4 +- .../test/unittest/bms_data_mgr_test/BUILD.gn | 6 ++- .../unittest/bms_event_handler_test/BUILD.gn | 6 ++- .../bms_extend_resource_manager_test/BUILD.gn | 8 ++-- .../unittest/bms_install_daemon_test/BUILD.gn | 3 +- .../bms_installd_client_test/BUILD.gn | 6 +-- .../unittest/bms_installd_host_test/BUILD.gn | 4 +- .../bms_service_bundle_scan_test/BUILD.gn | 8 ++-- .../bms_service_startup_test/BUILD.gn | 3 +- .../unittest/bms_syscap_tool_test/BUILD.gn | 3 +- 59 files changed, 226 insertions(+), 239 deletions(-) diff --git a/bundle.json b/bundle.json index f260209ef5..931bf0911f 100644 --- a/bundle.json +++ b/bundle.json @@ -46,6 +46,7 @@ "app_domain_verify", "appverify", "battery_manager", + "benchmark", "common_event_service", "config_policy", "c_utils", @@ -56,6 +57,7 @@ "eventhandler", "faultloggerd", "ffrt", + "googletest", "hicollie", "hisysevent", "hitrace", @@ -64,10 +66,15 @@ "init", "ipc", "image_framework", + "image_native", + "jsoncpp", + "libpng", + "libz", "napi", "os_account", "power_manager", "safwk", + "shared_icuuc", "resource_management", "samgr", "selinux_adapter", @@ -89,8 +96,7 @@ "webview" ], "third_party": [ - "libuv", - "jsoncpp" + "libuv" ] }, "build": { diff --git a/common/test/unittest/common_appexecfwk_log_test/BUILD.gn b/common/test/unittest/common_appexecfwk_log_test/BUILD.gn index 12a6b74240..96b5072181 100644 --- a/common/test/unittest/common_appexecfwk_log_test/BUILD.gn +++ b/common/test/unittest/common_appexecfwk_log_test/BUILD.gn @@ -28,9 +28,12 @@ ohos_unittest("AppExecFwkLogTest") { "${common_path}/test:common_test_config", ] - deps = [ "//third_party/googletest:gtest_main" ] + deps = [] - external_deps = [ "hilog:libhilog" ] + external_deps = [ + "googletest:gtest_main", + "hilog:libhilog", + ] } group("unittest") { diff --git a/common/test/unittest/common_perf_profile_test/BUILD.gn b/common/test/unittest/common_perf_profile_test/BUILD.gn index 5810bf7a0a..c09422a984 100644 --- a/common/test/unittest/common_perf_profile_test/BUILD.gn +++ b/common/test/unittest/common_perf_profile_test/BUILD.gn @@ -32,10 +32,11 @@ ohos_unittest("CommonPerfProfileTest") { "${inner_api_path}/appexecfwk_base:appexecfwk_base_sdk_config", ] - deps = [ "//third_party/googletest:gtest_main" ] + deps = [] external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", ] } diff --git a/interfaces/kits/js/zip/test/BUILD.gn b/interfaces/kits/js/zip/test/BUILD.gn index f2b0ad29fe..a8589a4310 100644 --- a/interfaces/kits/js/zip/test/BUILD.gn +++ b/interfaces/kits/js/zip/test/BUILD.gn @@ -51,17 +51,17 @@ ohos_unittest("zip_test") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${kits_path}/js/common:bundle_napi_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - "//third_party/zlib:libz", ] external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", + "zlib:libz", ] } diff --git a/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn index f3e7be0c43..7bc0306a87 100644 --- a/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn @@ -29,7 +29,7 @@ ohos_unittest("BmsAbilityManagerHelperTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -68,6 +68,7 @@ ohos_unittest("BmsAbilityManagerHelperTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_app_control_proxy_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_app_control_proxy_test/BUILD.gn index 2f608b5319..3385d78bb1 100644 --- a/services/bundlemgr/test/unittest/bms_app_control_proxy_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_app_control_proxy_test/BUILD.gn @@ -34,7 +34,6 @@ ohos_unittest("BmsAppControlProxyTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -44,6 +43,7 @@ ohos_unittest("BmsAppControlProxyTest") { "ability_runtime:app_manager", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/BUILD.gn index da77b3f149..832f0f8ed4 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/BUILD.gn @@ -26,10 +26,7 @@ ohos_unittest("BmsBundleAccessTokenIdTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -95,6 +92,8 @@ ohos_unittest("BmsBundleAccessTokenIdTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn index 841f8654c8..8526f1cee6 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn @@ -29,10 +29,7 @@ ohos_unittest("BmsAOTMgrTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/test/mock/include/parameter", - ] + include_dirs = [ "${services_path}/bundlemgr/test/mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -82,6 +79,7 @@ ohos_unittest("BmsAOTMgrTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_app_control_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_app_control_test/BUILD.gn index 8d282992dc..4f4b8dcf32 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_app_control_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_app_control_test/BUILD.gn @@ -24,11 +24,7 @@ ohos_unittest("BmsBundleAppControlTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - "${services_path}/bundlemgr/include/app_control", - ] + include_dirs = [ "${services_path}/bundlemgr/include/app_control" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -87,6 +83,8 @@ ohos_unittest("BmsBundleAppControlTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -192,11 +190,7 @@ ohos_unittest("BmsBundleMockAppControlTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - "${services_path}/bundlemgr/include/app_control", - ] + include_dirs = [ "${services_path}/bundlemgr/include/app_control" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -248,6 +242,8 @@ ohos_unittest("BmsBundleMockAppControlTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/BUILD.gn index 0e7ed46b1e..76b0e32e27 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleAppProvisionInfoTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -85,6 +82,8 @@ ohos_unittest("BmsBundleAppProvisionInfoTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/BUILD.gn index 909105c2bc..478c24c16f 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/BUILD.gn @@ -21,7 +21,6 @@ config("private_config") { "${inner_api_path}/appexecfwk_base/include", "${bundle_framework_path}/libs/test/mockpermission/permission", "${services_path}/bundlemgr/test/mock/include", - "//third_party/json/include", ] } @@ -35,7 +34,7 @@ ohos_unittest("BmsBundleCloneAppBundleLogicTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -77,6 +76,7 @@ ohos_unittest("BmsBundleCloneAppBundleLogicTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -242,7 +242,7 @@ ohos_unittest("BmsBundleCloneAppIpcTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -293,6 +293,8 @@ ohos_unittest("BmsBundleCloneAppIpcTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_clone_installer_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_clone_installer_test/BUILD.gn index d3a5dbc229..84ba4a7b9d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_clone_installer_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_clone_installer_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleCloneInstallerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] @@ -74,8 +74,6 @@ ohos_unittest("BmsBundleCloneInstallerTest") { "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/versionTest3:versionTest3", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/wrong_bundle_name:wrong_bundle_name", "${core_path}:appexecfwk_core", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] deps += bundle_install_deps @@ -87,9 +85,12 @@ ohos_unittest("BmsBundleCloneInstallerTest") { "appverify:libhapverify", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_common_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_common_test/BUILD.gn index 19b3f369da..3b22d37854 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_common_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_common_test/BUILD.gn @@ -24,11 +24,7 @@ ohos_unittest("BmsBundleCommonTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - "${services_path}/bundlemgr/include/common", - ] + include_dirs = [ "${services_path}/bundlemgr/include/common" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -84,6 +80,8 @@ ohos_unittest("BmsBundleCommonTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_crowdtesting_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_crowdtesting_test/BUILD.gn index db1bacd84a..c42215510c 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_crowdtesting_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_crowdtesting_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleCrowdtestingTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -85,6 +82,8 @@ ohos_unittest("BmsBundleCrowdtestingTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_data_group_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_data_group_test/BUILD.gn index 6ce0a281f2..b0495c740e 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_data_group_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_data_group_test/BUILD.gn @@ -29,7 +29,7 @@ ohos_unittest("BmsBundleDataGroupTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -73,6 +73,7 @@ ohos_unittest("BmsBundleDataGroupTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/BUILD.gn index 2afd2f0947..6114a89388 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/BUILD.gn @@ -20,7 +20,6 @@ config("private_config") { "${inner_api_path}/appexecfwk_base/include", "${bundle_framework_path}/libs/test/mockpermission/permission", "${services_path}/bundlemgr/test/mock/include", - "//third_party/json/include", ] } @@ -62,6 +61,7 @@ ohos_unittest("BmsBundleDataStorageDatabaseTest") { "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", + "json:nlohmann_json_static", ] defines = [] if (ability_runtime_enable) { diff --git a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn index 7a9fa91006..27bb8e0183 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleDefaultAppTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -80,6 +77,8 @@ ohos_unittest("BmsBundleDefaultAppTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -193,11 +192,7 @@ ohos_unittest("BmsBundleDefaultAppMgrTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - "${services_path}/bundlemgr/test/unittest/bms_bundle_default_app_test/mock/", - ] + include_dirs = [ "${services_path}/bundlemgr/test/unittest/bms_bundle_default_app_test/mock/" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -251,6 +246,8 @@ ohos_unittest("BmsBundleDefaultAppMgrTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_dependencies_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_dependencies_test/BUILD.gn index 9e6dc84269..2877ba52b1 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_dependencies_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_dependencies_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleDependenciesTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -86,6 +83,8 @@ ohos_unittest("BmsBundleDependenciesTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/BUILD.gn index 6ef281a0be..230d78a357 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleExceptionHandlerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = [ "${services_path}/bundlemgr/src/bundle_exception_handler.cpp", "${services_path}/bundlemgr/src/inner_bundle_info.cpp", @@ -56,6 +53,8 @@ ohos_unittest("BmsBundleExceptionHandlerTest") { "eventhandler:libeventhandler", "hilog:libhilog", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", ] external_deps += bundle_install_external_deps diff --git a/services/bundlemgr/test/unittest/bms_bundle_free_install_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_free_install_test/BUILD.gn index 87db1763a0..7f8b96f989 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_free_install_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_free_install_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleFreeInstallBaseTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -68,11 +65,7 @@ ohos_unittest("BmsBundleFreeInstallBaseTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${core_path}:appexecfwk_core", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] + deps = [ "${core_path}:appexecfwk_core" ] deps += bundle_install_deps external_deps = [ @@ -90,9 +83,13 @@ ohos_unittest("BmsBundleFreeInstallBaseTest") { "device_usage_statistics:usagestatsinner", "display_manager:displaymgr", "eventhandler:libeventhandler", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -198,10 +195,7 @@ ohos_unittest("BmsBundleFreeInstallTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -247,8 +241,6 @@ ohos_unittest("BmsBundleFreeInstallTest") { deps = [ "${base_path}:appexecfwk_base", "${core_path}:appexecfwk_core", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] deps += bundle_install_deps external_deps = [ @@ -266,9 +258,13 @@ ohos_unittest("BmsBundleFreeInstallTest") { "device_usage_statistics:usagestatsinner", "display_manager:displaymgr", "eventhandler:libeventhandler", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_bundle_hap_verify_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_hap_verify_test/BUILD.gn index 990805b942..9939636b56 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_hap_verify_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_hap_verify_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleHapVerifyTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -78,6 +75,8 @@ ohos_unittest("BmsBundleHapVerifyTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn index 12aa6cd336..6d448486a3 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleHspTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -85,6 +82,8 @@ ohos_unittest("BmsBundleHspTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -187,10 +186,7 @@ ohos_unittest("BmsBundleSharedLibraryInstallTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -253,6 +249,8 @@ ohos_unittest("BmsBundleSharedLibraryInstallTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -355,10 +353,7 @@ ohos_unittest("BmsBundleSharedLibraryUninstallTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -416,6 +411,8 @@ ohos_unittest("BmsBundleSharedLibraryUninstallTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_manager_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installer_manager_test/BUILD.gn index 60e1390823..6a686190c1 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_manager_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_manager_test/BUILD.gn @@ -25,10 +25,7 @@ ohos_unittest("BmsBundleInstallerManagerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/include", - ] + include_dirs = [ "${services_path}/bundlemgr/include" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -57,11 +54,7 @@ ohos_unittest("BmsBundleInstallerManagerTest") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${core_path}:appexecfwk_core", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] + deps = [ "${core_path}:appexecfwk_core" ] deps += bundle_install_deps @@ -77,9 +70,12 @@ ohos_unittest("BmsBundleInstallerManagerTest") { "bounds_checking_function:libsec_shared", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_proxy_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installer_proxy_test/BUILD.gn index af6bdb2a5b..877e86e9c6 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_proxy_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_proxy_test/BUILD.gn @@ -37,7 +37,6 @@ ohos_unittest("BmsBundleInstallerProxyTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -46,6 +45,7 @@ ohos_unittest("BmsBundleInstallerProxyTest") { "ability_runtime:app_manager", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn index 5f26bb6a60..9b6dbbe5d5 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleInstallerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -97,6 +97,7 @@ ohos_unittest("BmsBundleInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -227,7 +228,7 @@ ohos_unittest("BmsBundleOtaUpdateTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -295,6 +296,7 @@ ohos_unittest("BmsBundleOtaUpdateTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -417,7 +419,7 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -495,6 +497,7 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -609,7 +612,7 @@ ohos_unittest("BmsBundleInstallIpcTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -660,6 +663,7 @@ ohos_unittest("BmsBundleInstallIpcTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -773,10 +777,7 @@ ohos_unittest("BmsBundleInstallCheckerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "../../mock/include/parameter", - ] + include_dirs = [ "../../mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -816,6 +817,7 @@ ohos_unittest("BmsBundleInstallCheckerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -922,10 +924,7 @@ ohos_unittest("BmsBundleInstallDeviceTypeTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "../../mock/include/parameter", - ] + include_dirs = [ "../../mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -966,6 +965,7 @@ ohos_unittest("BmsBundleInstallDeviceTypeTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1071,10 +1071,7 @@ ohos_unittest("BmsSystemBundleInstallerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/test/mock/include/parameter", - ] + include_dirs = [ "${services_path}/bundlemgr/test/mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -1120,6 +1117,7 @@ ohos_unittest("BmsSystemBundleInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1227,10 +1225,7 @@ ohos_unittest("BmsBundleInstallDriverTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/test/mock/include/parameter", - ] + include_dirs = [ "${services_path}/bundlemgr/test/mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -1308,6 +1303,7 @@ ohos_unittest("BmsBundleInstallDriverTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1423,7 +1419,7 @@ ohos_unittest("BmsBundleAppServiceFwkInstallerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -1480,6 +1476,7 @@ ohos_unittest("BmsBundleAppServiceFwkInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1602,7 +1599,7 @@ ohos_unittest("BmsBundleInstallerPermissionTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -1674,6 +1671,7 @@ ohos_unittest("BmsBundleInstallerPermissionTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_installers_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installers_test/BUILD.gn index 905cd16f78..b6bfbc1105 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installers_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installers_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleInstallersTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -73,6 +73,7 @@ ohos_unittest("BmsBundleInstallersTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn index 830693ea2d..24c92c113d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleKitServiceBaseTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -57,11 +57,7 @@ ohos_unittest("BmsBundleKitServiceBaseTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${core_path}:appexecfwk_core", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] + deps = [ "${core_path}:appexecfwk_core" ] deps += bundle_install_deps @@ -77,9 +73,12 @@ ohos_unittest("BmsBundleKitServiceBaseTest") { "bounds_checking_function:libsec_shared", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn index 66d60387cf..ba9e4802a5 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleDataMgrTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -85,6 +85,7 @@ ohos_unittest("BmsBundleDataMgrTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -204,7 +205,7 @@ ohos_unittest("BmsBundleKitServiceTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -263,6 +264,7 @@ ohos_unittest("BmsBundleKitServiceTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -377,7 +379,7 @@ ohos_unittest("BmsBundleGetWindowPropertiesTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -432,6 +434,7 @@ ohos_unittest("BmsBundleGetWindowPropertiesTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_manager_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_manager_test/BUILD.gn index 624ff7f528..eff2cb09de 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_manager_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_manager_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleManagerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -81,6 +81,7 @@ ohos_unittest("BmsBundleManagerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_mgr_proxy_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_mgr_proxy_test/BUILD.gn index 99945a5092..57f9bad81b 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_mgr_proxy_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_mgr_proxy_test/BUILD.gn @@ -32,7 +32,6 @@ ohos_unittest("BmsBundleMgrProxyTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -42,6 +41,7 @@ ohos_unittest("BmsBundleMgrProxyTest") { "ability_runtime:app_manager", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_bundle_mgr_service_death_recipient_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_mgr_service_death_recipient_test/BUILD.gn index d51dd67589..bc57c0cc3b 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_mgr_service_death_recipient_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_mgr_service_death_recipient_test/BUILD.gn @@ -28,14 +28,14 @@ ohos_unittest("BmsBundleMgrServiceDeathRecipientTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "ability_base:want", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn index f832ed8f3e..46f7702e1a 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn @@ -21,7 +21,6 @@ config("private_config") { "${inner_api_path}/appexecfwk_base/include", "${bundle_framework_path}/libs/test/mockpermission/permission", "${services_path}/bundlemgr/test/mock/include", - "//third_party/json/include", ] } @@ -35,7 +34,7 @@ ohos_unittest("BmsBundleMultiuserInstallIPCTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -77,6 +76,7 @@ ohos_unittest("BmsBundleMultiuserInstallIPCTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_navigation_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_navigation_test/BUILD.gn index e470960fd4..f08de3524b 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_navigation_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_navigation_test/BUILD.gn @@ -24,11 +24,7 @@ ohos_unittest("BmsBundleNavigationTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - "${services_path}/bundlemgr/include/navigation", - ] + include_dirs = [ "${services_path}/bundlemgr/include/navigation" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -77,6 +73,8 @@ ohos_unittest("BmsBundleNavigationTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_overlay_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_overlay_test/BUILD.gn index 5d9c454ff0..6f650d6295 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_overlay_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_overlay_test/BUILD.gn @@ -24,7 +24,7 @@ ohos_unittest("BmsBundleOverlayCheckerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -81,6 +81,7 @@ ohos_unittest("BmsBundleOverlayCheckerTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -160,7 +161,7 @@ ohos_unittest("BmsBundleOverlayCheckerTest") { ohos_unittest("BmsBundleOverlayInfoTest") { use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/json/include" ] + include_dirs = [] sources = [ "${base_path}/src/overlay/overlay_bundle_info.cpp", "${base_path}/src/overlay/overlay_module_info.cpp", @@ -195,6 +196,7 @@ ohos_unittest("BmsBundleOverlayInfoTest") { "device_usage_statistics:usagestatsinner", "display_manager:displaymgr", "ffrt:libffrt", + "jsoncpp:jsoncpp", "power_manager:powermgr_client", "syscap_codec:syscap_interface_shared", ] @@ -227,10 +229,7 @@ ohos_unittest("BmsBundleOverlayIpcTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/test/mock/include/parameter", - ] + include_dirs = [ "${services_path}/bundlemgr/test/mock/include/parameter" ] sources = [ "${core_path}/src/overlay/overlay_manager_host.cpp", "${core_path}/src/overlay/overlay_manager_proxy.cpp", @@ -290,6 +289,7 @@ ohos_unittest("BmsBundleOverlayIpcTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -379,10 +379,7 @@ ohos_unittest("BmsBundleManagerOverlayIpcTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/test/mock/include/parameter", - ] + include_dirs = [ "${services_path}/bundlemgr/test/mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -433,6 +430,7 @@ ohos_unittest("BmsBundleManagerOverlayIpcTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -521,10 +519,7 @@ ohos_unittest("BmsBundleSetOverlayEnabledTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/test/mock/include/parameter", - ] + include_dirs = [ "${services_path}/bundlemgr/test/mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -576,6 +571,7 @@ ohos_unittest("BmsBundleSetOverlayEnabledTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -664,10 +660,7 @@ ohos_unittest("BmsBundleGetOverlayModuleInfoTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/test/mock/include/parameter", - ] + include_dirs = [ "${services_path}/bundlemgr/test/mock/include/parameter" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -720,6 +713,7 @@ ohos_unittest("BmsBundleGetOverlayModuleInfoTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/BUILD.gn index 6c84ccaed8..61bfc73eb0 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/BUILD.gn @@ -24,7 +24,7 @@ ohos_unittest("BmsBundlePermissionDefListTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -99,6 +99,7 @@ ohos_unittest("BmsBundlePermissionDefListTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -203,7 +204,7 @@ ohos_unittest("BmsBundlePermissionGrantTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -278,6 +279,7 @@ ohos_unittest("BmsBundlePermissionGrantTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -380,7 +382,7 @@ ohos_unittest("BmsBundlePermissionFalseTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -455,6 +457,7 @@ ohos_unittest("BmsBundlePermissionFalseTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -563,7 +566,7 @@ ohos_unittest("BmsBundlePermissionStartFullTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -638,6 +641,7 @@ ohos_unittest("BmsBundlePermissionStartFullTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -928,7 +932,7 @@ ohos_unittest("BmsBundlePermissionTokenTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -1000,6 +1004,7 @@ ohos_unittest("BmsBundlePermissionTokenTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1106,7 +1111,7 @@ ohos_unittest("BmsBundlePermissionGetRequestTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -1167,6 +1172,7 @@ ohos_unittest("BmsBundlePermissionGetRequestTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_boot_scanner_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_boot_scanner_test/BUILD.gn index 3794d67ea4..ffc676a151 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_boot_scanner_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_boot_scanner_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleQuickFixBootScannerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/system_ability_helper.cpp" ] sources += [ @@ -80,6 +80,7 @@ ohos_unittest("BmsBundleQuickFixBootScannerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_deleter_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_deleter_test/BUILD.gn index b6b359eac5..d541e640a4 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_deleter_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_deleter_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleQuickFixDeleterTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -85,6 +85,7 @@ ohos_unittest("BmsBundleQuickFixDeleterTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_manager_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_manager_test/BUILD.gn index 198d6685df..957cd74901 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_manager_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_manager_test/BUILD.gn @@ -25,10 +25,7 @@ ohos_unittest("BmsBundleQuickFixManagerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -80,6 +77,8 @@ ohos_unittest("BmsBundleQuickFixManagerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/BUILD.gn index 955a2292b5..d6ffe06e8d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleQuickFixMgrRdbTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -66,8 +63,7 @@ ohos_unittest("BmsBundleQuickFixMgrRdbTest") { "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/bmsAccessTokentest3:bmsAccessTokentest3", ] if (bundle_framework_graphics) { - include_dirs += [ "../../../../../../../multimedia/image_framework/interfaces/innerkits/include" ] - deps += [ "../../../../../../../multimedia/image_framework/interfaces/innerkits:image_native" ] + include_dirs += [] } deps += bundle_install_deps @@ -90,7 +86,10 @@ ohos_unittest("BmsBundleQuickFixMgrRdbTest") { "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", + "image_framework:image_native", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/BUILD.gn index d865be2035..50f2f799a9 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleQuickFixQueryTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -71,6 +68,8 @@ ohos_unittest("BmsBundleQuickFixQueryTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_switcher_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_switcher_test/BUILD.gn index 5423f4c14f..a092067423 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_switcher_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_switcher_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsBundleQuickFixSwitcherTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -85,6 +85,7 @@ ohos_unittest("BmsBundleQuickFixSwitcherTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/BUILD.gn index 21ec8c9f31..e42426cad5 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleQuickFixTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -83,6 +80,8 @@ ohos_unittest("BmsBundleQuickFixTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/BUILD.gn index 8bcea086ab..7a491f5153 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/BUILD.gn @@ -26,7 +26,6 @@ ohos_unittest("BmsBundleRdbDataManagerTest") { } module_out_path = module_output_path include_dirs = [ - "//third_party/jsoncpp/include", "${services_path}/bundlemgr/include/rdb/", "${services_path}/bundlemgr/include", "${services_path}/bundlemgr/test/mock/include", @@ -49,12 +48,13 @@ ohos_unittest("BmsBundleRdbDataManagerTest") { deps = [ "${core_path}:appexecfwk_core", "${services_path}/bundlemgr:bundle_parser", - "//third_party/googletest:gmock_main", ] external_deps = [ + "googletest:gmock_main", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "relational_store:native_rdb", ] } diff --git a/services/bundlemgr/test/unittest/bms_bundle_resource_info_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_resource_info_test/BUILD.gn index 4e8d5b2670..bbc4271812 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_resource_info_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_resource_info_test/BUILD.gn @@ -30,16 +30,14 @@ ohos_unittest("BmsBundleResourceInfoTest") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${common_path}:libappexecfwk_common", - "//third_party/googletest:gtest_main", - ] + deps = [ "${common_path}:libappexecfwk_common" ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "ability_runtime:app_manager", "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "i18n:intl_util", "init:libbegetutil", diff --git a/services/bundlemgr/test/unittest/bms_bundle_resource_manager_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_resource_manager_test/BUILD.gn index 5302c18938..9961addf51 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_resource_manager_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_resource_manager_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleResourceManagerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -84,6 +81,8 @@ ohos_unittest("BmsBundleResourceManagerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn index a1d1d637b7..e4f51adee6 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn @@ -24,10 +24,7 @@ ohos_unittest("BmsBundleResourceTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -85,6 +82,8 @@ ohos_unittest("BmsBundleResourceTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -229,11 +228,11 @@ ohos_unittest("BmsBundleMgrHostUnitTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/BUILD.gn index 97a5acb053..4c904f7dcc 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsSandboxAppTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -82,6 +82,7 @@ ohos_unittest("BmsSandboxAppTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -196,7 +197,7 @@ ohos_unittest("BmsSandboxRdbTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -253,6 +254,7 @@ ohos_unittest("BmsSandboxRdbTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn index 8cd125ec70..ed91d70413 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn @@ -29,7 +29,7 @@ ohos_unittest("BmsBundleUninstallerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -97,6 +97,7 @@ ohos_unittest("BmsBundleUninstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn index afe00fbd50..652b7ed8b9 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn @@ -32,7 +32,7 @@ ohos_unittest("BmsBundleUpdaterTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -101,6 +101,7 @@ ohos_unittest("BmsBundleUpdaterTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_bundle_verifymanager_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_verifymanager_test/BUILD.gn index 03ef0578b3..4332be6e57 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_verifymanager_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_verifymanager_test/BUILD.gn @@ -25,8 +25,6 @@ ohos_unittest("BmsBundleVerifyManagerTest") { use_exceptions = true module_out_path = module_output_path include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", "${services_path}/bundlemgr/include/verify", "${services_path}/bundlemgr/include/app_control", ] @@ -81,6 +79,8 @@ ohos_unittest("BmsBundleVerifyManagerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_data_mgr_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_data_mgr_test/BUILD.gn index 9447b0ca5c..1f1ce33402 100644 --- a/services/bundlemgr/test/unittest/bms_data_mgr_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_data_mgr_test/BUILD.gn @@ -29,7 +29,7 @@ ohos_unittest("BmsDataMgrTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -69,6 +69,7 @@ ohos_unittest("BmsDataMgrTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -166,7 +167,7 @@ ohos_unittest("BmsExtensionDataMgrTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -207,6 +208,7 @@ ohos_unittest("BmsExtensionDataMgrTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_event_handler_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_event_handler_test/BUILD.gn index ac3c2c5c87..ac36f1e441 100644 --- a/services/bundlemgr/test/unittest/bms_event_handler_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_event_handler_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsEventHandlerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_install_sources sources += bundle_mgr_source @@ -56,6 +56,7 @@ ohos_unittest("BmsEventHandlerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -147,7 +148,7 @@ ohos_unittest("BmsEventHandlerUnLockedTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_install_sources sources += bundle_mgr_source @@ -179,6 +180,7 @@ ohos_unittest("BmsEventHandlerUnLockedTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/BUILD.gn index 7d1ce5fefe..d1870e1822 100644 --- a/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/BUILD.gn @@ -24,11 +24,7 @@ ohos_unittest("BmsExtendResourceManagerTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - "${services_path}/bundlemgr/include/extend_resource", - ] + include_dirs = [ "${services_path}/bundlemgr/include/extend_resource" ] sources = bundle_mgr_source sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] @@ -86,6 +82,8 @@ ohos_unittest("BmsExtendResourceManagerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_install_daemon_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_install_daemon_test/BUILD.gn index 0961a26f87..33d02e575a 100644 --- a/services/bundlemgr/test/unittest/bms_install_daemon_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_install_daemon_test/BUILD.gn @@ -20,7 +20,7 @@ module_output_path = "bundle_framework/bundlemgrservice" ohos_unittest("BmsInstallDaemonTest") { use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = [ "${services_path}/bundlemgr/src/system_ability_helper.cpp", "${services_path}/bundlemgr/test/mock/src/accesstoken_kit.cpp", @@ -60,6 +60,7 @@ ohos_unittest("BmsInstallDaemonTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_installd_client_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_installd_client_test/BUILD.gn index 21deebb106..9d39788187 100644 --- a/services/bundlemgr/test/unittest/bms_installd_client_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_installd_client_test/BUILD.gn @@ -20,10 +20,7 @@ module_output_path = "bundle_framework/bundlemgrservice" ohos_unittest("BmsInstalldClientTest") { use_exceptions = true module_out_path = module_output_path - include_dirs = [ - "//third_party/jsoncpp/include", - "${services_path}/bundlemgr/include", - ] + include_dirs = [ "${services_path}/bundlemgr/include" ] sources = [ "${services_path}/bundlemgr/src/system_ability_helper.cpp" ] sources += install_daemon_sources @@ -50,6 +47,7 @@ ohos_unittest("BmsInstalldClientTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_installd_host_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_installd_host_test/BUILD.gn index f4d669a320..50e149a430 100644 --- a/services/bundlemgr/test/unittest/bms_installd_host_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_installd_host_test/BUILD.gn @@ -25,8 +25,6 @@ ohos_unittest("BmsInstalldHostTest") { use_exceptions = true module_out_path = module_output_path include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", "${services_path}/bundlemgr/include/verify", "${services_path}/bundlemgr/include/ipc", ] @@ -79,6 +77,8 @@ ohos_unittest("BmsInstalldHostTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "json:nlohmann_json_static", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn index 94449a366f..ef740e36cb 100644 --- a/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsServiceBundleScanTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = [ "${services_path}/bundlemgr/test/mock/src/accesstoken_kit.cpp", @@ -48,10 +48,7 @@ ohos_unittest("BmsServiceBundleScanTest") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${core_path}:appexecfwk_core", - "//third_party/jsoncpp:jsoncpp", - ] + deps = [ "${core_path}:appexecfwk_core" ] deps += bundle_install_deps external_deps = [ @@ -66,6 +63,7 @@ ohos_unittest("BmsServiceBundleScanTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn index 172f0db9f3..d0177088a5 100644 --- a/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsServiceStartupTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = [ "${services_path}/bundlemgr/test/mock/src/accesstoken_kit.cpp", @@ -62,6 +62,7 @@ ohos_unittest("BmsServiceStartupTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/bundlemgr/test/unittest/bms_syscap_tool_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_syscap_tool_test/BUILD.gn index 3b614737f6..9c5f4c2536 100755 --- a/services/bundlemgr/test/unittest/bms_syscap_tool_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_syscap_tool_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("BmsSyscapToolTest") { } use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", "${services_path}/bundlemgr/src/installd/installd_host_impl.cpp", @@ -72,6 +72,7 @@ ohos_unittest("BmsSyscapToolTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", -- Gitee