From 1ba9c95a0a82d5d10369a624265a3108bb50d0f5 Mon Sep 17 00:00:00 2001 From: yyl Date: Tue, 10 Oct 2023 10:29:04 +0000 Subject: [PATCH 01/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: I7bc76389dd75029528facda63ec481cc2e9b2490 --- bundle.json | 16 ++--- .../plugin => frameworks/js/napi}/BUILD.gn | 7 +- .../js/napi}/include/async_callback_info.h | 0 .../js/napi}/include/sensor_js.h | 0 .../js/napi}/include/sensor_napi_error.h | 0 .../js/napi}/include/sensor_napi_utils.h | 0 .../js/napi}/include/sensor_system_js.h | 0 .../js/napi}/src/sensor_js.cpp | 0 .../js/napi}/src/sensor_napi_error.cpp | 0 .../js/napi}/src/sensor_napi_utils.cpp | 0 .../js/napi}/src/sensor_system_js.cpp | 0 frameworks/native/sensor/BUILD.gn | 50 ++++++++++++- .../sensor}/include/geomagnetic_field.h | 0 .../native/sensor}/include/sensor_algorithm.h | 0 .../native/sensor}/libsensor.json | 0 .../native/sensor}/src/geomagnetic_field.cpp | 0 .../native/sensor}/src/sensor_agent.cpp | 0 .../native/sensor}/src/sensor_algorithm.cpp | 0 .../include => inner_api}/sensor_agent.h | 0 .../include => inner_api}/sensor_agent_type.h | 0 interfaces/native/BUILD.gn | 66 ------------------ services/sensor/BUILD.gn | 4 +- .../fuzztest/sensor}/BUILD.gn | 0 .../getactivesensorinfos_fuzzer/BUILD.gn | 9 +-- .../getactivesensorinfos_fuzzer/corpus/init | 0 .../getactivesensorinfos_fuzzer.cpp | 0 .../getactivesensorinfos_fuzzer.h | 0 .../getactivesensorinfos_fuzzer/project.xml | 0 .../fuzztest/sensor}/register_fuzzer/BUILD.gn | 9 +-- .../sensor}/register_fuzzer/corpus/init | 0 .../sensor}/register_fuzzer/project.xml | 0 .../register_fuzzer/register_fuzzer.cpp | 0 .../sensor}/register_fuzzer/register_fuzzer.h | 0 .../sensor}/resumesensors_fuzzer/BUILD.gn | 9 +-- .../sensor}/resumesensors_fuzzer/corpus/init | 0 .../sensor}/resumesensors_fuzzer/project.xml | 0 .../resumesensors_fuzzer.cpp | 0 .../resumesensors_fuzzer.h | 0 .../sensor}/sensoragent_fuzzer/BUILD.gn | 9 +-- .../sensor}/sensoragent_fuzzer/corpus/init | 0 .../sensor}/sensoragent_fuzzer/project.xml | 0 .../sensoragent_fuzzer/sensoragent_fuzzer.cpp | 0 .../sensoragent_fuzzer/sensoragent_fuzzer.h | 0 .../sensor}/suspendsensors_fuzzer/BUILD.gn | 9 +-- .../sensor}/suspendsensors_fuzzer/corpus/init | 0 .../sensor}/suspendsensors_fuzzer/project.xml | 0 .../suspendsensors_fuzzer.cpp | 0 .../suspendsensors_fuzzer.h | 0 .../sensor}/unregister_fuzzer/BUILD.gn | 9 +-- .../sensor}/unregister_fuzzer/corpus/init | 0 .../sensor}/unregister_fuzzer/project.xml | 0 .../unregister_fuzzer/unregister_fuzzer.cpp | 0 .../unregister_fuzzer/unregister_fuzzer.h | 0 .../fuzztest/services}/BUILD.gn | 0 .../createdatachannelstub_fuzzer/BUILD.gn | 6 +- .../createdatachannelstub_fuzzer/corpus/init | 0 .../createdatachannelstub_fuzzer.cpp | 0 .../createdatachannelstub_fuzzer.h | 0 .../createdatachannelstub_fuzzer/project.xml | 0 .../createsocketchannelstub_fuzzer/BUILD.gn | 6 +- .../corpus/init | 0 .../createsocketchannelstub_fuzzer.cpp | 0 .../createsocketchannelstub_fuzzer.h | 0 .../project.xml | 0 .../destroydatachannelstub_fuzzer/BUILD.gn | 6 +- .../destroydatachannelstub_fuzzer/corpus/init | 0 .../destroydatachannelstub_fuzzer.cpp | 0 .../destroydatachannelstub_fuzzer.h | 0 .../destroydatachannelstub_fuzzer/project.xml | 0 .../destroysocketchannelstub_fuzzer/BUILD.gn | 6 +- .../corpus/init | 0 .../destroysocketchannelstub_fuzzer.cpp | 0 .../destroysocketchannelstub_fuzzer.h | 0 .../project.xml | 0 .../disableactiveinfocbstub_fuzzer/BUILD.gn | 6 +- .../corpus/init | 0 .../disableactiveinfocbstub_fuzzer.cpp | 0 .../disableactiveinfocbstub_fuzzer.h | 0 .../project.xml | 0 .../enableactiveinfocbstub_fuzzer/BUILD.gn | 6 +- .../enableactiveinfocbstub_fuzzer/corpus/init | 0 .../enableactiveinfocbstub_fuzzer.cpp | 0 .../enableactiveinfocbstub_fuzzer.h | 0 .../enableactiveinfocbstub_fuzzer/project.xml | 0 .../getactiveinfoliststub_fuzzer/BUILD.gn | 6 +- .../getactiveinfoliststub_fuzzer/corpus/init | 0 .../getactiveinfoliststub_fuzzer.cpp | 0 .../getactiveinfoliststub_fuzzer.h | 0 .../getactiveinfoliststub_fuzzer/project.xml | 0 .../getallsensorsstub_fuzzer/BUILD.gn | 6 +- .../getallsensorsstub_fuzzer/corpus/init | 0 .../getallsensorsstub_fuzzer.cpp | 0 .../getallsensorsstub_fuzzer.h | 0 .../getallsensorsstub_fuzzer/project.xml | 0 .../resetsensorsstub_fuzzer/BUILD.gn | 6 +- .../resetsensorsstub_fuzzer/corpus/init | 0 .../resetsensorsstub_fuzzer/project.xml | 0 .../resetsensorsstub_fuzzer.cpp | 0 .../resetsensorsstub_fuzzer.h | 0 .../resumesensorsstub_fuzzer/BUILD.gn | 6 +- .../resumesensorsstub_fuzzer/corpus/init | 0 .../resumesensorsstub_fuzzer/project.xml | 0 .../resumesensorsstub_fuzzer.cpp | 0 .../resumesensorsstub_fuzzer.h | 0 .../sensordisablestub_fuzzer/BUILD.gn | 6 +- .../sensordisablestub_fuzzer/corpus/init | 0 .../sensordisablestub_fuzzer/project.xml | 0 .../sensordisablestub_fuzzer.cpp | 0 .../sensordisablestub_fuzzer.h | 0 .../sensorenablestub_fuzzer/BUILD.gn | 6 +- .../sensorenablestub_fuzzer/corpus/init | 0 .../sensorenablestub_fuzzer/project.xml | 0 .../sensorenablestub_fuzzer.cpp | 0 .../sensorenablestub_fuzzer.h | 0 .../sensoronremoterequest_fuzzer/BUILD.gn | 6 +- .../sensoronremoterequest_fuzzer/corpus/init | 0 .../sensoronremoterequest_fuzzer/project.xml | 0 .../sensoronremoterequest_fuzzer.cpp | 0 .../sensoronremoterequest_fuzzer.h | 0 .../suspendsensorsstub_fuzzer/BUILD.gn | 6 +- .../suspendsensorsstub_fuzzer/corpus/init | 0 .../suspendsensorsstub_fuzzer/project.xml | 0 .../suspendsensorsstub_fuzzer.cpp | 0 .../suspendsensorsstub_fuzzer.h | 0 .../unittest => test/unittest/napi}/BUILD.gn | 0 .../unittest/napi}/barometer/BUILD.gn | 2 +- .../napi}/barometer/ExampleJsunit.test.js | 0 .../unittest/napi}/barometer/config.json | 0 .../unittest/napi}/color/BUILD.gn | 2 +- .../napi}/color/ExampleJsunit.test.js | 0 .../unittest/napi}/color/config.json | 0 .../unittest/napi}/gyroscope/BUILD.gn | 2 +- .../napi}/gyroscope/ExampleJsunit.test.js | 0 .../unittest/napi}/gyroscope/config.json | 0 .../unittest/napi}/pedometer/BUILD.gn | 2 +- .../napi}/pedometer/ExampleJsunit.test.js | 0 .../unittest/napi}/pedometer/config.json | 0 .../napi}/pedometer_detection/BUILD.gn | 4 +- .../pedometer_detection/ExampleJsunit.test.js | 0 .../napi}/pedometer_detection/config.json | 0 .../unittest/napi}/sar/BUILD.gn | 2 +- .../unittest/napi}/sar/ExampleJsunit.test.js | 0 .../unittest/napi}/sar/config.json | 0 .../unittest/napi}/sensor/BUILD.gn | 2 +- .../napi}/sensor/ExampleJsunit.test.js | 0 .../unittest/napi}/sensor/config.json | 0 .../napi}/signature/openharmony_core.p7b | Bin .../napi}/signature/openharmony_sx.p7b | Bin .../test => test/unittest/sensor}/BUILD.gn | 34 +++++---- .../unittest/sensor}/posture_test.cpp | 0 .../unittest/sensor}/sensor_agent_test.cpp | 0 .../sensor}/sensor_algorithm_test.cpp | 0 .../unittest/sensor}/sensor_power_test.cpp | 0 153 files changed, 162 insertions(+), 169 deletions(-) rename {interfaces/plugin => frameworks/js/napi}/BUILD.gn (84%) rename {interfaces/plugin => frameworks/js/napi}/include/async_callback_info.h (100%) rename {interfaces/plugin => frameworks/js/napi}/include/sensor_js.h (100%) rename {interfaces/plugin => frameworks/js/napi}/include/sensor_napi_error.h (100%) rename {interfaces/plugin => frameworks/js/napi}/include/sensor_napi_utils.h (100%) rename {interfaces/plugin => frameworks/js/napi}/include/sensor_system_js.h (100%) rename {interfaces/plugin => frameworks/js/napi}/src/sensor_js.cpp (100%) rename {interfaces/plugin => frameworks/js/napi}/src/sensor_napi_error.cpp (100%) rename {interfaces/plugin => frameworks/js/napi}/src/sensor_napi_utils.cpp (100%) rename {interfaces/plugin => frameworks/js/napi}/src/sensor_system_js.cpp (100%) rename {interfaces/native => frameworks/native/sensor}/include/geomagnetic_field.h (100%) rename {interfaces/native => frameworks/native/sensor}/include/sensor_algorithm.h (100%) rename {interfaces/native => frameworks/native/sensor}/libsensor.json (100%) rename {interfaces/native => frameworks/native/sensor}/src/geomagnetic_field.cpp (100%) rename {interfaces/native => frameworks/native/sensor}/src/sensor_agent.cpp (100%) rename {interfaces/native => frameworks/native/sensor}/src/sensor_algorithm.cpp (100%) rename interfaces/{native/include => inner_api}/sensor_agent.h (100%) rename interfaces/{native/include => inner_api}/sensor_agent_type.h (100%) delete mode 100644 interfaces/native/BUILD.gn rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/BUILD.gn (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/getactivesensorinfos_fuzzer/BUILD.gn (79%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/getactivesensorinfos_fuzzer/corpus/init (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/getactivesensorinfos_fuzzer/project.xml (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/register_fuzzer/BUILD.gn (81%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/register_fuzzer/corpus/init (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/register_fuzzer/project.xml (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/register_fuzzer/register_fuzzer.cpp (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/register_fuzzer/register_fuzzer.h (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/resumesensors_fuzzer/BUILD.gn (81%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/resumesensors_fuzzer/corpus/init (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/resumesensors_fuzzer/project.xml (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/resumesensors_fuzzer/resumesensors_fuzzer.cpp (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/resumesensors_fuzzer/resumesensors_fuzzer.h (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/sensoragent_fuzzer/BUILD.gn (79%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/sensoragent_fuzzer/corpus/init (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/sensoragent_fuzzer/project.xml (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/sensoragent_fuzzer/sensoragent_fuzzer.cpp (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/sensoragent_fuzzer/sensoragent_fuzzer.h (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/suspendsensors_fuzzer/BUILD.gn (81%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/suspendsensors_fuzzer/corpus/init (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/suspendsensors_fuzzer/project.xml (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/suspendsensors_fuzzer/suspendsensors_fuzzer.h (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/unregister_fuzzer/BUILD.gn (81%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/unregister_fuzzer/corpus/init (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/unregister_fuzzer/project.xml (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/unregister_fuzzer/unregister_fuzzer.cpp (100%) rename {interfaces/native/test/fuzztest => test/fuzztest/sensor}/unregister_fuzzer/unregister_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/BUILD.gn (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createdatachannelstub_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createdatachannelstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createdatachannelstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createsocketchannelstub_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createsocketchannelstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/createsocketchannelstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroydatachannelstub_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroydatachannelstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroydatachannelstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroysocketchannelstub_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroysocketchannelstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/destroysocketchannelstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/disableactiveinfocbstub_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/disableactiveinfocbstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/disableactiveinfocbstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/enableactiveinfocbstub_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/enableactiveinfocbstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/enableactiveinfocbstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getactiveinfoliststub_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getactiveinfoliststub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getactiveinfoliststub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getallsensorsstub_fuzzer/BUILD.gn (89%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getallsensorsstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/getallsensorsstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resetsensorsstub_fuzzer/BUILD.gn (89%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resetsensorsstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resetsensorsstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resumesensorsstub_fuzzer/BUILD.gn (89%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resumesensorsstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resumesensorsstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensordisablestub_fuzzer/BUILD.gn (89%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensordisablestub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensordisablestub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensordisablestub_fuzzer/sensordisablestub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensorenablestub_fuzzer/BUILD.gn (89%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensorenablestub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensorenablestub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensorenablestub_fuzzer/sensorenablestub_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensoronremoterequest_fuzzer/BUILD.gn (88%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensoronremoterequest_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensoronremoterequest_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.h (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/suspendsensorsstub_fuzzer/BUILD.gn (89%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/suspendsensorsstub_fuzzer/corpus/init (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/suspendsensorsstub_fuzzer/project.xml (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp (100%) rename {services/sensor/test/fuzztest => test/fuzztest/services}/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.h (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/BUILD.gn (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/barometer/BUILD.gn (95%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/barometer/ExampleJsunit.test.js (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/barometer/config.json (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/color/BUILD.gn (95%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/color/ExampleJsunit.test.js (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/color/config.json (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/gyroscope/BUILD.gn (95%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/gyroscope/ExampleJsunit.test.js (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/gyroscope/config.json (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/pedometer/BUILD.gn (95%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/pedometer/ExampleJsunit.test.js (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/pedometer/config.json (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/pedometer_detection/BUILD.gn (95%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/pedometer_detection/ExampleJsunit.test.js (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/pedometer_detection/config.json (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/sar/BUILD.gn (95%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/sar/ExampleJsunit.test.js (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/sar/config.json (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/sensor/BUILD.gn (95%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/sensor/ExampleJsunit.test.js (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/sensor/config.json (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/signature/openharmony_core.p7b (100%) rename {interfaces/plugin/test/unittest => test/unittest/napi}/signature/openharmony_sx.p7b (100%) rename {interfaces/native/test => test/unittest/sensor}/BUILD.gn (70%) rename {interfaces/native/test/unittest => test/unittest/sensor}/posture_test.cpp (100%) rename {interfaces/native/test/unittest => test/unittest/sensor}/sensor_agent_test.cpp (100%) rename {interfaces/native/test/unittest => test/unittest/sensor}/sensor_algorithm_test.cpp (100%) rename {interfaces/native/test/unittest => test/unittest/sensor}/sensor_power_test.cpp (100%) diff --git a/bundle.json b/bundle.json index a8b106d7..764fc70b 100755 --- a/bundle.json +++ b/bundle.json @@ -38,8 +38,8 @@ "group_type": { "base_group": [], "fwk_group": [ - "//base/sensors/sensor/interfaces/plugin:sensor_js_target", - "//base/sensors/sensor/interfaces/native:sensor_ndk_target", + "//base/sensors/sensor/frameworks/js/napi:sensor_js_target", + "//base/sensors/sensor/frameworks/native/sensor:sensor_ndk_target", "//base/sensors/sensor/frameworks/native/sensor:sensor_native_target", "//base/sensors/sensor/utils:sensor_utils_target" ], @@ -50,21 +50,21 @@ }, "inner_kits": [ { - "name": "//base/sensors/sensor/interfaces/native:sensor_interface_native", + "name": "//base/sensors/sensor/frameworks/native/sensor:sensor_interface_native", "header": { "header_files": [ "sensor_agent_type.h", "sensor_agent.h" ], - "header_base": "//base/sensors/sensor/interfaces/native/include" + "header_base": "//base/sensors/sensor/interfaces/inner_api" } } ], "test": [ - "//base/sensors/sensor/interfaces/plugin/test/unittest:unittest", - "//base/sensors/sensor/interfaces/native/test/fuzztest:fuzztest", - "//base/sensors/sensor/interfaces/native/test:unittest", - "//base/sensors/sensor/services/sensor/test/fuzztest:fuzztest" + "//base/sensors/sensor/test/unittest/napi:unittest", + "//base/sensors/sensortest/fuzztest/sensor:fuzztest", + "//base/sensors/sensor/test/unittest/sensor:unittest", + "//base/sensors/sensor/test/fuzztest/services:fuzztest" ] } } diff --git a/interfaces/plugin/BUILD.gn b/frameworks/js/napi/BUILD.gn similarity index 84% rename from interfaces/plugin/BUILD.gn rename to frameworks/js/napi/BUILD.gn index b3377dd1..3850f32d 100644 --- a/interfaces/plugin/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -16,8 +16,9 @@ import("./../../sensor.gni") ohos_shared_library("libsensor") { include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/plugin/include", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/js/napi/include", "$SUBSYSTEM_DIR/utils/common/include", "//third_party/libuv/include", "//third_party/node/src", @@ -32,7 +33,7 @@ ohos_shared_library("libsensor") { "src/sensor_napi_utils.cpp", "src/sensor_system_js.cpp", ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] external_deps = [ "c_utils:utils", "hilog:libhilog", diff --git a/interfaces/plugin/include/async_callback_info.h b/frameworks/js/napi/include/async_callback_info.h similarity index 100% rename from interfaces/plugin/include/async_callback_info.h rename to frameworks/js/napi/include/async_callback_info.h diff --git a/interfaces/plugin/include/sensor_js.h b/frameworks/js/napi/include/sensor_js.h similarity index 100% rename from interfaces/plugin/include/sensor_js.h rename to frameworks/js/napi/include/sensor_js.h diff --git a/interfaces/plugin/include/sensor_napi_error.h b/frameworks/js/napi/include/sensor_napi_error.h similarity index 100% rename from interfaces/plugin/include/sensor_napi_error.h rename to frameworks/js/napi/include/sensor_napi_error.h diff --git a/interfaces/plugin/include/sensor_napi_utils.h b/frameworks/js/napi/include/sensor_napi_utils.h similarity index 100% rename from interfaces/plugin/include/sensor_napi_utils.h rename to frameworks/js/napi/include/sensor_napi_utils.h diff --git a/interfaces/plugin/include/sensor_system_js.h b/frameworks/js/napi/include/sensor_system_js.h similarity index 100% rename from interfaces/plugin/include/sensor_system_js.h rename to frameworks/js/napi/include/sensor_system_js.h diff --git a/interfaces/plugin/src/sensor_js.cpp b/frameworks/js/napi/src/sensor_js.cpp similarity index 100% rename from interfaces/plugin/src/sensor_js.cpp rename to frameworks/js/napi/src/sensor_js.cpp diff --git a/interfaces/plugin/src/sensor_napi_error.cpp b/frameworks/js/napi/src/sensor_napi_error.cpp similarity index 100% rename from interfaces/plugin/src/sensor_napi_error.cpp rename to frameworks/js/napi/src/sensor_napi_error.cpp diff --git a/interfaces/plugin/src/sensor_napi_utils.cpp b/frameworks/js/napi/src/sensor_napi_utils.cpp similarity index 100% rename from interfaces/plugin/src/sensor_napi_utils.cpp rename to frameworks/js/napi/src/sensor_napi_utils.cpp diff --git a/interfaces/plugin/src/sensor_system_js.cpp b/frameworks/js/napi/src/sensor_system_js.cpp similarity index 100% rename from interfaces/plugin/src/sensor_system_js.cpp rename to frameworks/js/napi/src/sensor_system_js.cpp diff --git a/frameworks/native/sensor/BUILD.gn b/frameworks/native/sensor/BUILD.gn index ce241bde..de17763b 100755 --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/sensor/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("libsensor_native") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -59,6 +59,54 @@ ohos_shared_library("libsensor_native") { part_name = "sensor" subsystem_name = "sensors" } +ohos_ndk_library("libsensor_ndk") { + output_name = "sensor" + ndk_description_file = "./libsensor.json" + min_compact_version = "6" +} + +config("sensor_private_config") { + include_dirs = [ + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + config("sensor_public_config") { + include_dirs = [ "include" ] +} + +ohos_shared_library("sensor_interface_native") { + output_name = "sensor_agent" + sources = [ + "src/geomagnetic_field.cpp", + "src/sensor_agent.cpp", + "src/sensor_algorithm.cpp", + ] + + configs = [ ":sensor_private_config" ] + public_configs = [ ":sensor_public_config" ] + + deps = [ + "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_ndk", + ] + + external_deps = [ + "c_utils:utils", + "eventhandler:libeventhandler", + "hilog:libhilog", + "ipc:ipc_core", + "safwk:system_ability_fwk", + ] + + part_name = "sensor" + innerapi_tags = [ "platformsdk" ] + subsystem_name = "sensors" +} + +group("sensor_ndk_target") { + deps = [ ":sensor_interface_native" ] +} "$SUBSYSTEM_DIR/utils/common/include", + ] +} group("sensor_native_target") { deps = [ ":libsensor_native" ] diff --git a/interfaces/native/include/geomagnetic_field.h b/frameworks/native/sensor/include/geomagnetic_field.h similarity index 100% rename from interfaces/native/include/geomagnetic_field.h rename to frameworks/native/sensor/include/geomagnetic_field.h diff --git a/interfaces/native/include/sensor_algorithm.h b/frameworks/native/sensor/include/sensor_algorithm.h similarity index 100% rename from interfaces/native/include/sensor_algorithm.h rename to frameworks/native/sensor/include/sensor_algorithm.h diff --git a/interfaces/native/libsensor.json b/frameworks/native/sensor/libsensor.json similarity index 100% rename from interfaces/native/libsensor.json rename to frameworks/native/sensor/libsensor.json diff --git a/interfaces/native/src/geomagnetic_field.cpp b/frameworks/native/sensor/src/geomagnetic_field.cpp similarity index 100% rename from interfaces/native/src/geomagnetic_field.cpp rename to frameworks/native/sensor/src/geomagnetic_field.cpp diff --git a/interfaces/native/src/sensor_agent.cpp b/frameworks/native/sensor/src/sensor_agent.cpp similarity index 100% rename from interfaces/native/src/sensor_agent.cpp rename to frameworks/native/sensor/src/sensor_agent.cpp diff --git a/interfaces/native/src/sensor_algorithm.cpp b/frameworks/native/sensor/src/sensor_algorithm.cpp similarity index 100% rename from interfaces/native/src/sensor_algorithm.cpp rename to frameworks/native/sensor/src/sensor_algorithm.cpp diff --git a/interfaces/native/include/sensor_agent.h b/interfaces/inner_api/sensor_agent.h similarity index 100% rename from interfaces/native/include/sensor_agent.h rename to interfaces/inner_api/sensor_agent.h diff --git a/interfaces/native/include/sensor_agent_type.h b/interfaces/inner_api/sensor_agent_type.h similarity index 100% rename from interfaces/native/include/sensor_agent_type.h rename to interfaces/inner_api/sensor_agent_type.h diff --git a/interfaces/native/BUILD.gn b/interfaces/native/BUILD.gn deleted file mode 100644 index 09be0a46..00000000 --- a/interfaces/native/BUILD.gn +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) 2021-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("./../../sensor.gni") - -ohos_ndk_library("libsensor_ndk") { - output_name = "sensor" - ndk_description_file = "./libsensor.json" - min_compact_version = "6" -} - -config("sensor_private_config") { - include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/utils/common/include", - ] -} - -config("sensor_public_config") { - include_dirs = [ "include" ] -} - -ohos_shared_library("sensor_interface_native") { - output_name = "sensor_agent" - sources = [ - "src/geomagnetic_field.cpp", - "src/sensor_agent.cpp", - "src/sensor_algorithm.cpp", - ] - - configs = [ ":sensor_private_config" ] - public_configs = [ ":sensor_public_config" ] - - deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", - "$SUBSYSTEM_DIR/interfaces/native:libsensor_ndk", - ] - - external_deps = [ - "c_utils:utils", - "eventhandler:libeventhandler", - "hilog:libhilog", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] - - part_name = "sensor" - innerapi_tags = [ "platformsdk" ] - subsystem_name = "sensors" -} - -group("sensor_ndk_target") { - deps = [ ":sensor_interface_native" ] -} diff --git a/services/sensor/BUILD.gn b/services/sensor/BUILD.gn index aed15e5b..bb26b975 100644 --- a/services/sensor/BUILD.gn +++ b/services/sensor/BUILD.gn @@ -29,7 +29,7 @@ ohos_shared_library("libsensor_service") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/include", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -97,7 +97,7 @@ ohos_shared_library("libsensor_service_static") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/include", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", diff --git a/interfaces/native/test/fuzztest/BUILD.gn b/test/fuzztest/sensor/BUILD.gn similarity index 100% rename from interfaces/native/test/fuzztest/BUILD.gn rename to test/fuzztest/sensor/BUILD.gn diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn similarity index 79% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn rename to test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn index 35d43c1d..f1604770 100644 --- a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn @@ -19,11 +19,12 @@ import("./../../../../../sensor.gni") ohos_fuzztest("GetActiveSensorInfosFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/getactivesensorinfos_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/test/fuzztest/sensor/getactivesensorinfos_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -36,7 +37,7 @@ ohos_fuzztest("GetActiveSensorInfosFuzzTest") { sources = [ "getactivesensorinfos_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/corpus/init b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/corpus/init rename to test/fuzztest/sensor/getactivesensorinfos_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp rename to test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h rename to test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/project.xml b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/project.xml rename to test/fuzztest/sensor/getactivesensorinfos_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn b/test/fuzztest/sensor/register_fuzzer/BUILD.gn similarity index 81% rename from interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn rename to test/fuzztest/sensor/register_fuzzer/BUILD.gn index 136c1355..bd4334a9 100644 --- a/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/register_fuzzer/BUILD.gn @@ -20,11 +20,12 @@ ohos_fuzztest("RegisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/register_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/sensor/register_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/register_fuzzer", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/test/fuzztest/sensor/register_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +38,7 @@ ohos_fuzztest("RegisterFuzzTest") { sources = [ "register_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/register_fuzzer/corpus/init b/test/fuzztest/sensor/register_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/register_fuzzer/corpus/init rename to test/fuzztest/sensor/register_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/register_fuzzer/project.xml b/test/fuzztest/sensor/register_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/register_fuzzer/project.xml rename to test/fuzztest/sensor/register_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.cpp b/test/fuzztest/sensor/register_fuzzer/register_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.cpp rename to test/fuzztest/sensor/register_fuzzer/register_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.h b/test/fuzztest/sensor/register_fuzzer/register_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.h rename to test/fuzztest/sensor/register_fuzzer/register_fuzzer.h diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn b/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn similarity index 81% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn rename to test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn index fd6a1282..778e6898 100644 --- a/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn @@ -20,11 +20,12 @@ ohos_fuzztest("ResumeSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/resumesensors_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/sensor/resumesensors_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/resumesensors_fuzzer", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/test/fuzztest/sensor/resumesensors_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +38,7 @@ ohos_fuzztest("ResumeSensorsFuzzTest") { sources = [ "resumesensors_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/corpus/init b/test/fuzztest/sensor/resumesensors_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/corpus/init rename to test/fuzztest/sensor/resumesensors_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/project.xml b/test/fuzztest/sensor/resumesensors_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/project.xml rename to test/fuzztest/sensor/resumesensors_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.cpp b/test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.cpp rename to test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.h b/test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.h rename to test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.h diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn b/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn similarity index 79% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn rename to test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn index 218e70a4..e51b6690 100644 --- a/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn @@ -20,11 +20,12 @@ ohos_fuzztest("SensorAgentFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/sensoragent_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/sensor/sensoragent_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/sensoragent_fuzzer", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/test/fuzztest/sensor/sensoragent_fuzzer", ] cflags = [ @@ -36,7 +37,7 @@ ohos_fuzztest("SensorAgentFuzzTest") { sources = [ "sensoragent_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] external_deps = [ "c_utils:utils" ] } diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/corpus/init b/test/fuzztest/sensor/sensoragent_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/corpus/init rename to test/fuzztest/sensor/sensoragent_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/project.xml b/test/fuzztest/sensor/sensoragent_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/project.xml rename to test/fuzztest/sensor/sensoragent_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.cpp b/test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.cpp rename to test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.h b/test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.h rename to test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.h diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn b/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn similarity index 81% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn rename to test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn index 4a642de8..718caa67 100644 --- a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn @@ -20,11 +20,12 @@ ohos_fuzztest("SuspendSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/suspendsensors_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/sensor/suspendsensors_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/suspendsensors_fuzzer", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/test/fuzztest/sensor/suspendsensors_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +38,7 @@ ohos_fuzztest("SuspendSensorsFuzzTest") { sources = [ "suspendsensors_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/corpus/init b/test/fuzztest/sensor/suspendsensors_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/corpus/init rename to test/fuzztest/sensor/suspendsensors_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/project.xml b/test/fuzztest/sensor/suspendsensors_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/project.xml rename to test/fuzztest/sensor/suspendsensors_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp b/test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp rename to test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.h b/test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.h rename to test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.h diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn b/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn similarity index 81% rename from interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn rename to test/fuzztest/sensor/unregister_fuzzer/BUILD.gn index e338c482..50b718f5 100644 --- a/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn @@ -20,11 +20,12 @@ ohos_fuzztest("UnregisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/unregister_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/sensor/unregister_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/unregister_fuzzer", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/test/fuzztest/sensor/unregister_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +38,7 @@ ohos_fuzztest("UnregisterFuzzTest") { sources = [ "unregister_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/corpus/init b/test/fuzztest/sensor/unregister_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/unregister_fuzzer/corpus/init rename to test/fuzztest/sensor/unregister_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/project.xml b/test/fuzztest/sensor/unregister_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/unregister_fuzzer/project.xml rename to test/fuzztest/sensor/unregister_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.cpp b/test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.cpp rename to test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.h b/test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.h rename to test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.h diff --git a/services/sensor/test/fuzztest/BUILD.gn b/test/fuzztest/services/BUILD.gn similarity index 100% rename from services/sensor/test/fuzztest/BUILD.gn rename to test/fuzztest/services/BUILD.gn diff --git a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn index ffd8bad6..12dfe814 100644 --- a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("CreateDataChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/createdatachannelstub_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/createdatachannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("CreateDataChannelStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/createdatachannelstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/createdatachannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("CreateDataChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/corpus/init b/test/fuzztest/services/createdatachannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/createdatachannelstub_fuzzer/corpus/init rename to test/fuzztest/services/createdatachannelstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp rename to test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.h b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.h rename to test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/project.xml b/test/fuzztest/services/createdatachannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/createdatachannelstub_fuzzer/project.xml rename to test/fuzztest/services/createdatachannelstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn index 47954426..696b24d3 100644 --- a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("CreateSocketChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/createsocketchannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("CreateSocketChannelStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/createsocketchannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("CreateSocketChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/corpus/init b/test/fuzztest/services/createsocketchannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/corpus/init rename to test/fuzztest/services/createsocketchannelstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp rename to test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.h b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.h rename to test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/project.xml b/test/fuzztest/services/createsocketchannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/project.xml rename to test/fuzztest/services/createsocketchannelstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn index dc856996..960fbbb6 100644 --- a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("DestroyDataChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/destroydatachannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("DestroyDataChannelStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/destroydatachannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("DestroyDataChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/corpus/init b/test/fuzztest/services/destroydatachannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/corpus/init rename to test/fuzztest/services/destroydatachannelstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp rename to test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.h b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.h rename to test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/project.xml b/test/fuzztest/services/destroydatachannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/project.xml rename to test/fuzztest/services/destroydatachannelstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn index 185ba2c3..0f727de0 100644 --- a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("DestroySocketChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/destroysocketchannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("DestroySocketChannelStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/destroysocketchannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("DestroySocketChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/corpus/init b/test/fuzztest/services/destroysocketchannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/corpus/init rename to test/fuzztest/services/destroysocketchannelstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp rename to test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.h b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.h rename to test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/project.xml b/test/fuzztest/services/destroysocketchannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/project.xml rename to test/fuzztest/services/destroysocketchannelstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn rename to test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn index f17f8f57..f5bb94d5 100644 --- a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/disableactiveinfocbstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/disableactiveinfocbstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/corpus/init b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/corpus/init rename to test/fuzztest/services/disableactiveinfocbstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp rename to test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.h b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.h rename to test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/project.xml b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/project.xml rename to test/fuzztest/services/disableactiveinfocbstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn rename to test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn index d2613b09..5b64a14a 100644 --- a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/enableactiveinfocbstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/services/enableactiveinfocbstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/corpus/init b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/corpus/init rename to test/fuzztest/services/enableactiveinfocbstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp rename to test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.h b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.h rename to test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/project.xml b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/project.xml rename to test/fuzztest/services/enableactiveinfocbstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn rename to test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn index 2542338f..5d5b75c6 100644 --- a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("GetActiveInfoListStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/getactiveinfoliststub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("GetActiveInfoListStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/getactiveinfoliststub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("GetActiveInfoListStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/corpus/init b/test/fuzztest/services/getactiveinfoliststub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/corpus/init rename to test/fuzztest/services/getactiveinfoliststub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp rename to test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.h b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.h rename to test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.h diff --git a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/project.xml b/test/fuzztest/services/getactiveinfoliststub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/project.xml rename to test/fuzztest/services/getactiveinfoliststub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn similarity index 89% rename from services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn index 89437be6..417f4ee4 100644 --- a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("GetAllSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/getallsensorsstub_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/services/getallsensorsstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -28,7 +28,7 @@ ohos_fuzztest("GetAllSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/getallsensorsstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/getallsensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -45,7 +45,7 @@ ohos_fuzztest("GetAllSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/corpus/init b/test/fuzztest/services/getallsensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/getallsensorsstub_fuzzer/corpus/init rename to test/fuzztest/services/getallsensorsstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp rename to test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.h b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.h rename to test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/project.xml b/test/fuzztest/services/getallsensorsstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/getallsensorsstub_fuzzer/project.xml rename to test/fuzztest/services/getallsensorsstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn similarity index 89% rename from services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn index b5a89a1b..9e7eabec 100644 --- a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("ResetSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/resetsensorsstub_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/services/resetsensorsstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -28,7 +28,7 @@ ohos_fuzztest("ResetSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/resetsensorsstub_fuzzer", + "$SUBSYSTEM_DIR/services/fuzztest/services/resetsensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -45,7 +45,7 @@ ohos_fuzztest("ResetSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/corpus/init b/test/fuzztest/services/resetsensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/resetsensorsstub_fuzzer/corpus/init rename to test/fuzztest/services/resetsensorsstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/project.xml b/test/fuzztest/services/resetsensorsstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/resetsensorsstub_fuzzer/project.xml rename to test/fuzztest/services/resetsensorsstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp rename to test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.h b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.h rename to test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn similarity index 89% rename from services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn index 9b0cd78a..2213456d 100644 --- a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("ResumeSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/resumesensorsstub_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/services/resumesensorsstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -28,7 +28,7 @@ ohos_fuzztest("ResumeSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/resumesensorsstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/resumesensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -45,7 +45,7 @@ ohos_fuzztest("ResumeSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/corpus/init b/test/fuzztest/services/resumesensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/resumesensorsstub_fuzzer/corpus/init rename to test/fuzztest/services/resumesensorsstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/project.xml b/test/fuzztest/services/resumesensorsstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/resumesensorsstub_fuzzer/project.xml rename to test/fuzztest/services/resumesensorsstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp rename to test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.h b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.h rename to test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.h diff --git a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn b/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn similarity index 89% rename from services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn rename to test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn index 8c01778b..6ffd312a 100644 --- a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("SensorDisableStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensordisablestub_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/services/sensordisablestub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -28,7 +28,7 @@ ohos_fuzztest("SensorDisableStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensordisablestub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/sensordisablestub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -45,7 +45,7 @@ ohos_fuzztest("SensorDisableStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/corpus/init b/test/fuzztest/services/sensordisablestub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/sensordisablestub_fuzzer/corpus/init rename to test/fuzztest/services/sensordisablestub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/project.xml b/test/fuzztest/services/sensordisablestub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/sensordisablestub_fuzzer/project.xml rename to test/fuzztest/services/sensordisablestub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp rename to test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/sensordisablestub_fuzzer.h b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/sensordisablestub_fuzzer/sensordisablestub_fuzzer.h rename to test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.h diff --git a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn b/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn similarity index 89% rename from services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn rename to test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn index ce98b8de..cf0e3f38 100644 --- a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("SensorEnableStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensorenablestub_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/services/sensorenablestub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -28,7 +28,7 @@ ohos_fuzztest("SensorEnableStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensorenablestub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/sensorenablestub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -45,7 +45,7 @@ ohos_fuzztest("SensorEnableStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/corpus/init b/test/fuzztest/services/sensorenablestub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/sensorenablestub_fuzzer/corpus/init rename to test/fuzztest/services/sensorenablestub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/project.xml b/test/fuzztest/services/sensorenablestub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/sensorenablestub_fuzzer/project.xml rename to test/fuzztest/services/sensorenablestub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp b/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp rename to test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/sensorenablestub_fuzzer.h b/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/sensorenablestub_fuzzer/sensorenablestub_fuzzer.h rename to test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.h diff --git a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn similarity index 88% rename from services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn rename to test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn index 7dc01e91..aedceb30 100644 --- a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ import("./../../../../../sensor.gni") ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/sensoronremoterequest_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -27,7 +27,7 @@ ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/sensoronremoterequest_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/corpus/init b/test/fuzztest/services/sensoronremoterequest_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/corpus/init rename to test/fuzztest/services/sensoronremoterequest_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/project.xml b/test/fuzztest/services/sensoronremoterequest_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/project.xml rename to test/fuzztest/services/sensoronremoterequest_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp rename to test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.h b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.h rename to test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.h diff --git a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn similarity index 89% rename from services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn index eb249eee..ba435402 100644 --- a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("SuspendSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/services/suspendsensorsstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", @@ -28,7 +28,7 @@ ohos_fuzztest("SuspendSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer", + "$SUBSYSTEM_DIR/test/fuzztest/services/suspendsensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -45,7 +45,7 @@ ohos_fuzztest("SuspendSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", diff --git a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/corpus/init b/test/fuzztest/services/suspendsensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/corpus/init rename to test/fuzztest/services/suspendsensorsstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/project.xml b/test/fuzztest/services/suspendsensorsstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/project.xml rename to test/fuzztest/services/suspendsensorsstub_fuzzer/project.xml diff --git a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp similarity index 100% rename from services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp rename to test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp diff --git a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.h b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.h similarity index 100% rename from services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.h rename to test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.h diff --git a/interfaces/plugin/test/unittest/BUILD.gn b/test/unittest/napi/BUILD.gn similarity index 100% rename from interfaces/plugin/test/unittest/BUILD.gn rename to test/unittest/napi/BUILD.gn diff --git a/interfaces/plugin/test/unittest/barometer/BUILD.gn b/test/unittest/napi/barometer/BUILD.gn similarity index 95% rename from interfaces/plugin/test/unittest/barometer/BUILD.gn rename to test/unittest/napi/barometer/BUILD.gn index 23e8ddce..35d12e5c 100755 --- a/interfaces/plugin/test/unittest/barometer/BUILD.gn +++ b/test/unittest/napi/barometer/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/frameworks" ohos_js_unittest("BarometerJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js b/test/unittest/napi/barometer/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js rename to test/unittest/napi/barometer/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/barometer/config.json b/test/unittest/napi/barometer/config.json similarity index 100% rename from interfaces/plugin/test/unittest/barometer/config.json rename to test/unittest/napi/barometer/config.json diff --git a/interfaces/plugin/test/unittest/color/BUILD.gn b/test/unittest/napi/color/BUILD.gn similarity index 95% rename from interfaces/plugin/test/unittest/color/BUILD.gn rename to test/unittest/napi/color/BUILD.gn index a77fe897..fa1bd3ae 100755 --- a/interfaces/plugin/test/unittest/color/BUILD.gn +++ b/test/unittest/napi/color/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/frameworks" ohos_js_unittest("ColorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/interfaces/plugin/test/unittest/color/ExampleJsunit.test.js b/test/unittest/napi/color/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/color/ExampleJsunit.test.js rename to test/unittest/napi/color/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/color/config.json b/test/unittest/napi/color/config.json similarity index 100% rename from interfaces/plugin/test/unittest/color/config.json rename to test/unittest/napi/color/config.json diff --git a/interfaces/plugin/test/unittest/gyroscope/BUILD.gn b/test/unittest/napi/gyroscope/BUILD.gn similarity index 95% rename from interfaces/plugin/test/unittest/gyroscope/BUILD.gn rename to test/unittest/napi/gyroscope/BUILD.gn index 2a40c6ac..f86a46a3 100755 --- a/interfaces/plugin/test/unittest/gyroscope/BUILD.gn +++ b/test/unittest/napi/gyroscope/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/frameworks" ohos_js_unittest("GyroscopeJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js b/test/unittest/napi/gyroscope/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js rename to test/unittest/napi/gyroscope/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/gyroscope/config.json b/test/unittest/napi/gyroscope/config.json similarity index 100% rename from interfaces/plugin/test/unittest/gyroscope/config.json rename to test/unittest/napi/gyroscope/config.json diff --git a/interfaces/plugin/test/unittest/pedometer/BUILD.gn b/test/unittest/napi/pedometer/BUILD.gn similarity index 95% rename from interfaces/plugin/test/unittest/pedometer/BUILD.gn rename to test/unittest/napi/pedometer/BUILD.gn index ea556501..636cca13 100644 --- a/interfaces/plugin/test/unittest/pedometer/BUILD.gn +++ b/test/unittest/napi/pedometer/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/frameworks" ohos_js_unittest("PedometerJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/interfaces/plugin/test/unittest/pedometer/ExampleJsunit.test.js b/test/unittest/napi/pedometer/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/pedometer/ExampleJsunit.test.js rename to test/unittest/napi/pedometer/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/pedometer/config.json b/test/unittest/napi/pedometer/config.json similarity index 100% rename from interfaces/plugin/test/unittest/pedometer/config.json rename to test/unittest/napi/pedometer/config.json diff --git a/interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn b/test/unittest/napi/pedometer_detection/BUILD.gn similarity index 95% rename from interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn rename to test/unittest/napi/pedometer_detection/BUILD.gn index 18b81579..a76982dc 100755 --- a/interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn +++ b/test/unittest/napi/pedometer_detection/BUILD.gn @@ -9,11 +9,11 @@ # 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. +# limitations under the License. import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/frameworks" ohos_js_unittest("PedometerDetectionJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/interfaces/plugin/test/unittest/pedometer_detection/ExampleJsunit.test.js b/test/unittest/napi/pedometer_detection/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/pedometer_detection/ExampleJsunit.test.js rename to test/unittest/napi/pedometer_detection/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/pedometer_detection/config.json b/test/unittest/napi/pedometer_detection/config.json similarity index 100% rename from interfaces/plugin/test/unittest/pedometer_detection/config.json rename to test/unittest/napi/pedometer_detection/config.json diff --git a/interfaces/plugin/test/unittest/sar/BUILD.gn b/test/unittest/napi/sar/BUILD.gn similarity index 95% rename from interfaces/plugin/test/unittest/sar/BUILD.gn rename to test/unittest/napi/sar/BUILD.gn index a635b5bd..01f37f33 100755 --- a/interfaces/plugin/test/unittest/sar/BUILD.gn +++ b/test/unittest/napi/sar/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/frameworks" ohos_js_unittest("SarJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/interfaces/plugin/test/unittest/sar/ExampleJsunit.test.js b/test/unittest/napi/sar/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/sar/ExampleJsunit.test.js rename to test/unittest/napi/sar/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/sar/config.json b/test/unittest/napi/sar/config.json similarity index 100% rename from interfaces/plugin/test/unittest/sar/config.json rename to test/unittest/napi/sar/config.json diff --git a/interfaces/plugin/test/unittest/sensor/BUILD.gn b/test/unittest/napi/sensor/BUILD.gn similarity index 95% rename from interfaces/plugin/test/unittest/sensor/BUILD.gn rename to test/unittest/napi/sensor/BUILD.gn index 6a4cef74..147af590 100755 --- a/interfaces/plugin/test/unittest/sensor/BUILD.gn +++ b/test/unittest/napi/sensor/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/frameworks" ohos_js_unittest("SensorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js b/test/unittest/napi/sensor/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js rename to test/unittest/napi/sensor/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/sensor/config.json b/test/unittest/napi/sensor/config.json similarity index 100% rename from interfaces/plugin/test/unittest/sensor/config.json rename to test/unittest/napi/sensor/config.json diff --git a/interfaces/plugin/test/unittest/signature/openharmony_core.p7b b/test/unittest/napi/signature/openharmony_core.p7b similarity index 100% rename from interfaces/plugin/test/unittest/signature/openharmony_core.p7b rename to test/unittest/napi/signature/openharmony_core.p7b diff --git a/interfaces/plugin/test/unittest/signature/openharmony_sx.p7b b/test/unittest/napi/signature/openharmony_sx.p7b similarity index 100% rename from interfaces/plugin/test/unittest/signature/openharmony_sx.p7b rename to test/unittest/napi/signature/openharmony_sx.p7b diff --git a/interfaces/native/test/BUILD.gn b/test/unittest/sensor/BUILD.gn similarity index 70% rename from interfaces/native/test/BUILD.gn rename to test/unittest/sensor/BUILD.gn index 727f68b5..74ce0f61 100644 --- a/interfaces/native/test/BUILD.gn +++ b/test/unittest/sensor/BUILD.gn @@ -15,21 +15,22 @@ import("//build/test.gni") import("./../../../sensor.gni") ohos_unittest("SensorAgentTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensors/sensor/frameworks" sources = [ - "$SUBSYSTEM_DIR/interfaces/native/test/unittest/sensor_agent_test.cpp", + "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_agent_test.cpp", "$SUBSYSTEM_DIR/test/unittest/common/src/system_info.cpp", ] include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", "$SUBSYSTEM_DIR/test/unittest/common/include", "$SUBSYSTEM_DIR/utils/common/include", ] deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -46,18 +47,19 @@ ohos_unittest("SensorAgentTest") { } ohos_unittest("SensorAlgorithmTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensors/sensor/frameworks" - sources = [ "unittest/sensor_algorithm_test.cpp" ] + sources = ["$SUBSYSTEM_DIR/test/unittest/sensor/sensor_algorithm_test.cpp" ] include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", "$SUBSYSTEM_DIR/test/unittest/common/include", "$SUBSYSTEM_DIR/utils/common/include", ] deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -71,17 +73,18 @@ ohos_unittest("SensorAlgorithmTest") { } ohos_unittest("SensorPowerTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensors/sensor/frameworks" - sources = [ "unittest/sensor_power_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_power_test.cpp" ] include_dirs = [ "$SUBSYSTEM_DIR/utils/common/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", ] deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -100,15 +103,16 @@ ohos_unittest("SensorPowerTest") { ohos_unittest("PostureTest") { module_out_path = "sensors/sensor/interfaces" - sources = [ "unittest/posture_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/posture_test.cpp" ] include_dirs = [ "$SUBSYSTEM_DIR/utils/common/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", ] deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/interfaces/native/test/unittest/posture_test.cpp b/test/unittest/sensor/posture_test.cpp similarity index 100% rename from interfaces/native/test/unittest/posture_test.cpp rename to test/unittest/sensor/posture_test.cpp diff --git a/interfaces/native/test/unittest/sensor_agent_test.cpp b/test/unittest/sensor/sensor_agent_test.cpp similarity index 100% rename from interfaces/native/test/unittest/sensor_agent_test.cpp rename to test/unittest/sensor/sensor_agent_test.cpp diff --git a/interfaces/native/test/unittest/sensor_algorithm_test.cpp b/test/unittest/sensor/sensor_algorithm_test.cpp similarity index 100% rename from interfaces/native/test/unittest/sensor_algorithm_test.cpp rename to test/unittest/sensor/sensor_algorithm_test.cpp diff --git a/interfaces/native/test/unittest/sensor_power_test.cpp b/test/unittest/sensor/sensor_power_test.cpp similarity index 100% rename from interfaces/native/test/unittest/sensor_power_test.cpp rename to test/unittest/sensor/sensor_power_test.cpp -- Gitee From 71ebd55ce68cde6e6503a1b34a7b56a68e83c714 Mon Sep 17 00:00:00 2001 From: yyl Date: Wed, 11 Oct 2023 02:43:52 +0000 Subject: [PATCH 02/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: Ide92bf7db7b3a016b9809a2bf5147cf52709c50a --- bundle.json | 5 ++--- frameworks/js/napi/BUILD.gn | 2 +- frameworks/native/sensor/BUILD.gn | 13 ++++++------- .../sensor/getactivesensorinfos_fuzzer/BUILD.gn | 2 +- test/fuzztest/sensor/register_fuzzer/BUILD.gn | 2 +- test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn | 2 +- test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn | 2 +- .../fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn | 2 +- test/fuzztest/sensor/unregister_fuzzer/BUILD.gn | 2 +- .../services/createdatachannelstub_fuzzer/BUILD.gn | 3 ++- .../createsocketchannelstub_fuzzer/BUILD.gn | 3 ++- .../destroydatachannelstub_fuzzer/BUILD.gn | 3 ++- .../destroysocketchannelstub_fuzzer/BUILD.gn | 3 ++- .../disableactiveinfocbstub_fuzzer/BUILD.gn | 3 ++- .../enableactiveinfocbstub_fuzzer/BUILD.gn | 3 ++- .../services/getactiveinfoliststub_fuzzer/BUILD.gn | 3 ++- .../services/getallsensorsstub_fuzzer/BUILD.gn | 3 ++- .../services/resetsensorsstub_fuzzer/BUILD.gn | 3 ++- .../services/resumesensorsstub_fuzzer/BUILD.gn | 3 ++- .../services/sensordisablestub_fuzzer/BUILD.gn | 3 ++- .../services/sensorenablestub_fuzzer/BUILD.gn | 3 ++- .../services/sensoronremoterequest_fuzzer/BUILD.gn | 3 ++- .../services/suspendsensorsstub_fuzzer/BUILD.gn | 3 ++- test/unittest/napi/barometer/BUILD.gn | 2 +- test/unittest/napi/color/BUILD.gn | 2 +- test/unittest/napi/gyroscope/BUILD.gn | 2 +- test/unittest/napi/pedometer/BUILD.gn | 2 +- test/unittest/napi/pedometer_detection/BUILD.gn | 2 +- test/unittest/napi/sar/BUILD.gn | 2 +- test/unittest/napi/sensor/BUILD.gn | 2 +- test/unittest/sensor/BUILD.gn | 14 +++++++------- utils/common/BUILD.gn | 3 ++- 32 files changed, 59 insertions(+), 46 deletions(-) diff --git a/bundle.json b/bundle.json index 764fc70b..c6435460 100755 --- a/bundle.json +++ b/bundle.json @@ -39,8 +39,7 @@ "base_group": [], "fwk_group": [ "//base/sensors/sensor/frameworks/js/napi:sensor_js_target", - "//base/sensors/sensor/frameworks/native/sensor:sensor_ndk_target", - "//base/sensors/sensor/frameworks/native/sensor:sensor_native_target", + "//base/sensors/sensor/frameworks/native/sensor:sensor_target", "//base/sensors/sensor/utils:sensor_utils_target" ], "service_group": [ @@ -62,7 +61,7 @@ ], "test": [ "//base/sensors/sensor/test/unittest/napi:unittest", - "//base/sensors/sensortest/fuzztest/sensor:fuzztest", + "//base/sensors/sensor/test/fuzztest/sensor:fuzztest", "//base/sensors/sensor/test/unittest/sensor:unittest", "//base/sensors/sensor/test/fuzztest/services:fuzztest" ] diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 3850f32d..dd01d194 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("./../../sensor.gni") +import("./../../../sensor.gni") ohos_shared_library("libsensor") { include_dirs = [ diff --git a/frameworks/native/sensor/BUILD.gn b/frameworks/native/sensor/BUILD.gn index de17763b..38314874 100755 --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/sensor/BUILD.gn @@ -69,6 +69,9 @@ config("sensor_private_config") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/utils/common/include", + ] +} config("sensor_public_config") { include_dirs = [ "include" ] } @@ -102,12 +105,8 @@ ohos_shared_library("sensor_interface_native") { subsystem_name = "sensors" } -group("sensor_ndk_target") { - deps = [ ":sensor_interface_native" ] -} "$SUBSYSTEM_DIR/utils/common/include", - ] +group("sensor_target") { + deps = [ ":sensor_interface_native", + ":libsensor_native" ] } -group("sensor_native_target") { - deps = [ ":libsensor_native" ] -} diff --git a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn index f1604770..542b113b 100644 --- a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("GetActiveSensorInfosFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH diff --git a/test/fuzztest/sensor/register_fuzzer/BUILD.gn b/test/fuzztest/sensor/register_fuzzer/BUILD.gn index bd4334a9..a12aae0e 100644 --- a/test/fuzztest/sensor/register_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/register_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("RegisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH diff --git a/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn b/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn index 778e6898..23a3f66a 100644 --- a/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("ResumeSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH diff --git a/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn b/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn index e51b6690..618f6551 100644 --- a/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("SensorAgentFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH diff --git a/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn b/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn index 718caa67..c4547428 100644 --- a/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("SuspendSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH diff --git a/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn b/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn index 50b718f5..074e1ac1 100644 --- a/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("UnregisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH diff --git a/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn index 12dfe814..8d1c721e 100644 --- a/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("CreateDataChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("CreateDataChannelStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn index 696b24d3..99801693 100644 --- a/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("CreateSocketChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("CreateSocketChannelStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn index 960fbbb6..6bfd08fa 100644 --- a/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("DestroyDataChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("DestroyDataChannelStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn index 0f727de0..f40e7f7f 100644 --- a/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("DestroySocketChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("DestroySocketChannelStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn index f5bb94d5..1dc179b7 100644 --- a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn index 5b64a14a..4d906ae9 100644 --- a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn index 5d5b75c6..630cc239 100644 --- a/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("GetActiveInfoListStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("GetActiveInfoListStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn index 417f4ee4..f8d82956 100644 --- a/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("GetAllSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -24,6 +24,7 @@ ohos_fuzztest("GetAllSensorsStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn index 9e7eabec..82db066d 100644 --- a/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("ResetSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -24,6 +24,7 @@ ohos_fuzztest("ResetSensorsStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn index 2213456d..85200325 100644 --- a/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("ResumeSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -24,6 +24,7 @@ ohos_fuzztest("ResumeSensorsStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn b/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn index 6ffd312a..aa865d01 100644 --- a/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("SensorDisableStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -24,6 +24,7 @@ ohos_fuzztest("SensorDisableStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn b/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn index cf0e3f38..9bca6533 100644 --- a/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("SensorEnableStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -24,6 +24,7 @@ ohos_fuzztest("SensorEnableStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn index aedceb30..c50237fe 100644 --- a/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -23,6 +23,7 @@ ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn index ba435402..d22b554c 100644 --- a/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("./../../../../../sensor.gni") +import("./../../../../sensor.gni") ohos_fuzztest("SuspendSensorsStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH @@ -24,6 +24,7 @@ ohos_fuzztest("SuspendSensorsStubFuzzTest") { include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", diff --git a/test/unittest/napi/barometer/BUILD.gn b/test/unittest/napi/barometer/BUILD.gn index 35d12e5c..23e8ddce 100755 --- a/test/unittest/napi/barometer/BUILD.gn +++ b/test/unittest/napi/barometer/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/frameworks" +module_output_path = "sensor/interfaces" ohos_js_unittest("BarometerJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/color/BUILD.gn b/test/unittest/napi/color/BUILD.gn index fa1bd3ae..a77fe897 100755 --- a/test/unittest/napi/color/BUILD.gn +++ b/test/unittest/napi/color/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/frameworks" +module_output_path = "sensor/interfaces" ohos_js_unittest("ColorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/gyroscope/BUILD.gn b/test/unittest/napi/gyroscope/BUILD.gn index f86a46a3..2a40c6ac 100755 --- a/test/unittest/napi/gyroscope/BUILD.gn +++ b/test/unittest/napi/gyroscope/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/frameworks" +module_output_path = "sensor/interfaces" ohos_js_unittest("GyroscopeJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/pedometer/BUILD.gn b/test/unittest/napi/pedometer/BUILD.gn index 636cca13..ea556501 100644 --- a/test/unittest/napi/pedometer/BUILD.gn +++ b/test/unittest/napi/pedometer/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/frameworks" +module_output_path = "sensor/interfaces" ohos_js_unittest("PedometerJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/pedometer_detection/BUILD.gn b/test/unittest/napi/pedometer_detection/BUILD.gn index a76982dc..3291a874 100755 --- a/test/unittest/napi/pedometer_detection/BUILD.gn +++ b/test/unittest/napi/pedometer_detection/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/frameworks" +module_output_path = "sensor/interfaces" ohos_js_unittest("PedometerDetectionJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/sar/BUILD.gn b/test/unittest/napi/sar/BUILD.gn index 01f37f33..a635b5bd 100755 --- a/test/unittest/napi/sar/BUILD.gn +++ b/test/unittest/napi/sar/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/frameworks" +module_output_path = "sensor/interfaces" ohos_js_unittest("SarJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/sensor/BUILD.gn b/test/unittest/napi/sensor/BUILD.gn index 147af590..6a4cef74 100755 --- a/test/unittest/napi/sensor/BUILD.gn +++ b/test/unittest/napi/sensor/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/frameworks" +module_output_path = "sensor/interfaces" ohos_js_unittest("SensorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/sensor/BUILD.gn b/test/unittest/sensor/BUILD.gn index 74ce0f61..8fcc8933 100644 --- a/test/unittest/sensor/BUILD.gn +++ b/test/unittest/sensor/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("./../../../sensor.gni") ohos_unittest("SensorAgentTest") { - module_out_path = "sensors/sensor/frameworks" + module_out_path = "sensors/sensor/interfaces" sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_agent_test.cpp", @@ -30,7 +30,7 @@ ohos_unittest("SensorAgentTest") { ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -47,7 +47,7 @@ ohos_unittest("SensorAgentTest") { } ohos_unittest("SensorAlgorithmTest") { - module_out_path = "sensors/sensor/frameworks" + module_out_path = "sensors/sensor/interfaces" sources = ["$SUBSYSTEM_DIR/test/unittest/sensor/sensor_algorithm_test.cpp" ] @@ -59,7 +59,7 @@ ohos_unittest("SensorAlgorithmTest") { ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -73,7 +73,7 @@ ohos_unittest("SensorAlgorithmTest") { } ohos_unittest("SensorPowerTest") { - module_out_path = "sensors/sensor/frameworks" + module_out_path = "sensors/sensor/interfaces" sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_power_test.cpp" ] @@ -84,7 +84,7 @@ ohos_unittest("SensorPowerTest") { ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -112,7 +112,7 @@ ohos_unittest("PostureTest") { ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/utils/common/BUILD.gn b/utils/common/BUILD.gn index 97bb603b..058f9aee 100644 --- a/utils/common/BUILD.gn +++ b/utils/common/BUILD.gn @@ -26,7 +26,8 @@ ohos_shared_library("libsensor_utils") { ] include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/sensor/include", "$SUBSYSTEM_DIR/utils/common/include", ] -- Gitee From 022d4d78dab214ac264d284d3c38bb1c17615b91 Mon Sep 17 00:00:00 2001 From: yyl Date: Wed, 11 Oct 2023 03:37:34 +0000 Subject: [PATCH 03/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: I572f3cd1342c20d2173fd66be220349e5d9ccee2 --- frameworks/native/sensor/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/sensor/BUILD.gn b/frameworks/native/sensor/BUILD.gn index 38314874..14680b87 100755 --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/sensor/BUILD.gn @@ -73,7 +73,7 @@ config("sensor_private_config") { ] } config("sensor_public_config") { - include_dirs = [ "include" ] + include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api" ] } ohos_shared_library("sensor_interface_native") { -- Gitee From 3fe3f16e48bf8619e3fdd0f5379c0e5c2005050e Mon Sep 17 00:00:00 2001 From: yyl Date: Wed, 11 Oct 2023 04:37:06 +0000 Subject: [PATCH 04/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: Id1aee0b169d7a35d8bf9497e181c0fe4dc230f8c --- frameworks/native/sensor/BUILD.gn | 9 +++++---- .../fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn | 3 ++- test/fuzztest/sensor/register_fuzzer/BUILD.gn | 3 +-- test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn | 3 +-- test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn | 3 +-- test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn | 3 +-- test/fuzztest/sensor/unregister_fuzzer/BUILD.gn | 3 +-- .../services/createdatachannelstub_fuzzer/BUILD.gn | 3 ++- .../services/createsocketchannelstub_fuzzer/BUILD.gn | 3 ++- .../services/destroydatachannelstub_fuzzer/BUILD.gn | 3 ++- .../services/destroysocketchannelstub_fuzzer/BUILD.gn | 3 ++- .../services/disableactiveinfocbstub_fuzzer/BUILD.gn | 3 ++- .../services/enableactiveinfocbstub_fuzzer/BUILD.gn | 3 ++- .../services/getactiveinfoliststub_fuzzer/BUILD.gn | 3 ++- .../services/sensoronremoterequest_fuzzer/BUILD.gn | 3 ++- test/unittest/sensor/BUILD.gn | 4 ++-- 16 files changed, 30 insertions(+), 25 deletions(-) diff --git a/frameworks/native/sensor/BUILD.gn b/frameworks/native/sensor/BUILD.gn index 14680b87..b051d657 100755 --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/sensor/BUILD.gn @@ -72,7 +72,7 @@ config("sensor_private_config") { "$SUBSYSTEM_DIR/utils/common/include", ] } - config("sensor_public_config") { +config("sensor_public_config") { include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api" ] } @@ -106,7 +106,8 @@ ohos_shared_library("sensor_interface_native") { } group("sensor_target") { - deps = [ ":sensor_interface_native", - ":libsensor_native" ] + deps = [ + ":libsensor_native", + ":sensor_interface_native", + ] } - diff --git a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn index 542b113b..7a9ec75b 100644 --- a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("GetActiveSensorInfosFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/getactivesensorinfos_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/sensor/getactivesensorinfos_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", diff --git a/test/fuzztest/sensor/register_fuzzer/BUILD.gn b/test/fuzztest/sensor/register_fuzzer/BUILD.gn index a12aae0e..7758fe9f 100644 --- a/test/fuzztest/sensor/register_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/register_fuzzer/BUILD.gn @@ -19,8 +19,7 @@ import("./../../../../sensor.gni") ohos_fuzztest("RegisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = - "$SUBSYSTEM_DIR/test/fuzztest/sensor/register_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/register_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", diff --git a/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn b/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn index 23a3f66a..84cd96ac 100644 --- a/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn @@ -19,8 +19,7 @@ import("./../../../../sensor.gni") ohos_fuzztest("ResumeSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = - "$SUBSYSTEM_DIR/test/fuzztest/sensor/resumesensors_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/resumesensors_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", diff --git a/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn b/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn index 618f6551..15b72df5 100644 --- a/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn @@ -19,8 +19,7 @@ import("./../../../../sensor.gni") ohos_fuzztest("SensorAgentFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = - "$SUBSYSTEM_DIR/test/fuzztest/sensor/sensoragent_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/sensoragent_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", diff --git a/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn b/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn index c4547428..4ebce209 100644 --- a/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn @@ -19,8 +19,7 @@ import("./../../../../sensor.gni") ohos_fuzztest("SuspendSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = - "$SUBSYSTEM_DIR/test/fuzztest/sensor/suspendsensors_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/suspendsensors_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", diff --git a/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn b/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn index 074e1ac1..82d157a9 100644 --- a/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn +++ b/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn @@ -19,8 +19,7 @@ import("./../../../../sensor.gni") ohos_fuzztest("UnregisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = - "$SUBSYSTEM_DIR/test/fuzztest/sensor/unregister_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/unregister_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", diff --git a/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn index 8d1c721e..c8959ee1 100644 --- a/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("CreateDataChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/createdatachannelstub_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/createdatachannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn index 99801693..534479ab 100644 --- a/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("CreateSocketChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/createsocketchannelstub_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/createsocketchannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn index 6bfd08fa..f24348b1 100644 --- a/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("DestroyDataChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/destroydatachannelstub_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/destroydatachannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn index f40e7f7f..f72eb073 100644 --- a/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("DestroySocketChannelStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/destroysocketchannelstub_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/destroysocketchannelstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn index 1dc179b7..b5fe2a15 100644 --- a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/disableactiveinfocbstub_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/disableactiveinfocbstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn index 4d906ae9..527bb04f 100644 --- a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/enableactiveinfocbstub_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/enableactiveinfocbstub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn index 630cc239..dad172e6 100644 --- a/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("GetActiveInfoListStubFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/getactiveinfoliststub_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/getactiveinfoliststub_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn index c50237fe..04a49a9c 100644 --- a/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("./../../../../sensor.gni") ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/services/sensoronremoterequest_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/services/sensoronremoterequest_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/frameworks/native/sensor/include", diff --git a/test/unittest/sensor/BUILD.gn b/test/unittest/sensor/BUILD.gn index 8fcc8933..dfda7524 100644 --- a/test/unittest/sensor/BUILD.gn +++ b/test/unittest/sensor/BUILD.gn @@ -18,8 +18,8 @@ ohos_unittest("SensorAgentTest") { module_out_path = "sensors/sensor/interfaces" sources = [ - "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_agent_test.cpp", "$SUBSYSTEM_DIR/test/unittest/common/src/system_info.cpp", + "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_agent_test.cpp", ] include_dirs = [ @@ -49,7 +49,7 @@ ohos_unittest("SensorAgentTest") { ohos_unittest("SensorAlgorithmTest") { module_out_path = "sensors/sensor/interfaces" - sources = ["$SUBSYSTEM_DIR/test/unittest/sensor/sensor_algorithm_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_algorithm_test.cpp" ] include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", -- Gitee From b3a86cf580fe55e589d64ddeab2a8c7b1050e58b Mon Sep 17 00:00:00 2001 From: yyl Date: Wed, 11 Oct 2023 10:17:27 +0000 Subject: [PATCH 05/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: I003ac937881edc8a7dcba4de509cbe9b55cd067e --- bundle.json | 12 +++---- frameworks/js/napi/BUILD.gn | 4 +-- frameworks/native/{sensor => }/BUILD.gn | 10 +++--- .../native/{sensor => }/include/fd_listener.h | 0 .../{sensor => }/include/geomagnetic_field.h | 0 .../{sensor => }/include/i_sensor_client.h | 0 .../{sensor => }/include/i_sensor_service.h | 0 .../{sensor => }/include/sensor_agent_proxy.h | 0 .../{sensor => }/include/sensor_algorithm.h | 0 .../include/sensor_client_proxy.h | 0 .../{sensor => }/include/sensor_client_stub.h | 0 .../include/sensor_data_channel.h | 0 .../include/sensor_event_handler.h | 0 .../include/sensor_file_descriptor_listener.h | 0 .../include/sensor_service_client.h | 0 .../include/sensor_service_proxy.h | 0 .../include/sensors_ipc_interface_code.h | 0 frameworks/native/{sensor => }/libsensor.json | 0 .../native/{sensor => }/src/fd_listener.cpp | 0 .../{sensor => }/src/geomagnetic_field.cpp | 0 .../native/{sensor => }/src/sensor_agent.cpp | 0 .../{sensor => }/src/sensor_agent_proxy.cpp | 0 .../{sensor => }/src/sensor_algorithm.cpp | 0 .../{sensor => }/src/sensor_client_stub.cpp | 0 .../{sensor => }/src/sensor_data_channel.cpp | 0 .../{sensor => }/src/sensor_event_handler.cpp | 0 .../src/sensor_file_descriptor_listener.cpp | 0 .../src/sensor_service_client.cpp | 0 .../{sensor => }/src/sensor_service_proxy.cpp | 0 services/{sensor => }/BUILD.gn | 22 ++++++------ .../adapter/include/compatible_connection.h | 0 .../adapter/include/hdi_connection.h | 0 .../adapter/include/sensor_event_callback.h | 0 .../adapter/src/compatible_connection.cpp | 0 .../adapter/src/hdi_connection.cpp | 0 .../adapter/src/sensor_event_callback.cpp | 0 .../hardware/include/hdi_service_impl.h | 0 .../hardware/src/hdi_service_impl.cpp | 0 .../include/i_sensor_hdi_connection.h | 0 .../interface/include/sensor_hdi_connection.h | 0 .../interface/src/sensor_hdi_connection.cpp | 0 services/{sensor => }/include/client_info.h | 0 .../{sensor => }/include/fifo_cache_data.h | 0 .../{sensor => }/include/flush_info_record.h | 0 .../include/sensor_data_processer.h | 0 services/{sensor => }/include/sensor_dump.h | 0 .../{sensor => }/include/sensor_manager.h | 0 .../include/sensor_power_policy.h | 0 .../{sensor => }/include/sensor_service.h | 0 .../include/sensor_service_proxy.h | 0 .../include/sensor_service_stub.h | 0 services/{sensor => }/include/stream_server.h | 0 services/{sensor => }/src/client_info.cpp | 0 services/{sensor => }/src/fifo_cache_data.cpp | 0 .../{sensor => }/src/flush_info_record.cpp | 0 .../src/sensor_data_processer.cpp | 0 services/{sensor => }/src/sensor_dump.cpp | 0 services/{sensor => }/src/sensor_manager.cpp | 0 .../{sensor => }/src/sensor_power_policy.cpp | 0 services/{sensor => }/src/sensor_service.cpp | 0 .../{sensor => }/src/sensor_service_stub.cpp | 0 services/{sensor => }/src/stream_server.cpp | 0 test/fuzztest/{sensor => interfaces}/BUILD.gn | 0 .../getactivesensorinfos_fuzzer/BUILD.gn | 8 ++--- .../getactivesensorinfos_fuzzer/corpus/init | 0 .../getactivesensorinfos_fuzzer.cpp | 0 .../getactivesensorinfos_fuzzer.h | 0 .../getactivesensorinfos_fuzzer/project.xml | 0 .../register_fuzzer/BUILD.gn | 8 ++--- .../register_fuzzer/corpus/init | 0 .../register_fuzzer/project.xml | 0 .../register_fuzzer/register_fuzzer.cpp | 0 .../register_fuzzer/register_fuzzer.h | 0 .../resumesensors_fuzzer/BUILD.gn | 9 ++--- .../resumesensors_fuzzer/corpus/init | 0 .../resumesensors_fuzzer/project.xml | 0 .../resumesensors_fuzzer.cpp | 0 .../resumesensors_fuzzer.h | 0 .../sensoragent_fuzzer/BUILD.gn | 9 ++--- .../sensoragent_fuzzer/corpus/init | 0 .../sensoragent_fuzzer/project.xml | 0 .../sensoragent_fuzzer/sensoragent_fuzzer.cpp | 0 .../sensoragent_fuzzer/sensoragent_fuzzer.h | 0 .../suspendsensors_fuzzer/BUILD.gn | 9 ++--- .../suspendsensors_fuzzer/corpus/init | 0 .../suspendsensors_fuzzer/project.xml | 0 .../suspendsensors_fuzzer.cpp | 0 .../suspendsensors_fuzzer.h | 0 .../unregister_fuzzer/BUILD.gn | 8 ++--- .../unregister_fuzzer/corpus/init | 0 .../unregister_fuzzer/project.xml | 0 .../unregister_fuzzer/unregister_fuzzer.cpp | 0 .../unregister_fuzzer/unregister_fuzzer.h | 0 .../createdatachannelstub_fuzzer/BUILD.gn | 14 ++++---- .../createsocketchannelstub_fuzzer/BUILD.gn | 14 ++++---- .../destroydatachannelstub_fuzzer/BUILD.gn | 14 ++++---- .../destroysocketchannelstub_fuzzer/BUILD.gn | 14 ++++---- .../disableactiveinfocbstub_fuzzer/BUILD.gn | 14 ++++---- .../enableactiveinfocbstub_fuzzer/BUILD.gn | 16 ++++----- .../getactiveinfoliststub_fuzzer/BUILD.gn | 14 ++++---- .../getallsensorsstub_fuzzer/BUILD.gn | 14 ++++---- .../services/resetsensorsstub_fuzzer/BUILD.gn | 14 ++++---- .../resumesensorsstub_fuzzer/BUILD.gn | 14 ++++---- .../sensordisablestub_fuzzer/BUILD.gn | 14 ++++---- .../services/sensorenablestub_fuzzer/BUILD.gn | 14 ++++---- .../sensoronremoterequest_fuzzer/BUILD.gn | 14 ++++---- .../suspendsensorsstub_fuzzer/BUILD.gn | 14 ++++---- .../{sensor => interfaces/inner_api}/BUILD.gn | 34 +++++++++--------- .../inner_api}/posture_test.cpp | 0 .../inner_api}/sensor_agent_test.cpp | 0 .../inner_api}/sensor_algorithm_test.cpp | 0 .../inner_api}/sensor_power_test.cpp | 0 .../unittest/{napi => interfaces/js}/BUILD.gn | 0 .../js}/barometer/BUILD.gn | 2 +- .../js}/barometer/ExampleJsunit.test.js | 0 .../js}/barometer/config.json | 0 .../{napi => interfaces/js}/color/BUILD.gn | 2 +- .../js}/color/ExampleJsunit.test.js | 0 .../{napi => interfaces/js}/color/config.json | 0 .../js}/gyroscope/BUILD.gn | 2 +- .../js}/gyroscope/ExampleJsunit.test.js | 0 .../js}/gyroscope/config.json | 0 .../js}/pedometer/BUILD.gn | 2 +- .../js}/pedometer/ExampleJsunit.test.js | 0 .../js}/pedometer/config.json | 0 .../js}/pedometer_detection/BUILD.gn | 2 +- .../pedometer_detection/ExampleJsunit.test.js | 0 .../js}/pedometer_detection/config.json | 0 .../{napi => interfaces/js}/sar/BUILD.gn | 2 +- .../js}/sar/ExampleJsunit.test.js | 0 .../{napi => interfaces/js}/sar/config.json | 0 .../{napi => interfaces/js}/sensor/BUILD.gn | 2 +- .../js}/sensor/ExampleJsunit.test.js | 0 .../js}/sensor/config.json | 0 .../js}/signature/openharmony_core.p7b | Bin .../js}/signature/openharmony_sx.p7b | Bin utils/common/BUILD.gn | 2 +- 137 files changed, 175 insertions(+), 172 deletions(-) rename frameworks/native/{sensor => }/BUILD.gn (91%) rename frameworks/native/{sensor => }/include/fd_listener.h (100%) rename frameworks/native/{sensor => }/include/geomagnetic_field.h (100%) rename frameworks/native/{sensor => }/include/i_sensor_client.h (100%) rename frameworks/native/{sensor => }/include/i_sensor_service.h (100%) rename frameworks/native/{sensor => }/include/sensor_agent_proxy.h (100%) rename frameworks/native/{sensor => }/include/sensor_algorithm.h (100%) rename frameworks/native/{sensor => }/include/sensor_client_proxy.h (100%) rename frameworks/native/{sensor => }/include/sensor_client_stub.h (100%) rename frameworks/native/{sensor => }/include/sensor_data_channel.h (100%) rename frameworks/native/{sensor => }/include/sensor_event_handler.h (100%) rename frameworks/native/{sensor => }/include/sensor_file_descriptor_listener.h (100%) rename frameworks/native/{sensor => }/include/sensor_service_client.h (100%) rename frameworks/native/{sensor => }/include/sensor_service_proxy.h (100%) rename frameworks/native/{sensor => }/include/sensors_ipc_interface_code.h (100%) rename frameworks/native/{sensor => }/libsensor.json (100%) rename frameworks/native/{sensor => }/src/fd_listener.cpp (100%) rename frameworks/native/{sensor => }/src/geomagnetic_field.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_agent.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_agent_proxy.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_algorithm.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_client_stub.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_data_channel.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_event_handler.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_file_descriptor_listener.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_service_client.cpp (100%) rename frameworks/native/{sensor => }/src/sensor_service_proxy.cpp (100%) rename services/{sensor => }/BUILD.gn (85%) rename services/{sensor => }/hdi_connection/adapter/include/compatible_connection.h (100%) rename services/{sensor => }/hdi_connection/adapter/include/hdi_connection.h (100%) rename services/{sensor => }/hdi_connection/adapter/include/sensor_event_callback.h (100%) rename services/{sensor => }/hdi_connection/adapter/src/compatible_connection.cpp (100%) rename services/{sensor => }/hdi_connection/adapter/src/hdi_connection.cpp (100%) rename services/{sensor => }/hdi_connection/adapter/src/sensor_event_callback.cpp (100%) rename services/{sensor => }/hdi_connection/hardware/include/hdi_service_impl.h (100%) rename services/{sensor => }/hdi_connection/hardware/src/hdi_service_impl.cpp (100%) rename services/{sensor => }/hdi_connection/interface/include/i_sensor_hdi_connection.h (100%) rename services/{sensor => }/hdi_connection/interface/include/sensor_hdi_connection.h (100%) rename services/{sensor => }/hdi_connection/interface/src/sensor_hdi_connection.cpp (100%) rename services/{sensor => }/include/client_info.h (100%) rename services/{sensor => }/include/fifo_cache_data.h (100%) rename services/{sensor => }/include/flush_info_record.h (100%) rename services/{sensor => }/include/sensor_data_processer.h (100%) rename services/{sensor => }/include/sensor_dump.h (100%) rename services/{sensor => }/include/sensor_manager.h (100%) rename services/{sensor => }/include/sensor_power_policy.h (100%) rename services/{sensor => }/include/sensor_service.h (100%) rename services/{sensor => }/include/sensor_service_proxy.h (100%) rename services/{sensor => }/include/sensor_service_stub.h (100%) rename services/{sensor => }/include/stream_server.h (100%) rename services/{sensor => }/src/client_info.cpp (100%) rename services/{sensor => }/src/fifo_cache_data.cpp (100%) rename services/{sensor => }/src/flush_info_record.cpp (100%) rename services/{sensor => }/src/sensor_data_processer.cpp (100%) rename services/{sensor => }/src/sensor_dump.cpp (100%) rename services/{sensor => }/src/sensor_manager.cpp (100%) rename services/{sensor => }/src/sensor_power_policy.cpp (100%) rename services/{sensor => }/src/sensor_service.cpp (100%) rename services/{sensor => }/src/sensor_service_stub.cpp (100%) rename services/{sensor => }/src/stream_server.cpp (100%) rename test/fuzztest/{sensor => interfaces}/BUILD.gn (100%) rename test/fuzztest/{sensor => interfaces}/getactivesensorinfos_fuzzer/BUILD.gn (83%) rename test/fuzztest/{sensor => interfaces}/getactivesensorinfos_fuzzer/corpus/init (100%) rename test/fuzztest/{sensor => interfaces}/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp (100%) rename test/fuzztest/{sensor => interfaces}/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h (100%) rename test/fuzztest/{sensor => interfaces}/getactivesensorinfos_fuzzer/project.xml (100%) rename test/fuzztest/{sensor => interfaces}/register_fuzzer/BUILD.gn (83%) rename test/fuzztest/{sensor => interfaces}/register_fuzzer/corpus/init (100%) rename test/fuzztest/{sensor => interfaces}/register_fuzzer/project.xml (100%) rename test/fuzztest/{sensor => interfaces}/register_fuzzer/register_fuzzer.cpp (100%) rename test/fuzztest/{sensor => interfaces}/register_fuzzer/register_fuzzer.h (100%) rename test/fuzztest/{sensor => interfaces}/resumesensors_fuzzer/BUILD.gn (82%) rename test/fuzztest/{sensor => interfaces}/resumesensors_fuzzer/corpus/init (100%) rename test/fuzztest/{sensor => interfaces}/resumesensors_fuzzer/project.xml (100%) rename test/fuzztest/{sensor => interfaces}/resumesensors_fuzzer/resumesensors_fuzzer.cpp (100%) rename test/fuzztest/{sensor => interfaces}/resumesensors_fuzzer/resumesensors_fuzzer.h (100%) rename test/fuzztest/{sensor => interfaces}/sensoragent_fuzzer/BUILD.gn (80%) rename test/fuzztest/{sensor => interfaces}/sensoragent_fuzzer/corpus/init (100%) rename test/fuzztest/{sensor => interfaces}/sensoragent_fuzzer/project.xml (100%) rename test/fuzztest/{sensor => interfaces}/sensoragent_fuzzer/sensoragent_fuzzer.cpp (100%) rename test/fuzztest/{sensor => interfaces}/sensoragent_fuzzer/sensoragent_fuzzer.h (100%) rename test/fuzztest/{sensor => interfaces}/suspendsensors_fuzzer/BUILD.gn (82%) rename test/fuzztest/{sensor => interfaces}/suspendsensors_fuzzer/corpus/init (100%) rename test/fuzztest/{sensor => interfaces}/suspendsensors_fuzzer/project.xml (100%) rename test/fuzztest/{sensor => interfaces}/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp (100%) rename test/fuzztest/{sensor => interfaces}/suspendsensors_fuzzer/suspendsensors_fuzzer.h (100%) rename test/fuzztest/{sensor => interfaces}/unregister_fuzzer/BUILD.gn (83%) rename test/fuzztest/{sensor => interfaces}/unregister_fuzzer/corpus/init (100%) rename test/fuzztest/{sensor => interfaces}/unregister_fuzzer/project.xml (100%) rename test/fuzztest/{sensor => interfaces}/unregister_fuzzer/unregister_fuzzer.cpp (100%) rename test/fuzztest/{sensor => interfaces}/unregister_fuzzer/unregister_fuzzer.h (100%) rename test/unittest/{sensor => interfaces/inner_api}/BUILD.gn (73%) rename test/unittest/{sensor => interfaces/inner_api}/posture_test.cpp (100%) rename test/unittest/{sensor => interfaces/inner_api}/sensor_agent_test.cpp (100%) rename test/unittest/{sensor => interfaces/inner_api}/sensor_algorithm_test.cpp (100%) rename test/unittest/{sensor => interfaces/inner_api}/sensor_power_test.cpp (100%) rename test/unittest/{napi => interfaces/js}/BUILD.gn (100%) rename test/unittest/{napi => interfaces/js}/barometer/BUILD.gn (94%) rename test/unittest/{napi => interfaces/js}/barometer/ExampleJsunit.test.js (100%) rename test/unittest/{napi => interfaces/js}/barometer/config.json (100%) rename test/unittest/{napi => interfaces/js}/color/BUILD.gn (94%) rename test/unittest/{napi => interfaces/js}/color/ExampleJsunit.test.js (100%) rename test/unittest/{napi => interfaces/js}/color/config.json (100%) rename test/unittest/{napi => interfaces/js}/gyroscope/BUILD.gn (94%) rename test/unittest/{napi => interfaces/js}/gyroscope/ExampleJsunit.test.js (100%) rename test/unittest/{napi => interfaces/js}/gyroscope/config.json (100%) rename test/unittest/{napi => interfaces/js}/pedometer/BUILD.gn (94%) rename test/unittest/{napi => interfaces/js}/pedometer/ExampleJsunit.test.js (100%) rename test/unittest/{napi => interfaces/js}/pedometer/config.json (100%) rename test/unittest/{napi => interfaces/js}/pedometer_detection/BUILD.gn (94%) rename test/unittest/{napi => interfaces/js}/pedometer_detection/ExampleJsunit.test.js (100%) rename test/unittest/{napi => interfaces/js}/pedometer_detection/config.json (100%) rename test/unittest/{napi => interfaces/js}/sar/BUILD.gn (94%) rename test/unittest/{napi => interfaces/js}/sar/ExampleJsunit.test.js (100%) rename test/unittest/{napi => interfaces/js}/sar/config.json (100%) rename test/unittest/{napi => interfaces/js}/sensor/BUILD.gn (94%) rename test/unittest/{napi => interfaces/js}/sensor/ExampleJsunit.test.js (100%) rename test/unittest/{napi => interfaces/js}/sensor/config.json (100%) rename test/unittest/{napi => interfaces/js}/signature/openharmony_core.p7b (100%) rename test/unittest/{napi => interfaces/js}/signature/openharmony_sx.p7b (100%) diff --git a/bundle.json b/bundle.json index c6435460..94ec4a33 100755 --- a/bundle.json +++ b/bundle.json @@ -39,17 +39,17 @@ "base_group": [], "fwk_group": [ "//base/sensors/sensor/frameworks/js/napi:sensor_js_target", - "//base/sensors/sensor/frameworks/native/sensor:sensor_target", + "//base/sensors/sensor/frameworks/native:sensor_target", "//base/sensors/sensor/utils:sensor_utils_target" ], "service_group": [ - "//base/sensors/sensor/services/sensor:sensor_service_target", + "//base/sensors/sensor/services:sensor_service_target", "//base/sensors/sensor/sa_profile:sensors_sa_profiles" ] }, "inner_kits": [ { - "name": "//base/sensors/sensor/frameworks/native/sensor:sensor_interface_native", + "name": "//base/sensors/sensor/frameworks/native:sensor_interface_native", "header": { "header_files": [ "sensor_agent_type.h", @@ -60,9 +60,9 @@ } ], "test": [ - "//base/sensors/sensor/test/unittest/napi:unittest", - "//base/sensors/sensor/test/fuzztest/sensor:fuzztest", - "//base/sensors/sensor/test/unittest/sensor:unittest", + "//base/sensors/sensor/test/unittest/interfaces/js:unittest", + "//base/sensors/sensor/test/fuzztest/interfaces:fuzztest", + "//base/sensors/sensor/test/unittest/interfaces/inner_api:unittest", "//base/sensors/sensor/test/fuzztest/services:fuzztest" ] } diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index dd01d194..26d9e80d 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -16,7 +16,7 @@ import("./../../../sensor.gni") ohos_shared_library("libsensor") { include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/frameworks/js/napi/include", "$SUBSYSTEM_DIR/utils/common/include", @@ -33,7 +33,7 @@ ohos_shared_library("libsensor") { "src/sensor_napi_utils.cpp", "src/sensor_system_js.cpp", ] - deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "c_utils:utils", "hilog:libhilog", diff --git a/frameworks/native/sensor/BUILD.gn b/frameworks/native/BUILD.gn similarity index 91% rename from frameworks/native/sensor/BUILD.gn rename to frameworks/native/BUILD.gn index b051d657..7f1a8754 100755 --- a/frameworks/native/sensor/BUILD.gn +++ b/frameworks/native/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("./../../../sensor.gni") +import("./../../sensor.gni") ohos_shared_library("libsensor_native") { sources = [ @@ -27,7 +27,7 @@ ohos_shared_library("libsensor_native") { ] include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -67,7 +67,7 @@ ohos_ndk_library("libsensor_ndk") { config("sensor_private_config") { include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -88,8 +88,8 @@ ohos_shared_library("sensor_interface_native") { public_configs = [ ":sensor_public_config" ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", - "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_ndk", + "$SUBSYSTEM_DIR/frameworks/native:libsensor_native", + "$SUBSYSTEM_DIR/frameworks/native:libsensor_ndk", ] external_deps = [ diff --git a/frameworks/native/sensor/include/fd_listener.h b/frameworks/native/include/fd_listener.h similarity index 100% rename from frameworks/native/sensor/include/fd_listener.h rename to frameworks/native/include/fd_listener.h diff --git a/frameworks/native/sensor/include/geomagnetic_field.h b/frameworks/native/include/geomagnetic_field.h similarity index 100% rename from frameworks/native/sensor/include/geomagnetic_field.h rename to frameworks/native/include/geomagnetic_field.h diff --git a/frameworks/native/sensor/include/i_sensor_client.h b/frameworks/native/include/i_sensor_client.h similarity index 100% rename from frameworks/native/sensor/include/i_sensor_client.h rename to frameworks/native/include/i_sensor_client.h diff --git a/frameworks/native/sensor/include/i_sensor_service.h b/frameworks/native/include/i_sensor_service.h similarity index 100% rename from frameworks/native/sensor/include/i_sensor_service.h rename to frameworks/native/include/i_sensor_service.h diff --git a/frameworks/native/sensor/include/sensor_agent_proxy.h b/frameworks/native/include/sensor_agent_proxy.h similarity index 100% rename from frameworks/native/sensor/include/sensor_agent_proxy.h rename to frameworks/native/include/sensor_agent_proxy.h diff --git a/frameworks/native/sensor/include/sensor_algorithm.h b/frameworks/native/include/sensor_algorithm.h similarity index 100% rename from frameworks/native/sensor/include/sensor_algorithm.h rename to frameworks/native/include/sensor_algorithm.h diff --git a/frameworks/native/sensor/include/sensor_client_proxy.h b/frameworks/native/include/sensor_client_proxy.h similarity index 100% rename from frameworks/native/sensor/include/sensor_client_proxy.h rename to frameworks/native/include/sensor_client_proxy.h diff --git a/frameworks/native/sensor/include/sensor_client_stub.h b/frameworks/native/include/sensor_client_stub.h similarity index 100% rename from frameworks/native/sensor/include/sensor_client_stub.h rename to frameworks/native/include/sensor_client_stub.h diff --git a/frameworks/native/sensor/include/sensor_data_channel.h b/frameworks/native/include/sensor_data_channel.h similarity index 100% rename from frameworks/native/sensor/include/sensor_data_channel.h rename to frameworks/native/include/sensor_data_channel.h diff --git a/frameworks/native/sensor/include/sensor_event_handler.h b/frameworks/native/include/sensor_event_handler.h similarity index 100% rename from frameworks/native/sensor/include/sensor_event_handler.h rename to frameworks/native/include/sensor_event_handler.h diff --git a/frameworks/native/sensor/include/sensor_file_descriptor_listener.h b/frameworks/native/include/sensor_file_descriptor_listener.h similarity index 100% rename from frameworks/native/sensor/include/sensor_file_descriptor_listener.h rename to frameworks/native/include/sensor_file_descriptor_listener.h diff --git a/frameworks/native/sensor/include/sensor_service_client.h b/frameworks/native/include/sensor_service_client.h similarity index 100% rename from frameworks/native/sensor/include/sensor_service_client.h rename to frameworks/native/include/sensor_service_client.h diff --git a/frameworks/native/sensor/include/sensor_service_proxy.h b/frameworks/native/include/sensor_service_proxy.h similarity index 100% rename from frameworks/native/sensor/include/sensor_service_proxy.h rename to frameworks/native/include/sensor_service_proxy.h diff --git a/frameworks/native/sensor/include/sensors_ipc_interface_code.h b/frameworks/native/include/sensors_ipc_interface_code.h similarity index 100% rename from frameworks/native/sensor/include/sensors_ipc_interface_code.h rename to frameworks/native/include/sensors_ipc_interface_code.h diff --git a/frameworks/native/sensor/libsensor.json b/frameworks/native/libsensor.json similarity index 100% rename from frameworks/native/sensor/libsensor.json rename to frameworks/native/libsensor.json diff --git a/frameworks/native/sensor/src/fd_listener.cpp b/frameworks/native/src/fd_listener.cpp similarity index 100% rename from frameworks/native/sensor/src/fd_listener.cpp rename to frameworks/native/src/fd_listener.cpp diff --git a/frameworks/native/sensor/src/geomagnetic_field.cpp b/frameworks/native/src/geomagnetic_field.cpp similarity index 100% rename from frameworks/native/sensor/src/geomagnetic_field.cpp rename to frameworks/native/src/geomagnetic_field.cpp diff --git a/frameworks/native/sensor/src/sensor_agent.cpp b/frameworks/native/src/sensor_agent.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_agent.cpp rename to frameworks/native/src/sensor_agent.cpp diff --git a/frameworks/native/sensor/src/sensor_agent_proxy.cpp b/frameworks/native/src/sensor_agent_proxy.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_agent_proxy.cpp rename to frameworks/native/src/sensor_agent_proxy.cpp diff --git a/frameworks/native/sensor/src/sensor_algorithm.cpp b/frameworks/native/src/sensor_algorithm.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_algorithm.cpp rename to frameworks/native/src/sensor_algorithm.cpp diff --git a/frameworks/native/sensor/src/sensor_client_stub.cpp b/frameworks/native/src/sensor_client_stub.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_client_stub.cpp rename to frameworks/native/src/sensor_client_stub.cpp diff --git a/frameworks/native/sensor/src/sensor_data_channel.cpp b/frameworks/native/src/sensor_data_channel.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_data_channel.cpp rename to frameworks/native/src/sensor_data_channel.cpp diff --git a/frameworks/native/sensor/src/sensor_event_handler.cpp b/frameworks/native/src/sensor_event_handler.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_event_handler.cpp rename to frameworks/native/src/sensor_event_handler.cpp diff --git a/frameworks/native/sensor/src/sensor_file_descriptor_listener.cpp b/frameworks/native/src/sensor_file_descriptor_listener.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_file_descriptor_listener.cpp rename to frameworks/native/src/sensor_file_descriptor_listener.cpp diff --git a/frameworks/native/sensor/src/sensor_service_client.cpp b/frameworks/native/src/sensor_service_client.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_service_client.cpp rename to frameworks/native/src/sensor_service_client.cpp diff --git a/frameworks/native/sensor/src/sensor_service_proxy.cpp b/frameworks/native/src/sensor_service_proxy.cpp similarity index 100% rename from frameworks/native/sensor/src/sensor_service_proxy.cpp rename to frameworks/native/src/sensor_service_proxy.cpp diff --git a/services/sensor/BUILD.gn b/services/BUILD.gn similarity index 85% rename from services/sensor/BUILD.gn rename to services/BUILD.gn index bb26b975..6513d2d9 100644 --- a/services/sensor/BUILD.gn +++ b/services/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("./../../sensor.gni") +import("./../sensor.gni") ohos_shared_library("libsensor_service") { sources = [ @@ -28,9 +28,9 @@ ohos_shared_library("libsensor_service") { ] include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -68,9 +68,9 @@ ohos_shared_library("libsensor_service") { ] include_dirs += [ - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", ] external_deps += [ "drivers_interface_sensor:libsensor_proxy_1.1" ] @@ -96,9 +96,9 @@ ohos_shared_library("libsensor_service_static") { ] include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -136,9 +136,9 @@ ohos_shared_library("libsensor_service_static") { ] include_dirs += [ - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", ] external_deps += [ "drivers_interface_sensor:libsensor_proxy_1.1" ] diff --git a/services/sensor/hdi_connection/adapter/include/compatible_connection.h b/services/hdi_connection/adapter/include/compatible_connection.h similarity index 100% rename from services/sensor/hdi_connection/adapter/include/compatible_connection.h rename to services/hdi_connection/adapter/include/compatible_connection.h diff --git a/services/sensor/hdi_connection/adapter/include/hdi_connection.h b/services/hdi_connection/adapter/include/hdi_connection.h similarity index 100% rename from services/sensor/hdi_connection/adapter/include/hdi_connection.h rename to services/hdi_connection/adapter/include/hdi_connection.h diff --git a/services/sensor/hdi_connection/adapter/include/sensor_event_callback.h b/services/hdi_connection/adapter/include/sensor_event_callback.h similarity index 100% rename from services/sensor/hdi_connection/adapter/include/sensor_event_callback.h rename to services/hdi_connection/adapter/include/sensor_event_callback.h diff --git a/services/sensor/hdi_connection/adapter/src/compatible_connection.cpp b/services/hdi_connection/adapter/src/compatible_connection.cpp similarity index 100% rename from services/sensor/hdi_connection/adapter/src/compatible_connection.cpp rename to services/hdi_connection/adapter/src/compatible_connection.cpp diff --git a/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp b/services/hdi_connection/adapter/src/hdi_connection.cpp similarity index 100% rename from services/sensor/hdi_connection/adapter/src/hdi_connection.cpp rename to services/hdi_connection/adapter/src/hdi_connection.cpp diff --git a/services/sensor/hdi_connection/adapter/src/sensor_event_callback.cpp b/services/hdi_connection/adapter/src/sensor_event_callback.cpp similarity index 100% rename from services/sensor/hdi_connection/adapter/src/sensor_event_callback.cpp rename to services/hdi_connection/adapter/src/sensor_event_callback.cpp diff --git a/services/sensor/hdi_connection/hardware/include/hdi_service_impl.h b/services/hdi_connection/hardware/include/hdi_service_impl.h similarity index 100% rename from services/sensor/hdi_connection/hardware/include/hdi_service_impl.h rename to services/hdi_connection/hardware/include/hdi_service_impl.h diff --git a/services/sensor/hdi_connection/hardware/src/hdi_service_impl.cpp b/services/hdi_connection/hardware/src/hdi_service_impl.cpp similarity index 100% rename from services/sensor/hdi_connection/hardware/src/hdi_service_impl.cpp rename to services/hdi_connection/hardware/src/hdi_service_impl.cpp diff --git a/services/sensor/hdi_connection/interface/include/i_sensor_hdi_connection.h b/services/hdi_connection/interface/include/i_sensor_hdi_connection.h similarity index 100% rename from services/sensor/hdi_connection/interface/include/i_sensor_hdi_connection.h rename to services/hdi_connection/interface/include/i_sensor_hdi_connection.h diff --git a/services/sensor/hdi_connection/interface/include/sensor_hdi_connection.h b/services/hdi_connection/interface/include/sensor_hdi_connection.h similarity index 100% rename from services/sensor/hdi_connection/interface/include/sensor_hdi_connection.h rename to services/hdi_connection/interface/include/sensor_hdi_connection.h diff --git a/services/sensor/hdi_connection/interface/src/sensor_hdi_connection.cpp b/services/hdi_connection/interface/src/sensor_hdi_connection.cpp similarity index 100% rename from services/sensor/hdi_connection/interface/src/sensor_hdi_connection.cpp rename to services/hdi_connection/interface/src/sensor_hdi_connection.cpp diff --git a/services/sensor/include/client_info.h b/services/include/client_info.h similarity index 100% rename from services/sensor/include/client_info.h rename to services/include/client_info.h diff --git a/services/sensor/include/fifo_cache_data.h b/services/include/fifo_cache_data.h similarity index 100% rename from services/sensor/include/fifo_cache_data.h rename to services/include/fifo_cache_data.h diff --git a/services/sensor/include/flush_info_record.h b/services/include/flush_info_record.h similarity index 100% rename from services/sensor/include/flush_info_record.h rename to services/include/flush_info_record.h diff --git a/services/sensor/include/sensor_data_processer.h b/services/include/sensor_data_processer.h similarity index 100% rename from services/sensor/include/sensor_data_processer.h rename to services/include/sensor_data_processer.h diff --git a/services/sensor/include/sensor_dump.h b/services/include/sensor_dump.h similarity index 100% rename from services/sensor/include/sensor_dump.h rename to services/include/sensor_dump.h diff --git a/services/sensor/include/sensor_manager.h b/services/include/sensor_manager.h similarity index 100% rename from services/sensor/include/sensor_manager.h rename to services/include/sensor_manager.h diff --git a/services/sensor/include/sensor_power_policy.h b/services/include/sensor_power_policy.h similarity index 100% rename from services/sensor/include/sensor_power_policy.h rename to services/include/sensor_power_policy.h diff --git a/services/sensor/include/sensor_service.h b/services/include/sensor_service.h similarity index 100% rename from services/sensor/include/sensor_service.h rename to services/include/sensor_service.h diff --git a/services/sensor/include/sensor_service_proxy.h b/services/include/sensor_service_proxy.h similarity index 100% rename from services/sensor/include/sensor_service_proxy.h rename to services/include/sensor_service_proxy.h diff --git a/services/sensor/include/sensor_service_stub.h b/services/include/sensor_service_stub.h similarity index 100% rename from services/sensor/include/sensor_service_stub.h rename to services/include/sensor_service_stub.h diff --git a/services/sensor/include/stream_server.h b/services/include/stream_server.h similarity index 100% rename from services/sensor/include/stream_server.h rename to services/include/stream_server.h diff --git a/services/sensor/src/client_info.cpp b/services/src/client_info.cpp similarity index 100% rename from services/sensor/src/client_info.cpp rename to services/src/client_info.cpp diff --git a/services/sensor/src/fifo_cache_data.cpp b/services/src/fifo_cache_data.cpp similarity index 100% rename from services/sensor/src/fifo_cache_data.cpp rename to services/src/fifo_cache_data.cpp diff --git a/services/sensor/src/flush_info_record.cpp b/services/src/flush_info_record.cpp similarity index 100% rename from services/sensor/src/flush_info_record.cpp rename to services/src/flush_info_record.cpp diff --git a/services/sensor/src/sensor_data_processer.cpp b/services/src/sensor_data_processer.cpp similarity index 100% rename from services/sensor/src/sensor_data_processer.cpp rename to services/src/sensor_data_processer.cpp diff --git a/services/sensor/src/sensor_dump.cpp b/services/src/sensor_dump.cpp similarity index 100% rename from services/sensor/src/sensor_dump.cpp rename to services/src/sensor_dump.cpp diff --git a/services/sensor/src/sensor_manager.cpp b/services/src/sensor_manager.cpp similarity index 100% rename from services/sensor/src/sensor_manager.cpp rename to services/src/sensor_manager.cpp diff --git a/services/sensor/src/sensor_power_policy.cpp b/services/src/sensor_power_policy.cpp similarity index 100% rename from services/sensor/src/sensor_power_policy.cpp rename to services/src/sensor_power_policy.cpp diff --git a/services/sensor/src/sensor_service.cpp b/services/src/sensor_service.cpp similarity index 100% rename from services/sensor/src/sensor_service.cpp rename to services/src/sensor_service.cpp diff --git a/services/sensor/src/sensor_service_stub.cpp b/services/src/sensor_service_stub.cpp similarity index 100% rename from services/sensor/src/sensor_service_stub.cpp rename to services/src/sensor_service_stub.cpp diff --git a/services/sensor/src/stream_server.cpp b/services/src/stream_server.cpp similarity index 100% rename from services/sensor/src/stream_server.cpp rename to services/src/stream_server.cpp diff --git a/test/fuzztest/sensor/BUILD.gn b/test/fuzztest/interfaces/BUILD.gn similarity index 100% rename from test/fuzztest/sensor/BUILD.gn rename to test/fuzztest/interfaces/BUILD.gn diff --git a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/BUILD.gn similarity index 83% rename from test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/BUILD.gn index 7a9ec75b..84ceda70 100644 --- a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/BUILD.gn @@ -20,12 +20,12 @@ ohos_fuzztest("GetActiveSensorInfosFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = - "$SUBSYSTEM_DIR/test/fuzztest/sensor/getactivesensorinfos_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/getactivesensorinfos_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/test/fuzztest/sensor/getactivesensorinfos_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/getactivesensorinfos_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -38,7 +38,7 @@ ohos_fuzztest("GetActiveSensorInfosFuzzTest") { sources = [ "getactivesensorinfos_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/corpus/init b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/corpus/init similarity index 100% rename from test/fuzztest/sensor/getactivesensorinfos_fuzzer/corpus/init rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/corpus/init diff --git a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp similarity index 100% rename from test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp diff --git a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h similarity index 100% rename from test/fuzztest/sensor/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h diff --git a/test/fuzztest/sensor/getactivesensorinfos_fuzzer/project.xml b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/project.xml similarity index 100% rename from test/fuzztest/sensor/getactivesensorinfos_fuzzer/project.xml rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/project.xml diff --git a/test/fuzztest/sensor/register_fuzzer/BUILD.gn b/test/fuzztest/interfaces/register_fuzzer/BUILD.gn similarity index 83% rename from test/fuzztest/sensor/register_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/register_fuzzer/BUILD.gn index 7758fe9f..4295a299 100644 --- a/test/fuzztest/sensor/register_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/register_fuzzer/BUILD.gn @@ -19,12 +19,12 @@ import("./../../../../sensor.gni") ohos_fuzztest("RegisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/register_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/interfaces/register_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/test/fuzztest/sensor/register_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/register_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +37,7 @@ ohos_fuzztest("RegisterFuzzTest") { sources = [ "register_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzztest/sensor/register_fuzzer/corpus/init b/test/fuzztest/interfaces/register_fuzzer/corpus/init similarity index 100% rename from test/fuzztest/sensor/register_fuzzer/corpus/init rename to test/fuzztest/interfaces/register_fuzzer/corpus/init diff --git a/test/fuzztest/sensor/register_fuzzer/project.xml b/test/fuzztest/interfaces/register_fuzzer/project.xml similarity index 100% rename from test/fuzztest/sensor/register_fuzzer/project.xml rename to test/fuzztest/interfaces/register_fuzzer/project.xml diff --git a/test/fuzztest/sensor/register_fuzzer/register_fuzzer.cpp b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp similarity index 100% rename from test/fuzztest/sensor/register_fuzzer/register_fuzzer.cpp rename to test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp diff --git a/test/fuzztest/sensor/register_fuzzer/register_fuzzer.h b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.h similarity index 100% rename from test/fuzztest/sensor/register_fuzzer/register_fuzzer.h rename to test/fuzztest/interfaces/register_fuzzer/register_fuzzer.h diff --git a/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn b/test/fuzztest/interfaces/resumesensors_fuzzer/BUILD.gn similarity index 82% rename from test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/resumesensors_fuzzer/BUILD.gn index 84cd96ac..e9021273 100644 --- a/test/fuzztest/sensor/resumesensors_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/resumesensors_fuzzer/BUILD.gn @@ -19,12 +19,13 @@ import("./../../../../sensor.gni") ohos_fuzztest("ResumeSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/resumesensors_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/resumesensors_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/test/fuzztest/sensor/resumesensors_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/resumesensors_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +38,7 @@ ohos_fuzztest("ResumeSensorsFuzzTest") { sources = [ "resumesensors_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzztest/sensor/resumesensors_fuzzer/corpus/init b/test/fuzztest/interfaces/resumesensors_fuzzer/corpus/init similarity index 100% rename from test/fuzztest/sensor/resumesensors_fuzzer/corpus/init rename to test/fuzztest/interfaces/resumesensors_fuzzer/corpus/init diff --git a/test/fuzztest/sensor/resumesensors_fuzzer/project.xml b/test/fuzztest/interfaces/resumesensors_fuzzer/project.xml similarity index 100% rename from test/fuzztest/sensor/resumesensors_fuzzer/project.xml rename to test/fuzztest/interfaces/resumesensors_fuzzer/project.xml diff --git a/test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.cpp b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp similarity index 100% rename from test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.cpp rename to test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp diff --git a/test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.h b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.h similarity index 100% rename from test/fuzztest/sensor/resumesensors_fuzzer/resumesensors_fuzzer.h rename to test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.h diff --git a/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn b/test/fuzztest/interfaces/sensoragent_fuzzer/BUILD.gn similarity index 80% rename from test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/sensoragent_fuzzer/BUILD.gn index 15b72df5..2528534f 100644 --- a/test/fuzztest/sensor/sensoragent_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/sensoragent_fuzzer/BUILD.gn @@ -19,12 +19,13 @@ import("./../../../../sensor.gni") ohos_fuzztest("SensorAgentFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/sensoragent_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/sensoragent_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/test/fuzztest/sensor/sensoragent_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/sensoragent_fuzzer", ] cflags = [ @@ -36,7 +37,7 @@ ohos_fuzztest("SensorAgentFuzzTest") { sources = [ "sensoragent_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "c_utils:utils" ] } diff --git a/test/fuzztest/sensor/sensoragent_fuzzer/corpus/init b/test/fuzztest/interfaces/sensoragent_fuzzer/corpus/init similarity index 100% rename from test/fuzztest/sensor/sensoragent_fuzzer/corpus/init rename to test/fuzztest/interfaces/sensoragent_fuzzer/corpus/init diff --git a/test/fuzztest/sensor/sensoragent_fuzzer/project.xml b/test/fuzztest/interfaces/sensoragent_fuzzer/project.xml similarity index 100% rename from test/fuzztest/sensor/sensoragent_fuzzer/project.xml rename to test/fuzztest/interfaces/sensoragent_fuzzer/project.xml diff --git a/test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.cpp b/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp similarity index 100% rename from test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.cpp rename to test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp diff --git a/test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.h b/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.h similarity index 100% rename from test/fuzztest/sensor/sensoragent_fuzzer/sensoragent_fuzzer.h rename to test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.h diff --git a/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn b/test/fuzztest/interfaces/suspendsensors_fuzzer/BUILD.gn similarity index 82% rename from test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/suspendsensors_fuzzer/BUILD.gn index 4ebce209..51f8ac61 100644 --- a/test/fuzztest/sensor/suspendsensors_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/suspendsensors_fuzzer/BUILD.gn @@ -19,12 +19,13 @@ import("./../../../../sensor.gni") ohos_fuzztest("SuspendSensorsFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/suspendsensors_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/suspendsensors_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/test/fuzztest/sensor/suspendsensors_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/suspendsensors_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +38,7 @@ ohos_fuzztest("SuspendSensorsFuzzTest") { sources = [ "suspendsensors_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzztest/sensor/suspendsensors_fuzzer/corpus/init b/test/fuzztest/interfaces/suspendsensors_fuzzer/corpus/init similarity index 100% rename from test/fuzztest/sensor/suspendsensors_fuzzer/corpus/init rename to test/fuzztest/interfaces/suspendsensors_fuzzer/corpus/init diff --git a/test/fuzztest/sensor/suspendsensors_fuzzer/project.xml b/test/fuzztest/interfaces/suspendsensors_fuzzer/project.xml similarity index 100% rename from test/fuzztest/sensor/suspendsensors_fuzzer/project.xml rename to test/fuzztest/interfaces/suspendsensors_fuzzer/project.xml diff --git a/test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp similarity index 100% rename from test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp rename to test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp diff --git a/test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.h b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.h similarity index 100% rename from test/fuzztest/sensor/suspendsensors_fuzzer/suspendsensors_fuzzer.h rename to test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.h diff --git a/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn b/test/fuzztest/interfaces/unregister_fuzzer/BUILD.gn similarity index 83% rename from test/fuzztest/sensor/unregister_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/unregister_fuzzer/BUILD.gn index 82d157a9..d581ee18 100644 --- a/test/fuzztest/sensor/unregister_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/unregister_fuzzer/BUILD.gn @@ -19,12 +19,12 @@ import("./../../../../sensor.gni") ohos_fuzztest("UnregisterFuzzTest") { module_out_path = FUZZ_MODULE_OUT_PATH - fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/sensor/unregister_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/interfaces/unregister_fuzzer" include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/test/fuzztest/sensor/unregister_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/unregister_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -37,7 +37,7 @@ ohos_fuzztest("UnregisterFuzzTest") { sources = [ "unregister_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzztest/sensor/unregister_fuzzer/corpus/init b/test/fuzztest/interfaces/unregister_fuzzer/corpus/init similarity index 100% rename from test/fuzztest/sensor/unregister_fuzzer/corpus/init rename to test/fuzztest/interfaces/unregister_fuzzer/corpus/init diff --git a/test/fuzztest/sensor/unregister_fuzzer/project.xml b/test/fuzztest/interfaces/unregister_fuzzer/project.xml similarity index 100% rename from test/fuzztest/sensor/unregister_fuzzer/project.xml rename to test/fuzztest/interfaces/unregister_fuzzer/project.xml diff --git a/test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.cpp b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp similarity index 100% rename from test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.cpp rename to test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp diff --git a/test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.h b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.h similarity index 100% rename from test/fuzztest/sensor/unregister_fuzzer/unregister_fuzzer.h rename to test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.h diff --git a/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn index c8959ee1..391384be 100644 --- a/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("CreateDataChannelStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/createdatachannelstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/createdatachannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("CreateDataChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn index 534479ab..5b0a6e57 100644 --- a/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("CreateSocketChannelStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/createsocketchannelstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/createsocketchannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("CreateSocketChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn index f24348b1..a3c02cc7 100644 --- a/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("DestroyDataChannelStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/destroydatachannelstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/destroydatachannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("DestroyDataChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn index f72eb073..432a44f8 100644 --- a/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("DestroySocketChannelStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/destroysocketchannelstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/destroysocketchannelstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("DestroySocketChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn index b5fe2a15..c93ad83d 100644 --- a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/disableactiveinfocbstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/disableactiveinfocbstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn index 527bb04f..16eeea79 100644 --- a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn @@ -23,13 +23,13 @@ ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/enableactiveinfocbstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", - "$SUBSYSTEM_DIR/test/fuzztest/services/services/enableactiveinfocbstub_fuzzer", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", + "$SUBSYSTEM_DIR/test/fuzztest/services/enableactiveinfocbstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -46,8 +46,8 @@ ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn index dad172e6..9719854d 100644 --- a/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("GetActiveInfoListStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/getactiveinfoliststub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/getactiveinfoliststub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("GetActiveInfoListStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn index f8d82956..9f4f87b0 100644 --- a/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("GetAllSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/getallsensorsstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/getallsensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("GetAllSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn index 82db066d..ca613fd5 100644 --- a/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("ResetSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/resetsensorsstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/services/fuzztest/services/resetsensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("ResetSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn index 85200325..83a3f562 100644 --- a/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("ResumeSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/resumesensorsstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/resumesensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("ResumeSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn b/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn index aa865d01..595e4f33 100644 --- a/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("SensorDisableStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/sensordisablestub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/sensordisablestub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("SensorDisableStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn b/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn index 9bca6533..9a5c6409 100644 --- a/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("SensorEnableStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/sensorenablestub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/sensorenablestub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("SensorEnableStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn index 04a49a9c..2b819ff7 100644 --- a/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/sensoronremoterequest_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/sensoronremoterequest_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn b/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn index d22b554c..410c9c48 100644 --- a/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn @@ -23,12 +23,12 @@ ohos_fuzztest("SuspendSensorsStubFuzzTest") { "$SUBSYSTEM_DIR/test/fuzztest/services/suspendsensorsstub_fuzzer" include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/interface/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/adapter/include", - "$SUBSYSTEM_DIR/services/sensor/hdi_connection/hardware/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/services/hdi_connection/interface/include", + "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include", + "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include", + "$SUBSYSTEM_DIR/services/include", "$SUBSYSTEM_DIR/test/fuzztest/services/suspendsensorsstub_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", @@ -46,8 +46,8 @@ ohos_fuzztest("SuspendSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_interface_native", - "$SUBSYSTEM_DIR/services/sensor:libsensor_service_static", + "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native", + "$SUBSYSTEM_DIR/services:libsensor_service_static", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] diff --git a/test/unittest/sensor/BUILD.gn b/test/unittest/interfaces/inner_api/BUILD.gn similarity index 73% rename from test/unittest/sensor/BUILD.gn rename to test/unittest/interfaces/inner_api/BUILD.gn index dfda7524..11c0e421 100644 --- a/test/unittest/sensor/BUILD.gn +++ b/test/unittest/interfaces/inner_api/BUILD.gn @@ -12,25 +12,25 @@ # limitations under the License. import("//build/test.gni") -import("./../../../sensor.gni") +import("./../../../../sensor.gni") ohos_unittest("SensorAgentTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensor/interfaces/inner_api" sources = [ "$SUBSYSTEM_DIR/test/unittest/common/src/system_info.cpp", - "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_agent_test.cpp", + "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api/sensor_agent_test.cpp", ] include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/test/unittest/common/include", "$SUBSYSTEM_DIR/utils/common/include", ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", + "$SUBSYSTEM_DIR/frameworks/native:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -47,19 +47,19 @@ ohos_unittest("SensorAgentTest") { } ohos_unittest("SensorAlgorithmTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensor/interfaces/inner_api" - sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_algorithm_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api/sensor_algorithm_test.cpp" ] include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/test/unittest/common/include", "$SUBSYSTEM_DIR/utils/common/include", ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", + "$SUBSYSTEM_DIR/frameworks/native:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -73,18 +73,18 @@ ohos_unittest("SensorAlgorithmTest") { } ohos_unittest("SensorPowerTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensor/interfaces/inner_api" - sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/sensor_power_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api/sensor_power_test.cpp" ] include_dirs = [ "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", + "$SUBSYSTEM_DIR/frameworks/native:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -101,18 +101,18 @@ ohos_unittest("SensorPowerTest") { } ohos_unittest("PostureTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensor/interfaces/inner_api" - sources = [ "$SUBSYSTEM_DIR/test/unittest/sensor/posture_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api/posture_test.cpp" ] include_dirs = [ "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", ] deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:sensor_target", + "$SUBSYSTEM_DIR/frameworks/native:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/test/unittest/sensor/posture_test.cpp b/test/unittest/interfaces/inner_api/posture_test.cpp similarity index 100% rename from test/unittest/sensor/posture_test.cpp rename to test/unittest/interfaces/inner_api/posture_test.cpp diff --git a/test/unittest/sensor/sensor_agent_test.cpp b/test/unittest/interfaces/inner_api/sensor_agent_test.cpp similarity index 100% rename from test/unittest/sensor/sensor_agent_test.cpp rename to test/unittest/interfaces/inner_api/sensor_agent_test.cpp diff --git a/test/unittest/sensor/sensor_algorithm_test.cpp b/test/unittest/interfaces/inner_api/sensor_algorithm_test.cpp similarity index 100% rename from test/unittest/sensor/sensor_algorithm_test.cpp rename to test/unittest/interfaces/inner_api/sensor_algorithm_test.cpp diff --git a/test/unittest/sensor/sensor_power_test.cpp b/test/unittest/interfaces/inner_api/sensor_power_test.cpp similarity index 100% rename from test/unittest/sensor/sensor_power_test.cpp rename to test/unittest/interfaces/inner_api/sensor_power_test.cpp diff --git a/test/unittest/napi/BUILD.gn b/test/unittest/interfaces/js/BUILD.gn similarity index 100% rename from test/unittest/napi/BUILD.gn rename to test/unittest/interfaces/js/BUILD.gn diff --git a/test/unittest/napi/barometer/BUILD.gn b/test/unittest/interfaces/js/barometer/BUILD.gn similarity index 94% rename from test/unittest/napi/barometer/BUILD.gn rename to test/unittest/interfaces/js/barometer/BUILD.gn index 23e8ddce..61cc010d 100755 --- a/test/unittest/napi/barometer/BUILD.gn +++ b/test/unittest/interfaces/js/barometer/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/interfaces/js" ohos_js_unittest("BarometerJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/barometer/ExampleJsunit.test.js b/test/unittest/interfaces/js/barometer/ExampleJsunit.test.js similarity index 100% rename from test/unittest/napi/barometer/ExampleJsunit.test.js rename to test/unittest/interfaces/js/barometer/ExampleJsunit.test.js diff --git a/test/unittest/napi/barometer/config.json b/test/unittest/interfaces/js/barometer/config.json similarity index 100% rename from test/unittest/napi/barometer/config.json rename to test/unittest/interfaces/js/barometer/config.json diff --git a/test/unittest/napi/color/BUILD.gn b/test/unittest/interfaces/js/color/BUILD.gn similarity index 94% rename from test/unittest/napi/color/BUILD.gn rename to test/unittest/interfaces/js/color/BUILD.gn index a77fe897..cf13f01f 100755 --- a/test/unittest/napi/color/BUILD.gn +++ b/test/unittest/interfaces/js/color/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/interfaces/js" ohos_js_unittest("ColorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/color/ExampleJsunit.test.js b/test/unittest/interfaces/js/color/ExampleJsunit.test.js similarity index 100% rename from test/unittest/napi/color/ExampleJsunit.test.js rename to test/unittest/interfaces/js/color/ExampleJsunit.test.js diff --git a/test/unittest/napi/color/config.json b/test/unittest/interfaces/js/color/config.json similarity index 100% rename from test/unittest/napi/color/config.json rename to test/unittest/interfaces/js/color/config.json diff --git a/test/unittest/napi/gyroscope/BUILD.gn b/test/unittest/interfaces/js/gyroscope/BUILD.gn similarity index 94% rename from test/unittest/napi/gyroscope/BUILD.gn rename to test/unittest/interfaces/js/gyroscope/BUILD.gn index 2a40c6ac..4e921e2f 100755 --- a/test/unittest/napi/gyroscope/BUILD.gn +++ b/test/unittest/interfaces/js/gyroscope/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/interfaces/js" ohos_js_unittest("GyroscopeJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/gyroscope/ExampleJsunit.test.js b/test/unittest/interfaces/js/gyroscope/ExampleJsunit.test.js similarity index 100% rename from test/unittest/napi/gyroscope/ExampleJsunit.test.js rename to test/unittest/interfaces/js/gyroscope/ExampleJsunit.test.js diff --git a/test/unittest/napi/gyroscope/config.json b/test/unittest/interfaces/js/gyroscope/config.json similarity index 100% rename from test/unittest/napi/gyroscope/config.json rename to test/unittest/interfaces/js/gyroscope/config.json diff --git a/test/unittest/napi/pedometer/BUILD.gn b/test/unittest/interfaces/js/pedometer/BUILD.gn similarity index 94% rename from test/unittest/napi/pedometer/BUILD.gn rename to test/unittest/interfaces/js/pedometer/BUILD.gn index ea556501..4088531f 100644 --- a/test/unittest/napi/pedometer/BUILD.gn +++ b/test/unittest/interfaces/js/pedometer/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/interfaces/js" ohos_js_unittest("PedometerJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/pedometer/ExampleJsunit.test.js b/test/unittest/interfaces/js/pedometer/ExampleJsunit.test.js similarity index 100% rename from test/unittest/napi/pedometer/ExampleJsunit.test.js rename to test/unittest/interfaces/js/pedometer/ExampleJsunit.test.js diff --git a/test/unittest/napi/pedometer/config.json b/test/unittest/interfaces/js/pedometer/config.json similarity index 100% rename from test/unittest/napi/pedometer/config.json rename to test/unittest/interfaces/js/pedometer/config.json diff --git a/test/unittest/napi/pedometer_detection/BUILD.gn b/test/unittest/interfaces/js/pedometer_detection/BUILD.gn similarity index 94% rename from test/unittest/napi/pedometer_detection/BUILD.gn rename to test/unittest/interfaces/js/pedometer_detection/BUILD.gn index 3291a874..6b47c04f 100755 --- a/test/unittest/napi/pedometer_detection/BUILD.gn +++ b/test/unittest/interfaces/js/pedometer_detection/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/interfaces/js" ohos_js_unittest("PedometerDetectionJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/pedometer_detection/ExampleJsunit.test.js b/test/unittest/interfaces/js/pedometer_detection/ExampleJsunit.test.js similarity index 100% rename from test/unittest/napi/pedometer_detection/ExampleJsunit.test.js rename to test/unittest/interfaces/js/pedometer_detection/ExampleJsunit.test.js diff --git a/test/unittest/napi/pedometer_detection/config.json b/test/unittest/interfaces/js/pedometer_detection/config.json similarity index 100% rename from test/unittest/napi/pedometer_detection/config.json rename to test/unittest/interfaces/js/pedometer_detection/config.json diff --git a/test/unittest/napi/sar/BUILD.gn b/test/unittest/interfaces/js/sar/BUILD.gn similarity index 94% rename from test/unittest/napi/sar/BUILD.gn rename to test/unittest/interfaces/js/sar/BUILD.gn index a635b5bd..cb376253 100755 --- a/test/unittest/napi/sar/BUILD.gn +++ b/test/unittest/interfaces/js/sar/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/interfaces/js" ohos_js_unittest("SarJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/sar/ExampleJsunit.test.js b/test/unittest/interfaces/js/sar/ExampleJsunit.test.js similarity index 100% rename from test/unittest/napi/sar/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sar/ExampleJsunit.test.js diff --git a/test/unittest/napi/sar/config.json b/test/unittest/interfaces/js/sar/config.json similarity index 100% rename from test/unittest/napi/sar/config.json rename to test/unittest/interfaces/js/sar/config.json diff --git a/test/unittest/napi/sensor/BUILD.gn b/test/unittest/interfaces/js/sensor/BUILD.gn similarity index 94% rename from test/unittest/napi/sensor/BUILD.gn rename to test/unittest/interfaces/js/sensor/BUILD.gn index 6a4cef74..b0b9915f 100755 --- a/test/unittest/napi/sensor/BUILD.gn +++ b/test/unittest/interfaces/js/sensor/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "sensor/interfaces" +module_output_path = "sensor/interfaces/js" ohos_js_unittest("SensorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" diff --git a/test/unittest/napi/sensor/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js similarity index 100% rename from test/unittest/napi/sensor/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/ExampleJsunit.test.js diff --git a/test/unittest/napi/sensor/config.json b/test/unittest/interfaces/js/sensor/config.json similarity index 100% rename from test/unittest/napi/sensor/config.json rename to test/unittest/interfaces/js/sensor/config.json diff --git a/test/unittest/napi/signature/openharmony_core.p7b b/test/unittest/interfaces/js/signature/openharmony_core.p7b similarity index 100% rename from test/unittest/napi/signature/openharmony_core.p7b rename to test/unittest/interfaces/js/signature/openharmony_core.p7b diff --git a/test/unittest/napi/signature/openharmony_sx.p7b b/test/unittest/interfaces/js/signature/openharmony_sx.p7b similarity index 100% rename from test/unittest/napi/signature/openharmony_sx.p7b rename to test/unittest/interfaces/js/signature/openharmony_sx.p7b diff --git a/utils/common/BUILD.gn b/utils/common/BUILD.gn index 058f9aee..91777c23 100644 --- a/utils/common/BUILD.gn +++ b/utils/common/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("libsensor_utils") { include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api", - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", "$SUBSYSTEM_DIR/utils/common/include", ] -- Gitee From 84f71452c127d79e97d0a4e70fa46e51895eac95 Mon Sep 17 00:00:00 2001 From: yyl Date: Wed, 18 Oct 2023 02:58:34 +0000 Subject: [PATCH 06/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: Ia7e9a2ed3e0c29ca509df4453790250be3ba3281 --- frameworks/js/napi/src/sensor_js.cpp | 1 - frameworks/native/src/geomagnetic_field.cpp | 76 +++++++++---------- frameworks/native/src/sensor_agent_proxy.cpp | 36 ++++----- frameworks/native/src/sensor_algorithm.cpp | 28 ++++--- .../socket_ipc_rust_ffi/src/stream_buffer.rs | 3 +- .../adapter/src/hdi_connection.cpp | 10 +-- services/src/client_info.cpp | 3 +- services/src/sensor_manager.cpp | 2 +- .../getactivesensorinfos_fuzzer.cpp | 2 +- .../register_fuzzer/register_fuzzer.cpp | 2 +- .../resumesensors_fuzzer.cpp | 2 +- .../suspendsensors_fuzzer.cpp | 2 +- .../unregister_fuzzer/unregister_fuzzer.cpp | 2 +- .../createdatachannelstub_fuzzer.cpp | 2 +- .../createsocketchannelstub_fuzzer.cpp | 2 +- .../destroydatachannelstub_fuzzer.cpp | 2 +- .../destroysocketchannelstub_fuzzer.cpp | 2 +- .../disableactiveinfocbstub_fuzzer.cpp | 2 +- .../enableactiveinfocbstub_fuzzer.cpp | 2 +- .../getactiveinfoliststub_fuzzer.cpp | 2 +- .../getallsensorsstub_fuzzer.cpp | 2 +- .../resetsensorsstub_fuzzer.cpp | 2 +- .../resumesensorsstub_fuzzer.cpp | 2 +- .../sensordisablestub_fuzzer.cpp | 2 +- .../sensorenablestub_fuzzer.cpp | 2 +- .../sensoronremoterequest_fuzzer.cpp | 2 +- .../suspendsensorsstub_fuzzer.cpp | 2 +- .../inner_api/sensor_agent_test.cpp | 6 +- .../inner_api/sensor_power_test.cpp | 2 +- 29 files changed, 106 insertions(+), 99 deletions(-) diff --git a/frameworks/js/napi/src/sensor_js.cpp b/frameworks/js/napi/src/sensor_js.cpp index 0b3b279b..4e45e97f 100644 --- a/frameworks/js/napi/src/sensor_js.cpp +++ b/frameworks/js/napi/src/sensor_js.cpp @@ -1228,7 +1228,6 @@ static napi_value CreateEnumSensorAccuracy(napi_env env, napi_value exports) sizeof(desc) / sizeof(*desc), desc, &result), "napi_define_class"); CHKNRP(env, napi_set_named_property(env, exports, "SensorAccuracy", result), "napi_set_named_property fail"); return exports; - } static napi_value Init(napi_env env, napi_value exports) diff --git a/frameworks/native/src/geomagnetic_field.cpp b/frameworks/native/src/geomagnetic_field.cpp index 37c86000..e0ac5c49 100644 --- a/frameworks/native/src/geomagnetic_field.cpp +++ b/frameworks/native/src/geomagnetic_field.cpp @@ -96,14 +96,14 @@ constexpr float DELTA_GAUSS_COEFFICIENT_H[13][13] = { {0.0f, 0.0f, 0.0f, -0.1f, 0.1f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0.0f, -0.1f} }; constexpr int32_t GAUSSIAN_COEFFICIENT_DIMENSION = 13; -std::mutex mutex_; +std::mutex g_mutex; -float northComponent; -float eastComponent; -float downComponent; -float geocentricLatitude; -float geocentricLongitude; -float geocentricRadius; +float g_northComponent; +float g_eastComponent; +float g_downComponent; +float g_geocentricLatitude; +float g_geocentricLongitude; +float g_geocentricRadius; std::vector> schmidtQuasiNormalFactors; std::vector> polynomials(GAUSSIAN_COEFFICIENT_DIMENSION); @@ -115,13 +115,13 @@ std::vector cosMLongitude(GAUSSIAN_COEFFICIENT_DIMENSION); GeomagneticField::GeomagneticField(float latitude, float longitude, float altitude, int64_t timeMillis) { - std::lock_guard geomagneticLock(mutex_); + std::lock_guard geomagneticLock(g_mutex); schmidtQuasiNormalFactors = GetSchmidtQuasiNormalFactors(GAUSSIAN_COEFFICIENT_DIMENSION); float gcLatitude = fmax(LATITUDE_MIN + PRECISION, fmin(LATITUDE_MAX - PRECISION, latitude)); CalibrateGeocentricCoordinates(gcLatitude, longitude, altitude); - InitLegendreTable(GAUSSIAN_COEFFICIENT_DIMENSION - 1, static_cast(M_PI / 2.0 - geocentricLatitude)); + InitLegendreTable(GAUSSIAN_COEFFICIENT_DIMENSION - 1, static_cast(M_PI / 2.0 - g_geocentricLatitude)); GetRelativeRadiusPower(); - double latDiffRad = ToRadians(gcLatitude) - geocentricLatitude; + double latDiffRad = ToRadians(gcLatitude) - g_geocentricLatitude; CalculateGeomagneticComponent(latDiffRad, timeMillis); } @@ -146,8 +146,8 @@ std::vector> GeomagneticField::GetSchmidtQuasiNormalFactors(i void GeomagneticField::CalculateGeomagneticComponent(double latDiffRad, int64_t timeMillis) { float yearsSinceBase = (timeMillis - WMM_BASE_TIME) / (365.0f * 24.0f * 60.0f * 60.0f * 1000.0f); - float inverseCosLatitude = IsEqual(static_cast(cos(geocentricLatitude)), 0.0f) ? - std::numeric_limits::max() : DERIVATIVE_FACTOR / static_cast(cos(geocentricLatitude)); + float inverseCosLatitude = IsEqual(static_cast(cos(g_geocentricLatitude)), 0.0f) ? + std::numeric_limits::max() : DERIVATIVE_FACTOR / static_cast(cos(g_geocentricLatitude)); GetLongitudeTrigonometric(); float gcX = 0.0f; float gcY = 0.0f; @@ -172,9 +172,9 @@ void GeomagneticField::CalculateGeomagneticComponent(double latDiffRad, int64_t * polynomials[row][column] * schmidtQuasiNormalFactors[row][column]; } - northComponent = static_cast(gcX * cos(latDiffRad) + gcZ * sin(latDiffRad)); - eastComponent = gcY; - downComponent = static_cast(-gcX * sin(latDiffRad) + gcZ * cos(latDiffRad)); + g_northComponent = static_cast(gcX * cos(latDiffRad) + gcZ * sin(latDiffRad)); + g_eastComponent = gcY; + g_downComponent = static_cast(-gcX * sin(latDiffRad) + gcZ * cos(latDiffRad)); } } @@ -182,8 +182,8 @@ void GeomagneticField::GetLongitudeTrigonometric() { sinMLongitude[0] = 0.0f; cosMLongitude[0] = 1.0f; - sinMLongitude[1] = static_cast(sin(geocentricLongitude)); - cosMLongitude[1] = static_cast(cos(geocentricLongitude)); + sinMLongitude[1] = static_cast(sin(g_geocentricLongitude)); + cosMLongitude[1] = static_cast(cos(g_geocentricLongitude)); for (uint32_t index = 2; index < GAUSSIAN_COEFFICIENT_DIMENSION; ++index) { uint32_t x = index >> 1; sinMLongitude[index] = (sinMLongitude[index - x] * cosMLongitude[x] @@ -196,8 +196,8 @@ void GeomagneticField::GetLongitudeTrigonometric() void GeomagneticField::GetRelativeRadiusPower() { relativeRadiusPower[0] = 1.0f; - relativeRadiusPower[1] = IsEqual(geocentricRadius, 0.0f) ? std::numeric_limits::max() : - EARTH_REFERENCE_RADIUS / geocentricRadius; + relativeRadiusPower[1] = IsEqual(g_geocentricRadius, 0.0f) ? std::numeric_limits::max() : + EARTH_REFERENCE_RADIUS / g_geocentricRadius; for (int32_t index = 2; index < static_cast(relativeRadiusPower.size()); ++index) { relativeRadiusPower[index] = relativeRadiusPower[index - 1] * relativeRadiusPower[1]; } @@ -213,13 +213,13 @@ void GeomagneticField::CalibrateGeocentricCoordinates(float latitude, float long float slat = static_cast(sin(gdLatRad)); float tlat = IsEqual(clat, 0.0f) ? std::numeric_limits::max() : slat / clat; float latRad = static_cast(sqrt(a2 * clat * clat + b2 * slat * slat)); - geocentricLatitude = static_cast(atan(tlat * (latRad * altitudeKm + b2) + g_geocentricLatitude = static_cast(atan(tlat * (latRad * altitudeKm + b2) / (latRad * altitudeKm + a2))); - geocentricLongitude = static_cast(ToRadians(longitude)); + g_geocentricLongitude = static_cast(ToRadians(longitude)); float radSq = altitudeKm * altitudeKm + 2 * altitudeKm * latRad + (a2 * a2 * clat * clat + b2 * b2 * slat * slat) / (a2 * clat * clat + b2 * slat * slat); - geocentricRadius = static_cast(sqrt(radSq)); + g_geocentricRadius = static_cast(sqrt(radSq)); } void GeomagneticField::InitLegendreTable(int32_t expansionDegree, float thetaRad) @@ -257,27 +257,27 @@ void GeomagneticField::InitLegendreTable(int32_t expansionDegree, float thetaRad float GeomagneticField::ObtainX() { - std::lock_guard geomagneticLock(mutex_); - return northComponent; + std::lock_guard geomagneticLock(g_mutex); + return g_northComponent; } float GeomagneticField::ObtainY() { - std::lock_guard geomagneticLock(mutex_); - return eastComponent; + std::lock_guard geomagneticLock(g_mutex); + return g_eastComponent; } float GeomagneticField::ObtainZ() { - std::lock_guard geomagneticLock(mutex_); - return downComponent; + std::lock_guard geomagneticLock(g_mutex); + return g_downComponent; } float GeomagneticField::ObtainGeomagneticDip() { - std::lock_guard geomagneticLock(mutex_); - float horizontalIntensity = hypot(northComponent, eastComponent); - return static_cast(ToDegrees(atan2(downComponent, horizontalIntensity))); + std::lock_guard geomagneticLock(g_mutex); + float horizontalIntensity = hypot(g_northComponent, g_eastComponent); + return static_cast(ToDegrees(atan2(g_downComponent, horizontalIntensity))); } double GeomagneticField::ToDegrees(double angrad) @@ -292,22 +292,22 @@ double GeomagneticField::ToRadians(double angdeg) float GeomagneticField::ObtainDeflectionAngle() { - std::lock_guard geomagneticLock(mutex_); - return static_cast(ToDegrees(atan2(eastComponent, northComponent))); + std::lock_guard geomagneticLock(g_mutex); + return static_cast(ToDegrees(atan2(g_eastComponent, g_northComponent))); } float GeomagneticField::ObtainLevelIntensity() { - std::lock_guard geomagneticLock(mutex_); - float horizontalIntensity = hypot(northComponent, eastComponent); + std::lock_guard geomagneticLock(g_mutex); + float horizontalIntensity = hypot(g_northComponent, g_eastComponent); return horizontalIntensity; } float GeomagneticField::ObtainTotalIntensity() { - std::lock_guard geomagneticLock(mutex_); - float sumOfSquares = northComponent * northComponent + eastComponent * eastComponent - + downComponent * downComponent; + std::lock_guard geomagneticLock(g_mutex); + float sumOfSquares = g_northComponent * g_northComponent + g_eastComponent * g_eastComponent + + g_downComponent * g_downComponent; float totalIntensity = static_cast(sqrt(sumOfSquares)); return totalIntensity; } diff --git a/frameworks/native/src/sensor_agent_proxy.cpp b/frameworks/native/src/sensor_agent_proxy.cpp index 0a201f74..14152488 100644 --- a/frameworks/native/src/sensor_agent_proxy.cpp +++ b/frameworks/native/src/sensor_agent_proxy.cpp @@ -34,7 +34,7 @@ SensorActiveInfo *sensorActiveInfos_ = nullptr; int32_t sensorInfoCount_ = 0; } // namespace -#define SenClient SensorServiceClient::GetInstance() +#define SEN_CLIENT SensorServiceClient::GetInstance() std::recursive_mutex SensorAgentProxy::subscribeMutex_; std::mutex SensorAgentProxy::chanelMutex_; @@ -85,7 +85,7 @@ int32_t SensorAgentProxy::CreateSensorDataChannel() SEN_HILOGE("Create data channel failed, ret:%{public}d", ret); return ret; } - ret = SenClient.TransferDataChannel(dataChannel_); + ret = SEN_CLIENT.TransferDataChannel(dataChannel_); if (ret != ERR_OK) { auto destroyRet = dataChannel_->DestroySensorDataChannel(); SEN_HILOGE("Transfer data channel failed, ret:%{public}d, destroyRet:%{public}d", ret, destroyRet); @@ -109,7 +109,7 @@ int32_t SensorAgentProxy::DestroySensorDataChannel() SEN_HILOGE("Destroy data channel failed, ret:%{public}d", ret); return ret; } - ret = SenClient.DestroyDataChannel(); + ret = SEN_CLIENT.DestroyDataChannel(); if (ret != ERR_OK) { SEN_HILOGE("Destroy service data channel fail, ret:%{public}d", ret); return ret; @@ -126,7 +126,7 @@ int32_t SensorAgentProxy::ActivateSensor(int32_t sensorId, const SensorUser *use SEN_HILOGE("SamplingPeriod or reportInterval_ is invalid"); return ERROR; } - if (!SenClient.IsValid(sensorId)) { + if (!SEN_CLIENT.IsValid(sensorId)) { SEN_HILOGE("sensorId is invalid, %{public}d", sensorId); return PARAMETER_ERROR; } @@ -135,7 +135,7 @@ int32_t SensorAgentProxy::ActivateSensor(int32_t sensorId, const SensorUser *use SEN_HILOGE("Subscribe sensorId first"); return ERROR; } - int32_t ret = SenClient.EnableSensor(sensorId, samplingInterval_, reportInterval_); + int32_t ret = SEN_CLIENT.EnableSensor(sensorId, samplingInterval_, reportInterval_); samplingInterval_ = -1; reportInterval_ = -1; if (ret != 0) { @@ -150,7 +150,7 @@ int32_t SensorAgentProxy::DeactivateSensor(int32_t sensorId, const SensorUser *u { CHKPR(user, OHOS::Sensors::ERROR); CHKPR(user->callback, OHOS::Sensors::ERROR); - if (!SenClient.IsValid(sensorId)) { + if (!SEN_CLIENT.IsValid(sensorId)) { SEN_HILOGE("sensorId is invalid, %{public}d", sensorId); return PARAMETER_ERROR; } @@ -161,7 +161,7 @@ int32_t SensorAgentProxy::DeactivateSensor(int32_t sensorId, const SensorUser *u } subscribeMap_.erase(sensorId); unsubscribeMap_[sensorId] = user; - int32_t ret = SenClient.DisableSensor(sensorId); + int32_t ret = SEN_CLIENT.DisableSensor(sensorId); if (ret != 0) { SEN_HILOGE("DisableSensor failed, ret:%{public}d", ret); return ret; @@ -173,7 +173,7 @@ int32_t SensorAgentProxy::SetBatch(int32_t sensorId, const SensorUser *user, int int64_t reportInterval) { CHKPR(user, OHOS::Sensors::ERROR); - if (!SenClient.IsValid(sensorId)) { + if (!SEN_CLIENT.IsValid(sensorId)) { SEN_HILOGE("sensorId is invalid, %{public}d", sensorId); return PARAMETER_ERROR; } @@ -196,7 +196,7 @@ int32_t SensorAgentProxy::SubscribeSensor(int32_t sensorId, const SensorUser *us SEN_HILOGI("In, sensorId:%{public}d", sensorId); CHKPR(user, OHOS::Sensors::ERROR); CHKPR(user->callback, OHOS::Sensors::ERROR); - if (!SenClient.IsValid(sensorId)) { + if (!SEN_CLIENT.IsValid(sensorId)) { SEN_HILOGE("sensorId is invalid, %{public}d", sensorId); return PARAMETER_ERROR; } @@ -215,7 +215,7 @@ int32_t SensorAgentProxy::UnsubscribeSensor(int32_t sensorId, const SensorUser * SEN_HILOGI("In, sensorId:%{public}d", sensorId); CHKPR(user, OHOS::Sensors::ERROR); CHKPR(user->callback, OHOS::Sensors::ERROR); - if (!SenClient.IsValid(sensorId)) { + if (!SEN_CLIENT.IsValid(sensorId)) { SEN_HILOGE("sensorId is invalid, %{public}d", sensorId); return PARAMETER_ERROR; } @@ -239,7 +239,7 @@ int32_t SensorAgentProxy::SetMode(int32_t sensorId, const SensorUser *user, int3 { CHKPR(user, OHOS::Sensors::ERROR); CHKPR(user->callback, OHOS::Sensors::ERROR); - if (!SenClient.IsValid(sensorId)) { + if (!SEN_CLIENT.IsValid(sensorId)) { SEN_HILOGE("sensorId is invalid, %{public}d", sensorId); return ERROR; } @@ -265,7 +265,7 @@ void SensorAgentProxy::ClearSensorInfos() const int32_t SensorAgentProxy::ConvertSensorInfos() const { CALL_LOG_ENTER; - std::vector sensorList = SenClient.GetSensorList(); + std::vector sensorList = SEN_CLIENT.GetSensorList(); if (sensorList.empty()) { SEN_HILOGE("Get sensor lists failed"); return ERROR; @@ -329,7 +329,7 @@ int32_t SensorAgentProxy::SuspendSensors(int32_t pid) SEN_HILOGE("Pid is invalid, pid:%{public}d", pid); return PARAMETER_ERROR; } - int32_t ret = SenClient.SuspendSensors(pid); + int32_t ret = SEN_CLIENT.SuspendSensors(pid); if (ret != ERR_OK) { SEN_HILOGE("Suspend sensors failed, ret:%{public}d", ret); } @@ -343,7 +343,7 @@ int32_t SensorAgentProxy::ResumeSensors(int32_t pid) SEN_HILOGE("Pid is invalid, pid:%{public}d", pid); return PARAMETER_ERROR; } - int32_t ret = SenClient.ResumeSensors(pid); + int32_t ret = SEN_CLIENT.ResumeSensors(pid); if (ret != ERR_OK) { SEN_HILOGE("Resume sensors failed, ret:%{public}d", ret); } @@ -366,7 +366,7 @@ int32_t SensorAgentProxy::GetSensorActiveInfos(int32_t pid, sensorActiveInfos_ = nullptr; } std::vector activeInfoList; - int32_t ret = SenClient.GetActiveInfoList(pid, activeInfoList); + int32_t ret = SEN_CLIENT.GetActiveInfoList(pid, activeInfoList); if (ret != ERR_OK) { SEN_HILOGE("Get active info list failed, ret:%{public}d", ret); return ret; @@ -400,7 +400,7 @@ int32_t SensorAgentProxy::Register(SensorActiveInfoCB callback) { CHKPR(callback, OHOS::Sensors::ERROR); CHKPR(dataChannel_, INVALID_POINTER); - int32_t ret = SenClient.Register(callback, dataChannel_); + int32_t ret = SEN_CLIENT.Register(callback, dataChannel_); if (ret != ERR_OK) { SEN_HILOGE("Register sensor active info callback failed, ret:%{public}d", ret); } @@ -410,7 +410,7 @@ int32_t SensorAgentProxy::Register(SensorActiveInfoCB callback) int32_t SensorAgentProxy::Unregister(SensorActiveInfoCB callback) { CHKPR(callback, OHOS::Sensors::ERROR); - int32_t ret = SenClient.Unregister(callback); + int32_t ret = SEN_CLIENT.Unregister(callback); if (ret != ERR_OK) { SEN_HILOGE("Unregister sensor active info callback failed, ret:%{public}d", ret); } @@ -419,7 +419,7 @@ int32_t SensorAgentProxy::Unregister(SensorActiveInfoCB callback) int32_t SensorAgentProxy::ResetSensors() const { - int32_t ret = SenClient.ResetSensors(); + int32_t ret = SEN_CLIENT.ResetSensors(); if (ret != ERR_OK) { SEN_HILOGE("Reset sensors failed, ret:%{public}d", ret); } diff --git a/frameworks/native/src/sensor_algorithm.cpp b/frameworks/native/src/sensor_algorithm.cpp index 46a3e0ce..1c983695 100644 --- a/frameworks/native/src/sensor_algorithm.cpp +++ b/frameworks/native/src/sensor_algorithm.cpp @@ -77,13 +77,16 @@ int32_t SensorAlgorithm::TransformCoordinateSystemImpl(std::vector inRota int32_t offset = j * matrixDimension; for (int32_t i = 0; i < 3; i++) { if (x == i) { - outRotationMatrix[offset + i] = (axisX >= 0x80) ? -inRotationMatrix[offset + 0] : inRotationMatrix[offset + 0]; + outRotationMatrix[offset + i] = (axisX >= 0x80) ? -inRotationMatrix[offset + 0] : + inRotationMatrix[offset + 0]; } if (y == i) { - outRotationMatrix[offset + i] = (axisY >= 0x80) ? -inRotationMatrix[offset + 1] : inRotationMatrix[offset + 1]; + outRotationMatrix[offset + i] = (axisY >= 0x80) ? -inRotationMatrix[offset + 1] : + inRotationMatrix[offset + 1]; } if (z == i) { - outRotationMatrix[offset + i] = (axisZ >= 0x80) ? -inRotationMatrix[offset + 2] : inRotationMatrix[offset + 2]; + outRotationMatrix[offset + i] = (axisZ >= 0x80) ? -inRotationMatrix[offset + 2] : + inRotationMatrix[offset + 2]; } } } @@ -103,14 +106,16 @@ int32_t SensorAlgorithm::TransformCoordinateSystem(std::vector inRotation return OHOS::Sensors::PARAMETER_ERROR; } int32_t inRotationMatrixLength = static_cast(inRotationMatrix.size()); - if (((inRotationMatrixLength != THREE_DIMENSIONAL_MATRIX_LENGTH) && (inRotationMatrixLength != FOUR_DIMENSIONAL_MATRIX_LENGTH)) - || (inRotationMatrixLength != static_cast(outRotationMatrix.size()))) { + if (((inRotationMatrixLength != THREE_DIMENSIONAL_MATRIX_LENGTH) && + (inRotationMatrixLength != FOUR_DIMENSIONAL_MATRIX_LENGTH)) || + (inRotationMatrixLength != static_cast(outRotationMatrix.size()))) { SEN_HILOGE("Invalid input parameter"); return OHOS::Sensors::PARAMETER_ERROR; } if (inRotationMatrix == outRotationMatrix) { std::vector tempRotationMatrix(inRotationMatrixLength); - if (TransformCoordinateSystemImpl(inRotationMatrix, axisX, axisY, tempRotationMatrix) != OHOS::Sensors::SUCCESS) { + if (TransformCoordinateSystemImpl(inRotationMatrix, axisX, axisY, tempRotationMatrix) + != OHOS::Sensors::SUCCESS) { SEN_HILOGE("TransformCoordinateSystemImpl failed"); return OHOS::Sensors::PARAMETER_ERROR; } @@ -250,7 +255,7 @@ int32_t SensorAlgorithm::CreateRotationMatrix(std::vector rotationVector, rotationMatrix[0] = 1 - squareOfY - squareOfZ; rotationMatrix[1] = productOfXY - productOfWZ; rotationMatrix[2] = productOfXZ + productOfWY; - rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] + rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = productOfXY + productOfWZ; rotationMatrix[4 % ROTATION_VECTOR_LENGTH + (4 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = 1 - squareOfX - squareOfZ; @@ -326,9 +331,12 @@ int32_t SensorAlgorithm::CreateRotationAndInclination(std::vector gravity rotationMatrix[0] = componentH[0]; rotationMatrix[1] = componentH[1]; rotationMatrix[2] = componentH[2]; - rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = measuredValue[0]; - rotationMatrix[4 % ROTATION_VECTOR_LENGTH + (4 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = measuredValue[1]; - rotationMatrix[5 % ROTATION_VECTOR_LENGTH + (5 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = measuredValue[2]; + rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = + measuredValue[0]; + rotationMatrix[4 % ROTATION_VECTOR_LENGTH + (4 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = + measuredValue[1]; + rotationMatrix[5 % ROTATION_VECTOR_LENGTH + (5 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = + measuredValue[2]; rotationMatrix[6 % ROTATION_VECTOR_LENGTH + (6 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = gravity[0]; rotationMatrix[7 % ROTATION_VECTOR_LENGTH + (7 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = gravity[1]; rotationMatrix[8 % ROTATION_VECTOR_LENGTH + (8 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = gravity[2]; diff --git a/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs b/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs index 71695c94..35cb254f 100644 --- a/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs +++ b/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs @@ -272,7 +272,8 @@ impl StreamBuffer { self.write_char_usize(buf, size) } - pub unsafe fn read_client_packets(&mut self, client: *const CSensorServiceClient, callback_fun: ClientPacketCallBackFun) { + pub unsafe fn read_client_packets(&mut self, client: *const CSensorServiceClient, callback_fun: + ClientPacketCallBackFun) { const HEAD_SIZE: usize = size_of::(); for _i in 0..ONCE_PROCESS_NETPACKET_LIMIT { let unread_size = self.unread_size(); diff --git a/services/hdi_connection/adapter/src/hdi_connection.cpp b/services/hdi_connection/adapter/src/hdi_connection.cpp index 239c0a32..5a60a5d2 100755 --- a/services/hdi_connection/adapter/src/hdi_connection.cpp +++ b/services/hdi_connection/adapter/src/hdi_connection.cpp @@ -35,7 +35,7 @@ constexpr HiLogLabel LABEL = { LOG_CORE, SENSOR_LOG_DOMAIN, "HdiConnection" }; sptr sensorInterface_ = nullptr; sptr eventCallback_ = nullptr; std::map sensorBasicInfoMap_; -std::mutex sensorBasicInfoMutex_; +std::mutex g_sensorBasicInfoMutex; constexpr int32_t GET_HDI_SERVICE_COUNT = 5; constexpr uint32_t WAIT_MS = 200; } // namespace @@ -208,7 +208,7 @@ sptr HdiConnection::GetReportDataCallback() void HdiConnection::UpdateSensorBasicInfo(int32_t sensorId, int64_t samplingPeriodNs, int64_t maxReportDelayNs) { - std::lock_guard sensorInfoLock(sensorBasicInfoMutex_); + std::lock_guard sensorInfoLock(g_sensorBasicInfoMutex); SensorBasicInfo sensorBasicInfo; sensorBasicInfo.SetSamplingPeriodNs(samplingPeriodNs); sensorBasicInfo.SetMaxReportDelayNs(maxReportDelayNs); @@ -217,7 +217,7 @@ void HdiConnection::UpdateSensorBasicInfo(int32_t sensorId, int64_t samplingPeri void HdiConnection::SetSensorBasicInfoState(int32_t sensorId, bool state) { - std::lock_guard sensorInfoLock(sensorBasicInfoMutex_); + std::lock_guard sensorInfoLock(g_sensorBasicInfoMutex); auto it = sensorBasicInfoMap_.find(sensorId); if (it == sensorBasicInfoMap_.end()) { SEN_HILOGW("Should set batch first"); @@ -228,7 +228,7 @@ void HdiConnection::SetSensorBasicInfoState(int32_t sensorId, bool state) void HdiConnection::DeleteSensorBasicInfoState(int32_t sensorId) { - std::lock_guard sensorInfoLock(sensorBasicInfoMutex_); + std::lock_guard sensorInfoLock(g_sensorBasicInfoMutex); auto it = sensorBasicInfoMap_.find(sensorId); if (it != sensorBasicInfoMap_.end()) { sensorBasicInfoMap_.erase(sensorId); @@ -284,7 +284,7 @@ void HdiConnection::Reconnect() SEN_HILOGE("Get sensor list fail"); return; } - std::lock_guard sensorInfoLock(sensorBasicInfoMutex_); + std::lock_guard sensorInfoLock(g_sensorBasicInfoMutex); for (const auto &sensorInfo: sensorBasicInfoMap_) { int32_t sensorTypeId = sensorInfo.first; SensorBasicInfo info = sensorInfo.second; diff --git a/services/src/client_info.cpp b/services/src/client_info.cpp index 17bf5c7a..248d2f5f 100644 --- a/services/src/client_info.cpp +++ b/services/src/client_info.cpp @@ -759,8 +759,7 @@ int32_t ClientInfo::GetPidByTokenId(AccessTokenID tokenId) auto iter = std::find_if(appThreadInfoMap_.begin(), appThreadInfoMap_.end(), [tokenId] (auto appThreadInfo) { return appThreadInfo.second.callerToken == tokenId; - } - ); + }); if (iter != appThreadInfoMap_.end()) { pid = iter->second.pid; } diff --git a/services/src/sensor_manager.cpp b/services/src/sensor_manager.cpp index 337c6b1f..3e4ff37a 100644 --- a/services/src/sensor_manager.cpp +++ b/services/src/sensor_manager.cpp @@ -203,7 +203,7 @@ void SensorManager::GetPackageName(AccessTokenID tokenId, std::string &packageNa SEN_HILOGE("Get native token info fail"); return; } - packageName = tokenInfo.processName; + packageName = tokenInfo.process_name; break; } default: { diff --git a/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp index 3619cde0..1b4dd5e2 100644 --- a/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp +++ b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp @@ -57,7 +57,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "GetActiveSensorInfosFuzzTest", + .process_name = "GetActiveSensorInfosFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp index cde631c6..0eac309e 100644 --- a/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp +++ b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp @@ -57,7 +57,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "RegisterFuzzTest", + .process_name = "RegisterFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp index 77a42ad0..ebcdac4d 100644 --- a/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp +++ b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp @@ -56,7 +56,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "ResumeSensorsFuzzTest", + .process_name = "ResumeSensorsFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp index 1ed02639..bdc7f862 100644 --- a/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp +++ b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp @@ -56,7 +56,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "SuspendSensorsFuzzTest", + .process_name = "SuspendSensorsFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp index 336f780b..8ffaf121 100644 --- a/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp +++ b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp @@ -57,7 +57,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "UnregisterFuzzTest", + .process_name = "UnregisterFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp index 5394ff1b..cdcb5516 100644 --- a/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp +++ b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "CreateDataChannelStubFuzzTest", + .process_name = "CreateDataChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp index 9664deb1..0b8a4d0e 100644 --- a/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp +++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "CreateSocketChannelStubFuzzTest", + .process_name = "CreateSocketChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp index c7b17b2f..11216040 100644 --- a/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp +++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "DestroyDataChannelStubFuzzTest", + .process_name = "DestroyDataChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp index e7c20b3b..82f81508 100644 --- a/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp +++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "DestroySocketChannelStubFuzzTest", + .process_name = "DestroySocketChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp index c5510ddd..62284311 100644 --- a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp +++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "DisableActiveInfoCBStubFuzzTest", + .process_name = "DisableActiveInfoCBStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp index 89920778..f592d77f 100644 --- a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp +++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "EnableActiveInfoCBStubFuzzTest", + .process_name = "EnableActiveInfoCBStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp index 3f46761b..b6ca8cba 100644 --- a/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp +++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "GetActiveInfoListStubFuzzTest", + .process_name = "GetActiveInfoListStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp index 9e1c8f2c..99403e79 100644 --- a/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "GetAllSensorsStubFuzzTest", + .process_name = "GetAllSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp index f17d2dfe..2bf643b1 100644 --- a/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "ResetSensorsStubFuzzTest", + .process_name = "ResetSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp index d3ad2968..f4e70839 100644 --- a/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "ResumeSensorsStubFuzzTest", + .process_name = "ResumeSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp index 4d84342e..596fc15d 100644 --- a/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp +++ b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "SensorDisableStubFuzzTest", + .process_name = "SensorDisableStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp b/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp index 1c54ea3e..731ed549 100644 --- a/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp +++ b/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "SensorEnableStubFuzzTest", + .process_name = "SensorEnableStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp index 81224c1c..1fa03ca2 100644 --- a/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp +++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp @@ -53,7 +53,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "SensorOnRemoteRequestFuzzTest", + .process_name = "SensorOnRemoteRequestFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp index b7fd0647..154a6cd7 100644 --- a/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "SuspendSensorsStubFuzzTest", + .process_name = "SuspendSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/unittest/interfaces/inner_api/sensor_agent_test.cpp b/test/unittest/interfaces/inner_api/sensor_agent_test.cpp index 93ed023c..a3a5dced 100755 --- a/test/unittest/interfaces/inner_api/sensor_agent_test.cpp +++ b/test/unittest/interfaces/inner_api/sensor_agent_test.cpp @@ -389,9 +389,9 @@ HWTEST_F(SensorAgentTest, GetProcCpuUsageTest_001, TestSize.Level1) { SEN_HILOGI("GetProcCpuUsageTest_001 in"); SYSTEM_INFO::CpuInfo cpuInfo; - const std::string process_name = "sensors"; - auto usage = cpuInfo.GetProcCpuUsage(process_name); - SEN_HILOGD("The CPU usage of the %{public}s process is %{public}.2f", process_name.c_str(), usage); + const std::string processName = "sensors"; + auto usage = cpuInfo.GetProcCpuUsage(processName); + SEN_HILOGD("The CPU usage of the %{public}s process is %{public}.2f", processName.c_str(), usage); ASSERT_TRUE(usage < SYSTEM_INFO::CPU_USAGE_LOAD && usage != SYSTEM_INFO::CPU_USAGE_UNKNOWN); } diff --git a/test/unittest/interfaces/inner_api/sensor_power_test.cpp b/test/unittest/interfaces/inner_api/sensor_power_test.cpp index 6116bb75..4f0eb09d 100644 --- a/test/unittest/interfaces/inner_api/sensor_power_test.cpp +++ b/test/unittest/interfaces/inner_api/sensor_power_test.cpp @@ -63,7 +63,7 @@ void SensorPowerTest::SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "SensorPowerTest", + .process_name = "SensorPowerTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); -- Gitee From 223bb221f0944fb0fb94b5453ca497e13117a167 Mon Sep 17 00:00:00 2001 From: yyl Date: Wed, 18 Oct 2023 07:49:23 +0000 Subject: [PATCH 07/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=831?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: Ib06d622fa9b5642a8e2e06b58ef3bb3dc611b4ae --- services/src/sensor_manager.cpp | 2 +- .../getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp | 2 +- test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp | 2 +- .../interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp | 2 +- .../interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp | 2 +- .../fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp | 2 +- .../createdatachannelstub_fuzzer.cpp | 2 +- .../createsocketchannelstub_fuzzer.cpp | 2 +- .../destroydatachannelstub_fuzzer.cpp | 2 +- .../destroysocketchannelstub_fuzzer.cpp | 2 +- .../disableactiveinfocbstub_fuzzer.cpp | 2 +- .../enableactiveinfocbstub_fuzzer.cpp | 2 +- .../getactiveinfoliststub_fuzzer.cpp | 2 +- .../getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp | 2 +- .../resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp | 2 +- .../resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp | 2 +- .../sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp | 2 +- .../sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp | 2 +- .../sensoronremoterequest_fuzzer.cpp | 2 +- .../suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp | 2 +- test/unittest/interfaces/inner_api/sensor_power_test.cpp | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/services/src/sensor_manager.cpp b/services/src/sensor_manager.cpp index 3e4ff37a..337c6b1f 100644 --- a/services/src/sensor_manager.cpp +++ b/services/src/sensor_manager.cpp @@ -203,7 +203,7 @@ void SensorManager::GetPackageName(AccessTokenID tokenId, std::string &packageNa SEN_HILOGE("Get native token info fail"); return; } - packageName = tokenInfo.process_name; + packageName = tokenInfo.processName; break; } default: { diff --git a/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp index 1b4dd5e2..3619cde0 100644 --- a/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp +++ b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp @@ -57,7 +57,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "GetActiveSensorInfosFuzzTest", + .processName = "GetActiveSensorInfosFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp index 0eac309e..cde631c6 100644 --- a/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp +++ b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp @@ -57,7 +57,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "RegisterFuzzTest", + .processName = "RegisterFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp index ebcdac4d..77a42ad0 100644 --- a/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp +++ b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp @@ -56,7 +56,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "ResumeSensorsFuzzTest", + .processName = "ResumeSensorsFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp index bdc7f862..1ed02639 100644 --- a/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp +++ b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp @@ -56,7 +56,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "SuspendSensorsFuzzTest", + .processName = "SuspendSensorsFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp index 8ffaf121..336f780b 100644 --- a/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp +++ b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp @@ -57,7 +57,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "UnregisterFuzzTest", + .processName = "UnregisterFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp index cdcb5516..5394ff1b 100644 --- a/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp +++ b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "CreateDataChannelStubFuzzTest", + .processName = "CreateDataChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp index 0b8a4d0e..9664deb1 100644 --- a/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp +++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "CreateSocketChannelStubFuzzTest", + .processName = "CreateSocketChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp index 11216040..c7b17b2f 100644 --- a/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp +++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "DestroyDataChannelStubFuzzTest", + .processName = "DestroyDataChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp index 82f81508..e7c20b3b 100644 --- a/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp +++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "DestroySocketChannelStubFuzzTest", + .processName = "DestroySocketChannelStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp index 62284311..c5510ddd 100644 --- a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp +++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "DisableActiveInfoCBStubFuzzTest", + .processName = "DisableActiveInfoCBStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp index f592d77f..89920778 100644 --- a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp +++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "EnableActiveInfoCBStubFuzzTest", + .processName = "EnableActiveInfoCBStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp index b6ca8cba..3f46761b 100644 --- a/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp +++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "GetActiveInfoListStubFuzzTest", + .processName = "GetActiveInfoListStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp index 99403e79..9e1c8f2c 100644 --- a/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "GetAllSensorsStubFuzzTest", + .processName = "GetAllSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp index 2bf643b1..f17d2dfe 100644 --- a/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "ResetSensorsStubFuzzTest", + .processName = "ResetSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp index f4e70839..d3ad2968 100644 --- a/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "ResumeSensorsStubFuzzTest", + .processName = "ResumeSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp index 596fc15d..4d84342e 100644 --- a/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp +++ b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "SensorDisableStubFuzzTest", + .processName = "SensorDisableStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp b/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp index 731ed549..1c54ea3e 100644 --- a/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp +++ b/test/fuzztest/services/sensorenablestub_fuzzer/sensorenablestub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "SensorEnableStubFuzzTest", + .processName = "SensorEnableStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp index 1fa03ca2..81224c1c 100644 --- a/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp +++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp @@ -53,7 +53,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "SensorOnRemoteRequestFuzzTest", + .processName = "SensorOnRemoteRequestFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp index 154a6cd7..b7fd0647 100644 --- a/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp +++ b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp @@ -52,7 +52,7 @@ void SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "SuspendSensorsStubFuzzTest", + .processName = "SuspendSensorsStubFuzzTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); diff --git a/test/unittest/interfaces/inner_api/sensor_power_test.cpp b/test/unittest/interfaces/inner_api/sensor_power_test.cpp index 4f0eb09d..6116bb75 100644 --- a/test/unittest/interfaces/inner_api/sensor_power_test.cpp +++ b/test/unittest/interfaces/inner_api/sensor_power_test.cpp @@ -63,7 +63,7 @@ void SensorPowerTest::SetUpTestCase() .dcaps = nullptr, .perms = perms, .acls = nullptr, - .process_name = "SensorPowerTest", + .processName = "SensorPowerTest", .aplStr = "system_core", }; uint64_t tokenId = GetAccessTokenId(&infoInstance); -- Gitee From 466a836bf94496c96186f1b662ab6dfc399b2e58 Mon Sep 17 00:00:00 2001 From: yyl Date: Wed, 18 Oct 2023 08:36:49 +0000 Subject: [PATCH 08/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=832?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: Ia16bf5f63122c4eaa5d5033c90059f4429196320 --- test/unittest/interfaces/inner_api/BUILD.gn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/unittest/interfaces/inner_api/BUILD.gn b/test/unittest/interfaces/inner_api/BUILD.gn index 08771381..e835d036 100644 --- a/test/unittest/interfaces/inner_api/BUILD.gn +++ b/test/unittest/interfaces/inner_api/BUILD.gn @@ -128,15 +128,16 @@ ohos_unittest("PostureTest") { ohos_unittest("HeadPostureTest") { module_out_path = "sensors/sensor/interfaces" - sources = [ "unittest/head_posture_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api//head_posture_test.cpp" ] include_dirs = [ "$SUBSYSTEM_DIR/utils/common/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/include", ] deps = [ - "$SUBSYSTEM_DIR/interfaces/native:sensor_ndk_target", + "$SUBSYSTEM_DIR/frameworks/native:sensor_target", "$SUBSYSTEM_DIR/utils/common:libsensor_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", -- Gitee From 3b828264d3065910eef750248cd64bb38034ff6a Mon Sep 17 00:00:00 2001 From: yyl Date: Thu, 19 Oct 2023 05:00:41 +0000 Subject: [PATCH 09/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=833?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: I470e17cb6eb91c04f4aef7655faad9c330ef252e --- services/src/client_info.cpp | 3 +-- .../interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/src/client_info.cpp b/services/src/client_info.cpp index 248d2f5f..b3e18c8a 100644 --- a/services/src/client_info.cpp +++ b/services/src/client_info.cpp @@ -756,8 +756,7 @@ int32_t ClientInfo::GetPidByTokenId(AccessTokenID tokenId) { std::lock_guard uidLock(uidMutex_); int32_t pid = INVALID_PID; - auto iter = std::find_if(appThreadInfoMap_.begin(), appThreadInfoMap_.end(), - [tokenId] (auto appThreadInfo) { + auto iter = std::find_if(appThreadInfoMap_.begin(), appThreadInfoMap_.end(), [tokenId] (auto appThreadInfo) { return appThreadInfo.second.callerToken == tokenId; }); if (iter != appThreadInfoMap_.end()) { diff --git a/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp b/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp index 13291246..2c94f505 100644 --- a/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp +++ b/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp @@ -34,8 +34,7 @@ bool CheckSensorTypeId(int32_t sensorTypeId) if (ret != 0) { return false; } - for (int32_t i = 0; i < count; i++) - { + for (int32_t i = 0; i < count; i++) { if ((sensorInfo + i)->sensorTypeId == sensorTypeId) { return true; } -- Gitee From db6e96d192dfb7e2d02abe13747d5d0254fc5d38 Mon Sep 17 00:00:00 2001 From: yyl Date: Thu, 19 Oct 2023 09:11:08 +0000 Subject: [PATCH 10/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=834?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: I67137c0ea5f4864b5679ea993a2c8df9380536b4 --- frameworks/native/src/sensor_algorithm.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frameworks/native/src/sensor_algorithm.cpp b/frameworks/native/src/sensor_algorithm.cpp index 1c983695..be70f1e2 100644 --- a/frameworks/native/src/sensor_algorithm.cpp +++ b/frameworks/native/src/sensor_algorithm.cpp @@ -67,7 +67,7 @@ int32_t SensorAlgorithm::TransformCoordinateSystemImpl(std::vector inRota int32_t x = (axisX & 0x3) - 1; int32_t y = (axisY & 0x3) - 1; int32_t z = (axisZ & 0x3) - 1; - if (((x ^ ((z + 1) % 3)) | ( y ^ ((z + 2) % 3))) != 0) { + if (((x ^ ((z + 1) % 3)) | (y ^ ((z + 2) % 3))) != 0) { axisZ ^= 0x80; } int32_t inRotationMatrixLength = static_cast(inRotationMatrix.size()); @@ -81,11 +81,11 @@ int32_t SensorAlgorithm::TransformCoordinateSystemImpl(std::vector inRota inRotationMatrix[offset + 0]; } if (y == i) { - outRotationMatrix[offset + i] = (axisY >= 0x80) ? -inRotationMatrix[offset + 1] : + outRotationMatrix[offset + i] = (axisY >= 0x80) ? -inRotationMatrix[offset + 1] : inRotationMatrix[offset + 1]; } if (z == i) { - outRotationMatrix[offset + i] = (axisZ >= 0x80) ? -inRotationMatrix[offset + 2] : + outRotationMatrix[offset + i] = (axisZ >= 0x80) ? -inRotationMatrix[offset + 2] : inRotationMatrix[offset + 2]; } } @@ -106,8 +106,8 @@ int32_t SensorAlgorithm::TransformCoordinateSystem(std::vector inRotation return OHOS::Sensors::PARAMETER_ERROR; } int32_t inRotationMatrixLength = static_cast(inRotationMatrix.size()); - if (((inRotationMatrixLength != THREE_DIMENSIONAL_MATRIX_LENGTH) && - (inRotationMatrixLength != FOUR_DIMENSIONAL_MATRIX_LENGTH)) || + if (((inRotationMatrixLength != THREE_DIMENSIONAL_MATRIX_LENGTH) && + (inRotationMatrixLength != FOUR_DIMENSIONAL_MATRIX_LENGTH)) || (inRotationMatrixLength != static_cast(outRotationMatrix.size()))) { SEN_HILOGE("Invalid input parameter"); return OHOS::Sensors::PARAMETER_ERROR; @@ -255,7 +255,7 @@ int32_t SensorAlgorithm::CreateRotationMatrix(std::vector rotationVector, rotationMatrix[0] = 1 - squareOfY - squareOfZ; rotationMatrix[1] = productOfXY - productOfWZ; rotationMatrix[2] = productOfXZ + productOfWY; - rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] + rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = productOfXY + productOfWZ; rotationMatrix[4 % ROTATION_VECTOR_LENGTH + (4 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = 1 - squareOfX - squareOfZ; @@ -331,11 +331,11 @@ int32_t SensorAlgorithm::CreateRotationAndInclination(std::vector gravity rotationMatrix[0] = componentH[0]; rotationMatrix[1] = componentH[1]; rotationMatrix[2] = componentH[2]; - rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = + rotationMatrix[3 % ROTATION_VECTOR_LENGTH + (3 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = measuredValue[0]; - rotationMatrix[4 % ROTATION_VECTOR_LENGTH + (4 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = + rotationMatrix[4 % ROTATION_VECTOR_LENGTH + (4 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = measuredValue[1]; - rotationMatrix[5 % ROTATION_VECTOR_LENGTH + (5 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = + rotationMatrix[5 % ROTATION_VECTOR_LENGTH + (5 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = measuredValue[2]; rotationMatrix[6 % ROTATION_VECTOR_LENGTH + (6 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = gravity[0]; rotationMatrix[7 % ROTATION_VECTOR_LENGTH + (7 / ROTATION_VECTOR_LENGTH) * rotationMatrixDimension] = gravity[1]; -- Gitee From e332b475bd6ecffe23b8084e233a83b7c58825fc Mon Sep 17 00:00:00 2001 From: yyl Date: Fri, 20 Oct 2023 02:03:37 +0000 Subject: [PATCH 11/11] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=835?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl Change-Id: I8cda73f11c115d627177c3440742df849ad3c01f --- frameworks/native/src/sensor_algorithm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/src/sensor_algorithm.cpp b/frameworks/native/src/sensor_algorithm.cpp index be70f1e2..4f7980f8 100644 --- a/frameworks/native/src/sensor_algorithm.cpp +++ b/frameworks/native/src/sensor_algorithm.cpp @@ -114,7 +114,7 @@ int32_t SensorAlgorithm::TransformCoordinateSystem(std::vector inRotation } if (inRotationMatrix == outRotationMatrix) { std::vector tempRotationMatrix(inRotationMatrixLength); - if (TransformCoordinateSystemImpl(inRotationMatrix, axisX, axisY, tempRotationMatrix) + if (TransformCoordinateSystemImpl(inRotationMatrix, axisX, axisY, tempRotationMatrix) != OHOS::Sensors::SUCCESS) { SEN_HILOGE("TransformCoordinateSystemImpl failed"); return OHOS::Sensors::PARAMETER_ERROR; -- Gitee