diff --git a/ohos.build b/bundle.json old mode 100755 new mode 100644 similarity index 55% rename from ohos.build rename to bundle.json index a3d869f0950b5fe642e39eb989717ea6c72c3033..a5d570df3f244c2edd411143166b3c74bb90e1ef --- a/ohos.build +++ b/bundle.json @@ -1,8 +1,31 @@ { - "subsystem": "sensors", - "parts": { - "miscdevice": { - "module_list": [ + "name": "@ohos/miscdevice", + "description": "Control vibration vibration", + "version": "3.1", + "license": "Apache License 2.0", + "component": { + "name": "miscdevice", + "subsystem": "sensors", + "syscap": ["SystemCapability.Sensors.MiscDevice"], + "features": [], + "adapted_system_type": [ "standard" ], + "rom": "230KB", + "ram": "~4KB", + "deps": { + "components": [ + "libhilog", + "ipc_core", + "system_ability_fwk", + "samgr_proxy", + "utils_base", + "libeventhandler", + "libpermissionsdk_standard", + "ace_napi" + ], + "third_party": [] + }, + "build": { + "sub_component": [ "//base/sensors/miscdevice/interfaces/native/vibrator:vibrator_target", "//base/sensors/miscdevice/interfaces/plugin:vibrator_js_target", "//base/sensors/miscdevice/frameworks/native/miscdevice:miscdevice_native_target", @@ -12,17 +35,17 @@ ], "inner_kits": [ { + "name": "//base/sensors/miscdevice/interfaces/native/vibrator:vibrator_interface_native", "header": { "header_files": [ "vibrator_agent.h", "vibrator_agent_type.h" ], "header_base": "//base/sensors/miscdevice/interfaces/native/vibrator/include" - }, - "name": "//base/sensors/miscdevice/interfaces/native/vibrator:vibrator_interface_native" + } } ], - "test_list": [ + "test": [ "//base/sensors/miscdevice/interfaces/plugin/vibrator/test/unittest:unittest" ] } diff --git a/frameworks/native/miscdevice/BUILD.gn b/frameworks/native/miscdevice/BUILD.gn old mode 100755 new mode 100644 index 30a6180d462a705544682c14bb03b50c69193ff0..453aabc16e21afe476b6a954bb85bd0dc121d7ec --- a/frameworks/native/miscdevice/BUILD.gn +++ b/frameworks/native/miscdevice/BUILD.gn @@ -33,7 +33,6 @@ ohos_shared_library("liblight_native") { deps = [ "$SUBSYSTEM_DIR/miscdevice/services/miscdevice_service:libmiscdevice_service", "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", - "//utils/native/base:utils", ] external_deps = [ @@ -41,6 +40,7 @@ ohos_shared_library("liblight_native") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "miscdevice" subsystem_name = "sensors" @@ -61,17 +61,14 @@ ohos_shared_library("libvibrator_native") { "//utils/jni/jnikit/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] - deps = [ - "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//utils/native/base:utils", - ] + deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils" ] external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "miscdevice" subsystem_name = "sensors" diff --git a/interfaces/native/vibrator/BUILD.gn b/interfaces/native/vibrator/BUILD.gn old mode 100755 new mode 100644 index 522fbccac67064a5735b3667acc5d1a6d53f77f4..4bdb94c0b48a3614954d99f649c2922881245bbc --- a/interfaces/native/vibrator/BUILD.gn +++ b/interfaces/native/vibrator/BUILD.gn @@ -49,11 +49,13 @@ ohos_shared_library("vibrator_interface_native") { deps = [ "$SUBSYSTEM_DIR/frameworks/native/miscdevice:libvibrator_native", "$SUBSYSTEM_DIR/interfaces/native/vibrator:libvibrator_ndk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "utils_base:utils", + ] public_configs = [ ":vibrator_config" ] part_name = "miscdevice" diff --git a/interfaces/plugin/BUILD.gn b/interfaces/plugin/BUILD.gn old mode 100755 new mode 100644 index 0574caa06d886c260f97b4193eb8082da1688b2e..292ebf03d120a8718ce66e3549d152cd6c31a819 --- a/interfaces/plugin/BUILD.gn +++ b/interfaces/plugin/BUILD.gn @@ -32,12 +32,12 @@ ohos_shared_library("vibrator") { "./vibrator/src/vibrator_napi_utils.cpp", ] - deps = [ - "../native/vibrator:vibrator_interface_native", - "//foundation/ace/napi:ace_napi", - "//utils/native/base:utils", + deps = [ "//base/sensors/miscdevice/interfaces/native/vibrator:vibrator_interface_native" ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "napi:ace_napi", + "utils_base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] relative_install_dir = "module" part_name = "miscdevice" subsystem_name = "sensors" diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 25fe2c9c3450344eb14af5abbbe9ff61bb55e05c..842c91190dd82aea3f41a5b297f766813a2ab03f 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("libmiscdevice_service") { deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", "//drivers/peripheral/misc/vibrator/hal:hdi_vibrator", - "//utils/native/base:utils", ] external_deps = [ @@ -43,6 +42,7 @@ ohos_shared_library("libmiscdevice_service") { "permission_standard:libpermissionsdk_standard", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "miscdevice" diff --git a/utils/BUILD.gn b/utils/BUILD.gn old mode 100755 new mode 100644 index 05c75fa70c6fe49f10085483102c7ffa727607ed..992117b3dee7530e5ff5f4c838e07dab5ca5d803 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -23,7 +23,6 @@ ohos_shared_library("libmiscdevice_utils") { "//utils/native/base/include", "//utils/system/safwk/native/include", ] - deps = [ "//utils/native/base:utils" ] external_deps = [ "hisysevent_native:libhisysevent", @@ -31,6 +30,7 @@ ohos_shared_library("libmiscdevice_utils") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "miscdevice" subsystem_name = "sensors"