From 1f2bbd87f17a6756e11285fdcb6e22a6748fb306 Mon Sep 17 00:00:00 2001 From: hellohyh001 Date: Wed, 12 Jan 2022 21:16:08 +0800 Subject: [PATCH 1/3] Signed-off-by:hellohyh001 Signed-off-by: hellohyh001 --- bundle.json | 55 +++++++++++++++++++ frameworks/native/sensor/BUILD.gn | 9 +-- interfaces/{native => innerkits}/BUILD.gn | 12 ++-- .../include/geomagnetic_field.h | 0 .../include/sensor_agent.h | 0 .../include/sensor_agent_type.h | 0 .../include/sensor_algorithm.h | 0 .../{native => innerkits}/libsensor.json | 0 .../src/geomagnetic_field.cpp | 0 .../src/sensor_agent.cpp | 0 .../src/sensor_algorithm.cpp | 0 .../{native => innerkits}/test/BUILD.gn | 4 +- .../test/unittest/sensor_agent_test.cpp | 0 interfaces/plugin/BUILD.gn | 12 ++-- ohos.build | 37 ------------- services/sensor/BUILD.gn | 7 +-- utils/BUILD.gn | 13 +---- 17 files changed, 78 insertions(+), 71 deletions(-) create mode 100644 bundle.json mode change 100755 => 100644 frameworks/native/sensor/BUILD.gn rename interfaces/{native => innerkits}/BUILD.gn (86%) mode change 100755 => 100644 rename interfaces/{native => innerkits}/include/geomagnetic_field.h (100%) rename interfaces/{native => innerkits}/include/sensor_agent.h (100%) rename interfaces/{native => innerkits}/include/sensor_agent_type.h (100%) rename interfaces/{native => innerkits}/include/sensor_algorithm.h (100%) rename interfaces/{native => innerkits}/libsensor.json (100%) rename interfaces/{native => innerkits}/src/geomagnetic_field.cpp (100%) rename interfaces/{native => innerkits}/src/sensor_agent.cpp (100%) rename interfaces/{native => innerkits}/src/sensor_algorithm.cpp (100%) rename interfaces/{native => innerkits}/test/BUILD.gn (91%) mode change 100755 => 100644 rename interfaces/{native => innerkits}/test/unittest/sensor_agent_test.cpp (100%) mode change 100755 => 100644 interfaces/plugin/BUILD.gn delete mode 100755 ohos.build mode change 100755 => 100644 utils/BUILD.gn diff --git a/bundle.json b/bundle.json new file mode 100644 index 00000000..90f0234b --- /dev/null +++ b/bundle.json @@ -0,0 +1,55 @@ +{ + "name": "@openharmony/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/innerkits: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/innerkits:sensor_interface_native", + "header": { + "header_files": [ + "sensor_agent_type.h", + "sensor_agent.h" + ], + "header_base": "//base/sensors/sensor/interfaces/innerkits/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 35fa0fe1..789d2026 --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/sensor/BUILD.gn @@ -35,25 +35,22 @@ ohos_shared_library("libsensor_native") { "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/sensor/utils/include", "$SUBSYSTEM_DIR/sensor/services/sensor/include", - "$SUBSYSTEM_DIR/sensor/interfaces/native/include", - "//drivers/peripheral/sensor/interfaces/include", + "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/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/innerkits/BUILD.gn old mode 100755 new mode 100644 similarity index 86% rename from interfaces/native/BUILD.gn rename to interfaces/innerkits/BUILD.gn index 91a938c4..73c5b0ca --- a/interfaces/native/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -38,18 +38,20 @@ ohos_shared_library("sensor_interface_native") { "$SUBSYSTEM_DIR/utils/include", #"//drivers/peripheral/sensor/interfaces/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/innerkits/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", ] deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", - "$SUBSYSTEM_DIR/interfaces/native:libsensor_ndk", + "$SUBSYSTEM_DIR/interfaces/innerkits: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/include/geomagnetic_field.h b/interfaces/innerkits/include/geomagnetic_field.h similarity index 100% rename from interfaces/native/include/geomagnetic_field.h rename to interfaces/innerkits/include/geomagnetic_field.h diff --git a/interfaces/native/include/sensor_agent.h b/interfaces/innerkits/include/sensor_agent.h similarity index 100% rename from interfaces/native/include/sensor_agent.h rename to interfaces/innerkits/include/sensor_agent.h diff --git a/interfaces/native/include/sensor_agent_type.h b/interfaces/innerkits/include/sensor_agent_type.h similarity index 100% rename from interfaces/native/include/sensor_agent_type.h rename to interfaces/innerkits/include/sensor_agent_type.h diff --git a/interfaces/native/include/sensor_algorithm.h b/interfaces/innerkits/include/sensor_algorithm.h similarity index 100% rename from interfaces/native/include/sensor_algorithm.h rename to interfaces/innerkits/include/sensor_algorithm.h diff --git a/interfaces/native/libsensor.json b/interfaces/innerkits/libsensor.json similarity index 100% rename from interfaces/native/libsensor.json rename to interfaces/innerkits/libsensor.json diff --git a/interfaces/native/src/geomagnetic_field.cpp b/interfaces/innerkits/src/geomagnetic_field.cpp similarity index 100% rename from interfaces/native/src/geomagnetic_field.cpp rename to interfaces/innerkits/src/geomagnetic_field.cpp diff --git a/interfaces/native/src/sensor_agent.cpp b/interfaces/innerkits/src/sensor_agent.cpp similarity index 100% rename from interfaces/native/src/sensor_agent.cpp rename to interfaces/innerkits/src/sensor_agent.cpp diff --git a/interfaces/native/src/sensor_algorithm.cpp b/interfaces/innerkits/src/sensor_algorithm.cpp similarity index 100% rename from interfaces/native/src/sensor_algorithm.cpp rename to interfaces/innerkits/src/sensor_algorithm.cpp diff --git a/interfaces/native/test/BUILD.gn b/interfaces/innerkits/test/BUILD.gn old mode 100755 new mode 100644 similarity index 91% rename from interfaces/native/test/BUILD.gn rename to interfaces/innerkits/test/BUILD.gn index c0d402a8..81852c52 --- a/interfaces/native/test/BUILD.gn +++ b/interfaces/innerkits/test/BUILD.gn @@ -25,11 +25,11 @@ ohos_unittest("SensorAgentTest") { include_dirs = [ "//utils/native/base/include", "$SUBSYSTEM_DIR/sensor/utils/include", - "$SUBSYSTEM_DIR/sensor/interfaces/native/include", + "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/include", ] deps = [ - "$SUBSYSTEM_DIR/sensor/interfaces/native:sensor_ndk_target", + "$SUBSYSTEM_DIR/sensor/interfaces/innerkits:sensor_ndk_target", "$SUBSYSTEM_DIR/sensor/utils:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/interfaces/native/test/unittest/sensor_agent_test.cpp b/interfaces/innerkits/test/unittest/sensor_agent_test.cpp similarity index 100% rename from interfaces/native/test/unittest/sensor_agent_test.cpp rename to interfaces/innerkits/test/unittest/sensor_agent_test.cpp diff --git a/interfaces/plugin/BUILD.gn b/interfaces/plugin/BUILD.gn old mode 100755 new mode 100644 index 3bf528ca..6a08a744 --- a/interfaces/plugin/BUILD.gn +++ b/interfaces/plugin/BUILD.gn @@ -17,7 +17,7 @@ ohos_shared_library("sensor") { include_dirs = [ "//third_party/node/src", "//native_engine", - "../native/include", + "../innerkits/include", "//third_party/libuv/include", "//utils/native/base/include", "./include", @@ -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 = [ "../innerkits: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 03d1fc33..00000000 --- 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 e18affb2..3b076a63 100644 --- a/services/sensor/BUILD.gn +++ b/services/sensor/BUILD.gn @@ -36,7 +36,7 @@ ohos_shared_library("libsensor_service") { include_dirs = [ "include", "$SUBSYSTEM_DIR/sensor/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/sensor/interfaces/native/include", + "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/sensor/utils/include", @@ -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 a5c46b3a..027b92ee --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -30,25 +30,18 @@ ohos_shared_library("libsensor_utils") { "//utils/native/base/include", "//utils/system/safwk/native/include", "//drivers/peripheral/sensor/interfaces/include", - "$SUBSYSTEM_DIR/sensor/interfaces/native/include", + "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/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" -- Gitee From 91a8801e1debfa45cb3538a7b59f292cc5e3e68a Mon Sep 17 00:00:00 2001 From: hellohyh001 Date: Wed, 12 Jan 2022 22:55:10 +0800 Subject: [PATCH 2/3] Signed-off-by:hellohyh001 Signed-off-by: hellohyh001 --- bundle.json | 6 +++--- frameworks/native/sensor/BUILD.gn | 2 +- interfaces/{innerkits => native}/BUILD.gn | 4 ++-- .../{innerkits => native}/include/geomagnetic_field.h | 0 interfaces/{innerkits => native}/include/sensor_agent.h | 0 .../{innerkits => native}/include/sensor_agent_type.h | 0 interfaces/{innerkits => native}/include/sensor_algorithm.h | 0 interfaces/{innerkits => native}/libsensor.json | 0 interfaces/{innerkits => native}/src/geomagnetic_field.cpp | 0 interfaces/{innerkits => native}/src/sensor_agent.cpp | 0 interfaces/{innerkits => native}/src/sensor_algorithm.cpp | 0 interfaces/{innerkits => native}/test/BUILD.gn | 4 ++-- .../test/unittest/sensor_agent_test.cpp | 0 interfaces/plugin/BUILD.gn | 4 ++-- services/sensor/BUILD.gn | 2 +- utils/BUILD.gn | 2 +- 16 files changed, 12 insertions(+), 12 deletions(-) rename interfaces/{innerkits => native}/BUILD.gn (94%) rename interfaces/{innerkits => native}/include/geomagnetic_field.h (100%) rename interfaces/{innerkits => native}/include/sensor_agent.h (100%) rename interfaces/{innerkits => native}/include/sensor_agent_type.h (100%) rename interfaces/{innerkits => native}/include/sensor_algorithm.h (100%) rename interfaces/{innerkits => native}/libsensor.json (100%) rename interfaces/{innerkits => native}/src/geomagnetic_field.cpp (100%) rename interfaces/{innerkits => native}/src/sensor_agent.cpp (100%) rename interfaces/{innerkits => native}/src/sensor_algorithm.cpp (100%) rename interfaces/{innerkits => native}/test/BUILD.gn (91%) rename interfaces/{innerkits => native}/test/unittest/sensor_agent_test.cpp (100%) diff --git a/bundle.json b/bundle.json index 90f0234b..0b3188b2 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,7 @@ }, "build": { "sub_component": [ - "//base/sensors/sensor/interfaces/innerkits:sensor_ndk_target", + "//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", @@ -37,13 +37,13 @@ ], "inner_kits": [ { - "name": "//base/sensors/sensor/interfaces/innerkits:sensor_interface_native", + "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/innerkits/include" + "header_base": "//base/sensors/sensor/interfaces/native/include" } } ], diff --git a/frameworks/native/sensor/BUILD.gn b/frameworks/native/sensor/BUILD.gn index 789d2026..1f426468 100644 --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/sensor/BUILD.gn @@ -35,7 +35,7 @@ ohos_shared_library("libsensor_native") { "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/sensor/utils/include", "$SUBSYSTEM_DIR/sensor/services/sensor/include", - "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/include", + "$SUBSYSTEM_DIR/sensor/interfaces/native/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/appexecfwk/standard/libs/test/moduletest/common/event_handler", ] diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/native/BUILD.gn similarity index 94% rename from interfaces/innerkits/BUILD.gn rename to interfaces/native/BUILD.gn index 73c5b0ca..5e609c39 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/native/BUILD.gn @@ -38,13 +38,13 @@ ohos_shared_library("sensor_interface_native") { "$SUBSYSTEM_DIR/utils/include", #"//drivers/peripheral/sensor/interfaces/include", - "$SUBSYSTEM_DIR/interfaces/innerkits/include", + "$SUBSYSTEM_DIR/interfaces/native/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", ] deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", - "$SUBSYSTEM_DIR/interfaces/innerkits:libsensor_ndk", + "$SUBSYSTEM_DIR/interfaces/native:libsensor_ndk", "$SUBSYSTEM_DIR/utils:libsensor_utils", ] external_deps = [ diff --git a/interfaces/innerkits/include/geomagnetic_field.h b/interfaces/native/include/geomagnetic_field.h similarity index 100% rename from interfaces/innerkits/include/geomagnetic_field.h rename to interfaces/native/include/geomagnetic_field.h diff --git a/interfaces/innerkits/include/sensor_agent.h b/interfaces/native/include/sensor_agent.h similarity index 100% rename from interfaces/innerkits/include/sensor_agent.h rename to interfaces/native/include/sensor_agent.h diff --git a/interfaces/innerkits/include/sensor_agent_type.h b/interfaces/native/include/sensor_agent_type.h similarity index 100% rename from interfaces/innerkits/include/sensor_agent_type.h rename to interfaces/native/include/sensor_agent_type.h diff --git a/interfaces/innerkits/include/sensor_algorithm.h b/interfaces/native/include/sensor_algorithm.h similarity index 100% rename from interfaces/innerkits/include/sensor_algorithm.h rename to interfaces/native/include/sensor_algorithm.h diff --git a/interfaces/innerkits/libsensor.json b/interfaces/native/libsensor.json similarity index 100% rename from interfaces/innerkits/libsensor.json rename to interfaces/native/libsensor.json diff --git a/interfaces/innerkits/src/geomagnetic_field.cpp b/interfaces/native/src/geomagnetic_field.cpp similarity index 100% rename from interfaces/innerkits/src/geomagnetic_field.cpp rename to interfaces/native/src/geomagnetic_field.cpp diff --git a/interfaces/innerkits/src/sensor_agent.cpp b/interfaces/native/src/sensor_agent.cpp similarity index 100% rename from interfaces/innerkits/src/sensor_agent.cpp rename to interfaces/native/src/sensor_agent.cpp diff --git a/interfaces/innerkits/src/sensor_algorithm.cpp b/interfaces/native/src/sensor_algorithm.cpp similarity index 100% rename from interfaces/innerkits/src/sensor_algorithm.cpp rename to interfaces/native/src/sensor_algorithm.cpp diff --git a/interfaces/innerkits/test/BUILD.gn b/interfaces/native/test/BUILD.gn similarity index 91% rename from interfaces/innerkits/test/BUILD.gn rename to interfaces/native/test/BUILD.gn index 81852c52..c0d402a8 100644 --- a/interfaces/innerkits/test/BUILD.gn +++ b/interfaces/native/test/BUILD.gn @@ -25,11 +25,11 @@ ohos_unittest("SensorAgentTest") { include_dirs = [ "//utils/native/base/include", "$SUBSYSTEM_DIR/sensor/utils/include", - "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/include", + "$SUBSYSTEM_DIR/sensor/interfaces/native/include", ] deps = [ - "$SUBSYSTEM_DIR/sensor/interfaces/innerkits:sensor_ndk_target", + "$SUBSYSTEM_DIR/sensor/interfaces/native:sensor_ndk_target", "$SUBSYSTEM_DIR/sensor/utils:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/interfaces/innerkits/test/unittest/sensor_agent_test.cpp b/interfaces/native/test/unittest/sensor_agent_test.cpp similarity index 100% rename from interfaces/innerkits/test/unittest/sensor_agent_test.cpp rename to interfaces/native/test/unittest/sensor_agent_test.cpp diff --git a/interfaces/plugin/BUILD.gn b/interfaces/plugin/BUILD.gn index 6a08a744..fdd5fc74 100644 --- a/interfaces/plugin/BUILD.gn +++ b/interfaces/plugin/BUILD.gn @@ -17,7 +17,7 @@ ohos_shared_library("sensor") { include_dirs = [ "//third_party/node/src", "//native_engine", - "../innerkits/include", + "../native/include", "//third_party/libuv/include", "//utils/native/base/include", "./include", @@ -30,7 +30,7 @@ ohos_shared_library("sensor") { "./src/sensor_js.cpp", "./src/sensor_napi_utils.cpp", ] - deps = [ "../innerkits:sensor_interface_native" ] + deps = [ "../native:sensor_interface_native" ] external_deps = [ "hiviewdfx_hilog_native:libhilog", "napi:ace_napi", diff --git a/services/sensor/BUILD.gn b/services/sensor/BUILD.gn index 3b076a63..40163b7f 100644 --- a/services/sensor/BUILD.gn +++ b/services/sensor/BUILD.gn @@ -36,7 +36,7 @@ ohos_shared_library("libsensor_service") { include_dirs = [ "include", "$SUBSYSTEM_DIR/sensor/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/include", + "$SUBSYSTEM_DIR/sensor/interfaces/native/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/sensor/utils/include", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 027b92ee..5a2c120a 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -30,7 +30,7 @@ ohos_shared_library("libsensor_utils") { "//utils/native/base/include", "//utils/system/safwk/native/include", "//drivers/peripheral/sensor/interfaces/include", - "$SUBSYSTEM_DIR/sensor/interfaces/innerkits/include", + "$SUBSYSTEM_DIR/sensor/interfaces/native/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include/message_parcel.h", ] deps = [ "//drivers/peripheral/sensor/hal:hdi_sensor" ] -- Gitee From ed3aac864c1817b572dcfe5cb25f8227d789eb99 Mon Sep 17 00:00:00 2001 From: SUE Date: Thu, 13 Jan 2022 06:26:24 +0000 Subject: [PATCH 3/3] Signed-off-by:hellohyh001 --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 0b3188b2..68a53619 100644 --- a/bundle.json +++ b/bundle.json @@ -1,5 +1,5 @@ { - "name": "@openharmony/sensor", + "name": "@ohos/sensor", "description": "Obtaining sensor data", "version": "3.1", "license": "Apache License 2.0", -- Gitee