diff --git a/bundle.json b/bundle.json new file mode 100644 index 0000000000000000000000000000000000000000..68a53619f821d95ebe606292126228c2057f7036 --- /dev/null +++ b/bundle.json @@ -0,0 +1,55 @@ +{ + "name": "@ohos/sensor", + "description": "Obtaining sensor data", + "version": "3.1", + "license": "Apache License 2.0", + "component": { + "name": "sensor", + "subsystem": "sensors", + "syscap": ["SystemCapability.Sensors.Sensor"], + "features": [], + "adapted_system_type": [ "standard" ], + "rom": "340KB", + "ram": "~4KB", + "deps": { + "components": [ + "libhilog", + "ipc_core", + "system_ability_fwk", + "samgr_proxy", + "utils_base", + "libeventhandler", + "libpermissionsdk_standard", + "ace_napi", + "libhisysevent", + "hdi_sensor" + ], + "third_party": [] + }, + "build": { + "sub_component": [ + "//base/sensors/sensor/interfaces/native:sensor_ndk_target", + "//base/sensors/sensor/interfaces/plugin:sensor_js_target", + "//base/sensors/sensor/frameworks/native/sensor:sensor_native_target", + "//base/sensors/sensor/services/sensor:sensor_service_target", + "//base/sensors/sensor/utils:sensor_utils_target", + "//base/sensors/sensor/sa_profile:sensors_sa_profiles" + ], + "inner_kits": [ + { + "name": "//base/sensors/sensor/interfaces/native:sensor_interface_native", + "header": { + "header_files": [ + "sensor_agent_type.h", + "sensor_agent.h" + ], + "header_base": "//base/sensors/sensor/interfaces/native/include" + } + } + ], + "test": [ + "//base/sensors/sensor/interfaces/plugin/test/unittest:unittest" + ] + } + } +} \ No newline at end of file diff --git a/frameworks/native/sensor/BUILD.gn b/frameworks/native/sensor/BUILD.gn old mode 100755 new mode 100644 index 35fa0fe1b97def4c0ccb9f8217c185c495f8e3f7..1f426468c9c0f7a77fc50cbad46213a276e2ea5b --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/sensor/BUILD.gn @@ -36,24 +36,21 @@ ohos_shared_library("libsensor_native") { "$SUBSYSTEM_DIR/sensor/utils/include", "$SUBSYSTEM_DIR/sensor/services/sensor/include", "$SUBSYSTEM_DIR/sensor/interfaces/native/include", - "//drivers/peripheral/sensor/interfaces/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/appexecfwk/standard/libs/test/moduletest/common/event_handler", ] deps = [ "$SUBSYSTEM_DIR/sensor/services/sensor:libsensor_service", "$SUBSYSTEM_DIR/sensor/utils:libsensor_utils", - "//drivers/peripheral/sensor/hal:hdi_sensor", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_target", - "//utils/native/base:utils", ] external_deps = [ + "appexecfwk_standard:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "sensor" diff --git a/interfaces/native/BUILD.gn b/interfaces/native/BUILD.gn old mode 100755 new mode 100644 index 91a938c4410a8e326a1944fc43ec3a5f84cbdf55..5e609c39956220b68961a43f426ed1f4f9195d45 --- a/interfaces/native/BUILD.gn +++ b/interfaces/native/BUILD.gn @@ -46,10 +46,12 @@ ohos_shared_library("sensor_interface_native") { "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", "$SUBSYSTEM_DIR/interfaces/native:libsensor_ndk", "$SUBSYSTEM_DIR/utils:libsensor_utils", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "appexecfwk_standard:libeventhandler", + "hiviewdfx_hilog_native:libhilog", + "utils_base:utils", + ] part_name = "sensor" subsystem_name = "sensors" } diff --git a/interfaces/native/test/BUILD.gn b/interfaces/native/test/BUILD.gn old mode 100755 new mode 100644 diff --git a/interfaces/plugin/BUILD.gn b/interfaces/plugin/BUILD.gn old mode 100755 new mode 100644 index 3bf528ca3e97caddf57f10bca6ff1cb076152129..fdd5fc74983e89f7706c28123969762f7a7c98e8 --- a/interfaces/plugin/BUILD.gn +++ b/interfaces/plugin/BUILD.gn @@ -30,12 +30,12 @@ ohos_shared_library("sensor") { "./src/sensor_js.cpp", "./src/sensor_napi_utils.cpp", ] - deps = [ - "../native:sensor_interface_native", - "//foundation/ace/napi:ace_napi", - "//utils/native/base:utils", + deps = [ "../native:sensor_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 = "sensor" subsystem_name = "sensors" diff --git a/ohos.build b/ohos.build deleted file mode 100755 index 03d1fc33b37f87dd02c95520f06484dd5b2a2081..0000000000000000000000000000000000000000 --- a/ohos.build +++ /dev/null @@ -1,37 +0,0 @@ -{ - "subsystem": "sensors", - "parts": { - "sensor": { - "variants": [ - "phone", - "ivi", - "wearable", - "intellitv" - ], - "module_list": [ - "//base/sensors/sensor/interfaces/native:sensor_ndk_target", - "//base/sensors/sensor/interfaces/plugin:sensor_js_target", - "//base/sensors/sensor/frameworks/native/sensor:sensor_native_target", - "//base/sensors/sensor/services/sensor:sensor_service_target", - "//base/sensors/sensor/utils:sensor_utils_target", - "//base/sensors/sensor/sa_profile:sensors_sa_profiles" - ], - "inner_kits": [ - { - "header": { - "header_files": [ - "sensor_agent_type.h", - "sensor_agent.h" - ], - "header_base": "//base/sensors/sensor/interfaces/native/include" - }, - "name": "//base/sensors/sensor/interfaces/native:sensor_interface_native" - } - ], - "test_list": [ - "//base/sensors/sensor/interfaces/native/test:unittest", - "//base/sensors/sensor/interfaces/plugin/test/unittest:unittest" - ] - } - } -} diff --git a/services/sensor/BUILD.gn b/services/sensor/BUILD.gn index e18affb2583c7d8b902cee71f53240577ef60773..40163b7fd3f75392965a99b4b3b0976362e10c20 100644 --- a/services/sensor/BUILD.gn +++ b/services/sensor/BUILD.gn @@ -53,19 +53,16 @@ ohos_shared_library("libsensor_service") { "$SUBSYSTEM_DIR/sensor/utils:libsensor_utils", "//drivers/peripheral/sensor/hal:hdi_sensor", "//drivers/peripheral/sensor/interfaces/hdi/sensor/v1_0:libsensor_proxy", - "//utils/native/base:utils", ] external_deps = [ - "aafwk_standard:base", - "aafwk_standard:intent", - "appexecfwk_standard:appexecfwk_base", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "permission_standard:libpermissionsdk_standard", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "sensor" subsystem_name = "sensors" diff --git a/utils/BUILD.gn b/utils/BUILD.gn old mode 100755 new mode 100644 index a5c46b3a150b9ee42958161592f4e2fe54339543..5a2c120a16388141f13c234f7f0bc69b1d5f82a6 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -33,22 +33,15 @@ ohos_shared_library("libsensor_utils") { "$SUBSYSTEM_DIR/sensor/interfaces/native/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include/message_parcel.h", ] - deps = [ - "//drivers/peripheral/sensor/hal:hdi_sensor", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//utils/native/base:utils", - ] + deps = [ "//drivers/peripheral/sensor/hal:hdi_sensor" ] external_deps = [ - "aafwk_standard:base", - "aafwk_standard:intent", - "appexecfwk_standard:appexecfwk_base", - "appexecfwk_standard:appexecfwk_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "sensor" subsystem_name = "sensors"