diff --git a/bundle.json b/bundle.json index 0c80f8be60152752633253e2c90e61fa9d2ba9cd..265b5bbf418d9352c2805619d1761617487a5720 100755 --- a/bundle.json +++ b/bundle.json @@ -44,8 +44,7 @@ "hitrace", "graphic_surface", "window_manager", - "openssl", - "graphic_2d" + "openssl" ] }, "build": { diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 5ed35ceae89a27b7eac26564ce591088ec2e01db..fe8af2de5b8b1b3115a5e309c3d70ecda738945d 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -59,7 +59,6 @@ ohos_shared_library("libdinput_dfx_utils") { "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", - "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/src/distributed_input_client.cpp b/interfaces/ipc/src/distributed_input_client.cpp index a1faa31acaf32a940aa7612fdc1a210dd1e08832..adc03071c0309318b09f68a7aaba8b94f478ba8d 100644 --- a/interfaces/ipc/src/distributed_input_client.cpp +++ b/interfaces/ipc/src/distributed_input_client.cpp @@ -58,7 +58,7 @@ void DistributedInputClient::RegisterDInputCb::OnResult( DistributedInputClient::GetInstance().dHardWareFwkRstInfos.begin(); iter != DistributedInputClient::GetInstance().dHardWareFwkRstInfos.end(); ++iter) { - if (iter->devId == devId && iter->dhId == dhId && (iter->callback != nullptr)) { + if (iter->devId == devId && iter->dhId == dhId && iter->callback != nullptr) { iter->callback->OnRegisterResult(devId, dhId, status, ""); DistributedInputClient::GetInstance().dHardWareFwkRstInfos.erase(iter); return; @@ -74,7 +74,7 @@ void DistributedInputClient::UnregisterDInputCb::OnResult( DistributedInputClient::GetInstance().dHardWareFwkUnRstInfos.begin(); iter != DistributedInputClient::GetInstance().dHardWareFwkUnRstInfos.end(); ++iter) { - if (iter->devId == devId && iter->dhId == dhId && (iter->callback != nullptr)) { + if (iter->devId == devId && iter->dhId == dhId && iter->callback != nullptr) { iter->callback->OnUnregisterResult(devId, dhId, status, ""); DistributedInputClient::GetInstance().dHardWareFwkUnRstInfos.erase(iter); return; diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 0c659407b4ba33b0f73d6c9a6e0bd8a177c1526d..a8122e3c4909efd97be3b80ad712614032250ea2 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -80,9 +80,7 @@ ohos_shared_library("libdinput_sink") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "graphic_2d:librender_service_base", "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index f5431b6bf30e638237e5262ba100d8ba09cdc1bf..2d97d2ac536fa4aac11587d2ab43baae5f24c76d 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -64,11 +64,9 @@ ohos_shared_library("libdinput_source_trans") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", - "ipc:ipc_core", "json:nlohmann_json_static", "libevdev:libevdev", "samgr:samgr_proxy", diff --git a/services/state/BUILD.gn b/services/state/BUILD.gn index 20e77dfd9a7f2ef5a5015ecb68e492d5733f8ffc..0e831720b9e6705170bc475e6601f9c71d4518c4 100644 --- a/services/state/BUILD.gn +++ b/services/state/BUILD.gn @@ -70,7 +70,6 @@ ohos_shared_library("libdinput_sink_state") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", - "json:nlohmann_json_static", "libevdev:libevdev", "safwk:system_ability_fwk", "samgr:samgr_proxy",