From ee9a11c846f67ee6bfb29382a0e275070e600d3d Mon Sep 17 00:00:00 2001 From: h00514358 Date: Tue, 25 Jan 2022 16:32:12 +0800 Subject: [PATCH 1/2] Signed-off-by:hellohyh001 Signed-off-by: h00514358 --- bundle.json | 3 +- services/miscdevice_service/BUILD.gn | 10 +-- ...i_direct_connection.h => hdi_connection.h} | 20 ++--- .../adpter/src/compatible_connection.cpp | 8 +- ...rect_connection.cpp => hdi_connection.cpp} | 32 +++---- .../interface/src/vibrator_hdi_connection.cpp | 4 +- .../include/miscdevice_service.h | 6 +- .../include/miscdevice_service_impl.h | 46 ---------- .../src/miscdevice_service.cpp | 29 ++++--- .../src/miscdevice_service_impl.cpp | 86 ------------------- 10 files changed, 51 insertions(+), 193 deletions(-) rename services/miscdevice_service/hdi_connection/adpter/include/{hdi_direct_connection.h => hdi_connection.h} (70%) rename services/miscdevice_service/hdi_connection/adpter/src/{hdi_direct_connection.cpp => hdi_connection.cpp} (63%) mode change 100755 => 100644 services/miscdevice_service/include/miscdevice_service.h delete mode 100755 services/miscdevice_service/include/miscdevice_service_impl.h delete mode 100755 services/miscdevice_service/src/miscdevice_service_impl.cpp diff --git a/bundle.json b/bundle.json index 418484e..8187650 100644 --- a/bundle.json +++ b/bundle.json @@ -23,7 +23,8 @@ "utils_base", "permission_standard", "napi", - "hisysevent_native" + "hisysevent_native", + "vibrator_device_driver" ], "third_party": [] }, diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 96f6e5e..d2c4625 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -17,10 +17,9 @@ SUBSYSTEM_DIR = "//base/sensors" ohos_shared_library("libmiscdevice_service") { sources = [ "hdi_connection/adpter/src/compatible_connection.cpp", - "hdi_connection/adpter/src/hdi_direct_connection.cpp", + "hdi_connection/adpter/src/hdi_connection.cpp", "hdi_connection/interface/src/vibrator_hdi_connection.cpp", "src/miscdevice_service.cpp", - "src/miscdevice_service_impl.cpp", "src/miscdevice_service_stub.cpp", ] @@ -30,16 +29,12 @@ ohos_shared_library("libmiscdevice_service") { "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/miscdevice/frameworks/native/miscdevice/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", - "//drivers/peripheral/misc/vibrator/interfaces/include", "hdi_connection/adpter/include", "hdi_connection/interface/include", ] cflags = [ "-Wno-error=inconsistent-missing-override" ] - deps = [ - "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", - "//drivers/peripheral/misc/vibrator/hal:hdi_vibrator", - ] + deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils" ] external_deps = [ "hiviewdfx_hilog_native:libhilog", @@ -48,6 +43,7 @@ ohos_shared_library("libmiscdevice_service") { "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "utils_base:utils", + "vibrator_device_driver:libvibrator_proxy_1.0", ] part_name = "miscdevice" diff --git a/services/miscdevice_service/hdi_connection/adpter/include/hdi_direct_connection.h b/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h similarity index 70% rename from services/miscdevice_service/hdi_connection/adpter/include/hdi_direct_connection.h rename to services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h index 0dc4072..1e21239 100644 --- a/services/miscdevice_service/hdi_connection/adpter/include/hdi_direct_connection.h +++ b/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h @@ -13,19 +13,19 @@ * limitations under the License. */ -#ifndef HDI_DIRECT_CONNECTION_H -#define HDI_DIRECT_CONNECTION_H +#ifndef HDI_CONNECTION_H +#define HDI_CONNECTION_H #include "i_vibrator_hdi_connection.h" -#include "vibrator_if.h" - +#include "vibrator_interface_proxy.h" +using vibrator::v1_0::IVibratorInterface; namespace OHOS { namespace Sensors { -class HdiDirectConnection : public IVibratorHdiConnection { +class HdiConnection : public IVibratorHdiConnection { public: - HdiDirectConnection() = default; + HdiConnection() = default; - virtual ~HdiDirectConnection() {}; + virtual ~HdiConnection() {}; int32_t ConnectHdi() override; @@ -38,9 +38,9 @@ public: int32_t DestroyHdiConnection() override; private: - DISALLOW_COPY_AND_MOVE(HdiDirectConnection); - const struct VibratorInterface *vibratorInterface = nullptr; + DISALLOW_COPY_AND_MOVE(HdiConnection); + sptr vibratorInterface_ = nullptr; }; } // namespace Sensors } // namespace OHOS -#endif // HDI_DIRECT_CONNECTION_H \ No newline at end of file +#endif // HDI_CONNECTION_H \ No newline at end of file diff --git a/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp index 138ba3d..fff9419 100644 --- a/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp @@ -45,7 +45,7 @@ int32_t CompatibleConnection::StartOnce(uint32_t duration) HiLog::Info(LABEL, "%{public}s in", __func__); if (duration > MAX_VIBRATOR_TIME || duration <= MIN_VIBRATOR_TIME) { HiLog::Error(LABEL, "%{public}s duration: %{public}d invalid", __func__, duration); - return -1; + return VIBRATOR_ON_ERR; } duration_ = duration; if (!vibrateThread_.joinable()) { @@ -62,7 +62,7 @@ int32_t CompatibleConnection::Start(const char *effectType) HiLog::Info(LABEL, "%{public}s in", __func__); if (std::find(vibratorEffect_.begin(), vibratorEffect_.end(), effectType) == vibratorEffect_.end()) { HiLog::Error(LABEL, "%{public}s not support %{public}s type", __func__, effectType); - return -1; + return VIBRATOR_ON_ERR; } if (!vibrateThread_.joinable()) { std::thread senocdDataThread(CompatibleConnection::VibrateProcess); @@ -78,11 +78,11 @@ int32_t CompatibleConnection::Stop(VibratorStopMode mode) HiLog::Info(LABEL, "%{public}s in", __func__); if (mode < 0 || mode >= VIBRATOR_STOP_MODE_INVALID) { HiLog::Error(LABEL, "%{public}s mode: %{public}d invalid", __func__, mode); - return -1; + return VIBRATOR_OFF_ERR; } if (vibrateMode_ != mode) { HiLog::Error(LABEL, "%{public}s should start vibrate first", __func__); - return -1; + return VIBRATOR_OFF_ERR; } if (vibrateThread_.joinable()) { HiLog::Info(LABEL, "%{public}s stop vibrate thread", __func__); diff --git a/services/miscdevice_service/hdi_connection/adpter/src/hdi_direct_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp similarity index 63% rename from services/miscdevice_service/hdi_connection/adpter/src/hdi_direct_connection.cpp rename to services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp index 62fe1ae..0d88e57 100644 --- a/services/miscdevice_service/hdi_connection/adpter/src/hdi_direct_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp @@ -13,32 +13,31 @@ * limitations under the License. */ -#include "hdi_direct_connection.h" +#include "hdi_connection.h" #include "sensors_errors.h" #include "sensors_log_domain.h" -#include "vibrator_type.h" namespace OHOS { namespace Sensors { using namespace OHOS::HiviewDFX; namespace { -constexpr HiLogLabel LABEL = { LOG_CORE, SensorsLogDomain::SENSOR_SERVICE, "HdiDirectConnection" }; +constexpr HiLogLabel LABEL = { LOG_CORE, SensorsLogDomain::SENSOR_SERVICE, "HdiConnection" }; } -int32_t HdiDirectConnection::ConnectHdi() +int32_t HdiConnection::ConnectHdi() { HiLog::Info(LABEL, "%{public}s in", __func__); - vibratorInterface = NewVibratorInterfaceInstance(); - if (vibratorInterface == nullptr) { + vibratorInterface_ = IVibratorInterface::Get(); + if (vibratorInterface_ == nullptr) { HiLog::Error(LABEL, "%{public}s failed, vibrator interface initialization failed", __func__); return ERR_INVALID_VALUE; } return ERR_OK; } -int32_t HdiDirectConnection::StartOnce(uint32_t duration) +int32_t HdiConnection::StartOnce(uint32_t duration) { - int32_t ret = vibratorInterface->StartOnce(duration); + int32_t ret = vibratorInterface_->StartOnce(duration); if (ret < 0) { HiLog::Error(LABEL, "%{public}s failed", __func__); return ret; @@ -46,13 +45,13 @@ int32_t HdiDirectConnection::StartOnce(uint32_t duration) return ERR_OK; } -int32_t HdiDirectConnection::Start(const char *effectType) +int32_t HdiConnection::Start(const char *effectType) { if (effectType == nullptr) { HiLog::Error(LABEL, "%{public}s effectType is null", __func__); - return -1; + return VIBRATOR_ON_ERR; } - int32_t ret = vibratorInterface->Start(effectType); + int32_t ret = vibratorInterface_->Start(effectType); if (ret < 0) { HiLog::Error(LABEL, "%{public}s failed", __func__); return ret; @@ -60,9 +59,9 @@ int32_t HdiDirectConnection::Start(const char *effectType) return ERR_OK; } -int32_t HdiDirectConnection::Stop(VibratorStopMode mode) +int32_t HdiConnection::Stop(VibratorStopMode mode) { - int32_t ret = vibratorInterface->Stop(static_cast(mode)); + int32_t ret = vibratorInterface_->Stop(static_cast(mode)); if (ret < 0) { HiLog::Error(LABEL, "%{public}s failed", __func__); return ret; @@ -70,13 +69,8 @@ int32_t HdiDirectConnection::Stop(VibratorStopMode mode) return ERR_OK; } -int32_t HdiDirectConnection::DestroyHdiConnection() +int32_t HdiConnection::DestroyHdiConnection() { - int32_t ret = FreeVibratorInterfaceInstance(); - if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); - return ret; - } return ERR_OK; } } // namespace Sensors diff --git a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp index be5f4a2..4d6bf54 100644 --- a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp @@ -15,7 +15,7 @@ #include "vibrator_hdi_connection.h" #include "compatible_connection.h" -#include "hdi_direct_connection.h" +#include "hdi_connection.h" #include "sensors_errors.h" #include "sensors_log_domain.h" @@ -29,7 +29,7 @@ constexpr HiLogLabel LABEL = { LOG_CORE, SensorsLogDomain::SENSOR_SERVICE, "Vibr int32_t VibratorHdiConnection::ConnectHdi() { - iVibratorHdiConnection_ = std::make_unique(); + iVibratorHdiConnection_ = std::make_unique(); int32_t ret = iVibratorHdiConnection_->ConnectHdi(); if (ret != 0) { HiLog::Error(LABEL, "%{public}s hdi direct failed", __func__); diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h old mode 100755 new mode 100644 index f55542c..e2e7d02 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -30,9 +30,7 @@ #include "miscdevice_common.h" #include "miscdevice_service_stub.h" #include "nocopyable.h" -#include "vibrator_if.h" -#include "vibrator_type.h" -#include "miscdevice_service_impl.h" +#include "vibrator_hdi_connection.h" namespace OHOS { namespace Sensors { @@ -70,7 +68,7 @@ public: private: DISALLOW_COPY_AND_MOVE(MiscdeviceService); bool InitInterface(); - MiscdeviceServiceImpl &vibratorServiceImpl_ = MiscdeviceServiceImpl::GetInstance(); + VibratorHdiConnection &vibratorHdiConnection_ = VibratorHdiConnection::GetInstance(); class VibratorThread : public Thread { public: explicit VibratorThread(const MiscdeviceService &service); diff --git a/services/miscdevice_service/include/miscdevice_service_impl.h b/services/miscdevice_service/include/miscdevice_service_impl.h deleted file mode 100755 index 92de46a..0000000 --- a/services/miscdevice_service/include/miscdevice_service_impl.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MISCDEVICE_INTERFACE_H -#define MISCDEVICE_INTERFACE_H - -#include "errors.h" -#include "refbase.h" -#include "singleton.h" -#include "vibrator_if.h" -#include "vibrator_type.h" -#include "nocopyable.h" - -namespace OHOS { -namespace Sensors { -class MiscdeviceServiceImpl : public Singleton { -public: - MiscdeviceServiceImpl() = default; - - virtual ~MiscdeviceServiceImpl() = default; - bool IsVibratorEffectAvailable(int32_t vibratorId, const std::string &effectType); - ErrCode InitVibratorServiceImpl(); - ErrCode StartVibrator(const char *effectType) const; - ErrCode StartOnceVibrator(uint32_t duration) const; - ErrCode StopVibratorImpl(enum VibratorMode mode) const; - -private: - DISALLOW_COPY_AND_MOVE(MiscdeviceServiceImpl); - - const struct VibratorInterface *vibratorInterface = nullptr; -}; -} // namespace Sensors -} // namespace OHOS -#endif // SENSOR_INTERFACE_H diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index ae77466..6989230 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -19,9 +19,6 @@ #include "sensors_log_domain.h" #include "system_ability_definition.h" -#include "miscdevice_service_impl.h" - - namespace OHOS { namespace Sensors { using namespace OHOS::HiviewDFX; @@ -130,7 +127,7 @@ void MiscdeviceService::OnStart() bool MiscdeviceService::InitInterface() { - auto ret = vibratorServiceImpl_.InitVibratorServiceImpl(); + auto ret = vibratorHdiConnection_.ConnectHdi(); if (ret != ERR_OK) { HiLog::Error(LABEL, "%{public}s InitVibratorServiceImpl failed", __func__); return false; @@ -146,6 +143,10 @@ void MiscdeviceService::OnStop() return; } state_ = MiscdeviceServiceState::STATE_STOPPED; + int32_t ret = vibratorHdiConnection_.DestroyHdiConnection(); + if (ret != ERR_OK) { + HiLog::Error(LABEL, "%{public}s destroy hdi connection fail", __func__); + } HiLog::Info(LABEL, "%{public}s end", __func__); } @@ -180,13 +181,13 @@ int32_t MiscdeviceService::Vibrate(int32_t vibratorId, uint32_t timeOut) auto it = vibratorEffectMap_.find(vibratorId); if (it != vibratorEffectMap_.end()) { if (it->second == "time") { - vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_ONCE); + vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_TIME); } else { - vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_PRESET); + vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_PRESET); } } vibratorEffectMap_[vibratorId] = "time"; - return vibratorServiceImpl_.StartOnceVibrator((timeOut < MIN_VIBRATOR_TIME) ? MIN_VIBRATOR_TIME : timeOut); + return vibratorHdiConnection_.StartOnce((timeOut < MIN_VIBRATOR_TIME) ? MIN_VIBRATOR_TIME : timeOut); } int32_t MiscdeviceService::CancelVibrator(int32_t vibratorId) @@ -208,7 +209,7 @@ int32_t MiscdeviceService::CancelVibrator(int32_t vibratorId) vibratorThread_->NotifyExitSync(); } } - return vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_ONCE); + return vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_TIME); } int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::string &effect, bool isLooping) @@ -222,15 +223,15 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str vibratorThread_->NotifyExit(); vibratorThread_->NotifyExitSync(); } - vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_ONCE); + vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_TIME); } else { - vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_PRESET); + vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_PRESET); } } if (!isLooping) { vibratorEffectMap_[vibratorId] = effect; const char *effectType = (char *)effect.data(); - return vibratorServiceImpl_.StartVibrator(effectType); + return vibratorHdiConnection_.Start(effectType); } if (hapticRingMap_.empty()) { HiLog::Error(LABEL, "%{public}s hapticRingMap_ cannot be empty", __func__); @@ -276,9 +277,9 @@ int32_t MiscdeviceService::PlayCustomVibratorEffect(int32_t vibratorId, const st auto it = vibratorEffectMap_.find(vibratorId); if (it != vibratorEffectMap_.end()) { if (it->second == "time") { - vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_ONCE); + vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_TIME); } else { - vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_PRESET); + vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_PRESET); } } vibratorEffectMap_[vibratorId] = "time"; @@ -327,7 +328,7 @@ int32_t MiscdeviceService::StopVibratorEffect(int32_t vibratorId, const std::str ready_ = false; } } - int32_t ret = vibratorServiceImpl_.StopVibratorImpl(VIBRATOR_MODE_PRESET); + int32_t ret = vibratorHdiConnection_.Stop(IVibratorHdiConnection::VIBRATOR_STOP_MODE_PRESET); return ret; } diff --git a/services/miscdevice_service/src/miscdevice_service_impl.cpp b/services/miscdevice_service/src/miscdevice_service_impl.cpp deleted file mode 100755 index 6382453..0000000 --- a/services/miscdevice_service/src/miscdevice_service_impl.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "miscdevice_service_impl.h" - -#include - -#include "sensors_errors.h" -#include "sensors_log_domain.h" -#include "system_ability_definition.h" - - -namespace OHOS { -namespace Sensors { -using namespace OHOS::HiviewDFX; - -namespace { -constexpr HiLogLabel LABEL = { LOG_CORE, SensorsLogDomain::MISCDEVICE_SERVICE, "MiscdeviceServiceImpl" }; -} - -bool MiscdeviceServiceImpl::IsVibratorEffectAvailable(int32_t vibratorId, const std::string &effectType) -{ - return true; -} - -ErrCode MiscdeviceServiceImpl::InitVibratorServiceImpl() -{ - HiLog::Info(LABEL, "%{public}s begin", __func__); - vibratorInterface = NewVibratorInterfaceInstance(); - if (vibratorInterface == nullptr) { - HiLog::Error(LABEL, "%{public}s failed, vibratorInterface cannot be null", __func__); - return ERR_INVALID_VALUE; - } - HiLog::Info(LABEL, "%{public}s end", __func__); - return ERR_OK; -} - -ErrCode MiscdeviceServiceImpl::StartVibrator(const char *effectType) const -{ - HiLog::Info(LABEL, "%{public}s begin", __func__); - if (effectType == nullptr) { - HiLog::Error(LABEL, "%{public}s failed, effectType cannot be null", __func__); - return ERR_INVALID_VALUE; - } - int32_t ret = vibratorInterface->Start(effectType); - HiLog::Info(LABEL, "%{public}s end", __func__); - return ret; -} - -ErrCode MiscdeviceServiceImpl::StartOnceVibrator(uint32_t duration) const -{ - HiLog::Info(LABEL, "%{public}s begin", __func__); - if (duration < 0) { - HiLog::Error(LABEL, "%{public}s duration is invalid", __func__); - return ERR_INVALID_VALUE; - } - int32_t ret = vibratorInterface->StartOnce(duration); - HiLog::Info(LABEL, "%{public}s end", __func__); - return ret; -} - -ErrCode MiscdeviceServiceImpl::StopVibratorImpl(enum VibratorMode mode) const -{ - HiLog::Info(LABEL, "%{public}s begin", __func__); - if (mode < VIBRATOR_MODE_ONCE) { - HiLog::Error(LABEL, "%{public}s mode is invalid", __func__); - return ERR_INVALID_VALUE; - } - int32_t ret = vibratorInterface->Stop(mode); - HiLog::Info(LABEL, "%{public}s end", __func__); - return ret; -} -} // namespace Sensors -} // namespace OHOS -- Gitee From f84dd5012d383b0b190e2d71259ce0d2a825a193 Mon Sep 17 00:00:00 2001 From: h00514358 Date: Tue, 25 Jan 2022 17:01:47 +0800 Subject: [PATCH 2/2] Signed-off-by:hellohyh001 Signed-off-by: h00514358 --- services/miscdevice_service/BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index d2c4625..e8b9874 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -34,7 +34,10 @@ ohos_shared_library("libmiscdevice_service") { ] cflags = [ "-Wno-error=inconsistent-missing-override" ] - deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils" ] + deps = [ + "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", + "//drivers/interface/vibrator/v1_0:libvibrator_proxy_1.0", + ] external_deps = [ "hiviewdfx_hilog_native:libhilog", @@ -43,7 +46,6 @@ ohos_shared_library("libmiscdevice_service") { "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "utils_base:utils", - "vibrator_device_driver:libvibrator_proxy_1.0", ] part_name = "miscdevice" -- Gitee