diff --git a/bundle.json b/bundle.json index a11d853c79ad8b79455b1d8582724ea3ebe0b8d8..216edb024affa73fcdb42c56a0320a4646a9a829 100644 --- a/bundle.json +++ b/bundle.json @@ -56,9 +56,7 @@ "//drivers/external_device_manager/sa_profile:ext_dev_mgr_sa", "//drivers/external_device_manager/services:driver_extension_manager", "//drivers/external_device_manager/services:driver_extension_manager_test", - "//drivers/external_device_manager/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", "//drivers/external_device_manager/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager", - "//drivers/external_device_manager/services/native/driver_extension_manager/src/device_manager:driver_extension_dev_callback", "//drivers/external_device_manager/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", "//drivers/external_device_manager/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", "//drivers/external_device_manager/services/native/driver_extension_manager/src/bus_extension/usb:driver_extension_usb_bus" diff --git a/frameworks/ddk/base/BUILD.gn b/frameworks/ddk/base/BUILD.gn index c9212141aedb993f45981a0cbfca2de928facd78..5481eabf8ffcb08927333c73f2f862d7f04d8241 100644 --- a/frameworks/ddk/base/BUILD.gn +++ b/frameworks/ddk/base/BUILD.gn @@ -25,6 +25,10 @@ ohos_shared_library("ddk_base") { "c_utils:utils", "hilog:libhilog", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + ] install_enable = true subsystem_name = "hdf" part_name = "external_device_manager" diff --git a/frameworks/ddk/hid/BUILD.gn b/frameworks/ddk/hid/BUILD.gn index 46d05e12797af0ad84ab023cac809ef9d0d88780..76215a290db075bba14835480f7b632efea658e5 100644 --- a/frameworks/ddk/hid/BUILD.gn +++ b/frameworks/ddk/hid/BUILD.gn @@ -27,6 +27,10 @@ ohos_shared_library("hid") { "hilog:libhilog", "ipc:ipc_core", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + ] install_enable = true subsystem_name = "hdf" part_name = "external_device_manager" diff --git a/frameworks/ddk/usb/BUILD.gn b/frameworks/ddk/usb/BUILD.gn index f1ca94d794511b6ac054954c5f3e61ec5018593d..0fd13cff9a4a0a26ffd309a171694e1c0b09b4a3 100644 --- a/frameworks/ddk/usb/BUILD.gn +++ b/frameworks/ddk/usb/BUILD.gn @@ -36,6 +36,10 @@ ohos_shared_library("usb_ndk") { "hilog:libhilog", "ipc:ipc_core", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + ] install_enable = true subsystem_name = "hdf" part_name = "external_device_manager" diff --git a/frameworks/js/napi/device_manager/BUILD.gn b/frameworks/js/napi/device_manager/BUILD.gn index 09fd58a1f2ca8258629420920a868ea3e50f43c3..040e0e08016222c9dc3e843e25be3e382be0f3a6 100644 --- a/frameworks/js/napi/device_manager/BUILD.gn +++ b/frameworks/js/napi/device_manager/BUILD.gn @@ -25,15 +25,17 @@ ohos_shared_library("devicemanager_napi") { deps = [ "${ext_mgr_path}/interfaces/innerkits:driver_ext_mgr_client" ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", "hilog:libhilog", - "ipc:ipc_core", "ipc:ipc_napi", "ipc:ipc_single", "napi:ace_napi", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + "-Os", + ] relative_install_dir = "module/driver" diff --git a/services/BUILD.gn b/services/BUILD.gn index 8c2fe8be5dae424417c1776f25a5595c47d26927..218010e7312ecde53bb703e1e458de7e8c65e69e 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -32,14 +32,11 @@ ohos_shared_library("driver_extension_manager") { "${ext_mgr_path}/services/native/driver_extension_manager/include/device_manager", "${ext_mgr_path}/services/native/driver_extension_manager/include/bus_extension/core", "${ext_mgr_path}/services/native/driver_extension_manager/include/bus_extension/usb", - "${ext_mgr_path}/services/native/driver_extension_manager/include/driver_controller", ] configs = [ "${utils_path}:utils_config" ] deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", - "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_dev_callback", "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", "${ext_mgr_path}/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager", ] external_deps = [ @@ -54,6 +51,11 @@ ohos_shared_library("driver_extension_manager") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + "-Os", + ] sanitize = { cfi = true @@ -96,15 +98,12 @@ ohos_static_library("driver_extension_manager_test") { "${ext_mgr_path}/interfaces/ddk/usb/", "${ext_mgr_path}/services/native/driver_extension_manager/include/device_manager", "${ext_mgr_path}/services/native/driver_extension_manager/include/bus_extension/core", - "${ext_mgr_path}/services/native/driver_extension_manager/include/driver_controller", ] configs = [ "${utils_path}:utils_config" ] deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", - "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_dev_callback", "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", "${ext_mgr_path}/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager", ] external_deps = [ diff --git a/services/native/driver_extension/BUILD.gn b/services/native/driver_extension/BUILD.gn index 74a3f69a8fdc1780b3d1022dde970927fa5c22be..a3dfee56b613c171b9877c2678c001d1cfa77e46 100644 --- a/services/native/driver_extension/BUILD.gn +++ b/services/native/driver_extension/BUILD.gn @@ -49,6 +49,11 @@ ohos_shared_library("driver_extension") { "ipc:ipc_napi", "napi:ace_napi", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + "-Os", + ] subsystem_name = "hdf" part_name = "external_device_manager" @@ -64,16 +69,8 @@ ohos_shared_library("driver_extension_module") { deps = [ ":driver_extension" ] external_deps = [ - "ability_base:configuration", - "ability_base:session_info", "ability_runtime:ability_manager", "ability_runtime:extensionkit_native", - "ace_engine:ace_uicontent", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "c_utils:utils", - "hilog:libhilog", - "ipc:ipc_core", "napi:ace_napi", ] diff --git a/services/native/driver_extension_manager/include/bus_extension/usb/usb_bus_extension.h b/services/native/driver_extension_manager/include/bus_extension/usb/usb_bus_extension.h index 6c4b8a3f9e46fb483c12d3fbebc648cd01f6216f..226aeed17fea605cf53ff86131c8f6e60568d52c 100644 --- a/services/native/driver_extension_manager/include/bus_extension/usb/usb_bus_extension.h +++ b/services/native/driver_extension_manager/include/bus_extension/usb/usb_bus_extension.h @@ -35,7 +35,7 @@ public: ~UsbBusExtension(); int32_t SetDevChangeCallback(shared_ptr callback) override; bool MatchDriver(const DriverInfo &driver, const DeviceInfo &device) override; - shared_ptr ParseDriverInfo(const vector &metadata) override; + shared_ptr ParseDriverInfo(const map &metadata) override; shared_ptr GetNewDriverInfoExtObject() override; void SetUsbInferface(sptr iusb); void SetUsbDdk(sptr iUsbDdk); diff --git a/services/native/driver_extension_manager/include/driver_controller/driver_extension_controller.h b/services/native/driver_extension_manager/include/device_manager/driver_extension_controller.h similarity index 100% rename from services/native/driver_extension_manager/include/driver_controller/driver_extension_controller.h rename to services/native/driver_extension_manager/include/device_manager/driver_extension_controller.h diff --git a/services/native/driver_extension_manager/include/drivers_pkg_manager/drv_bundle_state_callback.h b/services/native/driver_extension_manager/include/drivers_pkg_manager/drv_bundle_state_callback.h index 38595971fa15cdae7cc64299316ee7a7e868be56..8ede7581146312c38ef708273aa1f1e2a705d40d 100644 --- a/services/native/driver_extension_manager/include/drivers_pkg_manager/drv_bundle_state_callback.h +++ b/services/native/driver_extension_manager/include/drivers_pkg_manager/drv_bundle_state_callback.h @@ -105,10 +105,11 @@ private: void ClearDriverInfo(DriverInfo &tmpDrvInfo); sptr GetBundleMgrProxy(); int32_t GetCurrentActiveUserId(); - void ChangeValue(DriverInfo &tmpDrvInfo, const std::vector &metadata); + void ChangeValue(DriverInfo &tmpDrvInfo, const map &metadata); std::string GetBundleSize(const std::string &bundleName); void ParseToPkgInfoTables( const std::vector &driverInfos, std::vector &pkgInfoTables); + PkgInfoTable CreatePkgInfoTable(const ExtensionAbilityInfo &driverInfo, string driverInfoStr); bool IsCurrentUserId(const int userId); void OnBundleDrvAdded(int bundleStatus); diff --git a/services/native/driver_extension_manager/src/bus_extension/core/BUILD.gn b/services/native/driver_extension_manager/src/bus_extension/core/BUILD.gn index c3cc9547e3329ce5f3077f9d30ba2774fb93c068..5047b632c2a0e9dbfff5055559dbe89c9159fc71 100644 --- a/services/native/driver_extension_manager/src/bus_extension/core/BUILD.gn +++ b/services/native/driver_extension_manager/src/bus_extension/core/BUILD.gn @@ -20,10 +20,14 @@ ohos_shared_library("driver_extension_bus_core") { include_dirs = [ "${ext_mgr_path}/services/native/driver_extension_manager/include/bus_extension/core" ] configs = [ "${utils_path}:utils_config" ] external_deps = [ - "bundle_framework:appexecfwk_base", "c_utils:utils", "hilog:libhilog", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + "-Os", + ] subsystem_name = "hdf" part_name = "external_device_manager" diff --git a/services/native/driver_extension_manager/src/bus_extension/usb/BUILD.gn b/services/native/driver_extension_manager/src/bus_extension/usb/BUILD.gn index c905c1a4e959ff6efd35e1d3ec23989f39bec29d..3c667a2d462cf61d2b61967ecadd0a05740e8dda 100644 --- a/services/native/driver_extension_manager/src/bus_extension/usb/BUILD.gn +++ b/services/native/driver_extension_manager/src/bus_extension/usb/BUILD.gn @@ -32,7 +32,6 @@ ohos_shared_library("driver_extension_usb_bus") { "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", ] external_deps = [ - "bundle_framework:appexecfwk_base", "cJSON:cjson", "c_utils:utils", "drivers_interface_usb:libusb_ddk_proxy_1.0", @@ -41,6 +40,11 @@ ohos_shared_library("driver_extension_usb_bus") { "ipc:ipc_core", "samgr:samgr_proxy", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + "-Os", + ] install_enable = true subsystem_name = "hdf" diff --git a/services/native/driver_extension_manager/src/bus_extension/usb/usb_bus_extension.cpp b/services/native/driver_extension_manager/src/bus_extension/usb/usb_bus_extension.cpp index 1379d663ac973e0ea43b18f9860127fe85f0647c..41c002665f80b23a4866bdfe15bfa3fca032a0e8 100644 --- a/services/native/driver_extension_manager/src/bus_extension/usb/usb_bus_extension.cpp +++ b/services/native/driver_extension_manager/src/bus_extension/usb/usb_bus_extension.cpp @@ -139,18 +139,18 @@ bool UsbBusExtension::MatchDriver(const DriverInfo &driver, const DeviceInfo &de return true; } -shared_ptr UsbBusExtension::ParseDriverInfo(const vector &metadata) +shared_ptr UsbBusExtension::ParseDriverInfo(const map &metadata) { shared_ptr usbDriverInfo = make_shared(); if (usbDriverInfo == nullptr) { EDM_LOGE(MODULE_BUS_USB, "creat UsbDriverInfo obj fail\n"); return nullptr; } - for (auto meta : metadata) { - if (LowerStr(meta.name) == "pid") { - usbDriverInfo->pids_ = this->ParseCommaStrToVectorUint16(meta.value); - } else if (LowerStr(meta.name) == "vid") { - usbDriverInfo->vids_ = this->ParseCommaStrToVectorUint16(meta.value); + for (auto& meta : metadata) { + if (LowerStr(meta.first) == "pid") { + usbDriverInfo->pids_ = this->ParseCommaStrToVectorUint16(meta.second); + } else if (LowerStr(meta.first) == "vid") { + usbDriverInfo->vids_ = this->ParseCommaStrToVectorUint16(meta.second); } } return usbDriverInfo; diff --git a/services/native/driver_extension_manager/src/device_manager/BUILD.gn b/services/native/driver_extension_manager/src/device_manager/BUILD.gn index 45b24a792ec8e454a29e97514432fd56ff8320cd..102f3fbbfe14100aef9f565910642f8e08a93f50 100644 --- a/services/native/driver_extension_manager/src/device_manager/BUILD.gn +++ b/services/native/driver_extension_manager/src/device_manager/BUILD.gn @@ -13,31 +13,13 @@ import("../../../../../extdevmgr.gni") -ohos_shared_library("driver_extension_dev_callback") { - install_enable = true - sources = [ "dev_change_callback.cpp" ] - - include_dirs = [ - "${ext_mgr_path}/services/native/driver_extension_manager/include/device_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/include/driver_controller", - "${ext_mgr_path}/interfaces/innerkits/", - ] - configs = [ "${utils_path}:utils_config" ] - deps = [ ":driver_extension_device_manager" ] - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - - subsystem_name = "hdf" - part_name = "external_device_manager" -} - ohos_shared_library("driver_extension_device_manager") { install_enable = true sources = [ "bundle_update_callback.cpp", + "dev_change_callback.cpp", "device.cpp", + "driver_extension_controller.cpp", "etx_device_mgr.cpp", ] @@ -45,21 +27,24 @@ ohos_shared_library("driver_extension_device_manager") { "${ext_mgr_path}/interfaces/innerkits/", "${ext_mgr_path}/services/native/driver_extension_manager/include/device_manager", "${ext_mgr_path}/services/native/driver_extension_manager/include/drivers_pkg_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/include/driver_controller", ] configs = [ "${utils_path}:utils_config" ] - deps = [ - "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", - "${ext_mgr_path}/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager", - ] + deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager" ] external_deps = [ + "ability_base:want", "ability_runtime:ability_manager", "bundle_framework:appexecfwk_core", + "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + "-Os", + ] subsystem_name = "hdf" part_name = "external_device_manager" diff --git a/services/native/driver_extension_manager/src/driver_controller/driver_extension_controller.cpp b/services/native/driver_extension_manager/src/device_manager/driver_extension_controller.cpp similarity index 100% rename from services/native/driver_extension_manager/src/driver_controller/driver_extension_controller.cpp rename to services/native/driver_extension_manager/src/device_manager/driver_extension_controller.cpp diff --git a/services/native/driver_extension_manager/src/driver_controller/BUILD.gn b/services/native/driver_extension_manager/src/driver_controller/BUILD.gn deleted file mode 100644 index bbaa119f042a67b34ebf1808e48a0f5fe09a3945..0000000000000000000000000000000000000000 --- a/services/native/driver_extension_manager/src/driver_controller/BUILD.gn +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2023 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. - -import("//build/ohos.gni") -import("//drivers/external_device_manager/extdevmgr.gni") - -config("driver_extension_controller_public_config") { - include_dirs = [ "../../include/driver_controller" ] -} - -ohos_shared_library("driver_extension_controller") { - sources = [ "driver_extension_controller.cpp" ] - include_dirs = [] - cflags = [] - cflags_c = [] - cflags_cc = [] - ldflags = [] - configs = [ - ":driver_extension_controller_public_config", - "${utils_path}:coverage_flags", - "${utils_path}:utils_config", - ] - public_configs = [ ":driver_extension_controller_public_config" ] - external_deps = [ - "ability_base:want", - "ability_runtime:ability_connect_callback_stub", - "ability_runtime:ability_manager", - "cJSON:cjson", - "c_utils:utilsbase", - "hilog:libhilog", - "ipc:ipc_core", - ] - install_enable = true - subsystem_name = "hdf" - part_name = "external_device_manager" -} diff --git a/services/native/driver_extension_manager/src/drivers_pkg_manager/BUILD.gn b/services/native/driver_extension_manager/src/drivers_pkg_manager/BUILD.gn index f4516993146f3be9c6c515b481a48541cca798c4..9784731484999dff8c24ad2ef8e0fb8727b5be6d 100644 --- a/services/native/driver_extension_manager/src/drivers_pkg_manager/BUILD.gn +++ b/services/native/driver_extension_manager/src/drivers_pkg_manager/BUILD.gn @@ -61,6 +61,11 @@ ohos_shared_library("drivers_pkg_manager") { "relational_store:native_rdb", "samgr:samgr_proxy", ] + cflags_cc = [ + "-fno-asynchronous-unwind-tables", + "-fno-unwind-tables", + "-Os", + ] subsystem_name = "hdf" part_name = "external_device_manager" } diff --git a/services/native/driver_extension_manager/src/drivers_pkg_manager/drv_bundle_state_callback.cpp b/services/native/driver_extension_manager/src/drivers_pkg_manager/drv_bundle_state_callback.cpp index 997375e76e18ce564f2f12b2c235fce0abc0fcd4..abf5cb68dd681da50792104331c179a5ce5add66 100644 --- a/services/native/driver_extension_manager/src/drivers_pkg_manager/drv_bundle_state_callback.cpp +++ b/services/native/driver_extension_manager/src/drivers_pkg_manager/drv_bundle_state_callback.cpp @@ -70,17 +70,17 @@ std::string DrvBundleStateCallback::GetBundleSize(const std::string &bundleName) return bundleSize; } -void DrvBundleStateCallback::ChangeValue(DriverInfo &tmpDrvInfo, const std::vector &metadata) +void DrvBundleStateCallback::ChangeValue(DriverInfo &tmpDrvInfo, const map &metadata) { for (auto data : metadata) { - if (data.name == DRV_INFO_BUS) { - tmpDrvInfo.bus_ = data.value; + if (data.first == DRV_INFO_BUS) { + tmpDrvInfo.bus_ = data.second; } - if (data.name == DRV_INFO_VENDOR) { - tmpDrvInfo.vendor_ = data.value; + if (data.first == DRV_INFO_VENDOR) { + tmpDrvInfo.vendor_ = data.second; } - if (data.name == DRV_INFO_DESC) { - tmpDrvInfo.description_ = data.value; + if (data.first == DRV_INFO_DESC) { + tmpDrvInfo.description_ = data.second; } } } @@ -95,13 +95,17 @@ void DrvBundleStateCallback::ParseToPkgInfoTables(const std::vector metaMap; + for (auto meta : driverInfo.metadata) { + metaMap.emplace(meta.name, meta.value); + } + ChangeValue(tmpDrvInfo, metaMap); extInstance = BusExtensionCore::GetInstance().GetBusExtensionByName(tmpDrvInfo.GetBusName()); if (extInstance == nullptr) { EDM_LOGE(MODULE_PKG_MGR, "GetBusExtensionByName failed, bus:%{public}s", tmpDrvInfo.bus_.c_str()); continue; } - tmpDrvInfo.driverInfoExt_ = extInstance->ParseDriverInfo(driverInfo.metadata); + tmpDrvInfo.driverInfoExt_ = extInstance->ParseDriverInfo(metaMap); if (tmpDrvInfo.driverInfoExt_ == nullptr) { EDM_LOGE(MODULE_PKG_MGR, "ParseDriverInfo null"); continue; @@ -120,26 +124,31 @@ void DrvBundleStateCallback::ParseToPkgInfoTables(const std::vector(); string str(reinterpret_cast(data)); - Metadata vids; - Metadata pids; - vids.name = "vid"; - vids.value = str; - pids.name = "pid"; - pids.value = str; - vector metadata = {vids, pids}; + map metadata = { + {"vid", str}, + {"pid", str} + }; auto ret = bus->ParseDriverInfo(metadata); return true; } diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index 513bfd8a08b860a3596fd1d2fd3e37919057ae47..2f46d66e2550f7172f937026b14761f84fcbd600 100644 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -37,9 +37,9 @@ ohos_executable("bus_extension_usb_mt") { ohos_executable("driver_extension_controller_mt") { sources = [ "driver_extension_controller_mt/driver_extension_controller_mt.cpp" ] - include_dirs = [ "${ext_mgr_path}/services/native/driver_extension_manager/include/driver_controller" ] + include_dirs = [ "${ext_mgr_path}/services/native/driver_extension_manager/include/device_manager" ] configs = [ "${utils_path}:utils_config" ] - deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller" ] + deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager" ] external_deps = [ "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", @@ -64,9 +64,7 @@ ohos_executable("bus_extension_core_mt") { configs = [ "${utils_path}:utils_config" ] deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", - "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_dev_callback", "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", ] external_deps = [ "c_utils:utils", @@ -85,14 +83,11 @@ ohos_executable("ext_device_manager_mt") { "${ext_mgr_path}/services/native/driver_extension_manager/include/bus_extension/core", "${ext_mgr_path}/interfaces/innerkits/", "${ext_mgr_path}/services/native/driver_extension_manager/include/drivers_pkg_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/include/driver_controller", ] configs = [ "${utils_path}:utils_config" ] deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", - "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_dev_callback", "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", "${ext_mgr_path}/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager", ] external_deps = [ @@ -122,7 +117,6 @@ ohos_executable("drivers_pkg_manager_mt") { configs = [ "${utils_path}:utils_config" ] deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", - "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_dev_callback", "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", "${ext_mgr_path}/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 4f52b5258c2c2033ee70803df542d6890340c5df..6e50c2e14c9fa4811d0128c14ce630be18c1f588 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -52,8 +52,9 @@ ohos_unittest("driver_extension_controller_test") { sources = [ "driver_extension_controller_test/src/driver_extension_controller_test.cpp", ] + include_dirs = [ "${ext_mgr_path}/services/native/driver_extension_manager/include/device_manager" ] deps = [ - "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", + "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/test/unittest/bus_extension_usb_test/src/usb_bus_extension_test.cpp b/test/unittest/bus_extension_usb_test/src/usb_bus_extension_test.cpp index f0237dbac4ef592c37dc6184cb00def028fe4342..c101fd65bd6fe3e281a64284d314913473f03c2d 100644 --- a/test/unittest/bus_extension_usb_test/src/usb_bus_extension_test.cpp +++ b/test/unittest/bus_extension_usb_test/src/usb_bus_extension_test.cpp @@ -40,12 +40,12 @@ public: } }; -static const vector g_testMetaDatas = { - Metadata("bus", "usb", ""), - Metadata("desc", "test usb driver extension", ""), - Metadata("vendor", "testVendor", ""), - Metadata("pid", "0x1234,0x5678", ""), - Metadata("vid", "0x1111,0x2222", "") +static const map g_testMetaDatas = { + {"bus", "usb"}, + {"desc", "test usb driver extension"}, + {"vendor", "testVendor"}, + {"pid", "0x1234,0x5678"}, + {"vid", "0x1111,0x2222"} }; HWTEST_F(UsbBusExtensionTest, GetExtensionInstanceTest, TestSize.Level1) { diff --git a/test/unittest/device_manager_test/BUILD.gn b/test/unittest/device_manager_test/BUILD.gn index 5797a93aebb6840bfc2ee2d41f70c4678d1db049..73e2bf027c68806a2b5c4308b0fe4a7c020e8298 100644 --- a/test/unittest/device_manager_test/BUILD.gn +++ b/test/unittest/device_manager_test/BUILD.gn @@ -30,9 +30,7 @@ ohos_unittest("device_manager_test") { deps = [ "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/core:driver_extension_bus_core", "${ext_mgr_path}/services/native/driver_extension_manager/src/bus_extension/usb:driver_extension_usb_bus", - "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_dev_callback", "${ext_mgr_path}/services/native/driver_extension_manager/src/device_manager:driver_extension_device_manager", - "${ext_mgr_path}/services/native/driver_extension_manager/src/driver_controller:driver_extension_controller", "${ext_mgr_path}/services/native/driver_extension_manager/src/drivers_pkg_manager:drivers_pkg_manager", ] external_deps = [ diff --git a/utils/include/ibus_extension.h b/utils/include/ibus_extension.h index 647bdc4dbf8b5e4ae98293a421a61a5541b8aac7..e90ba005e3e00ecacadeec1adc994276aae58c1a 100644 --- a/utils/include/ibus_extension.h +++ b/utils/include/ibus_extension.h @@ -16,22 +16,17 @@ #ifndef IUSB_EXTENSION_H #define IUSB_EXTENSION_H #include -#include -#include -#include -#include "application_info.h" +#include #include "ext_object.h" #include "idev_change_callback.h" namespace OHOS { namespace ExternalDeviceManager { using namespace std; -using namespace OHOS::AppExecFwk; - class IBusExtension { public: virtual ~IBusExtension() = default; - virtual shared_ptr ParseDriverInfo(const vector &metadata) = 0; + virtual shared_ptr ParseDriverInfo(const map &metadata) = 0; virtual shared_ptr GetNewDriverInfoExtObject() = 0; virtual bool MatchDriver(const DriverInfo &driver, const DeviceInfo &device) = 0; virtual int32_t SetDevChangeCallback(shared_ptr callback) = 0;