From 4af86b007380a1394f588554c9ad167012de8f50 Mon Sep 17 00:00:00 2001 From: zhangxin_T Date: Fri, 9 Sep 2022 10:03:47 +0800 Subject: [PATCH 1/3] bugfix for redundant so file Signed-off-by: zhangxin_T --- BUILD.gn | 10 +++------- services/common/include/bundle_active_service.h | 1 + services/common/include/ibundle_active_service.h | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 2c6f02b..1396bed 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -45,7 +45,6 @@ ohos_shared_library("usagestatsinner") { "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] @@ -73,6 +72,7 @@ ohos_shared_library("bundlestate") { "interfaces/innerkits/include", "services/packageusage/include", "services/packagegroup/include", + "//base/notification/eventhandler/interfaces/inner_api", ] deps = [ @@ -82,12 +82,9 @@ ohos_shared_library("bundlestate") { external_deps = [ "c_utils:utils", - "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "napi:ace_napi", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] relative_install_dir = "module" part_name = "${device_usage_statistics_part_name}" @@ -141,15 +138,14 @@ ohos_shared_library("usagestatservice") { "interfaces/kits/bundlestats/napi/include", ] + configs = [ "//foundation/ability/ability_runtime/interfaces/inner_api/wantagent:wantagent_innerkits_public_config" ] + external_deps = [ - "ability_base:configuration", "ability_base:want", "ability_runtime:app_manager", - "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/services/common/include/bundle_active_service.h b/services/common/include/bundle_active_service.h index ebe6615..bd49a3f 100644 --- a/services/common/include/bundle_active_service.h +++ b/services/common/include/bundle_active_service.h @@ -30,6 +30,7 @@ #include "bundle_active_account_helper.h" #include "file_ex.h" #include "string_ex.h" +#include "system_ability.h" namespace OHOS { namespace DeviceUsageStats { diff --git a/services/common/include/ibundle_active_service.h b/services/common/include/ibundle_active_service.h index fe1f87c..d8096a9 100644 --- a/services/common/include/ibundle_active_service.h +++ b/services/common/include/ibundle_active_service.h @@ -28,7 +28,6 @@ #include "iremote_proxy.h" #include "iremote_object.h" #include "ipc_skeleton.h" -#include "system_ability.h" #include "system_ability_definition.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" -- Gitee From 28848db76b99aa1d17c261ed48b8d19e81520406 Mon Sep 17 00:00:00 2001 From: zhangxin_T Date: Fri, 9 Sep 2022 10:08:29 +0800 Subject: [PATCH 2/3] bugfix Signed-off-by: zhangxin_T --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 1396bed..c17630f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -39,7 +39,7 @@ ohos_shared_library("usagestatsinner") { "services/packageusage/src/bundle_active_package_stats.cpp", ] public_configs = [ ":usagestatsinner_public_config" ] - public_deps = [ ":usagestatservice" ] + deps = [ ":usagestatservice" ] external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", -- Gitee From 62bdad394f55c33a312ca488844b4c7b673f7a80 Mon Sep 17 00:00:00 2001 From: zhangxin_T Date: Fri, 9 Sep 2022 11:10:04 +0800 Subject: [PATCH 3/3] add needed file for tdd Signed-off-by: zhangxin_T --- test/unittest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 1db38cd..4151a21 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -34,6 +34,7 @@ ohos_unittest("DeviceUsageStatsTest") { configs = [ ":module_private_config" ] deps = [ + "//foundation/resourceschedule/device_usage_statistics:usagestatservice", "//foundation/resourceschedule/device_usage_statistics:usagestatsinner", ] -- Gitee