diff --git a/bundle.json b/bundle.json index b69b1c600707749327d0e2186725b7e88eb440d9..e52b7374b424092ad42e07e49b7847acc65ecb92 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 12a6b7424048e554e8cab50bd45610b4da456021..96b5072181011553e59bf1880522f76a2d8f7cfe 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 5810bf7a0a2aa0598e32259bc1d3edca66d5e063..c09422a984e44f39006f901f681f0e36e13a0703 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 f3e7be0c433d06b90640112ff74f9f900b694a93..7bc0306a87221302fcd1e9add0db8d89abac2cfa 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 23c0011aeaa4f0e317846c9a9a9b14c2bf8b57d2..280111163bc1d545a238e44542e04d4dc1d9940a 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 da77b3f14947caca89acc0e357dfd65cae252106..832f0f8ed4fcc6b33c1fc9e00f2a82bd68fe92de 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 7b62baa8e770385279f9ba620610336066b1a68b..f64916a65dc4846b9a72141cb2720e624adeaf9d 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 8d282992dc32b08b3c846428b1f438b596b81fdb..4f4b8dcf32b63f049f26dc7261dc0c6d5c59738e 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 0e7ed46b1e93aca56ae53569dbf79955bb078613..76b0e32e2743aa4b9355a03d457cdc4a67e0e13c 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 3fc0b53e9dd4b6eba9a908807c0b706b66cd0d63..bc7b449833d87626c00a75593f89b3e3168edb11 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 d3a5dbc229523cf1b3e2adddf8f43289af0a60d6..84ba4a7b9d741c39939604ce999eb8a498b01c9e 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 19b3f369dac99db478abbdcfd8b0dad4ae32a535..3b22d378546acc82e87de03aa2868e9d74693612 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 db1bacd84ae644609270f7e5d7dbed533bad73d2..c42215510cf0f610c8ca353b2f33de97a04ca172 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 6ce0a281f296a1935c538b60879bcf5a34adb539..b0495c740e82f3d9e428f6181e7aa0e3ab194275 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 b639e3781f9ab0fb000bcfc9add0e0ebf93b688f..9b3f1eb486181590ee62af8b11f756ed8cc48857 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", ] } @@ -67,6 +66,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 7a9fa91006cec56abd9612876f8209ab511b7b68..27bb8e0183390ea6f50aa1c1f3b0d71e191641e1 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 9e6dc8426997efcadafd57d0c8701440e7ded46d..2877ba52b1b125800fd7cbf4038891e15f35faf8 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 6ef281a0befe7197c7bf2abfaaeaf8faf186c2ca..230d78a3571f41f3b6b8ca0c69fdcd24982ba26c 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 2bbe1216706dd6db1e2003ccdf4c76333a01ef25..84dc957c6c76a1f5934712bb2389d3a3e86ac318 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 990805b942b9e30ee17fcb7b47b63c8ff46c608a..9939636b56c31f864f8e1ecf41deeb7942082e79 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 12aa6cd33623652fd0a4a414bdf2e48621044764..6d448486a33f9aaaa9f422de28cea57c3be4cfd1 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 60e1390823a269929f7e40ee4f905974f72258c8..6a686190c180ecb0c495e0ec1b06d09b28956004 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 de3aa86924fde70bc7348576e1253eaf5f8f102b..4de53c26e1c7199a490fa4f660571d45fea384cb 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 d77cfa126be559d9584121468404d93e21f04ab0..282ab3aa94b57f4865bf24076d9442e919500581 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 905cd16f783a699694a3eefc6fa48f3a1750bc56..b6bfbc1105acf2b08a9c1b74079524728825c950 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 830693ea2d54863fbbaa54fcbd47824541c7f236..24c92c113de988da351d6eb67fb883bb8e8e4376 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 66d60387cf42e18934fe9b5423532652b49572d4..ba9e4802a5cc7a035a6b7f103b35c98b50ba2ce8 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 624ff7f5283e5097a6dd37e8b7d8de5a469b388c..eff2cb09de54c569d7fb7fd70d024bd8b9bb29b2 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 ceb2a5a7d046feb4b858ee12c9f448e0d509a1ba..310224da98e7711419e37d18005341d6752bbf40 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 d51dd675892357f17a87f440a808ec9d4faa2908..bc57c0cc3b1cbf164e4a7053cbfb830b8a93b91b 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 f832ed8f3e1b5c4f83054bf899573d7bfc67d320..46f7702e1a36e1dbfe34a00c1e8c131e187c4037 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 f7a494b7522b97d0d50660ed90cc4d428158b225..7562f4ea36813f4c1f9a7cabe2ae310dc8aa55ee 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 e891c7b1098fc36c148f52bdf1116bafd02ed7c8..cdeff4129ffe48d62a0ff1f7156239f14f86e0e8 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 6c84ccaed8c9bf1c6a866718ad28759197c15d2a..21262e14283689e8babac1deb546598102c63fa6 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 3794d67ea424b58972855d68d190e1e0c1e04ccc..ffc676a151edb012de7ff2f04f6a66aa70baf1f3 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 b6b359eac521348e0761b136a96d8ed1002f17f3..d541e640a456d526dca2d8bdc247029d6bf5e2d1 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 198d6685df3c0cf4d5cc7cee556d764d07712405..957cd74901dbdba69600b05ea68c1633773da79c 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 43eed3c82c3774dda685b6c6bb27ee724780a266..2e2cfa732bb84c8f63e2e22cc971ead6a632f655 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 d865be203504f8afc85bdc527769dd162773d709..50f2f799a9ecfd6d8aeb879027d354efbd06e7d3 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 5423f4c14f45ef3a3c8990c23aeec86c3ef3b576..a0920674238f0041eb5fa6c48bf027218ee06126 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 21ec8c9f31cd79a65e23c414fdf2dda9bb364c4e..e42426cad5cd95a611b853372be7c7a61465d5b5 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 0176b2588d8fe6d467e63f2c8c23b0406e812cb3..8221c19a40f46fc9cd8b580902fde09d8d1e6899 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 27aa30f64c22be2ad957fabff029f194c52045ec..29d9a0a76774241d47da83652c2e21a5e0f874ce 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 5302c189380e84adb770f73c723a730447824cd4..9961addf51f36e0ff646f331c6ac86017c5dc236 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 a1d1d637b76a6ecfc92e6c0a61ac945b9fa04715..e4f51adee616da4c3fd3ad03a0963e18366f1d83 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 97a5acb053b09026a61324a819cf292c5b385484..4c904f7dcc924157275fb28bb2ae0db53703f0be 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 a1decce73a8afc90b2856e90218e2dcd801f0319..54e205e7806c1e8de7b435d97b1715d7db5f8d78 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 8cd125ec70176bd1c0097fac90bd932dbbd784d2..ed91d70413979906cb790e2d287aa478d9668149 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 afe00fbd506ab627ce726c6b7fd89ba2d29a64e6..652b7ed8b93a7e143c2c92f29f54def333cd8150 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 03ef0578b3c67790e011c0e99618c7c03ec32df8..4332be6e577b02ef26e9bcf7048b71208f115c64 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 9447b0ca5cf5a43757005df43d647fc831586f12..1f1ce33402b195bb52200fdea7f7c9b5089b05a1 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 ac3c2c5c87c2b7f0c4d580d4df4e01f9f34a19a4..ac36f1e44183f5e43d700b011dee3a619067931c 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 0bc34dccbc7729abd25f16f669502c4bb868fa7f..5e9fc0328ea6a9f3b8d7b08db253a575008b27b9 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 3faf26f92ee74c1396dff8514145530ac35a02e4..8e960eea143d1807161998ee723edb8f8f4901c0 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 89cdc39c604698983db0095e70d77a02f722e844..7f10c32f36e75260dd28ad808c2b6ee201cc71b6 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 @@ -51,6 +48,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 f4d669a320824734a82f988ed7e9bcceb9b3cab8..50e149a430f204860bc6f79d2bc6ff9d5f46e444 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 94449a366fd09891256a8c856ebce6e07a95c228..ef740e36cbcec062e2d69a908996d80d19010b9e 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 54e9a9333c2a5b41a8073fe037ec5bd8be4cbdbb..8ede18f5f6bb05fc6f841f3abb7815dda05c5099 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 3b614737f6fc3c9d8aa72681dcebd59e98bc661a..9c5f4c25360461595b98bd4c967d1b9c5b6303fa 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 260bcdf89ba02727555dc6eac238bd52dd94c941..8a905bbc37574c6c96b3db5c74ff6c3117a718ee 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 6ec5dbbc6b5c757e98ddfa13c3c721f4219eb422..e31d32102da27553104fc343aa4c1a567157b3dd 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 1ec0a7d1babf3bc5849105f7e588b71ab197a949..3fe912cccc784074e1dccd55205bfcfaf32a8081 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 fd28b1a445e03566ca245cc6a57290207d0cf9b5..a731e3e06865cfdea525cbe556c9a0d35884cefb 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 f4e29a1ba050811bb19309ea86b7ea39ebe38e00..1835347971bc95bb7830c897d2f8e68b08c015e4 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 a39e213285629e805daa36c6a1a00b33da1252e7..a2bf24845ff2d1ac5212ec45d200b04046ea36d4 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 de37cbf35b6d75f68f52a0336f25ad2c77e8caf9..1bf2f8ad00e1a97b783247798e7e59ca00383905 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 beb60e2699e94d796dcafa65d51f1284e8ff43a1..37e472ae535ddf2440f4932b2b08df6a5b283e5e 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 041ac669e9cfcf7ecd5ed60e8a7035688459941b..9ac7378de0fbedf935e9b785ad5be21817253099 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 53bd31a919fa73852843261e0343a7731fd73ba5..ac894ef5488a7988d84adbf90c87cd6da5d08899 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 31d5e778147248e4d748570e8dbb56d6082ffbcc..a5d0e41cc89783ca861545dd4c609bd60b13780a 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 66721bd20860fad0ff32f358c7c27e837a8de048..4f026797c1247c6c2fb2e965b38d70eb640c8c3c 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 6ae1be9e2d181f33746704add394db4b7a2330b3..414fa7a9ed498b519cfc01c2fd5123be1272015d 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 fb5dde79ac9011af56daac645d94fcbdd5efb6c3..7527ca5cea7ebda26afc33e073a029f8396f5ea1 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 a89553122e90ec2e278c8e3fe228dabb49ad4f90..50f6a731422dda0c298f771272d910bfd9b8cce1 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 8bc0f0f8c00f4d78a4dd844eb69f9c1c210d9717..d342aa5ae29ea1b216fdabb199417466b2b39d06 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 c33817f5fa26e6b87ff583ec112b9d050e2dcfba..2fb7c3c7538a76df1b0b4401bb575a7e544491b5 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 688df9c701edd4916d431996fd0aa96f30e040b5..a5ea46efa1424faec577548e2fa47609b04eed9a 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 f6e2669b7a9fd5b650e88b43fce0c005f6428861..ef0bbbf9d9ace5ce745ef54ca15aad3e48c1115e 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 62d45aceec5b606e556ee6d783ba2e8703dc4418..7bb2ef34fd05acc0702456e25b8d33526a60584a 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 bb4372a65240e863086e695eaea23d20246d3674..0caa873c7417ae9242a136247e9c6b62e5fcd973 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 68153fba15c65789f59296652689f3a16b270eeb..1d428528b1956a528054de823ebd1d9b21151d77 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 fafbe1ff8933d7de11a7c82c445fa493a52d1815..06d926c6b65e0cb301fc6ed670be5438b4366e17 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 02f53bd52d6996868a897baa5fd914d859f0e331..c361b94b84df649d1f0e9e81a09f167724b4640e 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 d5ec1fdb91370656b94018f33508e83e583d8156..7c891863d4782f2865cfe38a7330787feef18456 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 263c68ef3eefb15f7ef151d0ceb5b8185792c6c8..ee77a546a5c7d3bff63abfac625793f616e70713 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 1d84385c04e3bb955171f2370c3f45878e982a0d..cf33d90dd9f76dcf35e8bd8c6b06e178b67da291 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 0c71baff31c8a306818bbb7aee4e357cdd0b45ff..c7f3a6c7e5bb058f4ab7b92f6857d7354e8a68ee 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 11ed3aa97b33d6a66f3385efa11f1eecf6adb845..a9ea153ff5ad0c63a4299efdcf94cdaa6b7b2e91 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 30579ba1ea6acb467dba381583b44af3744c58ae..64b8ef95899ec331e1b79b4e8bcd4ab0fc533611 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 0aa6345ef97d435f4ee3099cd0827f70c42b7b31..1170dabd8f7ea705e07a8df1e2c51a0e88cebc1a 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 a5088c930f965d6acb0ecb59c97acf6ef59c473b..182f62ee2c20b5b4aad8469e08a731435e34d7b8 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 a2ac4cfc4acdefd522c0ae57101c42ce8854345b..252f6797590ee7692648513ca12c553756cdf06e 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 0be0c14e4eee1901913831faf683fb7b1a7e25e1..68468caa84f0a1d9656eb3f862ab906e01faeed7 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 9e48d318b05e19efc8511040fe8d624605c275f1..4ed0479c5d8c8ce43f95ac0a9ced368ea56b1fcd 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 682d644d90c92166e2170edc9f740e2bc3d00f44..931d5f67bf093ad11725983ce188e9164abf9c4d 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 28056cdba6c559ad0136077277d5dc7e6c577eb3..406dcddfcc662607385a0a662b68b54059e7e263 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 e938eacaeb9a1af72d2d921362673f3fdfb8bc43..1b5cfa8c06e7126e39136e9001953d7cd52842ca 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 4eafd5cad60022b4750c626dce0a5b8b57c1aaea..025f0d2b675ee5bb67ad0e0b9d12d8012f33c5dc 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 430c92e82b9ff8aafb6407389659e96a23ee9079..6789c591c96b56374773d73246e1cc43d096cf2a 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/appservicefwkinstallerremoveinfo_fuzzer/BUILD.gn b/test/fuzztest/fuzztest_others/appservicefwkinstallerremoveinfo_fuzzer/BUILD.gn index f89ed262b9f5e21b17272f397c3b5c187bb6ceb7..011e1ca01cde8390efdf808fd4597abc7962698f 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 de30286f61d8d8232ae7046ad44a875bf302400b..3372df64d4406f22f5c7b6e9e664e44b2237dda6 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 b8fc8089368141aef9dfa08b7e4e204bb7948669..da504c15c4443cea38b10cbd5432d1004a58ec9e 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 1384d65200ff1d0144dd1a857d5e985f2eadbf72..6c165f113c86383b2c3069d7f84a2ed85ea71751 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 b9ef881567cdd5f8adeefc80aaed72cde47f7019..f0f9157814c5ccfd83a4d0a35058836860cfc0c8 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 1e63f969ab5ebc3d574a1f21562d30274c669771..fa1820c45727dfbb5bae54bfc2349fd239d21c83 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 cbdda1a66dc2690b09ff6e8f792ee3d2216efdd8..570ccb90e09c16227e218c0d5f3fb30715a30101 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 ed7e0a843e158ef6cb3247afea2435449c2acb5c..ff0b78b32481ccfbb079d0fe4dbee31fa4aa71a1 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 4c8d5066d25bf75aa8fdddfdc9e122c3ebe1bbac..b7ceb22de8fc01a8d0f7343cc0a0222916a88559 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 c5458d34688bf21676824b7a69acae69dc9683ae..fc28233dbbd540f0aa0f58af9faa0f93ea3363fe 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 e47f166e3d38051f479294624037b8d5e99fc77c..24e5109313e322581e203471370144b3f95a0682 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 64f696df8e33489e7c1b2e6f8c3ca039067bbe28..e40639ed0eaa34dcc749002789dab3ca5a939e87 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 5d4331d0822a5c4ad5207f5179b1b5cbff10db64..da4b738cbcdc72fc21329d59da7d87a6ddfe15bf 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 3a4352a9e8de2f381c166188a8a2bf939a895146..5b6a3541021cdf26d7fd8d8b1754dfc895fa55a1 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 99928d605174218c87ba5c4ff42bb6bed68b1449..5aec92011fcd4dc37c05bc3ee442b1e9432622df 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 5275312af929d341a401e89b033073e6878c0db0..3c19fa1fb14152b4b993b29101a5fd7826e9ace7 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 cb99211add1bb14c4e0480e4c450976f17a5e8d3..40f616d12d38f5a8266e76e575f6268df7e5db16 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 a79fa531d672bb4c415e44ede181b9659a570b85..ff12fa90ddec1b6cc1a2eab9ec5cbab09952d09b 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 4d9c3a1fdadf4b5e9aad8bb0c3de16823c6a2fcf..e680d6e9ee1b446ad3e01f816ab1963a63628afb 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 7f2433400fc6386b4bec4038d47df95879a42049..55b3285a86f6ddca5b3443293f787b02f3ac85db 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 9f70727197d0d5f05c961e697d8829eccc70aaba..7ea54150421f93f1cd69c00a541e24dca0660085 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 a777eb95ec64196585e1895503d668d570cc3046..fa40c97009d7e41cb27fdd043d118c99c0c0cb4d 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 dc2f357018dd248e307fd046b2e21b4e11d64559..038548458dca8668812abb2c1020f54f0a7bfab8 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 4e133570c54c1f3378d075e9e260ad606466c3b3..b2b089b7de81a905fffcbe5f957dd99b329ea4ca 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 f21dab689ce8f80263cbb4cfeaf474bfe59dd892..0197301867ab3b1202a1cbda9d50d3fee1b9a791 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 61e7e3407a6f708316797404adfb361a0fa51ec8..04a9657138efc07bb73d177b6fcb7b8606454965 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 caa79c8cc7108f1daccad156469bbd9149c8378e..55fe6b188c9b4bafdb9465899bd703c1825cb5c8 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 5fa82c4026a4e80814a104d76c2869b7581777e1..e2f728ac68d9eab1c458078a0ddfc8e53f67e771 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 a73dd60fbfbe45dfcdc60b93959d7fb2ae30e166..b13936e9c36552e688f97a9052dd6ee1452846bb 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 519d4c39433c235c257372d44ce7f827f24baca2..40c4c2784098581d53d5c6af89e93fbc0266c8c6 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 3561016ca8843acf8a58eb10ffeda6e213b5fb7c..e77a156aecf831de33b7f38fe357c4b0a6b53683 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 36971f85a8f0d090890ff0023772bec7a60bc4b1..e52d1067f61ccc0122cb4de26b84dcfe5d480985 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 07dc4415cdc0233661f2fa3a8bfdf937a25f4280..487e2075c8e0d054c8efa4b40f73cc26c49e487a 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 092c6ccd52305817cc1f2ead8fba9f140b67f4a1..93c061d6f72e7e5a7e01f5f85709048742c17e33 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 d89e4b993228c404e8cdd9978d24be6244fdacbb..3da0ba80268273e6649f505f3ded6aece41bcc0a 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 416f1cf6da30d3af8491af76930393938ffc8559..46249a29fc87d4b5921ad45c04c3a932d571fcfa 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 32541412c99d3c94c96431b814e1b0c3ee3632d9..ebc0147ca492fefcc106765b18f1ac1417d2982a 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 f1af01811877a1d33b15a769800b19362e084fec..c34481c5e714120093857db386a564015104768c 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 86b2282433453be919bccd2bdd191196cc5129d8..64ce52db16bb66633c11b618a5c58e871b105613 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 0871ceada16c4b38c9350726b3051af99e27d03a..39b9539e9caf08e967670015e03120094f789e99 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 d8797f62c267bba2c4d90b454293f29fe653acd7..4ad91c39ed395860241d8a17316d711f5e54b8f8 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 79f8970a341b650dc15c50a8d67f2f741b4ddb1c..5c37819e21a2c4fa9454a23d71f4ab2dd85443b3 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 8ecec601e315c1c1397a64cd86d2c4c677c1a1ed..e46a5b385e2efa34e3bd364491e3cbf34cec6057 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 bad9ffb7ac2c750d36f334a38ad34435d0174162..7291fe0ac0c0c1b1603fb7a79ed888bc825f5e35 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 e490e3e53ada65135cb28d08bd8c4fc70a49ba55..0c852d914b9ca3003ab6add41937adaef2793953 100644 --- a/test/fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ module_output_path = fuzz_test_path ohos_fuzztest("BundlecloneinstallerFuzzTest") { use_exceptions = true module_out_path = module_output_path - include_dirs = [ "//third_party/jsoncpp/include" ] + include_dirs = [] fuzz_config_file = "../../../fuzztest/fuzztest_others/bundlecloneinstaller_fuzzer" @@ -60,6 +60,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 dcaec0dcad761ecbd70cf520d0adab5c31177fd3..cc6cfe091f4fffdbe5c5439dae1a2f06ebc0d250 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 55cc0c8c21a9c6df51e0d06157cb168aef94e2a6..d01cf798236424a61be007135d9e8d0bfd233092 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 f62d53ebac638591d6cefe2642ed0ab06eff0b68..b61a0f770b00b5a98933b64fcae411dfa916c40d 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 89df6529007dc7c36aeadf9df9cca7dc07fb1bf5..3afaeb94c37bcf0283d17f5120f467c81fb8f51b 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 466e02f5c8f148f357fecf24a3b962ea0c709fca..c3e9c9dcdcd14ad335ecfd5bb71e669dd769e957 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 0a9d97fff071b182571319109b415fb73df091bc..6548496b2aa841b10c821747edcf11d66da6b2cc 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 9f8f40cc1ef8225e2f82b901b1e0f0e8e380b278..e1a06de9678292dd394dd2d460e68bdfa3c55afb 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 40eecfcbc45579978bfc6eac313a157702571c9f..5f8fcf5f932e1909896bd566f07886eb94311dd8 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 f389cb3718b970f5cc32739fdda50104d7373b35..363d3a9ca2f6ecf82e7cbecd9bb61e6d4b4c917d 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 b485ec14701f95e5950e853c10ecdc5e9cc1b36c..08d44c9152f4190d7513a056e41e2cb4d964de10 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 5f2cb29d89018861cdfadd155b430f33484290ac..e12ebee4c5069611cb90b1311e880e4f4f5ee912 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 61bd6498f0669ba8b3ee0d8a8ffd5ca3f4f7be6d..8b3535e4dab58c41c403c76c3223ca6640243994 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 74e71760b9d8ad5c68635eea28535d48e51f9a6a..75e77cf0ea154e933869bb6a8d7d79710af80dfa 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 f98831b1b07d977771f8d92a1aa10e04c1319265..10a9e9675bd4977eeb499ec17065269f773195ae 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 2c1bda9d1374b029e832d64cfbc172ef14baf4aa..401aaf7ef5d549d6ac35ec98f9f925ad86721d57 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 266d868e6128b1b27f65513f4b414ae2507e156e..d4ec0fd836571d3bd68fee7f11e6d1cc5535486b 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 66beb02d7c9989758dc9aae3c938e5284a2bfe56..898b70928569b48d583974c48a48495134ec6de6 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 eef2daeceaf3907534049dc2f80c12a9e6e0dffd..624a335658a9730257bd560e1b933d2f6e9c5021 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 7ffcc2a19dbe25eea97fc48f22dfcabe8353ee91..b93f74fdd9ec6cefdf63687d255e4849ad4df1a0 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 b93eb43e216163658ee2b3548211c27efc05d2d3..f0138c8de9e91ded6a3f7355f854b1cf89d2d087 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 a047a679dbf3c6c17d453360f2cd48eb27bf20ee..4d70a0e2d73b10056a21809a4e2dc2ab88659a35 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 ff90cd02271a91be3c7d94013c1ac37c401c0f0a..eacdd3c1c330e8ebc56ad43e048aba4d978140cd 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 02b139848a3cd65ac9844a47ddf343531d08c9f0..6082634ac8df5562771db5516b51c2217925ee9b 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 91579a9b1ab3ce36c9a769063c8dbcf452e08d8c..f2abcdc708f9d6287a310e6f11e9e30c6967f782 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 248d6a72344c7b69c011ca6d0ffd9e2ada24cfd8..09a1422031452256711aea263edd1d7aceccb67d 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 44c2afbc56215f60fc9943340a38b4d38f85170b..26cebe875c90023497aeb7f110fa6521be6b0a26 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 5016714f195842e1ea1edc77b4e79ab524871547..3424f87d8f11bb4ad14080ecd97e64680897c386 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 274e6d8aae67e258fbe8e682d9fb5e2ae8a9c6c4..85f4d6fe23aefbf0b9892ee1f3f073f3ec283742 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 b80d005b3ec62101092ccd859d9041391d7f2723..c3c221e90b0f9e063e53d2fa946ab1cbdc876d99 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 18d43726b8ec5a890d491a12353c8f64e0d1651a..819ecf6126ef9d2c531959fcbaf338286861a9cd 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 82ff447de2bf4803258419301c36524cabefe812..d1d7591ad049f92e5ca35a38f3d2e5f08c53e9d4 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 c5d5e140b039d9738dc95b9d8e413cd3aa63bfe7..19135b9128ef1a9e25c353e81050bb03f8389ee4 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 aa8bc40233d0d0f7d1520d6f78b0b05041e4bcac..053c12559d424e9e69b07f4273a3ce80c0328fec 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 35eb97351d0002e81db0627d1b935b635f32673e..5b37ada4d186819411f5760e90ec2036f447b97e 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 adea4d1f11f68db4a0073f9a437fd4fc4d403ae6..5ee8a9df097710d2d929df54158a2de6a5c2784f 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 0f2b93428c921add7681ae5f08e110432b991860..9633e66384283884a258c30ff3a5a4942c819455 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 63b5dc7bea9fbcb76980f47be551a6ff7ea7d0ad..2246a01b3368e2a4523ad1a8e614bd115162f161 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 41ed68a3ce2484af82925252ba8c9fdcddca9c2a..fadb71c644e64ee9a5925b4da2a75551c3052c90 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 5dadbd902f58d866294449973e32ed6527995d24..d5ffc2e5e7f4d9e3795b024a5acbad63923d9a91 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 f86f30d911b59cf946605f63e61491ec5e162420..ac6f467e48c17959f7e846f7a8938e6f609f98a6 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 00bc953250cc4af3fbbc5f02a8ce1acb4653fd54..884afea7af46d23915c3b227830e8cc3a645054f 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 82e909982087c7eed57cb94ed02a0d31c6b6666d..235d602380455798643c0712a2e61a4f9df0036d 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 63a6f61bbd4e2d787186b99c0ddc063b636b96ab..7905146cb1f8e3a9d6d8c98caf6c64418d0de794 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 833408b1f181a2d786d95b7d4a3a377ae242cf34..55c59d8506d6f129e2221c4e59e1ae6d4e2d1480 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 4ada4293d4b9b39d406c72f73e8ee07585ab9264..9a7507cb84993b71bac5652b3c0490ce05cc2d6d 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 f4e0ad8ad275ae0f365f5dbe8345c34bbaae6082..cbd10cdca0fcb39f8942dbc124ba1f062f7caefc 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 a3d458eb60d2a56e0918089093b56ddc7c146d43..0a664732c279ac68ee98c85eed820fb9a9456800 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 767c5d5b23330e9903f0a2527aa4f620a1d7d8b0..dea36f1fa5060cabf2ce67b0a9d550070bc21040 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 139e6f953adf687a16175a10747a923916e6e409..5e5a4ed2913de9fe10df3a48339416db32ea5af1 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 13e7ece0367cf8155d0c438eb335909cb36e47bb..d329d197ae825a9c10938599db2bae64d64e02cc 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 839986f1e71596235c56f8ff1f561d845ed9b0f9..3e968c01b3677013643ec286d76b8a21deb89fae 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 628b5a953b8c71667bb7acdb3a0b79a917406e95..f88f689e01f7c1bc980b43b9f33bccbb0a56d291 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 6bac873aa2d3cbccbf3131f26a24c2e96a204d72..57d2504c35290b11141098eb70a1365888cf6951 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 fdd84748061049628ec90aa576218e2ae2ada8d1..bfa6d541dcf08cf0d01a1bc977d9cae2c2a7ea33 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 d024d3aa85dacc77d76c5ad8a889ca4f5154b1be..15f52cc149a793169def11cbc5587e1aac760133 100644 --- a/test/fuzztest/fuzztest_others/routerdatastoragerdb_fuzzer/BUILD.gn +++ b/test/fuzztest/fuzztest_others/routerdatastoragerdb_fuzzer/BUILD.gn @@ -21,11 +21,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", @@ -67,6 +63,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 be41944c3d4c39e6f0d1fa36bd39482a86ce7ab6..2c9a36e24512bda8533b6d8a88d1c77edd243337 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 641092be1a9728450284cf0f77b64a6db1088755..5ec4f00368639e83b0d3d78cacf2c3865a108591 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 1c90cdf7ddb0a6e9cab00953f9a454bea0f7cbc8..13ab818fac88d2bb3f6f2dcf1f9ff80ba5c94aee 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 ada0c6ecef6553d77268b43656e8520f5c2bcc0f..40be1e2c08504c9c9e4407df91d2300c83a74aef 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 974f2cb43d27aaf1a0485a7b407cd8c804e75597..10fcd6a58d6066085c027e264ecaccb4e0c65a5a 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 e7c998b43d40e92b283751ca0df91b645823fb41..658cc409125c55821a3807a4598f26d893a645d6 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 30daa4856b6c3c483c384b3b85218d78d5a1985c..7586c1d7d94e4d34e019d70770eefd5aba7bc309 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 caa6bdc2fd38adf7bba9350ac9a87b8fb6cbd3e5..2ac76687544752387c66eddf0d76e44131a00c6d 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 7549e20937b05e98f137d00e6b5d400dbdc5a89f..9e8f17c02df21a11c5175203b1047683b6316b77 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 7095c8797ad7075c529d64557849229595a786e8..8bf32318d35f7c2e033a49cc40127aaf3462ccc0 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 d8d410d20a64e9ebb34a93485290cafdf7e5fedb..4b8b024d919cbc41cb0df5165197931b1d133a78 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 bd1dd93483e08107bbe533885826508577ed44e3..bc2397b50c4e6ac5cfb736e2007c8bb8af6a6fe0 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 810de45bcb09787be4ed8ddabdea462040627940..477a72d21881db5cf59de625fd876a8cee1fc5d3 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 33fbb3b75e4decbfe1a565cb8e29cfc4cbb37a4c..f9e234b08aecc128546180cb95c70020a452c6f7 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 e6cf179c91fffaa372f1bc7b09f2e1a6253b1814..01410f9ceec91ef266efce7bd7156573d3161bd1 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 49c33f58dc968625c459b62554708d219affd6da..18ef6f97af049467b903b332194af4c252a5864c 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 b442b7b4d1ccf9c4a64df3acf47f7ab2fb58dd90..54d3d032f01a686c5719e9c075bfc7066edafa2a 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 fcc8048e564ca5fe83358e3965b934f1d4208475..ccf3b9c7560c2713260ecfd729d9fceb2c511712 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 b0913a62142fb5e2dadea64071e1d073d5df5e86..6c5179199912dd8c7b8f65c43d9e75845cc263d3 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 cac3ff6d9b07325e869ca78daa8d5cfaa5971163..9e4e27ab4f4c53f9478d84065a8a588d21cbe533 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 14eae5edfc2289ea2f840426670a3b7c9628af2f..605fde6b73c86b57a62bfeb0562444b1a2f9fbc4 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 023978f76e68e258d82306073a044f49ef79dd0a..5b76a1459a96654af69745815d85339faa8bc8d6 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 2444f777d1372848a27e0349a2e6896d141089f6..d1072740bc3b25f6a99238049ae69c1e89093237 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 8bddc12c095c178c9d0bec6d6730a167d0639d9b..b71f0216c17ca954772de0a66cbaa3c0d3fa12a3 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 719579cae18c6c9b248bf4df783bf687cee4e33f..cdacdab76a77c96c3c216672001f87c59f3d7342 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 1819b1ccde105b3a92072346988b46caea7abf2e..43f088feddc5fa8bca38df66378d0ec8c5b026c3 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 6fb1298e8f39d4e12ef5bf48251b3826bc45477f..d9dc93d0942817100507390b2b20f7c6e5429e42 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 1d8c6b62e7c6de29170ad31924208dde3141bbb2..9279348b77c92af769691968e611246a8f0a7024 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 7a89a7a57ae636e87e8757ebc553bc1d66f3923a..3666fc07aa9e5211097977e81d36c7af8eed76f5 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 @@ -23,7 +23,7 @@ ohos_systemtest("ActsBmsKitSystemTest") { debug = false } module_out_path = module_output_path - include_dirs = [ "//third_party/json/include" ] + include_dirs = [] sources = [ "acts_bms_kit_system_test.cpp" ] cflags = [] @@ -53,7 +53,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\"" ] @@ -70,8 +69,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 6acbf7a5bee0d3f2112ea62a8b0969ac2de502d5..35d05dc3c571e129bf31d85b572d99e3c9d190d6 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 @@ -31,13 +31,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 01da650716a438377989e64df1a9ecc50675e2b4..16a85a3f3ff9e4a7ad9eb96c0bb27f2df586e529 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 @@ -31,13 +31,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 4d82d5691de827b2a3e85139079ffc9bb682d002..799bf8600a0d3a11a6c7878ee7c3d547b72442f9 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 @@ -31,13 +31,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 8439ad97f384377e50c633bc3d5a2d2eda32a791..25457831dc25f53fc7babe75017d15dae188bb48 100644 --- a/test/systemtest/common/bms/bms_check_service_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_check_service_test/BUILD.gn @@ -34,13 +34,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 881ac288311da13e22dabe13d61f831b3d9a080b..494ab18c8134df73ae1e30060ae6a85a60e0d417 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 @@ -33,8 +33,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\"" ] @@ -42,6 +40,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 1121f7208f02e171a51c4b09a62d85846bd4ea1d..3bdf773543138c979f78b34b23466220e252cfd9 100644 --- a/test/systemtest/common/bms/bms_client_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_client_system_test/BUILD.gn @@ -35,24 +35,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 4bdb6ea79f0df6b1bd45c12a32c9fb936e79338a..5fd646cd892170d2a140f3bbc2b7b2e9cd40705a 100644 --- a/test/systemtest/common/bms/bms_code_signature_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_code_signature_test/BUILD.gn @@ -37,7 +37,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\"" ] @@ -47,18 +46,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 4f2f3bf280b0ecb4d8af60433efe7ccd9ee42000..dca8be92cb8189d5249199bd58924a061aa99cdc 100644 --- a/test/systemtest/common/bms/bms_compatible_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_compatible_system_test/BUILD.gn @@ -41,7 +41,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" ] @@ -49,6 +48,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 27033a1808ec1bc951d57b4d0e81ba1178cb0710..44f16bb19eb01fa3075b13eaccd90e6361986402 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 @@ -31,12 +31,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 4028ea87e901bd56e8de55436b53d3c73cbcbe29..d81352d893407db5a6151b65dcf8acc0061e405a 100644 --- a/test/systemtest/common/bms/bms_install_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_install_system_test/BUILD.gn @@ -86,7 +86,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\"" ] @@ -95,6 +94,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", @@ -151,7 +151,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\"" ] @@ -159,6 +158,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", @@ -193,7 +193,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\"" ] @@ -201,6 +200,7 @@ ohos_systemtest("BmsInstallExternalHspSoTest") { external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", @@ -238,7 +238,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\"" ] @@ -246,6 +245,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", @@ -287,7 +287,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\"" ] @@ -295,6 +294,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 6a8c4c808f010709a3ffd2a282f28f01e80a7bd8..7700c6ce47656279c73ec22af203400dd77f1f03 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 @@ -38,7 +38,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" ] @@ -53,6 +52,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 f71e16175f2dd791f20c6b546a02c7d3050c3d8a..a2ff7e036d33353efbb36c357d0e842acfbe0a85 100755 --- a/test/systemtest/common/bms/bms_overlay_install_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_overlay_install_test/BUILD.gn @@ -52,7 +52,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\"" ] @@ -60,6 +59,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 5322f36be41bd6036cf44039d4cdcaa69d99120c..7010a1f6505370614b6b212219a1c410b542eed4 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 @@ -39,7 +39,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\"" ] @@ -47,6 +46,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 208546ca51f94143e1fa04b53c9a4be0fe67ee98..367cd83bdd80f0a1a640cf393b1cc5ceffe707ec 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 @@ -35,7 +35,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\"" ] @@ -45,17 +44,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 49ded5080727e3de887e90a9f48c93bed87ddb66..0bc4bc8b18042948a077c490b355cf9bfc3d8ffe 100644 --- a/test/systemtest/common/bms/bms_search_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_search_system_test/BUILD.gn @@ -23,7 +23,7 @@ ohos_systemtest("BmsSearchSystemTest") { debug = false } module_out_path = module_output_path - include_dirs = [ "//third_party/json/include" ] + include_dirs = [] sources = [ "bms_search_system_test.cpp" ] cflags = [] @@ -40,15 +40,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 af3277aa4d71a008a312dae05488f4caa05a4b72..a4577e7d969289ade5649387c4ef96e8a7b8cd8d 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 5a4299a17d5731f221373344068b13ee91e64820..cb18ff5fa8087a1f14c5142090410003a3458906 100644 --- a/test/systemtest/common/bms/bms_uninstall_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_uninstall_system_test/BUILD.gn @@ -45,13 +45,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 36aeb3e3c6c9ee40fc5b5d2ae51599c302e6dd2e..6ecc6f1b7159e1fb832af01c9a25aa677aef6f0b 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 @@ -31,12 +31,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 362d45110b6440ac3efc330d7818000350f6124a..eb730ea2482615e57898e5c89636b99fdf5a6d6b 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 @@ -31,12 +31,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 257447acd97e20b4fa9c3d7c9fc7a3d8fedd58fa..7c42a533c0d5b52054b6ad47df1627db85495d46 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 @@ -31,13 +31,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",