From 18a06cb60b61b7b2347b6f455c58985d48b739e8 Mon Sep 17 00:00:00 2001 From: sunjiakun Date: Tue, 24 Dec 2024 11:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunjiakun --- bundle.json | 4 +- .../common_appexecfwk_log_test/BUILD.gn | 7 +++- .../common_perf_profile_test/BUILD.gn | 3 +- .../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 | 21 ++++++---- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 7 ++-- .../BUILD.gn | 8 ++-- .../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 | 2 +- .../bms_bundle_resource_manager_test/BUILD.gn | 7 ++-- .../bms_bundle_resource_test/BUILD.gn | 9 ++-- .../bms_bundle_sandbox_app_test/BUILD.gn | 6 ++- .../BUILD.gn | 7 ++-- .../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 +- test/benchmarktest/ability_info_test/BUILD.gn | 6 +-- .../application_info_test/BUILD.gn | 10 ++--- test/benchmarktest/bundle_info_test/BUILD.gn | 6 +-- .../bundle_mgr_client_test/BUILD.gn | 2 +- .../bundle_user_info_test/BUILD.gn | 10 ++--- .../bundlemgr_proxy_test/BUILD.gn | 5 ++- .../common_event_info_test/BUILD.gn | 6 +-- .../distributed_bundle_info_test/BUILD.gn | 10 ++--- .../extension_ability_info_test/BUILD.gn | 10 ++--- .../extension_form_profile_test/BUILD.gn | 10 ++--- test/benchmarktest/form_info_test/BUILD.gn | 10 ++--- .../hap_module_info_test/BUILD.gn | 10 ++--- .../benchmarktest/install_param_test/BUILD.gn | 10 ++--- .../installer_proxy_test/BUILD.gn | 2 +- .../json_serializer_test/BUILD.gn | 6 +-- .../launcher_service_test/BUILD.gn | 2 +- test/benchmarktest/module_info_test/BUILD.gn | 10 ++--- .../permission_def_test/BUILD.gn | 10 ++--- .../remote_ability_info_test/BUILD.gn | 6 +-- .../benchmarktest/shortcut_info_test/BUILD.gn | 10 ++--- .../GetExtResource_fuzzer/BUILD.gn | 8 ++-- .../RemoveExtResource_fuzzer/BUILD.gn | 8 ++-- .../accounthelper_fuzzer/BUILD.gn | 3 +- .../aginghandlerchain_fuzzer/BUILD.gn | 7 ++-- .../agingrequest_fuzzer/BUILD.gn | 7 ++-- .../fuzztest_others/agingutil_fuzzer/BUILD.gn | 7 ++-- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../beforeaddextresource_fuzzer/BUILD.gn | 8 ++-- .../bmsbundleresourcehelper_fuzzer/BUILD.gn | 7 ++-- .../BUILD.gn | 7 ++-- .../bmsextensionclient_fuzzer/BUILD.gn | 3 +- .../bmskeyeventmgr_fuzzer/BUILD.gn | 3 +- .../bundleagingmgr_fuzzer/BUILD.gn | 7 ++-- .../bundlecloneinstaller_fuzzer/BUILD.gn | 3 +- .../bundleconnectabilitymgr_fuzzer/BUILD.gn | 7 ++-- .../bundlemanagercallback_fuzzer/BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../bundlemanagercallbackstub_fuzzer/BUILD.gn | 3 +- .../bundlemutiuserinstaller_fuzzer/BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../bundleoverlaymgr_fuzzer/BUILD.gn | 3 +- .../bundleresconfiguration_fuzzer/BUILD.gn | 7 ++-- .../bundleresdrawable_fuzzer/BUILD.gn | 7 ++-- .../bundlereshostimpl_fuzzer/BUILD.gn | 7 ++-- .../bundleresmgr_fuzzer/BUILD.gn | 7 ++-- .../bundleresparam_fuzzer/BUILD.gn | 7 ++-- .../bundleresparser_fuzzer/BUILD.gn | 7 ++-- .../bundleresprocess_fuzzer/BUILD.gn | 7 ++-- .../bundleresrdb_fuzzer/BUILD.gn | 7 ++-- .../checkfileparam_fuzzer/BUILD.gn | 8 ++-- .../checkmoduleexist_fuzzer/BUILD.gn | 8 ++-- .../copytotempdir_fuzzer/BUILD.gn | 8 ++-- .../fuzztest_others/createfd_fuzzer/BUILD.gn | 8 ++-- .../defaultapphost_fuzzer/BUILD.gn | 8 ++-- .../defaultapphostimpl_fuzzer/BUILD.gn | 7 ++-- .../defaultappmgr_fuzzer/BUILD.gn | 7 ++-- .../defaultappproxy_fuzzer/BUILD.gn | 8 ++-- .../defaultapprdb_fuzzer/BUILD.gn | 7 ++-- .../disabledynamicicon_fuzzer/BUILD.gn | 8 ++-- .../distributedmanager_fuzzer/BUILD.gn | 3 +- .../driverinstaller_fuzzer/BUILD.gn | 3 +- .../filenamevalid_fuzzer/BUILD.gn | 8 ++-- .../getdynamicicon_fuzzer/BUILD.gn | 8 ++-- .../getinnerbundleinfo_fuzzer/BUILD.gn | 8 ++-- .../hmpbundleinstaller_fuzzer/BUILD.gn | 3 +- .../innereventreport_fuzzer/BUILD.gn | 3 +- .../BUILD.gn | 8 ++-- .../mkdirifnotexist_fuzzer/BUILD.gn | 8 ++-- .../overlaydatamgr_fuzzer/BUILD.gn | 3 +- .../overlaymgrhostimpl_fuzzer/BUILD.gn | 3 +- .../parsebundleresource_fuzzer/BUILD.gn | 8 ++-- .../parseextendresourcefile_fuzzer/BUILD.gn | 8 ++-- .../preinstallexceptionmgr_fuzzer/BUILD.gn | 3 +- .../processaddextresource_fuzzer/BUILD.gn | 8 ++-- .../fuzztest_others/quickfix_fuzzer/BUILD.gn | 7 ++-- .../quickfixbootscanner_fuzzer/BUILD.gn | 3 +- .../quickfixchecker_fuzzer/BUILD.gn | 7 ++-- .../quickfixdatamgr_fuzzer/BUILD.gn | 7 ++-- .../quickfixdeleter_fuzzer/BUILD.gn | 7 ++-- .../quickfixdeployer_fuzzer/BUILD.gn | 7 ++-- .../quickfixmanagerhostipml_fuzzer/BUILD.gn | 7 ++-- .../quickfixmanagerrdb_fuzzer/BUILD.gn | 7 ++-- .../quickfixmgr_fuzzer/BUILD.gn | 7 ++-- .../quickfixswitcher_fuzzer/BUILD.gn | 7 ++-- .../recentlyunusedagingmgr_fuzzer/BUILD.gn | 3 +- .../removeextresourcesdb_fuzzer/BUILD.gn | 8 ++-- .../resetbundleresourceicon_fuzzer/BUILD.gn | 8 ++-- .../fuzztest_others/rollback_fuzzer/BUILD.gn | 8 ++-- .../routerdatastoragerdb_fuzzer/BUILD.gn | 8 ++-- .../routermaphelper_fuzzer/BUILD.gn | 8 ++-- .../savecurdynamicicon_fuzzer/BUILD.gn | 8 ++-- .../sendbroadcast_fuzzer/BUILD.gn | 8 ++-- .../servicecenterconnection_fuzzer/BUILD.gn | 8 ++-- .../BUILD.gn | 8 ++-- .../BUILD.gn | 7 ++-- .../shortcutdatastoragerdb_fuzzer/BUILD.gn | 3 +- .../systemabilityhelper_fuzzer/BUILD.gn | 3 +- .../updateextresourcesdb_fuzzer/BUILD.gn | 8 ++-- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 4 +- test/systemtest/common/bms/BUILD.gn | 3 +- .../bms/acts_bms_kit_system_test/BUILD.gn | 5 ++- .../bms/bms_app_control_host_test/BUILD.gn | 2 +- .../bms/bms_bundle_mgr_host_test/BUILD.gn | 2 +- .../bms_bundle_resource_host_test/BUILD.gn | 2 +- .../bms/bms_check_service_test/BUILD.gn | 2 +- .../BUILD.gn | 4 +- .../bms/bms_client_system_test/BUILD.gn | 9 ++-- .../bms/bms_code_signature_test/BUILD.gn | 9 ++-- .../bms/bms_compatible_system_test/BUILD.gn | 2 +- .../bms/bms_default_app_host_test/BUILD.gn | 2 +- .../bms/bms_install_system_test/BUILD.gn | 10 ++--- .../bms_launcher_service_system_test/BUILD.gn | 2 +- .../bms/bms_overlay_install_test/BUILD.gn | 2 +- .../bms_permission_grant_system_test/BUILD.gn | 2 +- .../bms/bms_sandbox_app_system_test/BUILD.gn | 9 ++-- .../bms/bms_search_system_test/BUILD.gn | 5 ++- .../bms_stream_installer_host_test/BUILD.gn | 4 +- .../bms/bms_uninstall_system_test/BUILD.gn | 2 +- .../bms/bms_verify_manager_host_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- 249 files changed, 685 insertions(+), 720 deletions(-) diff --git a/bundle.json b/bundle.json index 3b88be00dc..c724d836c3 100644 --- a/bundle.json +++ b/bundle.json @@ -64,6 +64,7 @@ "init", "ipc", "image_framework", + "jsoncpp", "kv_store", "libpng", "napi", @@ -91,8 +92,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/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 23c0011aea..280111163b 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 @@ -35,7 +35,6 @@ ohos_unittest("BmsAppControlProxyTest") { "${base_path}:appexecfwk_base", "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -45,6 +44,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 3fc0b53e9d..bc7b449833 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", @@ -243,7 +243,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" ] @@ -294,6 +294,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 d2031d14be..abc21c450c 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", ] } @@ -63,6 +62,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 2bbe121670..84dc957c6c 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", @@ -199,10 +196,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" ] @@ -248,8 +242,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 = [ @@ -267,9 +259,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 de3aa86924..4de53c26e1 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 @@ -38,7 +38,6 @@ ohos_unittest("BmsBundleInstallerProxyTest") { "${base_path}:appexecfwk_base", "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -47,6 +46,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 d77cfa126b..282ab3aa94 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" ] @@ -104,6 +104,7 @@ ohos_unittest("BmsBundleInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -234,7 +235,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" ] @@ -302,6 +303,7 @@ ohos_unittest("BmsBundleOtaUpdateTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -424,7 +426,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" ] @@ -505,6 +507,7 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -619,7 +622,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" ] @@ -670,6 +673,7 @@ ohos_unittest("BmsBundleInstallIpcTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -783,10 +787,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" ] @@ -826,6 +827,7 @@ ohos_unittest("BmsBundleInstallCheckerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -932,10 +934,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" ] @@ -976,6 +975,7 @@ ohos_unittest("BmsBundleInstallDeviceTypeTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1081,10 +1081,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" ] @@ -1130,6 +1127,7 @@ ohos_unittest("BmsSystemBundleInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1237,10 +1235,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" ] @@ -1318,6 +1313,7 @@ ohos_unittest("BmsBundleInstallDriverTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1433,7 +1429,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" ] @@ -1490,6 +1486,7 @@ ohos_unittest("BmsBundleAppServiceFwkInstallerTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -1612,7 +1609,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" ] @@ -1684,6 +1681,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 ceb2a5a7d0..310224da98 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 @@ -33,7 +33,6 @@ ohos_unittest("BmsBundleMgrProxyTest") { "${base_path}:appexecfwk_base", "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -43,6 +42,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 f7a494b752..7562f4ea36 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 e891c7b109..cdeff4129f 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") { "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -164,7 +165,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", @@ -201,6 +202,7 @@ ohos_unittest("BmsBundleOverlayInfoTest") { "battery_manager:batterysrv_client", "display_manager:displaymgr", "ffrt:libffrt", + "jsoncpp:jsoncpp", "power_manager:powermgr_client", "syscap_codec:syscap_interface_shared", ] @@ -238,10 +240,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", @@ -302,6 +301,7 @@ ohos_unittest("BmsBundleOverlayIpcTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -395,10 +395,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" ] @@ -450,6 +447,7 @@ ohos_unittest("BmsBundleManagerOverlayIpcTest") { "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -542,10 +540,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" ] @@ -598,6 +593,7 @@ ohos_unittest("BmsBundleSetOverlayEnabledTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -690,10 +686,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" ] @@ -747,6 +740,7 @@ ohos_unittest("BmsBundleGetOverlayModuleInfoTest") { "init:libbegetutil", "ipc:ipc_core", "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..21262e1428 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", @@ -745,7 +749,7 @@ ohos_unittest("BmsBundlePermissionSyetemAppFalseTest") { } 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" ] @@ -820,6 +824,7 @@ ohos_unittest("BmsBundlePermissionSyetemAppFalseTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", @@ -928,7 +933,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 +1005,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 +1112,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 +1173,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 43eed3c82c..2e2cfa732b 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" ] @@ -86,7 +83,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 0176b2588d..8221c19a40 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,13 +48,14 @@ ohos_unittest("BmsBundleRdbDataManagerTest") { deps = [ "${core_path}:appexecfwk_core", "${services_path}/bundlemgr:bundle_parser", - "//third_party/googletest:gmock_main", ] external_deps = [ + "googletest:gmock_main", "hilog:libhilog", "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 27aa30f64c..29d9a0a767 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 @@ -33,7 +33,6 @@ ohos_unittest("BmsBundleResourceInfoTest") { deps = [ "${bundle_framework_path}/interfaces/inner_api/appexecfwk_base:appexecfwk_base", "${common_path}:libappexecfwk_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -41,6 +40,7 @@ ohos_unittest("BmsBundleResourceInfoTest") { 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_stream_installer_host_impl/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_stream_installer_host_impl/BUILD.gn index a1decce73a..54e205e780 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_stream_installer_host_impl/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_stream_installer_host_impl/BUILD.gn @@ -82,6 +82,8 @@ ohos_unittest("BmsBundleInstallerHostTest") { "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", @@ -90,10 +92,7 @@ ohos_unittest("BmsBundleInstallerHostTest") { "selinux_adapter:librestorecon", ] - public_deps = [ - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] + public_deps = [] external_deps += bundle_install_external_deps defines = [] 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 0bc34dccbc..5e9fc0328e 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 534c774375..2a9f9b1dc1 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 54e9a9333c..8ede18f5f6 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/src/installd/installd_permission_mgr.cpp", @@ -63,6 +63,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", diff --git a/test/benchmarktest/ability_info_test/BUILD.gn b/test/benchmarktest/ability_info_test/BUILD.gn index 260bcdf89b..8a905bbc37 100644 --- a/test/benchmarktest/ability_info_test/BUILD.gn +++ b/test/benchmarktest/ability_info_test/BUILD.gn @@ -25,12 +25,10 @@ ohos_benchmarktest("BenchmarkTestForAbilityInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] external_deps = [ + "benchmark:benchmark", "c_utils:utils", "ipc:ipc_core", ] diff --git a/test/benchmarktest/application_info_test/BUILD.gn b/test/benchmarktest/application_info_test/BUILD.gn index 6ec5dbbc6b..e31d32102d 100644 --- a/test/benchmarktest/application_info_test/BUILD.gn +++ b/test/benchmarktest/application_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForApplicationInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/bundle_info_test/BUILD.gn b/test/benchmarktest/bundle_info_test/BUILD.gn index 1ec0a7d1ba..3fe912cccc 100644 --- a/test/benchmarktest/bundle_info_test/BUILD.gn +++ b/test/benchmarktest/bundle_info_test/BUILD.gn @@ -25,12 +25,10 @@ ohos_benchmarktest("BenchmarkTestForBundleInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] external_deps = [ + "benchmark:benchmark", "c_utils:utils", "ipc:ipc_core", ] diff --git a/test/benchmarktest/bundle_mgr_client_test/BUILD.gn b/test/benchmarktest/bundle_mgr_client_test/BUILD.gn index fd28b1a445..a731e3e068 100644 --- a/test/benchmarktest/bundle_mgr_client_test/BUILD.gn +++ b/test/benchmarktest/bundle_mgr_client_test/BUILD.gn @@ -28,11 +28,11 @@ ohos_benchmarktest("BenchmarkTestForBundleMgrClient") { deps = [ "${base_path}:appexecfwk_base", "${core_path}:appexecfwk_core", - "//third_party/benchmark:benchmark", ] external_deps = [ "ability_base:want", + "benchmark:benchmark", "c_utils:utils", "ipc:ipc_core", ] diff --git a/test/benchmarktest/bundle_user_info_test/BUILD.gn b/test/benchmarktest/bundle_user_info_test/BUILD.gn index f4e29a1ba0..1835347971 100644 --- a/test/benchmarktest/bundle_user_info_test/BUILD.gn +++ b/test/benchmarktest/bundle_user_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForBundleUserInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/bundlemgr_proxy_test/BUILD.gn b/test/benchmarktest/bundlemgr_proxy_test/BUILD.gn index a39e213285..a2bf24845f 100644 --- a/test/benchmarktest/bundlemgr_proxy_test/BUILD.gn +++ b/test/benchmarktest/bundlemgr_proxy_test/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "bundle_framework/benchmark/bundle_framework" ohos_benchmarktest("BenchmarkTestBundleMgrProxy") { module_out_path = module_output_path - include_dirs = [ "//third_party/json/include" ] + include_dirs = [] sources = [ "bundlemgr_proxy_test.cpp" ] @@ -31,13 +31,14 @@ ohos_benchmarktest("BenchmarkTestBundleMgrProxy") { "${base_path}:appexecfwk_base", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/benchmark:benchmark", ] external_deps = [ "ability_base:want", + "benchmark:benchmark", "c_utils:utils", "ipc:ipc_core", + "json:nlohmann_json_static", "samgr:samgr_proxy", ] diff --git a/test/benchmarktest/common_event_info_test/BUILD.gn b/test/benchmarktest/common_event_info_test/BUILD.gn index de37cbf35b..1bf2f8ad00 100644 --- a/test/benchmarktest/common_event_info_test/BUILD.gn +++ b/test/benchmarktest/common_event_info_test/BUILD.gn @@ -25,12 +25,10 @@ ohos_benchmarktest("BenchmarkTestForCommonEventInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] external_deps = [ + "benchmark:benchmark", "c_utils:utils", "ipc:ipc_core", ] diff --git a/test/benchmarktest/distributed_bundle_info_test/BUILD.gn b/test/benchmarktest/distributed_bundle_info_test/BUILD.gn index beb60e2699..37e472ae53 100644 --- a/test/benchmarktest/distributed_bundle_info_test/BUILD.gn +++ b/test/benchmarktest/distributed_bundle_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForDistributedBundleInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/extension_ability_info_test/BUILD.gn b/test/benchmarktest/extension_ability_info_test/BUILD.gn index 041ac669e9..9ac7378de0 100644 --- a/test/benchmarktest/extension_ability_info_test/BUILD.gn +++ b/test/benchmarktest/extension_ability_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForExtensionAbilityInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/extension_form_profile_test/BUILD.gn b/test/benchmarktest/extension_form_profile_test/BUILD.gn index 53bd31a919..ac894ef548 100644 --- a/test/benchmarktest/extension_form_profile_test/BUILD.gn +++ b/test/benchmarktest/extension_form_profile_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForExtensionFormProfile") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/form_info_test/BUILD.gn b/test/benchmarktest/form_info_test/BUILD.gn index 31d5e77814..a5d0e41cc8 100644 --- a/test/benchmarktest/form_info_test/BUILD.gn +++ b/test/benchmarktest/form_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForFormInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/hap_module_info_test/BUILD.gn b/test/benchmarktest/hap_module_info_test/BUILD.gn index 66721bd208..4f026797c1 100644 --- a/test/benchmarktest/hap_module_info_test/BUILD.gn +++ b/test/benchmarktest/hap_module_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForHapModuleInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/install_param_test/BUILD.gn b/test/benchmarktest/install_param_test/BUILD.gn index 6ae1be9e2d..414fa7a9ed 100644 --- a/test/benchmarktest/install_param_test/BUILD.gn +++ b/test/benchmarktest/install_param_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForInstallParam") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/installer_proxy_test/BUILD.gn b/test/benchmarktest/installer_proxy_test/BUILD.gn index fb5dde79ac..7527ca5cea 100644 --- a/test/benchmarktest/installer_proxy_test/BUILD.gn +++ b/test/benchmarktest/installer_proxy_test/BUILD.gn @@ -32,11 +32,11 @@ ohos_benchmarktest("BenchmarkTestInstallerProxy") { "${bundle_framework_path}/test/sceneProject/benchmark/ohos_test:copy_ohos_test", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/benchmark:benchmark", ] external_deps = [ "ability_base:want", + "benchmark:benchmark", "c_utils:utils", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/benchmarktest/json_serializer_test/BUILD.gn b/test/benchmarktest/json_serializer_test/BUILD.gn index a89553122e..50f6a73142 100644 --- a/test/benchmarktest/json_serializer_test/BUILD.gn +++ b/test/benchmarktest/json_serializer_test/BUILD.gn @@ -25,12 +25,10 @@ ohos_benchmarktest("BenchmarkTestForJsonSerializer") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] external_deps = [ + "benchmark:benchmark", "c_utils:utils", "ipc:ipc_core", ] diff --git a/test/benchmarktest/launcher_service_test/BUILD.gn b/test/benchmarktest/launcher_service_test/BUILD.gn index 8bc0f0f8c0..d342aa5ae2 100644 --- a/test/benchmarktest/launcher_service_test/BUILD.gn +++ b/test/benchmarktest/launcher_service_test/BUILD.gn @@ -29,11 +29,11 @@ ohos_benchmarktest("BenchmarkTestForLauncherService") { "${base_path}:appexecfwk_base", "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/benchmark:benchmark", ] external_deps = [ "ability_base:want", + "benchmark:benchmark", "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", diff --git a/test/benchmarktest/module_info_test/BUILD.gn b/test/benchmarktest/module_info_test/BUILD.gn index c33817f5fa..2fb7c3c753 100644 --- a/test/benchmarktest/module_info_test/BUILD.gn +++ b/test/benchmarktest/module_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForModuleInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/permission_def_test/BUILD.gn b/test/benchmarktest/permission_def_test/BUILD.gn index 688df9c701..a5ea46efa1 100644 --- a/test/benchmarktest/permission_def_test/BUILD.gn +++ b/test/benchmarktest/permission_def_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForPermissionDef") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/benchmarktest/remote_ability_info_test/BUILD.gn b/test/benchmarktest/remote_ability_info_test/BUILD.gn index f6e2669b7a..ef0bbbf9d9 100644 --- a/test/benchmarktest/remote_ability_info_test/BUILD.gn +++ b/test/benchmarktest/remote_ability_info_test/BUILD.gn @@ -25,13 +25,11 @@ ohos_benchmarktest("BenchmarkTestForRemoteAbilityInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] external_deps = [ "ability_base:want", + "benchmark:benchmark", "c_utils:utils", ] } diff --git a/test/benchmarktest/shortcut_info_test/BUILD.gn b/test/benchmarktest/shortcut_info_test/BUILD.gn index 62d45aceec..7bb2ef34fd 100644 --- a/test/benchmarktest/shortcut_info_test/BUILD.gn +++ b/test/benchmarktest/shortcut_info_test/BUILD.gn @@ -25,12 +25,12 @@ ohos_benchmarktest("BenchmarkTestForShortcutInfo") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${base_path}:appexecfwk_base", - "//third_party/benchmark:benchmark", - ] + deps = [ "${base_path}:appexecfwk_base" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "benchmark:benchmark", + "c_utils:utils", + ] } group("benchmarktest") { diff --git a/test/fuzztest/fuzztest_others/GetExtResource_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/GetExtResource_fuzzer/BUILD.gn index bb4372a652..0caa873c74 100644 --- a/test/fuzztest/fuzztest_others/GetExtResource_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/GetExtResource_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("GetExtResourceFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/GetExtResource_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("GetExtResourceFuzzTest") { "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/test/fuzztest/fuzztest_others/RemoveExtResource_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/RemoveExtResource_fuzzer/BUILD.gn index 68153fba15..1d428528b1 100644 --- a/test/fuzztest/fuzztest_others/RemoveExtResource_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/RemoveExtResource_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("RemoveExtResourceFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/RemoveExtResource_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("RemoveExtResourceFuzzTest") { "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/test/fuzztest/fuzztest_others/accounthelper_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/accounthelper_fuzzer/BUILD.gn index fafbe1ff89..06d926c6b6 100644 --- a/test/fuzztest/fuzztest_others/accounthelper_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/accounthelper_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("AccountHelperFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/accounthelper_fuzzer" 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 @@ -51,6 +51,7 @@ ohos_fuzztest("AccountHelperFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/test/fuzztest/fuzztest_others/aginghandlerchain_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/aginghandlerchain_fuzzer/BUILD.gn index 02f53bd52d..c361b94b84 100644 --- a/test/fuzztest/fuzztest_others/aginghandlerchain_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/aginghandlerchain_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("AgingHandlerChainFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/aginghandlerchain_fuzzer" - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", @@ -73,6 +70,8 @@ ohos_fuzztest("AgingHandlerChainFuzzTest") { "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/test/fuzztest/fuzztest_others/agingrequest_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/agingrequest_fuzzer/BUILD.gn index d5ec1fdb91..7c891863d4 100644 --- a/test/fuzztest/fuzztest_others/agingrequest_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/agingrequest_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("AgingRequestFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/agingrequest_fuzzer" - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", @@ -72,6 +69,8 @@ ohos_fuzztest("AgingRequestFuzzTest") { "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/test/fuzztest/fuzztest_others/agingutil_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/agingutil_fuzzer/BUILD.gn index 263c68ef3e..ee77a546a5 100644 --- a/test/fuzztest/fuzztest_others/agingutil_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/agingutil_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("AgingUtilFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/agingutil_fuzzer" - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", @@ -72,6 +69,8 @@ ohos_fuzztest("AgingUtilFuzzTest") { "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/test/fuzztest/fuzztest_others/appservicefwkinstalleraddappprovisioninfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstalleraddappprovisioninfo_fuzzer/BUILD.gn index 1d84385c04..cf33d90dd9 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstalleraddappprovisioninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstalleraddappprovisioninfo_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerAddAppProvisionInfoFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerAddAppProvisionInfoFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerbeforeinstall_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerbeforeinstall_fuzzer/BUILD.gn index 0c71baff31..c7f3a6c7e5 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerbeforeinstall_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerbeforeinstall_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerBeforeInstallFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerBeforeInstallFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallercheckandparsefiles_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallercheckandparsefiles_fuzzer/BUILD.gn index 11ed3aa97b..a9ea153ff5 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallercheckandparsefiles_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallercheckandparsefiles_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerCheckAndParseFilesFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerCheckAndParseFilesFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallercheckapplabelinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallercheckapplabelinfo_fuzzer/BUILD.gn index 30579ba1ea..64b8ef9589 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallercheckapplabelinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallercheckapplabelinfo_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerCheckAppLabelInfoFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerCheckAppLabelInfoFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallercheckfiletype_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallercheckfiletype_fuzzer/BUILD.gn index 0aa6345ef9..1170dabd8f 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallercheckfiletype_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallercheckfiletype_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerCheckFileTypeFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerCheckFileTypeFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerextractmodule_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerextractmodule_fuzzer/BUILD.gn index a5088c930f..182f62ee2c 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerextractmodule_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerextractmodule_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerExtractModuleFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerExtractModuleFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallergetinnerbundleinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallergetinnerbundleinfo_fuzzer/BUILD.gn index a2ac4cfc4a..252f679759 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallergetinnerbundleinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallergetinnerbundleinfo_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerGetInnerBundleInfoFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerGetInnerBundleInfoFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerinnerprocessinstall_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerinnerprocessinstall_fuzzer/BUILD.gn index 0be0c14e4e..68468caa84 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerinnerprocessinstall_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerinnerprocessinstall_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerInnerProcessInstallFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerInnerProcessInstallFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerinstall_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerinstall_fuzzer/BUILD.gn index 9e48d318b0..4ed0479c5d 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerinstall_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerinstall_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("AppServiceFwkInstallerInstallFuzzTest") { 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/aot/aot_executor.cpp", @@ -71,6 +71,7 @@ ohos_fuzztest("AppServiceFwkInstallerInstallFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallermergebundleinfos_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallermergebundleinfos_fuzzer/BUILD.gn index 682d644d90..931d5f67bf 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallermergebundleinfos_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallermergebundleinfos_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerMergeBundleInfosFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerMergeBundleInfosFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallermkdirifnotexist_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallermkdirifnotexist_fuzzer/BUILD.gn index 28056cdba6..406dcddfcc 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallermkdirifnotexist_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallermkdirifnotexist_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerMkdirIfNotExistFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerMkdirIfNotExistFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallermovesotorealpath_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallermovesotorealpath_fuzzer/BUILD.gn index e938eacaeb..1b5cfa8c06 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallermovesotorealpath_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallermovesotorealpath_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerMoveSoToRealPathFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerMoveSoToRealPathFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessinstall_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessinstall_fuzzer/BUILD.gn index 4eafd5cad6..025f0d2b67 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessinstall_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessinstall_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerProcessInstallFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerProcessInstallFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessnativelibrary_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessnativelibrary_fuzzer/BUILD.gn index 430c92e82b..6789c591c9 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessnativelibrary_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerprocessnativelibrary_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerProcessNativeLibraryFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerProcessNativeLibraryFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerremovebundlecodedir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerremovebundlecodedir_fuzzer/BUILD.gn index 0cde651fd2..e32a0a7729 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerremovebundlecodedir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerremovebundlecodedir_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerRemoveBundleCodeDirFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerRemoveBundleCodeDirFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerremoveinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerremoveinfo_fuzzer/BUILD.gn index f89ed262b9..011e1ca01c 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerremoveinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerremoveinfo_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerRemoveInfoFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerRemoveInfoFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerrollback_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerrollback_fuzzer/BUILD.gn index de30286f61..3372df64d4 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerrollback_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerrollback_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("AppServiceFwkInstallerRollBackFuzzTest") { 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/aot/aot_executor.cpp", @@ -71,6 +71,7 @@ ohos_fuzztest("AppServiceFwkInstallerRollBackFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallersavebundleinfotostorage_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallersavebundleinfotostorage_fuzzer/BUILD.gn index b8fc808936..da504c15c4 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallersavebundleinfotostorage_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallersavebundleinfotostorage_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerSaveBundleInfoToStorageFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerSaveBundleInfoToStorageFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallersavepreinstallbundleinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallersavepreinstallbundleinfo_fuzzer/BUILD.gn index 1384d65200..6c165f113c 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallersavepreinstallbundleinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallersavepreinstallbundleinfo_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerSavePreInstallBundleInfoFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerSavePreInstallBundleInfoFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallersendbundlesystemevent_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallersendbundlesystemevent_fuzzer/BUILD.gn index b9ef881567..f0f9157814 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallersendbundlesystemevent_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallersendbundlesystemevent_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerSendBundleSystemEventFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerSendBundleSystemEventFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstalleruninstalllowerversion_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstalleruninstalllowerversion_fuzzer/BUILD.gn index 1e63f969ab..fa1820c457 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstalleruninstalllowerversion_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstalleruninstalllowerversion_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerUninstallLowerVersionFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerUninstallLowerVersionFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/appservicefwkinstallerupdateappservice_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerupdateappservice_fuzzer/BUILD.gn index cbdda1a66d..570ccb90e0 100644 --- a/test/fuzztest/fuzztest_others/appservicefwkinstallerupdateappservice_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/appservicefwkinstallerupdateappservice_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("AppServiceFwkInstallerUpdateAppServiceFuzzTest") { 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/aot/aot_executor.cpp", @@ -70,6 +70,7 @@ ohos_fuzztest("AppServiceFwkInstallerUpdateAppServiceFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallercheckmultiplehapssigninfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallercheckmultiplehapssigninfo_fuzzer/BUILD.gn index ed7e0a843e..ff0b78b324 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallercheckmultiplehapssigninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallercheckmultiplehapssigninfo_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerCheckMultipleHapsSignInfoFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallercheckmultiplehapssigninfo_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerCheckMultipleHapsSignInfoFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerchecksyscap_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerchecksyscap_fuzzer/BUILD.gn index 4c8d5066d2..b7ceb22de8 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerchecksyscap_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerchecksyscap_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("BaseBundleInstallerCheckSysCapFuzzTest") { "../../../fuzztest/fuzztest_others/basebundleinstallerchecksyscap_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -54,6 +54,7 @@ ohos_fuzztest("BaseBundleInstallerCheckSysCapFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallercheckuninstallinnerbundleinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallercheckuninstallinnerbundleinfo_fuzzer/BUILD.gn index c5458d3468..fc28233dbb 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallercheckuninstallinnerbundleinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallercheckuninstallinnerbundleinfo_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerCheckUninstallInnerBundleInfoFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallercheckuninstallinnerbundleinfo_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerCheckUninstallInnerBundleInfoFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallercreatebundleanddatadir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallercreatebundleanddatadir_fuzzer/BUILD.gn index e47f166e3d..24e5109313 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallercreatebundleanddatadir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallercreatebundleanddatadir_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerCreateBundleAndDataDirFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallercreatebundleanddatadir_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerCreateBundleAndDataDirFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerextractmodule_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerextractmodule_fuzzer/BUILD.gn index 64f696df8e..e40639ed0e 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerextractmodule_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerextractmodule_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerExtractModuleFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerextractmodule_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerExtractModuleFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerextractmodulefiles_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerextractmodulefiles_fuzzer/BUILD.gn index 5d4331d082..da4b738cbc 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerextractmodulefiles_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerextractmodulefiles_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerExtractModuleFilesFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerextractmodulefiles_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerExtractModuleFilesFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessbundleinstall_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessbundleinstall_fuzzer/BUILD.gn index 3a4352a9e8..5b6a354102 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessbundleinstall_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessbundleinstall_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerInnerProcessBundleInstallFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerinnerprocessbundleinstall_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerInnerProcessBundleInstallFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessinstallbypreinstallinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessinstallbypreinstallinfo_fuzzer/BUILD.gn index 99928d6051..5aec92011f 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessinstallbypreinstallinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerinnerprocessinstallbypreinstallinfo_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest( fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerinnerprocessinstallbypreinstallinfo_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -55,6 +55,7 @@ ohos_fuzztest( "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundle_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundle_fuzzer/BUILD.gn index 5275312af9..3c19fa1fb1 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundle_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundle_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerInstallBundleFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerinstallbundle_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerInstallBundleFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlebybundlename_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlebybundlename_fuzzer/BUILD.gn index cb99211add..40f616d12d 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlebybundlename_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlebybundlename_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerInstallBundleByBundleNameFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerinstallbundlebybundlename_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerInstallBundleByBundleNameFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlevector_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlevector_fuzzer/BUILD.gn index a79fa531d6..ff12fa90dd 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlevector_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerinstallbundlevector_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerInstallBundleVectorFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerinstallbundlevector_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerInstallBundleVectorFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallermarkprebundlesyeeventboottag_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallermarkprebundlesyeeventboottag_fuzzer/BUILD.gn index 4d9c3a1fda..e680d6e9ee 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallermarkprebundlesyeeventboottag_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallermarkprebundlesyeeventboottag_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerMarkPreBundleSyeEventBootTagFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallermarkprebundlesyeeventboottag_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerMarkPreBundleSyeEventBootTagFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstall_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstall_fuzzer/BUILD.gn index 7f2433400f..55b3285a86 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstall_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstall_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleInstallFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstall_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleInstallFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallnative_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallnative_fuzzer/BUILD.gn index 9f70727197..7ea5415042 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallnative_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallnative_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleInstallNativeFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallnative_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleInstallNativeFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallstatus_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallstatus_fuzzer/BUILD.gn index a777eb95ec..fa40c97009 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallstatus_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallstatus_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleInstallStatusFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessbundleinstallstatus_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleInstallStatusFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstall_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstall_fuzzer/BUILD.gn index dc2f357018..038548458d 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstall_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstall_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleUninstallFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstall_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleUninstallFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstallnative_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstallnative_fuzzer/BUILD.gn index 4e133570c5..b2b089b7de 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstallnative_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstallnative_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleUnInstallNativeFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessbundleuninstallnative_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleUnInstallNativeFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleupdatestatus_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleupdatestatus_fuzzer/BUILD.gn index f21dab689c..0197301867 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleupdatestatus_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessbundleupdatestatus_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleUpdateStatusFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessbundleupdatestatus_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessBundleUpdateStatusFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessinstallbundlebybundlename_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessinstallbundlebybundlename_fuzzer/BUILD.gn index 61e7e3407a..04a9657138 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessinstallbundlebybundlename_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessinstallbundlebybundlename_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessInstallBundleByBundleNameFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessinstallbundlebybundlename_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -54,6 +54,7 @@ ohos_fuzztest("BaseBundleInstallerProcessInstallBundleByBundleNameFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessmoduleupdate_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessmoduleupdate_fuzzer/BUILD.gn index caa79c8cc7..55fe6b188c 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessmoduleupdate_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessmoduleupdate_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessModuleUpdateFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessmoduleupdate_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessModuleUpdateFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerprocessrecover_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerprocessrecover_fuzzer/BUILD.gn index 5fa82c4026..e2f728ac68 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerprocessrecover_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerprocessrecover_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerProcessRecoverFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerprocessrecover_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerProcessRecoverFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerrecover_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerrecover_fuzzer/BUILD.gn index a73dd60fbf..b13936e9c3 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerrecover_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerrecover_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("BaseBundleInstallerRecoverFuzzTest") { "../../../fuzztest/fuzztest_others/basebundleinstallerrecover_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -54,6 +54,7 @@ ohos_fuzztest("BaseBundleInstallerRecoverFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerremovebundle_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerremovebundle_fuzzer/BUILD.gn index 519d4c3943..40c4c27840 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerremovebundle_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerremovebundle_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveBundleFuzzTest") { "../../../fuzztest/fuzztest_others/basebundleinstallerremovebundle_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -54,6 +54,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveBundleFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerremovebundleanddatadir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerremovebundleanddatadir_fuzzer/BUILD.gn index 3561016ca8..e77a156aec 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerremovebundleanddatadir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerremovebundleanddatadir_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveBundleAndDataDirFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerremovebundleanddatadir_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveBundleAndDataDirFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduleanddatadir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduleanddatadir_fuzzer/BUILD.gn index 36971f85a8..e52d1067f6 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduleanddatadir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduleanddatadir_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveModuleAndDataDirFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerremovemoduleanddatadir_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveModuleAndDataDirFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduledir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduledir_fuzzer/BUILD.gn index 07dc4415cd..487e2075c8 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduledir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerremovemoduledir_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveModuleDirFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerremovemoduledir_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerRemoveModuleDirFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallerrenamemoduledir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallerrenamemoduledir_fuzzer/BUILD.gn index 092c6ccd52..93c061d6f7 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallerrenamemoduledir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallerrenamemoduledir_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerRenameModuleDirFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallerrenamemoduledir_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerRenameModuleDirFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstallersetcheckresultmsg_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstallersetcheckresultmsg_fuzzer/BUILD.gn index d89e4b9932..3da0ba8026 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstallersetcheckresultmsg_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstallersetcheckresultmsg_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerSetCheckResultMsgFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstallersetcheckresultmsg_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerSetCheckResultMsgFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundle_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundle_fuzzer/BUILD.gn index 416f1cf6da..46249a29fc 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundle_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundle_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerUnInstallBundleFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstalleruninstallbundle_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerUnInstallBundleFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlebyuninstallparam_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlebyuninstallparam_fuzzer/BUILD.gn index 32541412c9..ebc0147ca4 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlebyuninstallparam_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlebyuninstallparam_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerUninstallBundleByUninstallParamFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstalleruninstallbundlebyuninstallparam_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerUninstallBundleByUninstallParamFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlemodule_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlemodule_fuzzer/BUILD.gn index f1af018118..c34481c5e7 100644 --- a/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlemodule_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/basebundleinstalleruninstallbundlemodule_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BaseBundleInstallerUnInstallBundleModuleFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/basebundleinstalleruninstallbundlemodule_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("BaseBundleInstallerUnInstallBundleModuleFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/beforeaddextresource_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/beforeaddextresource_fuzzer/BUILD.gn index 86b2282433..64ce52db16 100644 --- a/test/fuzztest/fuzztest_others/beforeaddextresource_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/beforeaddextresource_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("BeforeAddExtResourceFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/beforeaddextresource_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("BeforeAddExtResourceFuzzTest") { "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/test/fuzztest/fuzztest_others/bmsbundleresourcehelper_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bmsbundleresourcehelper_fuzzer/BUILD.gn index 0871ceada1..39b9539e9c 100644 --- a/test/fuzztest/fuzztest_others/bmsbundleresourcehelper_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bmsbundleresourcehelper_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("BmsBundleResourceHelperFuzzTest") { "../../../fuzztest/fuzztest_others/bmsbundleresourcehelper_fuzzer" 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/aot/aot_executor.cpp", @@ -68,6 +65,8 @@ ohos_fuzztest("BmsBundleResourceHelperFuzzTest") { "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/test/fuzztest/fuzztest_others/bmsecologicalrulemgrserviceclient_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bmsecologicalrulemgrserviceclient_fuzzer/BUILD.gn index d8797f62c2..4ad91c39ed 100644 --- a/test/fuzztest/fuzztest_others/bmsecologicalrulemgrserviceclient_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bmsecologicalrulemgrserviceclient_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("BmsEcologicalRulemgrServiceClientFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bmsecologicalrulemgrserviceclient_fuzzer" 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/aot/aot_executor.cpp", @@ -65,6 +62,8 @@ ohos_fuzztest("BmsEcologicalRulemgrServiceClientFuzzTest") { "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/test/fuzztest/fuzztest_others/bmsextensionclient_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bmsextensionclient_fuzzer/BUILD.gn index 79f8970a34..5c37819e21 100644 --- a/test/fuzztest/fuzztest_others/bmsextensionclient_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bmsextensionclient_fuzzer/BUILD.gn @@ -25,7 +25,7 @@ ohos_fuzztest("BmsExtensionClientFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bmsextensionclient_fuzzer" use_exceptions = true - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", @@ -66,6 +66,7 @@ ohos_fuzztest("BmsExtensionClientFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/bmskeyeventmgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bmskeyeventmgr_fuzzer/BUILD.gn index 8ecec601e3..e46a5b385e 100644 --- a/test/fuzztest/fuzztest_others/bmskeyeventmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bmskeyeventmgr_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BmsKeyEventMgrFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bmskeyeventmgr_fuzzer" 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 @@ -51,6 +51,7 @@ ohos_fuzztest("BmsKeyEventMgrFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/test/fuzztest/fuzztest_others/bundleagingmgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleagingmgr_fuzzer/BUILD.gn index bad9ffb7ac..7291fe0ac0 100644 --- a/test/fuzztest/fuzztest_others/bundleagingmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleagingmgr_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("BundleAgingMgrFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/bundleagingmgr_fuzzer" - include_dirs = [ - "//third_party/jsoncpp/include", - "//third_party/json/include", - ] + include_dirs = [] sources = bundle_mgr_source sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", @@ -72,6 +69,8 @@ ohos_fuzztest("BundleAgingMgrFuzzTest") { "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/test/fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer/BUILD.gn index d599da4a1f..000158179e 100644 --- a/test/fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ module_output_path = fuzz_test_path ##############################fuzztest########################################## ohos_fuzztest("BundlecloneinstallerFuzzTest") { module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] fuzz_config_file = "../../../fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer" @@ -59,6 +59,7 @@ ohos_fuzztest("BundlecloneinstallerFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/bundleconnectabilitymgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleconnectabilitymgr_fuzzer/BUILD.gn index dcaec0dcad..cc6cfe091f 100644 --- a/test/fuzztest/fuzztest_others/bundleconnectabilitymgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleconnectabilitymgr_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("BundleConnectAbilityMgrFuzzTest") { "../../../fuzztest/fuzztest_others/bundleconnectabilitymgr_fuzzer" 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/aot/aot_executor.cpp", @@ -68,6 +65,8 @@ ohos_fuzztest("BundleConnectAbilityMgrFuzzTest") { "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/test/fuzztest/fuzztest_others/bundlemanagercallback_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundlemanagercallback_fuzzer/BUILD.gn index 55cc0c8c21..d01cf79823 100644 --- a/test/fuzztest/fuzztest_others/bundlemanagercallback_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundlemanagercallback_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("BundleManagerCallbackFuzzTest") { "../../../fuzztest/fuzztest_others/bundlemanagercallback_fuzzer" 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/aot/aot_executor.cpp", @@ -63,6 +63,7 @@ ohos_fuzztest("BundleManagerCallbackFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/bundlemanagercallbackproxy_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundlemanagercallbackproxy_fuzzer/BUILD.gn index f62d53ebac..b61a0f770b 100644 --- a/test/fuzztest/fuzztest_others/bundlemanagercallbackproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundlemanagercallbackproxy_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("BundleManagerCallbackProxyFuzzTest") { "../../../fuzztest/fuzztest_others/bundlemanagercallbackproxy_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += [ @@ -64,6 +64,7 @@ ohos_fuzztest("BundleManagerCallbackProxyFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/bundlemanagercallbackstub_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundlemanagercallbackstub_fuzzer/BUILD.gn index 89df652900..3afaeb94c3 100644 --- a/test/fuzztest/fuzztest_others/bundlemanagercallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundlemanagercallbackstub_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("BundleManagerCallbackStubFuzzTest") { "../../../fuzztest/fuzztest_others/bundlemanagercallbackstub_fuzzer" 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/aot/aot_executor.cpp", @@ -63,6 +63,7 @@ ohos_fuzztest("BundleManagerCallbackStubFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/bundlemutiuserinstaller_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundlemutiuserinstaller_fuzzer/BUILD.gn index 466e02f5c8..c3e9c9dcdc 100644 --- a/test/fuzztest/fuzztest_others/bundlemutiuserinstaller_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundlemutiuserinstaller_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("BundleMutiuserInstallerFuzzTest") { "../../../fuzztest/fuzztest_others/bundlemutiuserinstaller_fuzzer" 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 @@ -52,6 +52,7 @@ ohos_fuzztest("BundleMutiuserInstallerFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/test/fuzztest/fuzztest_others/bundleoverlayinstallchecker_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleoverlayinstallchecker_fuzzer/BUILD.gn index 0a9d97fff0..6548496b2a 100644 --- a/test/fuzztest/fuzztest_others/bundleoverlayinstallchecker_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleoverlayinstallchecker_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("BundleOverlayInstallCheckerFuzzTest") { "../../../fuzztest/fuzztest_others/bundleoverlayinstallchecker_fuzzer" 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/aot/aot_executor.cpp", @@ -65,6 +65,7 @@ ohos_fuzztest("BundleOverlayInstallCheckerFuzzTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/bundleoverlaymgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleoverlaymgr_fuzzer/BUILD.gn index 9f8f40cc1e..e1a06de967 100644 --- a/test/fuzztest/fuzztest_others/bundleoverlaymgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleoverlaymgr_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("BundleOverlayMgrFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bundleoverlaymgr_fuzzer" 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/aot/aot_executor.cpp", @@ -64,6 +64,7 @@ ohos_fuzztest("BundleOverlayMgrFuzzTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/bundleresconfiguration_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleresconfiguration_fuzzer/BUILD.gn index 40eecfcbc4..5f8fcf5f93 100644 --- a/test/fuzztest/fuzztest_others/bundleresconfiguration_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleresconfiguration_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("BundleResConfigurationFuzzTest") { "../../../fuzztest/fuzztest_others/bundleresconfiguration_fuzzer" 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/aot/aot_executor.cpp", @@ -69,6 +66,8 @@ ohos_fuzztest("BundleResConfigurationFuzzTest") { "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/test/fuzztest/fuzztest_others/bundleresdrawable_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleresdrawable_fuzzer/BUILD.gn index f389cb3718..363d3a9ca2 100644 --- a/test/fuzztest/fuzztest_others/bundleresdrawable_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleresdrawable_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("BundleResDrawableFuzzTest") { "../../../fuzztest/fuzztest_others/bundleresdrawable_fuzzer" 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/aot/aot_executor.cpp", @@ -69,6 +66,8 @@ ohos_fuzztest("BundleResDrawableFuzzTest") { "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/test/fuzztest/fuzztest_others/bundlereshostimpl_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundlereshostimpl_fuzzer/BUILD.gn index b485ec1470..08d44c9152 100644 --- a/test/fuzztest/fuzztest_others/bundlereshostimpl_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundlereshostimpl_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("BundleResHostImplFuzzTest") { "../../../fuzztest/fuzztest_others/bundlereshostimpl_fuzzer" 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/aot/aot_executor.cpp", @@ -69,6 +66,8 @@ ohos_fuzztest("BundleResHostImplFuzzTest") { "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/test/fuzztest/fuzztest_others/bundleresmgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleresmgr_fuzzer/BUILD.gn index 5f2cb29d89..e12ebee4c5 100644 --- a/test/fuzztest/fuzztest_others/bundleresmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleresmgr_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("BundleResMgrFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bundleresmgr_fuzzer" 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/aot/aot_executor.cpp", @@ -68,6 +65,8 @@ ohos_fuzztest("BundleResMgrFuzzTest") { "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/test/fuzztest/fuzztest_others/bundleresparam_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleresparam_fuzzer/BUILD.gn index 61bd6498f0..8b3535e4da 100644 --- a/test/fuzztest/fuzztest_others/bundleresparam_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleresparam_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("BundleResParamFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bundleresparam_fuzzer" 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/aot/aot_executor.cpp", @@ -68,6 +65,8 @@ ohos_fuzztest("BundleResParamFuzzTest") { "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/test/fuzztest/fuzztest_others/bundleresparser_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleresparser_fuzzer/BUILD.gn index 74e71760b9..75e77cf0ea 100644 --- a/test/fuzztest/fuzztest_others/bundleresparser_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleresparser_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("BundleResParserFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bundleresparser_fuzzer" 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/aot/aot_executor.cpp", @@ -68,6 +65,8 @@ ohos_fuzztest("BundleResParserFuzzTest") { "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/test/fuzztest/fuzztest_others/bundleresprocess_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleresprocess_fuzzer/BUILD.gn index f98831b1b0..10a9e9675b 100644 --- a/test/fuzztest/fuzztest_others/bundleresprocess_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleresprocess_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("BundleResProcessFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bundleresprocess_fuzzer" 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/aot/aot_executor.cpp", @@ -68,6 +65,8 @@ ohos_fuzztest("BundleResProcessFuzzTest") { "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/test/fuzztest/fuzztest_others/bundleresrdb_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/bundleresrdb_fuzzer/BUILD.gn index 2c1bda9d13..401aaf7ef5 100644 --- a/test/fuzztest/fuzztest_others/bundleresrdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundleresrdb_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("BundleResRdbFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/bundleresrdb_fuzzer" 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/aot/aot_executor.cpp", @@ -68,6 +65,8 @@ ohos_fuzztest("BundleResRdbFuzzTest") { "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/test/fuzztest/fuzztest_others/checkfileparam_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/checkfileparam_fuzzer/BUILD.gn index 266d868e61..d4ec0fd836 100644 --- a/test/fuzztest/fuzztest_others/checkfileparam_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/checkfileparam_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("CheckFileParamFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/checkfileparam_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("CheckFileParamFuzzTest") { "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/test/fuzztest/fuzztest_others/checkmoduleexist_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/checkmoduleexist_fuzzer/BUILD.gn index 66beb02d7c..898b709285 100644 --- a/test/fuzztest/fuzztest_others/checkmoduleexist_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/checkmoduleexist_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("CheckModuleExistFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/checkmoduleexist_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("CheckModuleExistFuzzTest") { "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/test/fuzztest/fuzztest_others/copytotempdir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/copytotempdir_fuzzer/BUILD.gn index eef2daecea..624a335658 100644 --- a/test/fuzztest/fuzztest_others/copytotempdir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/copytotempdir_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("CopyToTempDirFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/copytotempdir_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("CopyToTempDirFuzzTest") { "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/test/fuzztest/fuzztest_others/createfd_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/createfd_fuzzer/BUILD.gn index 7ffcc2a19d..b93f74fdd9 100644 --- a/test/fuzztest/fuzztest_others/createfd_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/createfd_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("CreateFdFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/createfd_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("CreateFdFuzzTest") { "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/test/fuzztest/fuzztest_others/defaultapphost_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/defaultapphost_fuzzer/BUILD.gn index b93eb43e21..f0138c8de9 100644 --- a/test/fuzztest/fuzztest_others/defaultapphost_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/defaultapphost_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("DefaultAppHostFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/defaultapphost_fuzzer" - 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/aot/aot_executor.cpp", @@ -74,6 +70,8 @@ ohos_fuzztest("DefaultAppHostFuzzTest") { "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/test/fuzztest/fuzztest_others/defaultapphostimpl_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/defaultapphostimpl_fuzzer/BUILD.gn index a047a679db..4d70a0e2d7 100644 --- a/test/fuzztest/fuzztest_others/defaultapphostimpl_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/defaultapphostimpl_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("DefaultAppHostImplFuzzTest") { "../../../fuzztest/fuzztest_others/defaultapphostimpl_fuzzer" 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/aot/aot_executor.cpp", @@ -70,6 +67,8 @@ ohos_fuzztest("DefaultAppHostImplFuzzTest") { "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/test/fuzztest/fuzztest_others/defaultappmgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/defaultappmgr_fuzzer/BUILD.gn index ff90cd0227..eacdd3c1c3 100644 --- a/test/fuzztest/fuzztest_others/defaultappmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/defaultappmgr_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("DefaultAppMgrFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/defaultappmgr_fuzzer" 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/aot/aot_executor.cpp", @@ -69,6 +66,8 @@ ohos_fuzztest("DefaultAppMgrFuzzTest") { "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/test/fuzztest/fuzztest_others/defaultappproxy_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/defaultappproxy_fuzzer/BUILD.gn index 02b139848a..6082634ac8 100644 --- a/test/fuzztest/fuzztest_others/defaultappproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/defaultappproxy_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("DefaultAppProxyFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/defaultappproxy_fuzzer" - 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/aot/aot_executor.cpp", @@ -74,6 +70,8 @@ ohos_fuzztest("DefaultAppProxyFuzzTest") { "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/test/fuzztest/fuzztest_others/defaultapprdb_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/defaultapprdb_fuzzer/BUILD.gn index 91579a9b1a..f2abcdc708 100644 --- a/test/fuzztest/fuzztest_others/defaultapprdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/defaultapprdb_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("DefaultAppRdbFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/defaultapprdb_fuzzer" 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/aot/aot_executor.cpp", @@ -69,6 +66,8 @@ ohos_fuzztest("DefaultAppRdbFuzzTest") { "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/test/fuzztest/fuzztest_others/disabledynamicicon_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/disabledynamicicon_fuzzer/BUILD.gn index 248d6a7234..09a1422031 100644 --- a/test/fuzztest/fuzztest_others/disabledynamicicon_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/disabledynamicicon_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("DisableDynamicIconFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/disabledynamicicon_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("DisableDynamicIconFuzzTest") { "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/test/fuzztest/fuzztest_others/distributedmanager_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/distributedmanager_fuzzer/BUILD.gn index 44c2afbc56..26cebe875c 100644 --- a/test/fuzztest/fuzztest_others/distributedmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/distributedmanager_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("DistributedManagerFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/distributedmanager_fuzzer" - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", @@ -64,6 +64,7 @@ ohos_fuzztest("DistributedManagerFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/driverinstaller_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/driverinstaller_fuzzer/BUILD.gn index 5016714f19..3424f87d8f 100644 --- a/test/fuzztest/fuzztest_others/driverinstaller_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/driverinstaller_fuzzer/BUILD.gn @@ -24,7 +24,7 @@ ohos_fuzztest("DriverInstallerFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/driverinstaller_fuzzer" use_exceptions = true - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", @@ -65,6 +65,7 @@ ohos_fuzztest("DriverInstallerFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/filenamevalid_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/filenamevalid_fuzzer/BUILD.gn index 274e6d8aae..85f4d6fe23 100644 --- a/test/fuzztest/fuzztest_others/filenamevalid_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/filenamevalid_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("FileNameValidFuzzTest") { 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("FileNameValidFuzzTest") { "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/test/fuzztest/fuzztest_others/getdynamicicon_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/getdynamicicon_fuzzer/BUILD.gn index b80d005b3e..c3c221e90b 100644 --- a/test/fuzztest/fuzztest_others/getdynamicicon_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/getdynamicicon_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("GetDynamicIconFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/getdynamicicon_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("GetDynamicIconFuzzTest") { "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/test/fuzztest/fuzztest_others/getinnerbundleinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/getinnerbundleinfo_fuzzer/BUILD.gn index 18d43726b8..819ecf6126 100644 --- a/test/fuzztest/fuzztest_others/getinnerbundleinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/getinnerbundleinfo_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("GetInnerBundleInfoFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/getinnerbundleinfo_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("GetInnerBundleInfoFuzzTest") { "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/test/fuzztest/fuzztest_others/hmpbundleinstaller_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/hmpbundleinstaller_fuzzer/BUILD.gn index 82ff447de2..d1d7591ad0 100644 --- a/test/fuzztest/fuzztest_others/hmpbundleinstaller_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/hmpbundleinstaller_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("HmpBundleInstallerFuzzTest") { "../../../fuzztest/fuzztest_others/hmpbundleinstaller_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -54,6 +54,7 @@ ohos_fuzztest("HmpBundleInstallerFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/innereventreport_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/innereventreport_fuzzer/BUILD.gn index c5d5e140b0..19135b9128 100644 --- a/test/fuzztest/fuzztest_others/innereventreport_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/innereventreport_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("InnerEventReportFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/innereventreport_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -53,6 +53,7 @@ ohos_fuzztest("InnerEventReportFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/innersaveextendresourceinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/innersaveextendresourceinfo_fuzzer/BUILD.gn index aa8bc40233..053c12559d 100644 --- a/test/fuzztest/fuzztest_others/innersaveextendresourceinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/innersaveextendresourceinfo_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("InnerSaveExtendResourceInfoFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/innersaveextendresourceinfo_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("InnerSaveExtendResourceInfoFuzzTest") { "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/test/fuzztest/fuzztest_others/mkdirifnotexist_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/mkdirifnotexist_fuzzer/BUILD.gn index 35eb97351d..5b37ada4d1 100644 --- a/test/fuzztest/fuzztest_others/mkdirifnotexist_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/mkdirifnotexist_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("MkDirIfNotExistFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/mkdirifnotexist_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("MkDirIfNotExistFuzzTest") { "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/test/fuzztest/fuzztest_others/overlaydatamgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/overlaydatamgr_fuzzer/BUILD.gn index adea4d1f11..5ee8a9df09 100644 --- a/test/fuzztest/fuzztest_others/overlaydatamgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/overlaydatamgr_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("OverlayDataMgrFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/overlaydatamgr_fuzzer" 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/aot/aot_executor.cpp", @@ -64,6 +64,7 @@ ohos_fuzztest("OverlayDataMgrFuzzTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/overlaymgrhostimpl_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/overlaymgrhostimpl_fuzzer/BUILD.gn index 0f2b93428c..9633e66384 100644 --- a/test/fuzztest/fuzztest_others/overlaymgrhostimpl_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/overlaymgrhostimpl_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("OverlayMgrHostImplFuzzTest") { "../../../fuzztest/fuzztest_others/overlaymgrhostimpl_fuzzer" 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/aot/aot_executor.cpp", @@ -65,6 +65,7 @@ ohos_fuzztest("OverlayMgrHostImplFuzzTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/parsebundleresource_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/parsebundleresource_fuzzer/BUILD.gn index 63b5dc7bea..2246a01b33 100644 --- a/test/fuzztest/fuzztest_others/parsebundleresource_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/parsebundleresource_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("ParseBundleResourceFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/parsebundleresource_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("ParseBundleResourceFuzzTest") { "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/test/fuzztest/fuzztest_others/parseextendresourcefile_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/parseextendresourcefile_fuzzer/BUILD.gn index 41ed68a3ce..fadb71c644 100644 --- a/test/fuzztest/fuzztest_others/parseextendresourcefile_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/parseextendresourcefile_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("ParseExtendResourceFileFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/parseextendresourcefile_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("ParseExtendResourceFileFuzzTest") { "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/test/fuzztest/fuzztest_others/preinstallexceptionmgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/preinstallexceptionmgr_fuzzer/BUILD.gn index 5dadbd902f..d5ffc2e5e7 100644 --- a/test/fuzztest/fuzztest_others/preinstallexceptionmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/preinstallexceptionmgr_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("PreInstallExceptionMgrFuzzTest") { "../../../fuzztest/fuzztest_others/preinstallexceptionmgr_fuzzer" 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 @@ -52,6 +52,7 @@ ohos_fuzztest("PreInstallExceptionMgrFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/BUILD.gn index f86f30d911..ac6f467e48 100644 --- a/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("ProcessAddExtResourceFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/processaddextresource_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("ProcessAddExtResourceFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfix_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfix_fuzzer/BUILD.gn index 00bc953250..884afea7af 100644 --- a/test/fuzztest/fuzztest_others/quickfix_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfix_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("QuickFixFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/quickfix_fuzzer" 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/aot/aot_executor.cpp", @@ -70,6 +67,8 @@ ohos_fuzztest("QuickFixFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixbootscanner_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixbootscanner_fuzzer/BUILD.gn index 82e9099820..235d602380 100644 --- a/test/fuzztest/fuzztest_others/quickfixbootscanner_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixbootscanner_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("QuickFixBootScannerFuzzTest") { "../../../fuzztest/fuzztest_others/quickfixbootscanner_fuzzer" 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/aot/aot_executor.cpp", @@ -84,6 +84,7 @@ ohos_fuzztest("QuickFixBootScannerFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/quickfixchecker_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixchecker_fuzzer/BUILD.gn index 63a6f61bbd..7905146cb1 100644 --- a/test/fuzztest/fuzztest_others/quickfixchecker_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixchecker_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("QuickFixCheckerFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/quickfixchecker_fuzzer" 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/aot/aot_executor.cpp", @@ -67,6 +64,8 @@ ohos_fuzztest("QuickFixCheckerFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixdatamgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixdatamgr_fuzzer/BUILD.gn index 833408b1f1..55c59d8506 100644 --- a/test/fuzztest/fuzztest_others/quickfixdatamgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixdatamgr_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("QuickFixDataMgrFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/quickfixdatamgr_fuzzer" 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/aot/aot_executor.cpp", @@ -61,6 +58,8 @@ ohos_fuzztest("QuickFixDataMgrFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixdeleter_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixdeleter_fuzzer/BUILD.gn index 4ada4293d4..9a7507cb84 100644 --- a/test/fuzztest/fuzztest_others/quickfixdeleter_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixdeleter_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("QuickFixDeleterFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/quickfixdeleter_fuzzer" 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/aot/aot_executor.cpp", @@ -70,6 +67,8 @@ ohos_fuzztest("QuickFixDeleterFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixdeployer_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixdeployer_fuzzer/BUILD.gn index f4e0ad8ad2..cbd10cdca0 100644 --- a/test/fuzztest/fuzztest_others/quickfixdeployer_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixdeployer_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("QuickFixDeployerFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/quickfixdeployer_fuzzer" 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/aot/aot_executor.cpp", @@ -64,6 +61,8 @@ ohos_fuzztest("QuickFixDeployerFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixmanagerhostipml_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixmanagerhostipml_fuzzer/BUILD.gn index a3d458eb60..0a664732c2 100644 --- a/test/fuzztest/fuzztest_others/quickfixmanagerhostipml_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixmanagerhostipml_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("QuickFixManagerHostIpmlFuzzTest") { "../../../fuzztest/fuzztest_others/quickfixmanagerhostipml_fuzzer" 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/aot/aot_executor.cpp", @@ -71,6 +68,8 @@ ohos_fuzztest("QuickFixManagerHostIpmlFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixmanagerrdb_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixmanagerrdb_fuzzer/BUILD.gn index 767c5d5b23..dea36f1fa5 100644 --- a/test/fuzztest/fuzztest_others/quickfixmanagerrdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixmanagerrdb_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("QuickFixManagerRdbFuzzTest") { "../../../fuzztest/fuzztest_others/quickfixmanagerrdb_fuzzer" 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/aot/aot_executor.cpp", @@ -63,6 +60,8 @@ ohos_fuzztest("QuickFixManagerRdbFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixmgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixmgr_fuzzer/BUILD.gn index 139e6f953a..5e5a4ed291 100644 --- a/test/fuzztest/fuzztest_others/quickfixmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixmgr_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("QuickFixMgrFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/quickfixmgr_fuzzer" 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/aot/aot_executor.cpp", @@ -70,6 +67,8 @@ ohos_fuzztest("QuickFixMgrFuzzTest") { "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/test/fuzztest/fuzztest_others/quickfixswitcher_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/quickfixswitcher_fuzzer/BUILD.gn index 13e7ece036..d329d197ae 100644 --- a/test/fuzztest/fuzztest_others/quickfixswitcher_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/quickfixswitcher_fuzzer/BUILD.gn @@ -20,10 +20,7 @@ ohos_fuzztest("QuickFixSwitcherFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/quickfixswitcher_fuzzer" 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/aot/aot_executor.cpp", @@ -61,6 +58,8 @@ ohos_fuzztest("QuickFixSwitcherFuzzTest") { "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/test/fuzztest/fuzztest_others/recentlyunusedagingmgr_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/recentlyunusedagingmgr_fuzzer/BUILD.gn index 839986f1e7..3e968c01b3 100644 --- a/test/fuzztest/fuzztest_others/recentlyunusedagingmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/recentlyunusedagingmgr_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("RecentlyUnusedAgingMgrFuzzTest") { "../../../fuzztest/fuzztest_others/recentlyunusedagingmgr_fuzzer" 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/aot/aot_executor.cpp", @@ -71,6 +71,7 @@ ohos_fuzztest("RecentlyUnusedAgingMgrFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/removeextresourcesdb_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/removeextresourcesdb_fuzzer/BUILD.gn index 628b5a953b..f88f689e01 100644 --- a/test/fuzztest/fuzztest_others/removeextresourcesdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/removeextresourcesdb_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("RemoveExtResourcesDbFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/removeextresourcesdb_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("RemoveExtResourcesDbFuzzTest") { "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/test/fuzztest/fuzztest_others/resetbundleresourceicon_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/resetbundleresourceicon_fuzzer/BUILD.gn index 6bac873aa2..57d2504c35 100644 --- a/test/fuzztest/fuzztest_others/resetbundleresourceicon_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/resetbundleresourceicon_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("ResetBundleResourceIconFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/resetbundleresourceicon_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("ResetBundleResourceIconFuzzTest") { "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/test/fuzztest/fuzztest_others/rollback_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/rollback_fuzzer/BUILD.gn index fdd8474806..bfa6d541dc 100644 --- a/test/fuzztest/fuzztest_others/rollback_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/rollback_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("RollBackFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/rollback_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("RollBackFuzzTest") { "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/test/fuzztest/fuzztest_others/routerdatastoragerdb_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/routerdatastoragerdb_fuzzer/BUILD.gn index 072048cab2..f32f7ed343 100644 --- a/test/fuzztest/fuzztest_others/routerdatastoragerdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/routerdatastoragerdb_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("RouterDataStorageRdbFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/routerdatastoragerdb_fuzzer" 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/aot/aot_executor.cpp", @@ -66,6 +62,8 @@ ohos_fuzztest("RouterDataStorageRdbFuzzTest") { "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/test/fuzztest/fuzztest_others/routermaphelper_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/routermaphelper_fuzzer/BUILD.gn index be41944c3d..2c9a36e245 100644 --- a/test/fuzztest/fuzztest_others/routermaphelper_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/routermaphelper_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("RouterMapHelperFuzzTest") { fuzz_config_file = "../../../fuzztest/fuzztest_others/routermaphelper_fuzzer" 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/aot/aot_executor.cpp", @@ -66,6 +62,8 @@ ohos_fuzztest("RouterMapHelperFuzzTest") { "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/test/fuzztest/fuzztest_others/savecurdynamicicon_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/savecurdynamicicon_fuzzer/BUILD.gn index 641092be1a..5ec4f00368 100644 --- a/test/fuzztest/fuzztest_others/savecurdynamicicon_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/savecurdynamicicon_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("SaveCurDynamicIconFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/savecurdynamicicon_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("SaveCurDynamicIconFuzzTest") { "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/test/fuzztest/fuzztest_others/sendbroadcast_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/sendbroadcast_fuzzer/BUILD.gn index 1c90cdf7dd..13ab818fac 100644 --- a/test/fuzztest/fuzztest_others/sendbroadcast_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/sendbroadcast_fuzzer/BUILD.gn @@ -20,11 +20,7 @@ ohos_fuzztest("SendBroadCastFuzzTest") { use_exceptions = true module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/sendbroadcast_fuzzer" - 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/aot/aot_executor.cpp", @@ -72,6 +68,8 @@ ohos_fuzztest("SendBroadCastFuzzTest") { "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/test/fuzztest/fuzztest_others/servicecenterconnection_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/servicecenterconnection_fuzzer/BUILD.gn index ada0c6ecef..40be1e2c08 100644 --- a/test/fuzztest/fuzztest_others/servicecenterconnection_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/servicecenterconnection_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("ServiceCenterConnectionFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/servicecenterconnection_fuzzer" - 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/aot/aot_executor.cpp", @@ -75,6 +71,8 @@ ohos_fuzztest("ServiceCenterConnectionFuzzTest") { "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/test/fuzztest/fuzztest_others/servicecenterstatuscallback_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/servicecenterstatuscallback_fuzzer/BUILD.gn index 974f2cb43d..10fcd6a58d 100644 --- a/test/fuzztest/fuzztest_others/servicecenterstatuscallback_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/servicecenterstatuscallback_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("ServiceCenterStatusCallbackFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/servicecenterstatuscallback_fuzzer" - 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/aot/aot_executor.cpp", @@ -75,6 +71,8 @@ ohos_fuzztest("ServiceCenterStatusCallbackFuzzTest") { "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/test/fuzztest/fuzztest_others/servicecenterstatuscallbackstub_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/servicecenterstatuscallbackstub_fuzzer/BUILD.gn index e7c998b43d..658cc40912 100644 --- a/test/fuzztest/fuzztest_others/servicecenterstatuscallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/servicecenterstatuscallbackstub_fuzzer/BUILD.gn @@ -21,10 +21,7 @@ ohos_fuzztest("ServiceCenterStatusCallbackStubFuzzTest") { "../../../fuzztest/fuzztest_others/servicecenterstatuscallbackstub_fuzzer" 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/aot/aot_executor.cpp", @@ -65,6 +62,8 @@ ohos_fuzztest("ServiceCenterStatusCallbackStubFuzzTest") { "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/test/fuzztest/fuzztest_others/shortcutdatastoragerdb_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/shortcutdatastoragerdb_fuzzer/BUILD.gn index 30daa4856b..7586c1d7d9 100644 --- a/test/fuzztest/fuzztest_others/shortcutdatastoragerdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/shortcutdatastoragerdb_fuzzer/BUILD.gn @@ -26,7 +26,7 @@ ohos_fuzztest("ShortCutDataStorageRdbFuzzTest") { "../../../fuzztest/fuzztest_others/shortcutdatastoragerdb_fuzzer" use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] sources = bundle_mgr_source sources += bundle_install_sources @@ -60,6 +60,7 @@ ohos_fuzztest("ShortCutDataStorageRdbFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", "selinux_adapter:librestorecon", diff --git a/test/fuzztest/fuzztest_others/systemabilityhelper_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/systemabilityhelper_fuzzer/BUILD.gn index caa6bdc2fd..2ac7668754 100644 --- a/test/fuzztest/fuzztest_others/systemabilityhelper_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/systemabilityhelper_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("SystemAbilityHelperFuzzTest") { "../../../fuzztest/fuzztest_others/systemabilityhelper_fuzzer" 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 @@ -52,6 +52,7 @@ ohos_fuzztest("SystemAbilityHelperFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/BUILD.gn index 7549e20937..9e8f17c02d 100644 --- a/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ ohos_fuzztest("UpdateExtResourcesDbFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../../../fuzztest/fuzztest_others/updateextresourcesdb_fuzzer" - 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/aot/aot_executor.cpp", @@ -73,6 +69,8 @@ ohos_fuzztest("UpdateExtResourcesDbFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplcheckfileparam_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplcheckfileparam_fuzzer/BUILD.gn index 7095c8797a..8bf32318d3 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplcheckfileparam_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplcheckfileparam_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplCheckFileParamFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplCheckFileParamFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplcopyfilestotempdir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplcopyfilestotempdir_fuzzer/BUILD.gn index d8d410d20a..4b8b024d91 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplcopyfilestotempdir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplcopyfilestotempdir_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplCopyFilesToTempDirFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplCopyFilesToTempDirFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimpldeleteabc_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimpldeleteabc_fuzzer/BUILD.gn index bd1dd93483..bc2397b50c 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimpldeleteabc_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimpldeleteabc_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("VerifyManagerHostImplDeleteAbcFuzzTest") { 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", ] @@ -71,6 +69,8 @@ ohos_fuzztest("VerifyManagerHostImplDeleteAbcFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplgetbundlemutex_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetbundlemutex_fuzzer/BUILD.gn index 810de45bcb..477a72d218 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplgetbundlemutex_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetbundlemutex_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplGetBundleMutexFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplGetBundleMutexFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplgetcallingbundlename_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetcallingbundlename_fuzzer/BUILD.gn index 33fbb3b75e..f9e234b08a 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplgetcallingbundlename_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetcallingbundlename_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplGetCallingBundleNameFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplGetCallingBundleNameFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfiledir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfiledir_fuzzer/BUILD.gn index e6cf179c91..01410f9cee 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfiledir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfiledir_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("VerifyManagerHostImplGetFileDirFuzzTest") { 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", ] @@ -71,6 +69,8 @@ ohos_fuzztest("VerifyManagerHostImplGetFileDirFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfilename_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfilename_fuzzer/BUILD.gn index 49c33f58dc..18ef6f97af 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfilename_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetfilename_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplGetFileNameFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplGetFileNameFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplgetrealpath_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetrealpath_fuzzer/BUILD.gn index b442b7b4d1..54d3d032f0 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplgetrealpath_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplgetrealpath_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplGetRealPathFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplGetRealPathFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplinnerverify_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplinnerverify_fuzzer/BUILD.gn index fcc8048e56..ccf3b9c756 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplinnerverify_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplinnerverify_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplInnerVerifyFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplInnerVerifyFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplmkdirIfnotexist_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplmkdirIfnotexist_fuzzer/BUILD.gn index b0913a6214..6c51791999 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplmkdirIfnotexist_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplmkdirIfnotexist_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplMkdirIfNotExistFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplMkdirIfNotExistFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplmoveabc_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplmoveabc_fuzzer/BUILD.gn index cac3ff6d9b..9e4e27ab4f 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplmoveabc_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplmoveabc_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("VerifyManagerHostImplMoveAbcFuzzTest") { 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", ] @@ -71,6 +69,8 @@ ohos_fuzztest("VerifyManagerHostImplMoveAbcFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfiles_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfiles_fuzzer/BUILD.gn index 14eae5edfc..605fde6b73 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfiles_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfiles_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplRemoveTempFilesFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplRemoveTempFilesFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfilespaths_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfilespaths_fuzzer/BUILD.gn index 023978f76e..5b76a1459a 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfilespaths_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplremovetempfilespaths_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplRemoveTempFilesPathsFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplRemoveTempFilesPathsFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplrollback_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplrollback_fuzzer/BUILD.gn index 2444f777d1..d1072740bc 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplrollback_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplrollback_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("VerifyManagerHostImplRollBackFuzzTest") { 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", ] @@ -71,6 +69,8 @@ ohos_fuzztest("VerifyManagerHostImplRollBackFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplrollbackdir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplrollbackdir_fuzzer/BUILD.gn index 8bddc12c09..b71f0216c1 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplrollbackdir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplrollbackdir_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplRollBackDirFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplRollBackDirFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplverify_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplverify_fuzzer/BUILD.gn index 719579cae1..cdacdab76a 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplverify_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplverify_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("VerifyManagerHostImplVerifyFuzzTest") { 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", ] @@ -71,6 +69,8 @@ ohos_fuzztest("VerifyManagerHostImplVerifyFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabc_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabc_fuzzer/BUILD.gn index 1819b1ccde..43f088fedd 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabc_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabc_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("VerifyManagerHostImplVerifyAbcFuzzTest") { 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", ] @@ -71,6 +69,8 @@ ohos_fuzztest("VerifyManagerHostImplVerifyAbcFuzzTest") { "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/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabcdir_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabcdir_fuzzer/BUILD.gn index 6fb1298e8f..d9dc93d094 100644 --- a/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabcdir_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/verifymanagerhostimplverifyabcdir_fuzzer/BUILD.gn @@ -22,8 +22,6 @@ ohos_fuzztest("VerifyManagerHostImplVerifyAbcDirFuzzTest") { 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", ] @@ -70,6 +68,8 @@ ohos_fuzztest("VerifyManagerHostImplVerifyAbcDirFuzzTest") { "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/test/systemtest/common/bms/BUILD.gn b/test/systemtest/common/bms/BUILD.gn index 1d8c6b62e7..9279348b77 100644 --- a/test/systemtest/common/bms/BUILD.gn +++ b/test/systemtest/common/bms/BUILD.gn @@ -39,7 +39,7 @@ ohos_static_library("bms_install_sst_source") { "${inner_api_path}/appexecfwk_core/src/bundlemgr/status_receiver_proxy.cpp", ] - include_dirs = [ "//third_party/json/include" ] + include_dirs = [] public_configs = [ ":bms_system_test_config" ] @@ -57,6 +57,7 @@ ohos_static_library("bms_install_sst_source") { "hilog:libhilog", "ipc:ipc_core", "json:nlohmann_json_static", + "jsoncpp:jsoncpp", ] part_name = "bundle_framework" diff --git a/test/systemtest/common/bms/acts_bms_kit_system_test/BUILD.gn b/test/systemtest/common/bms/acts_bms_kit_system_test/BUILD.gn index 955bd1bb7c..f76acf13cc 100644 --- a/test/systemtest/common/bms/acts_bms_kit_system_test/BUILD.gn +++ b/test/systemtest/common/bms/acts_bms_kit_system_test/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "bundle_framework/bundlemgrsst" ohos_systemtest("ActsBmsKitSystemTest") { module_out_path = module_output_path - include_dirs = [ "//third_party/json/include" ] + include_dirs = [] sources = [ "acts_bms_kit_system_test.cpp" ] cflags = [] @@ -48,7 +48,6 @@ ohos_systemtest("ActsBmsKitSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -65,8 +64,10 @@ ohos_systemtest("ActsBmsKitSystemTest") { "cJSON:cjson", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "samgr:samgr_proxy", "selinux_adapter:librestorecon", ] diff --git a/test/systemtest/common/bms/bms_app_control_host_test/BUILD.gn b/test/systemtest/common/bms/bms_app_control_host_test/BUILD.gn index c83bdfdbb2..5b657b7728 100644 --- a/test/systemtest/common/bms/bms_app_control_host_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_app_control_host_test/BUILD.gn @@ -26,13 +26,13 @@ ohos_systemtest("BmsAppControlHostTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_bundle_mgr_host_test/BUILD.gn b/test/systemtest/common/bms/bms_bundle_mgr_host_test/BUILD.gn index 0d582c641b..2b9a3ce5e3 100644 --- a/test/systemtest/common/bms/bms_bundle_mgr_host_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_bundle_mgr_host_test/BUILD.gn @@ -26,13 +26,13 @@ ohos_systemtest("BmsBundleMgrHostTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_bundle_resource_host_test/BUILD.gn b/test/systemtest/common/bms/bms_bundle_resource_host_test/BUILD.gn index 55af6515cf..c6115ae108 100755 --- a/test/systemtest/common/bms/bms_bundle_resource_host_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_bundle_resource_host_test/BUILD.gn @@ -26,13 +26,13 @@ ohos_systemtest("BmsBundleResourceHostTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_check_service_test/BUILD.gn b/test/systemtest/common/bms/bms_check_service_test/BUILD.gn index ed0665f9ff..f5d0772ef4 100644 --- a/test/systemtest/common/bms/bms_check_service_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_check_service_test/BUILD.gn @@ -29,13 +29,13 @@ ohos_systemtest("BmsCheckServiceTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "ability_base:want", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_clean_cache_callback_host_test/BUILD.gn b/test/systemtest/common/bms/bms_clean_cache_callback_host_test/BUILD.gn index eb16cb3679..656024ccc0 100644 --- a/test/systemtest/common/bms/bms_clean_cache_callback_host_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_clean_cache_callback_host_test/BUILD.gn @@ -28,8 +28,6 @@ ohos_systemtest("BmsCleanCacheCallbackHostTest") { "${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\"" ] @@ -37,6 +35,8 @@ ohos_systemtest("BmsCleanCacheCallbackHostTest") { external_deps = [ "ability_base:want", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/test/systemtest/common/bms/bms_client_system_test/BUILD.gn b/test/systemtest/common/bms/bms_client_system_test/BUILD.gn index b952eb43d8..58289c95db 100644 --- a/test/systemtest/common/bms/bms_client_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_client_system_test/BUILD.gn @@ -30,24 +30,23 @@ ohos_systemtest("BundleMgrClientSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] if (bundle_framework_graphics) { - public_deps = [ - "//third_party/icu/icu4c:shared_icuuc", - "//third_party/jsoncpp:jsoncpp", - ] + public_deps = [] } external_deps = [ "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", + "icu:shared_icuuc", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] if (global_resmgr_enable) { diff --git a/test/systemtest/common/bms/bms_code_signature_test/BUILD.gn b/test/systemtest/common/bms/bms_code_signature_test/BUILD.gn index de19bf41bb..1597a021a6 100644 --- a/test/systemtest/common/bms/bms_code_signature_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_code_signature_test/BUILD.gn @@ -32,7 +32,6 @@ ohos_systemtest("BundleMgrCodeSignatureSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -42,18 +41,18 @@ ohos_systemtest("BundleMgrCodeSignatureSystemTest") { } if (bundle_framework_graphics) { - public_deps = [ - "//third_party/icu/icu4c:shared_icuuc", - "//third_party/jsoncpp:jsoncpp", - ] + public_deps = [] } external_deps = [ "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", + "icu:shared_icuuc", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] diff --git a/test/systemtest/common/bms/bms_compatible_system_test/BUILD.gn b/test/systemtest/common/bms/bms_compatible_system_test/BUILD.gn index bf8805a2de..6ce36505a6 100644 --- a/test/systemtest/common/bms/bms_compatible_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_compatible_system_test/BUILD.gn @@ -36,7 +36,6 @@ ohos_systemtest("BmsCompatibleSystemTest") { "${core_path}:appexecfwk_core", "${services_path}/bundlemgr:libbms", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] sources = [ "bms_compatible_system_test.cpp" ] @@ -44,6 +43,7 @@ ohos_systemtest("BmsCompatibleSystemTest") { external_deps = [ "ability_base:want", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_default_app_host_test/BUILD.gn b/test/systemtest/common/bms/bms_default_app_host_test/BUILD.gn index 5e80713b55..7b50570cb8 100755 --- a/test/systemtest/common/bms/bms_default_app_host_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_default_app_host_test/BUILD.gn @@ -26,12 +26,12 @@ ohos_systemtest("BmsDefaultAppHostTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_install_system_test/BUILD.gn b/test/systemtest/common/bms/bms_install_system_test/BUILD.gn index a5b2e28e81..b89df168f5 100644 --- a/test/systemtest/common/bms/bms_install_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_install_system_test/BUILD.gn @@ -81,7 +81,6 @@ ohos_systemtest("BmsInstallHapSoTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -90,6 +89,7 @@ ohos_systemtest("BmsInstallHapSoTest") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", @@ -141,7 +141,6 @@ ohos_systemtest("BmsInstallSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -149,6 +148,7 @@ ohos_systemtest("BmsInstallSystemTest") { external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", @@ -178,7 +178,6 @@ ohos_systemtest("BmsInstallExternalHspSoTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -186,6 +185,7 @@ ohos_systemtest("BmsInstallExternalHspSoTest") { external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", @@ -215,7 +215,6 @@ ohos_systemtest("BmsInstallMultiUserTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -223,6 +222,7 @@ ohos_systemtest("BmsInstallMultiUserTest") { external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "os_account:os_account_innerkits", @@ -259,7 +259,6 @@ ohos_systemtest("BmsInstallExtensionSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -267,6 +266,7 @@ ohos_systemtest("BmsInstallExtensionSystemTest") { external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_launcher_service_system_test/BUILD.gn b/test/systemtest/common/bms/bms_launcher_service_system_test/BUILD.gn index ac93dc8790..eff9a61b54 100644 --- a/test/systemtest/common/bms/bms_launcher_service_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_launcher_service_system_test/BUILD.gn @@ -33,7 +33,6 @@ ohos_systemtest("BmsLauncherServiceSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] sources = [ "bms_launcher_service_system_test.cpp" ] @@ -48,6 +47,7 @@ ohos_systemtest("BmsLauncherServiceSystemTest") { "bounds_checking_function:libsec_shared", "cJSON:cjson", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_overlay_install_test/BUILD.gn b/test/systemtest/common/bms/bms_overlay_install_test/BUILD.gn index 2ac8ca488d..e91c19a1a5 100755 --- a/test/systemtest/common/bms/bms_overlay_install_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_overlay_install_test/BUILD.gn @@ -47,7 +47,6 @@ ohos_systemtest("BmsOverlayInternalInstallTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -55,6 +54,7 @@ ohos_systemtest("BmsOverlayInternalInstallTest") { external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/systemtest/common/bms/bms_permission_grant_system_test/BUILD.gn b/test/systemtest/common/bms/bms_permission_grant_system_test/BUILD.gn index 05bd7109c4..8fad27f779 100644 --- a/test/systemtest/common/bms/bms_permission_grant_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_permission_grant_system_test/BUILD.gn @@ -34,7 +34,6 @@ ohos_systemtest("BmsPermissionGrantSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrService\"" ] @@ -42,6 +41,7 @@ ohos_systemtest("BmsPermissionGrantSystemTest") { external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_sandbox_app_system_test/BUILD.gn b/test/systemtest/common/bms/bms_sandbox_app_system_test/BUILD.gn index fb9d1c5c2f..a997ba78a6 100644 --- a/test/systemtest/common/bms/bms_sandbox_app_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_sandbox_app_system_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_systemtest("BundleMgrSandboxAppSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] @@ -40,17 +39,17 @@ ohos_systemtest("BundleMgrSandboxAppSystemTest") { } if (bundle_framework_graphics) { - public_deps = [ - "//third_party/icu/icu4c:shared_icuuc", - "//third_party/jsoncpp:jsoncpp", - ] + public_deps = [] } external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", + "icu:shared_icuuc", "ipc:ipc_core", + "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] } diff --git a/test/systemtest/common/bms/bms_search_system_test/BUILD.gn b/test/systemtest/common/bms/bms_search_system_test/BUILD.gn index 8098549b44..7516722cd1 100644 --- a/test/systemtest/common/bms/bms_search_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_search_system_test/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "bundle_framework/bundlemgrsst" ohos_systemtest("BmsSearchSystemTest") { module_out_path = module_output_path - include_dirs = [ "//third_party/json/include" ] + include_dirs = [] sources = [ "bms_search_system_test.cpp" ] cflags = [] @@ -35,15 +35,16 @@ ohos_systemtest("BmsSearchSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "ability_base:want", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "samgr:samgr_proxy", ] } diff --git a/test/systemtest/common/bms/bms_stream_installer_host_test/BUILD.gn b/test/systemtest/common/bms/bms_stream_installer_host_test/BUILD.gn index af3277aa4d..a4577e7d96 100644 --- a/test/systemtest/common/bms/bms_stream_installer_host_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_stream_installer_host_test/BUILD.gn @@ -28,14 +28,14 @@ ohos_systemtest("BundleMgrStreamInstallerHostTest") { "${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 = [] external_deps = [ "ability_base:want", + "googletest:gmock_main", + "googletest:gtest_main", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/test/systemtest/common/bms/bms_uninstall_system_test/BUILD.gn b/test/systemtest/common/bms/bms_uninstall_system_test/BUILD.gn index 9e01bd6295..ed8e01b4aa 100644 --- a/test/systemtest/common/bms/bms_uninstall_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_uninstall_system_test/BUILD.gn @@ -40,13 +40,13 @@ ohos_systemtest("BmsUninstallSystemTest") { "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", "${services_path}/test/moduletest/utils:tool_common", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "ability_base:want", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/bms_verify_manager_host_test/BUILD.gn b/test/systemtest/common/bms/bms_verify_manager_host_test/BUILD.gn index 91d025b3f2..fa159feb9e 100755 --- a/test/systemtest/common/bms/bms_verify_manager_host_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_verify_manager_host_test/BUILD.gn @@ -26,12 +26,12 @@ ohos_systemtest("BmsVerifyManagerHostTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/extend_resource_manager_host_test/BUILD.gn b/test/systemtest/common/bms/extend_resource_manager_host_test/BUILD.gn index 563f0af2af..4fff99be8c 100644 --- a/test/systemtest/common/bms/extend_resource_manager_host_test/BUILD.gn +++ b/test/systemtest/common/bms/extend_resource_manager_host_test/BUILD.gn @@ -26,12 +26,12 @@ ohos_systemtest("ExtendResourceManagerHostTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/test/systemtest/common/bms/extend_resource_manager_proxy_test/BUILD.gn b/test/systemtest/common/bms/extend_resource_manager_proxy_test/BUILD.gn index 3dc3af5079..ad83839252 100644 --- a/test/systemtest/common/bms/extend_resource_manager_proxy_test/BUILD.gn +++ b/test/systemtest/common/bms/extend_resource_manager_proxy_test/BUILD.gn @@ -26,13 +26,13 @@ ohos_systemtest("ExtendResourceManagerProxyTest") { deps = [ "${common_path}:libappexecfwk_common", "${core_path}:appexecfwk_core", - "//third_party/googletest:gtest_main", ] defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", -- Gitee