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 f757923a..b711f48d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/BUILD.gn @@ -87,7 +87,6 @@ ohos_unittest("BmsBundleAccessTokenIdTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -123,6 +122,10 @@ ohos_unittest("BmsBundleAccessTokenIdTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] 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 77548971..6eb97529 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 @@ -56,13 +56,16 @@ ohos_unittest("BmsBundleDataStorageDatabaseTest") { "access_token:libaccesstoken_sdk", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "resmgr_standard:global_resmgr", ] defines = [] if (ability_runtime_enable) { external_deps += [ "ability_runtime:ability_manager" ] defines += [ "ABILITY_RUNTIME_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } group("unittest") { 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 b74ef087..9fc0a079 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn @@ -87,7 +87,6 @@ ohos_unittest("BmsBundleInstallerTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -125,7 +124,10 @@ ohos_unittest("BmsBundleInstallerTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } - + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] @@ -203,7 +205,6 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -243,7 +244,10 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] } - + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (device_manager_enable) { sources += [ "${services_path}/bundlemgr/src/bms_device_manager.cpp" ] external_deps += [ "device_manager_base:devicemanagersdk" ] 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 e167e66c..92db884c 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 @@ -91,7 +91,6 @@ ohos_unittest("BmsBundleKitServiceTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -128,6 +127,10 @@ ohos_unittest("BmsBundleKitServiceTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_parser_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_parser_test/BUILD.gn index 7eb5061b..ae1a6a64 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_parser_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_parser_test/BUILD.gn @@ -49,13 +49,16 @@ ohos_unittest("BmsBundleParserTest") { "access_token:libaccesstoken_sdk", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "resmgr_standard:global_resmgr", ] defines = [] if (ability_runtime_enable) { external_deps += [ "ability_runtime:ability_manager" ] defines += [ "ABILITY_RUNTIME_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } resource_config_file = "//foundation/appexecfwk/standard/test/resource/bundlemgrservice/ohos_test.xml" } 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 b4b0a5c7..a3fec61f 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 @@ -94,7 +94,6 @@ ohos_unittest("BmsBundlePermissionGrantTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -130,6 +129,10 @@ ohos_unittest("BmsBundlePermissionGrantTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] 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 eb2505a7..4f971514 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn @@ -92,7 +92,6 @@ ohos_unittest("BmsBundleUninstallerTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -128,6 +127,10 @@ ohos_unittest("BmsBundleUninstallerTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] 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 d0b4aa0a..bce60e5b 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn @@ -96,7 +96,6 @@ ohos_unittest("BmsBundleUpdaterTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -132,6 +131,10 @@ ohos_unittest("BmsBundleUpdaterTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] 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 07f27771..fc883449 100644 --- a/services/bundlemgr/test/unittest/bms_data_mgr_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_data_mgr_test/BUILD.gn @@ -90,7 +90,6 @@ ohos_unittest("BmsDataMgrTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -124,6 +123,10 @@ ohos_unittest("BmsDataMgrTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] 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 5d6b46ce..e8a44571 100644 --- a/services/bundlemgr/test/unittest/bms_install_daemon_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_install_daemon_test/BUILD.gn @@ -46,15 +46,18 @@ ohos_unittest("BmsInstallDaemonTest") { "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", ] + defines = [] if (build_selinux) { external_deps += [ "selinux:libhap_restorecon" ] cflags += [ "-DWITH_SELINUX" ] } - + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } resource_config_file = "//foundation/appexecfwk/standard/test/resource/bundlemgrservice/ohos_test.xml" } 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 fa26e7cc..202d2c17 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 @@ -79,7 +79,6 @@ ohos_unittest("BmsServiceBundleScanTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -113,6 +112,10 @@ ohos_unittest("BmsServiceBundleScanTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] 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 c53b308a..49281466 100644 --- a/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn @@ -79,7 +79,6 @@ ohos_unittest("BmsServiceStartupTest") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "init:libbegetutil", - "resmgr_standard:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "startup_l2:syspara", @@ -113,6 +112,10 @@ ohos_unittest("BmsServiceStartupTest") { external_deps += [ "device_manager_base:devicemanagersdk" ] defines += [ "DEVICE_MANAGER_ENABLE" ] } + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } if (hicollie_enable) { external_deps += [ "hicollie_native:libhicollie" ] defines += [ "HICOLLIE_ENABLE" ] diff --git a/test/fuzztest/ParseSysCap_fuzzer/BUILD.gn b/test/fuzztest/ParseSysCap_fuzzer/BUILD.gn index ddb249d5..86bdf1f5 100644 --- a/test/fuzztest/ParseSysCap_fuzzer/BUILD.gn +++ b/test/fuzztest/ParseSysCap_fuzzer/BUILD.gn @@ -46,6 +46,10 @@ ohos_fuzztest("ParseSysCapFuzzTest") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", - "resmgr_standard:global_resmgr", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } diff --git a/tools/test/moduletest/bm/BUILD.gn b/tools/test/moduletest/bm/BUILD.gn index 7caa8d25..122e3a27 100644 --- a/tools/test/moduletest/bm/BUILD.gn +++ b/tools/test/moduletest/bm/BUILD.gn @@ -70,11 +70,15 @@ ohos_moduletest("bm_command_dump_module_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "os_account_standard:os_account_innerkits", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", "utils_base:utils", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } ohos_moduletest("bm_command_install_module_test") { @@ -115,11 +119,15 @@ ohos_moduletest("bm_command_install_module_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "os_account_standard:os_account_innerkits", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", "utils_base:utils", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } ohos_moduletest("bm_command_uninstall_module_test") { @@ -160,11 +168,15 @@ ohos_moduletest("bm_command_uninstall_module_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "os_account_standard:os_account_innerkits", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", "utils_base:utils", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } group("moduletest") { diff --git a/tools/test/unittest/bm/BUILD.gn b/tools/test/unittest/bm/BUILD.gn index da14bb6a..b359b05b 100644 --- a/tools/test/unittest/bm/BUILD.gn +++ b/tools/test/unittest/bm/BUILD.gn @@ -81,11 +81,15 @@ ohos_unittest("bm_command_dump_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "os_account_standard:os_account_innerkits", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", "utils_base:utils", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } ohos_unittest("bm_command_install_test") { @@ -131,11 +135,15 @@ ohos_unittest("bm_command_install_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "os_account_standard:os_account_innerkits", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", "utils_base:utils", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } ohos_unittest("bm_command_test") { @@ -181,11 +189,15 @@ ohos_unittest("bm_command_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "os_account_standard:os_account_innerkits", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", "utils_base:utils", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } ohos_unittest("bm_command_uninstall_test") { @@ -231,11 +243,15 @@ ohos_unittest("bm_command_uninstall_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "os_account_standard:os_account_innerkits", - "resmgr_standard:global_resmgr", "samgr_standard:samgr_proxy", "startup_l2:syspara", "utils_base:utils", ] + defines = [] + if (global_resmgr_enable) { + defines += [ "GLOBAL_RESMGR_ENABLE" ] + external_deps += [ "resmgr_standard:global_resmgr" ] + } } group("unittest") {