diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index ad446f0cbfd6ff88d354a4b7092e6663d2b27c24..185f5f3c7d614926229450360598571372d24c26 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -105,12 +105,12 @@ ohos_shared_library("libdans") { "src/helper/analytics_util.cpp", "src/helper/bundle_resource_helper.cpp", "src/helper/distributed_operation_connection.cpp", + "src/helper/distributed_operation_helper.cpp", "src/helper/distributed_preference.cpp", "src/helper/distributed_rdb_helper.cpp", "src/soft_bus/distributed_cmd_service.cpp", "src/soft_bus/distributed_extern_intferface.cpp", "src/soft_bus/distributed_observer_service.cpp", - "src/soft_bus/distributed_operation_service.cpp", "src/soft_bus/distributed_publish_service.cpp", "src/soft_bus/distributed_service.cpp", "src/soft_bus/distributed_service_uitls.cpp", @@ -169,6 +169,10 @@ ohos_shared_library("libdans") { defines += [ "HITRACE_METER_ENABLE" ] } + if (distributed_notification_service_feature_distributed_master) { + defines += [ "DISTRIBUTED_FEATURE_MASTER" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/distributed/include/soft_bus/distributed_operation_service.h b/services/distributed/include/helper/distributed_operation_helper.h similarity index 100% rename from services/distributed/include/soft_bus/distributed_operation_service.h rename to services/distributed/include/helper/distributed_operation_helper.h diff --git a/services/distributed/src/soft_bus/distributed_operation_service.cpp b/services/distributed/src/helper/distributed_operation_helper.cpp similarity index 98% rename from services/distributed/src/soft_bus/distributed_operation_service.cpp rename to services/distributed/src/helper/distributed_operation_helper.cpp index 17aabde601440a1ac2b5576e739bbb21919ef42b..e9ce472843b0ca7e65734b360b1c913b628874b3 100644 --- a/services/distributed/src/soft_bus/distributed_operation_service.cpp +++ b/services/distributed/src/helper/distributed_operation_helper.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "distributed_operation_service.h" +#include "distributed_operation_helper.h" #include "screenlock_common.h" #include "in_process_call_wrapper.h" diff --git a/services/distributed/src/soft_bus/distributed_observer_service.cpp b/services/distributed/src/soft_bus/distributed_observer_service.cpp index ad286576663ba3b2f5a4872e3db427a0d5f8166d..e31cdc9379253d7d10921039614bebfa8f5a64ce 100644 --- a/services/distributed/src/soft_bus/distributed_observer_service.cpp +++ b/services/distributed/src/soft_bus/distributed_observer_service.cpp @@ -17,7 +17,7 @@ #include "distributed_service.h" #include "common_event_manager.h" #include "common_event_support.h" -#include "distributed_operation_service.h" +#include "distributed_operation_helper.h" namespace OHOS { namespace Notification { diff --git a/services/distributed/src/soft_bus/distributed_publish_service.cpp b/services/distributed/src/soft_bus/distributed_publish_service.cpp index 48ccb03a7430b9ce476503c7b042d08682bab3b1..60879db2d65b4f1b2e674d5e3d95d605b339028d 100644 --- a/services/distributed/src/soft_bus/distributed_publish_service.cpp +++ b/services/distributed/src/soft_bus/distributed_publish_service.cpp @@ -30,7 +30,7 @@ #include "response_box.h" #include "power_mgr_client.h" #include "distributed_local_config.h" -#include "distributed_operation_service.h" +#include "distributed_operation_helper.h" #include "notification_sync_box.h" #include "ans_inner_errors.h" #include "ability_manager_helper.h" diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index 18073254ba9db73802a8fe5b388d8e5854baa09f..2b76ae7b213d85ebae18f9ff66ac23688b7409b7 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -443,11 +443,11 @@ ohos_unittest("distributed_service_test") { "/${services_path}/distributed/src/helper/analytics_util.cpp", "/${services_path}/distributed/src/helper/bundle_resource_helper.cpp", "/${services_path}/distributed/src/helper/distributed_operation_connection.cpp", + "/${services_path}/distributed/src/helper/distributed_operation_helper.cpp", "/${services_path}/distributed/src/helper/distributed_preference.cpp", "/${services_path}/distributed/src/helper/distributed_rdb_helper.cpp", "/${services_path}/distributed/src/soft_bus/distributed_cmd_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_observer_service.cpp", - "/${services_path}/distributed/src/soft_bus/distributed_operation_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_publish_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service_uitls.cpp", @@ -536,11 +536,11 @@ ohos_unittest("distributed_subscriber_test") { "/${services_path}/distributed/src/helper/analytics_util.cpp", "/${services_path}/distributed/src/helper/bundle_resource_helper.cpp", "/${services_path}/distributed/src/helper/distributed_operation_connection.cpp", + "/${services_path}/distributed/src/helper/distributed_operation_helper.cpp", "/${services_path}/distributed/src/helper/distributed_preference.cpp", "/${services_path}/distributed/src/helper/distributed_rdb_helper.cpp", "/${services_path}/distributed/src/soft_bus/distributed_cmd_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_observer_service.cpp", - "/${services_path}/distributed/src/soft_bus/distributed_operation_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_publish_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service_uitls.cpp",