diff --git a/bundle.json b/bundle.json index a8b106d7d9c16adcfac7f2c3b2df7c0ddee29b1c..94ec4a333dba8c650786756e9a00c3e795f127a4 100755 --- a/bundle.json +++ b/bundle.json @@ -38,33 +38,32 @@ "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/native/sensor:sensor_native_target", + "//base/sensors/sensor/frameworks/js/napi:sensor_js_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/interfaces/native:sensor_interface_native", + "name": "//base/sensors/sensor/frameworks/native: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/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/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 b3377dd1fc1a25bbe77ec88cda4bdfa4cc87edec..26d9e80deb7898e2d2b6d3f373160047f9630804 100644 --- a/interfaces/plugin/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -12,12 +12,13 @@ # limitations under the License. import("//build/ohos.gni") -import("./../../sensor.gni") +import("./../../../sensor.gni") ohos_shared_library("libsensor") { include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", - "$SUBSYSTEM_DIR/interfaces/plugin/include", + "$SUBSYSTEM_DIR/frameworks/native/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_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 99% rename from interfaces/plugin/src/sensor_js.cpp rename to frameworks/js/napi/src/sensor_js.cpp index 0b3b279b4f47ab08231f09aee6610b0c8ed350f2..4e45e97f556b9429de5bd32c65e81c4e2b7d87b5 100644 --- a/interfaces/plugin/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/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/BUILD.gn similarity index 56% rename from frameworks/native/sensor/BUILD.gn rename to frameworks/native/BUILD.gn index ce241bdeee9cac122be9dab7f60601968f63dc32..7f1a8754853a12dcbb7d9f10cb3d1f4b8fbe3a3d 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,8 +27,8 @@ ohos_shared_library("libsensor_native") { ] include_dirs = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor/include", - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/utils/common/include", "$SUBSYSTEM_DIR/utils/ipc/include", ] @@ -59,7 +59,55 @@ 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/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/utils/common/include", + ] +} +config("sensor_public_config") { + include_dirs = [ "$SUBSYSTEM_DIR/interfaces/inner_api" ] +} + +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:libsensor_native", + "$SUBSYSTEM_DIR/frameworks/native:libsensor_ndk", + ] -group("sensor_native_target") { - deps = [ ":libsensor_native" ] + 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_target") { + deps = [ + ":libsensor_native", + ":sensor_interface_native", + ] } 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/interfaces/native/include/geomagnetic_field.h b/frameworks/native/include/geomagnetic_field.h similarity index 100% rename from interfaces/native/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/interfaces/native/include/sensor_algorithm.h b/frameworks/native/include/sensor_algorithm.h similarity index 100% rename from interfaces/native/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/interfaces/native/libsensor.json b/frameworks/native/libsensor.json similarity index 100% rename from interfaces/native/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/interfaces/native/src/geomagnetic_field.cpp b/frameworks/native/src/geomagnetic_field.cpp similarity index 84% rename from interfaces/native/src/geomagnetic_field.cpp rename to frameworks/native/src/geomagnetic_field.cpp index 37c86000c2d17bed05c7e4d63b9bfc0747445c12..e0ac5c49a1ff8bf012d72a772cd84446b3cecb8a 100644 --- a/interfaces/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/interfaces/native/src/sensor_agent.cpp b/frameworks/native/src/sensor_agent.cpp similarity index 100% rename from interfaces/native/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 93% rename from frameworks/native/sensor/src/sensor_agent_proxy.cpp rename to frameworks/native/src/sensor_agent_proxy.cpp index 0a201f74788689b6c165bc18fa39f9b4cfb1e3d4..141524882f1a5af75e32b9a81e3b46a3739b1457 100644 --- a/frameworks/native/sensor/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/interfaces/native/src/sensor_algorithm.cpp b/frameworks/native/src/sensor_algorithm.cpp similarity index 95% rename from interfaces/native/src/sensor_algorithm.cpp rename to frameworks/native/src/sensor_algorithm.cpp index 46a3e0ce82d2af22b0a66b099b421504f47159bc..4f7980f8346421acd86bb6015e062d353c2bb051 100644 --- a/interfaces/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()); @@ -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; } @@ -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/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/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 09be0a4622861f0d954abed008d6ab5a47132631..0000000000000000000000000000000000000000 --- 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/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs b/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs index 71695c943e7e2d0b659c9461d4214c44788eb285..35cb254f367d740ecb69f7150072ca68e91cf8b2 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/sensor/BUILD.gn b/services/BUILD.gn similarity index 83% rename from services/sensor/BUILD.gn rename to services/BUILD.gn index aed15e5b615f2ad26e0452f980de41f321d5974b..6513d2d9964e938c2a95df4027b1901184136624 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/interfaces/native/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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/interfaces/native/include", - "$SUBSYSTEM_DIR/services/sensor/include", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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 94% rename from services/sensor/hdi_connection/adapter/src/hdi_connection.cpp rename to services/hdi_connection/adapter/src/hdi_connection.cpp index 239c0a326fabd3a05b2dafbec734e716df0529fd..5a60a5d2284cf02b268d334c6b6b64070b72f9e4 100755 --- a/services/sensor/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/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 99% rename from services/sensor/src/client_info.cpp rename to services/src/client_info.cpp index 17bf5c7acf30c2e9d3d11f2e79aa5a108bec8280..b3e18c8a5a8216e663dd6786d7809415015d3eb3 100644 --- a/services/sensor/src/client_info.cpp +++ b/services/src/client_info.cpp @@ -756,11 +756,9 @@ 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()) { pid = iter->second.pid; } 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/interfaces/native/test/fuzztest/BUILD.gn b/test/fuzztest/interfaces/BUILD.gn similarity index 100% rename from interfaces/native/test/fuzztest/BUILD.gn rename to test/fuzztest/interfaces/BUILD.gn diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/BUILD.gn similarity index 78% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/BUILD.gn index 35d43c1d3cac25cca681faea57f4943c6f50db28..84ceda70f7d3f7e1350a89418292ab5dabcadb1f 100644 --- a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/BUILD.gn @@ -14,16 +14,18 @@ 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 - fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer" + fuzz_config_file = + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/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/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/getactivesensorinfos_fuzzer", "$SUBSYSTEM_DIR/utils/common/include", ] @@ -36,7 +38,7 @@ ohos_fuzztest("GetActiveSensorInfosFuzzTest") { sources = [ "getactivesensorinfos_fuzzer.cpp" ] - deps = [ "$SUBSYSTEM_DIR/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/corpus/init b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/unregister_fuzzer/corpus/init rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/getactivesensorinfos_fuzzer.h diff --git a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/project.xml b/test/fuzztest/interfaces/getactivesensorinfos_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/project.xml rename to test/fuzztest/interfaces/getactivesensorinfos_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn b/test/fuzztest/interfaces/register_fuzzer/BUILD.gn similarity index 79% rename from interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/register_fuzzer/BUILD.gn index 136c1355e988e628fafceaecd17078b371ed8b60..4295a299c547d235f1ae94efef6010c72f64b417 100644 --- a/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/register_fuzzer/BUILD.gn @@ -14,17 +14,17 @@ 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 - fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/register_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/interfaces/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/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/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/corpus/init b/test/fuzztest/interfaces/register_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/corpus/init rename to test/fuzztest/interfaces/register_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/project.xml b/test/fuzztest/interfaces/register_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/project.xml rename to test/fuzztest/interfaces/register_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.cpp b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.cpp rename to test/fuzztest/interfaces/register_fuzzer/register_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.h b/test/fuzztest/interfaces/register_fuzzer/register_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/register_fuzzer/register_fuzzer.h rename to test/fuzztest/interfaces/register_fuzzer/register_fuzzer.h diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn b/test/fuzztest/interfaces/resumesensors_fuzzer/BUILD.gn similarity index 79% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/resumesensors_fuzzer/BUILD.gn index fd6a128270d81b4be9e548a499eb209f358d66fa..e90212731d7d0ae12dbad350bb465302dc863667 100644 --- a/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/resumesensors_fuzzer/BUILD.gn @@ -14,17 +14,18 @@ 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 fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/resumesensors_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/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/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/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/corpus/init b/test/fuzztest/interfaces/resumesensors_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/corpus/init rename to test/fuzztest/interfaces/resumesensors_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/project.xml b/test/fuzztest/interfaces/resumesensors_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/sensorenablestub_fuzzer/project.xml rename to test/fuzztest/interfaces/resumesensors_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.cpp b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.cpp rename to test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.h b/test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_fuzzer/resumesensors_fuzzer.h rename to test/fuzztest/interfaces/resumesensors_fuzzer/resumesensors_fuzzer.h diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn b/test/fuzztest/interfaces/sensoragent_fuzzer/BUILD.gn similarity index 77% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/sensoragent_fuzzer/BUILD.gn index 218e70a43ad0900ed537488e36d5d41b377bd7c0..2528534f1e256cecda7c72c1bfebe273a0dd2241 100644 --- a/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/sensoragent_fuzzer/BUILD.gn @@ -14,17 +14,18 @@ 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 fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/sensoragent_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/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/include", + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/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_interface_native" ] external_deps = [ "c_utils:utils" ] } diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/corpus/init b/test/fuzztest/interfaces/sensoragent_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/corpus/init rename to test/fuzztest/interfaces/sensoragent_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/project.xml b/test/fuzztest/interfaces/sensoragent_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/project.xml rename to test/fuzztest/interfaces/sensoragent_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.cpp b/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp similarity index 97% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.cpp rename to test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.cpp index 13291246b354a4c214afc9e2d77c7e643ec6a86b..2c94f5056342ac882e376f4daf195bdf020d7205 100644 --- a/interfaces/native/test/fuzztest/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; } diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.h b/test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/sensoragent_fuzzer/sensoragent_fuzzer.h rename to test/fuzztest/interfaces/sensoragent_fuzzer/sensoragent_fuzzer.h diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn b/test/fuzztest/interfaces/suspendsensors_fuzzer/BUILD.gn similarity index 79% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/suspendsensors_fuzzer/BUILD.gn index 4a642de840f70c0382c7d50579a4ba20e987260f..51f8ac618075248b2b7041f6f24e7abcac69d658 100644 --- a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/suspendsensors_fuzzer/BUILD.gn @@ -14,17 +14,18 @@ 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 fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/suspendsensors_fuzzer" + "$SUBSYSTEM_DIR/test/fuzztest/interfaces/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/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/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/register_fuzzer/corpus/init b/test/fuzztest/interfaces/suspendsensors_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/register_fuzzer/corpus/init rename to test/fuzztest/interfaces/suspendsensors_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/project.xml b/test/fuzztest/interfaces/suspendsensors_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/sensordisablestub_fuzzer/project.xml rename to test/fuzztest/interfaces/suspendsensors_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp rename to test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.h b/test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_fuzzer/suspendsensors_fuzzer.h rename to test/fuzztest/interfaces/suspendsensors_fuzzer/suspendsensors_fuzzer.h diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn b/test/fuzztest/interfaces/unregister_fuzzer/BUILD.gn similarity index 79% rename from interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn rename to test/fuzztest/interfaces/unregister_fuzzer/BUILD.gn index e338c482daf36bfde9155ab6aea79c3b09a0f1ff..d581ee18069daa64bfc4b0e303a5fa0c3bb4502b 100644 --- a/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn +++ b/test/fuzztest/interfaces/unregister_fuzzer/BUILD.gn @@ -14,17 +14,17 @@ 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 - fuzz_config_file = - "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/unregister_fuzzer" + fuzz_config_file = "$SUBSYSTEM_DIR/test/fuzztest/interfaces/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/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/interfaces/native:sensor_interface_native" ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native:sensor_interface_native" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/corpus/init b/test/fuzztest/interfaces/unregister_fuzzer/corpus/init similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/corpus/init rename to test/fuzztest/interfaces/unregister_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/project.xml b/test/fuzztest/interfaces/unregister_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/resumesensorsstub_fuzzer/project.xml rename to test/fuzztest/interfaces/unregister_fuzzer/project.xml diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.cpp b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp similarity index 100% rename from interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.cpp rename to test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.cpp diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.h b/test/fuzztest/interfaces/unregister_fuzzer/unregister_fuzzer.h similarity index 100% rename from interfaces/native/test/fuzztest/unregister_fuzzer/unregister_fuzzer.h rename to test/fuzztest/interfaces/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 69% rename from services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn index ffd8bad6687248d506a2a62290b9b0fa2416a8ac..391384be76a30548e4022df92d58bb883b9e27f6 100644 --- a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createdatachannelstub_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/createdatachannelstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("CreateDataChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/corpus/init b/test/fuzztest/services/createdatachannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/suspendsensorsstub_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/resetsensorsstub_fuzzer/project.xml b/test/fuzztest/services/createdatachannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/resetsensorsstub_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 69% rename from services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn index 47954426510d0b5aba47c53433d66cd678191630..5b0a6e5729a41a4c0ce8e5a484d781a242cb9d4b 100644 --- a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/createsocketchannelstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("CreateSocketChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/corpus/init b/test/fuzztest/services/createsocketchannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/sensoronremoterequest_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/getallsensorsstub_fuzzer/project.xml b/test/fuzztest/services/createsocketchannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/getallsensorsstub_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 69% rename from services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn index dc856996a3e08e1345b3dc27ff7242285a53d518..a3c02cc79d8addc639450746148ecfa767c49b05 100644 --- a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/destroydatachannelstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("DestroyDataChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/sensorenablestub_fuzzer/corpus/init b/test/fuzztest/services/destroydatachannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/sensorenablestub_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/getactiveinfoliststub_fuzzer/project.xml b/test/fuzztest/services/destroydatachannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/getactiveinfoliststub_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 69% rename from services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn rename to test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn index 185ba2c3265c1bde77deef018ed6a6c334db2fe9..432a44f8a77286af59ee30b07fb3310b5bc9472b 100644 --- a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/destroysocketchannelstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("DestroySocketChannelStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/sensordisablestub_fuzzer/corpus/init b/test/fuzztest/services/destroysocketchannelstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/sensordisablestub_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/enableactiveinfocbstub_fuzzer/project.xml b/test/fuzztest/services/destroysocketchannelstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_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 69% rename from services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn rename to test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn index f17f8f5796aa323b97984a7e8b35f7be3ad4f3bc..c93ad83dbfe150896f1b7da5621b3d8664c6f893 100644 --- a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/corpus/init b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/resumesensorsstub_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 69% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn rename to test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn index d2613b09e2f01e5c716c8934407b6edf215e764a..16eeea7911222118423a814d4d3f4c64189dc99a 100644 --- a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/corpus/init b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/resetsensorsstub_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/destroysocketchannelstub_fuzzer/project.xml b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/destroysocketchannelstub_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 69% rename from services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn rename to test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn index 2542338ff67f1253ace105447988154f38c25aa9..9719854dad2acd6be86f0df54feb1ce3d58ee831 100644 --- a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/getactiveinfoliststub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("GetActiveInfoListStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/corpus/init b/test/fuzztest/services/getactiveinfoliststub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/getallsensorsstub_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/destroydatachannelstub_fuzzer/project.xml b/test/fuzztest/services/getactiveinfoliststub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/destroydatachannelstub_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 70% rename from services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn index 89437be69c70798ce3c8f60aa0820f83bab9c288..9f4f87b01a5c203f68480e2274d32fcf8c8d9cb7 100644 --- a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/getallsensorsstub_fuzzer/BUILD.gn @@ -14,21 +14,22 @@ 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 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", - "$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/sensor/test/fuzztest/getallsensorsstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -45,8 +46,8 @@ ohos_fuzztest("GetAllSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/corpus/init b/test/fuzztest/services/getallsensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/getactiveinfoliststub_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/createsocketchannelstub_fuzzer/project.xml b/test/fuzztest/services/getallsensorsstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/createsocketchannelstub_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 70% rename from services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn index b5a89a1b43f4db1e5cd723af20411de858396fd3..ca613fd5b35c79d3491b6da5b26aa69dbc01d81d 100644 --- a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resetsensorsstub_fuzzer/BUILD.gn @@ -14,21 +14,22 @@ 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 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", - "$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/sensor/test/fuzztest/resetsensorsstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -45,8 +46,8 @@ ohos_fuzztest("ResetSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/corpus/init b/test/fuzztest/services/resetsensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/corpus/init rename to test/fuzztest/services/resetsensorsstub_fuzzer/corpus/init diff --git a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/project.xml b/test/fuzztest/services/resetsensorsstub_fuzzer/project.xml similarity index 100% rename from services/sensor/test/fuzztest/createdatachannelstub_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 70% rename from services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn index 9b0cd78a66c700ec5728cdd12a83e2a088b38910..83a3f562a1dccfec01e47e498b364b9176a4f8d3 100644 --- a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/resumesensorsstub_fuzzer/BUILD.gn @@ -14,21 +14,22 @@ 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 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", - "$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/sensor/test/fuzztest/resumesensorsstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -45,8 +46,8 @@ ohos_fuzztest("ResumeSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/corpus/init b/test/fuzztest/services/resumesensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/corpus/init rename to test/fuzztest/services/resumesensorsstub_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/project.xml b/test/fuzztest/services/resumesensorsstub_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/unregister_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 70% rename from services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn rename to test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn index 8c01778bd365a76c0f10aec5bb66ba32868e0c5c..595e4f332c299cdbbc3c4f829edd3a832b16de0e 100644 --- a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensordisablestub_fuzzer/BUILD.gn @@ -14,21 +14,22 @@ 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 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", - "$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/sensor/test/fuzztest/sensordisablestub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -45,8 +46,8 @@ ohos_fuzztest("SensorDisableStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/corpus/init b/test/fuzztest/services/sensordisablestub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/corpus/init rename to test/fuzztest/services/sensordisablestub_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/project.xml b/test/fuzztest/services/sensordisablestub_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/suspendsensors_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 70% rename from services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn rename to test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn index ce98b8dee4d5104bc82b83b8577b8602ce70eec7..9a5c6409da7024c56b69dc344f50f10ce2e1f1e9 100644 --- a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensorenablestub_fuzzer/BUILD.gn @@ -14,21 +14,22 @@ 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 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", - "$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/sensor/test/fuzztest/sensorenablestub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -45,8 +46,8 @@ ohos_fuzztest("SensorEnableStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/corpus/init b/test/fuzztest/services/sensorenablestub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/corpus/init rename to test/fuzztest/services/sensorenablestub_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/project.xml b/test/fuzztest/services/sensorenablestub_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/resumesensors_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 69% rename from services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn rename to test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn index 7dc01e91ceffff4c6bc4b7335c277f87168c9b27..2b819ff79c07dcf5b8ebfe5e03fa20a8c46a19aa 100644 --- a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn +++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/BUILD.gn @@ -14,20 +14,22 @@ 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 - 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", - "$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/sensor/test/fuzztest/sensoronremoterequest_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -44,8 +46,8 @@ ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/corpus/init b/test/fuzztest/services/sensoronremoterequest_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/corpus/init rename to test/fuzztest/services/sensoronremoterequest_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/register_fuzzer/project.xml b/test/fuzztest/services/sensoronremoterequest_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/register_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 70% rename from services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn rename to test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn index eb249eee27efe84d9f5e25fd815f74c2f54104f4..410c9c48bc82b066c5be7ef0143ef3abce1ca8e9 100644 --- a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/suspendsensorsstub_fuzzer/BUILD.gn @@ -14,21 +14,22 @@ 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 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", - "$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/sensor/test/fuzztest/suspendsensorsstub_fuzzer", + "$SUBSYSTEM_DIR/frameworks/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$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", ] @@ -45,8 +46,8 @@ ohos_fuzztest("SuspendSensorsStubFuzzTest") { defines = sensor_default_defines deps = [ - "$SUBSYSTEM_DIR/interfaces/native: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/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/corpus/init b/test/fuzztest/services/suspendsensorsstub_fuzzer/corpus/init similarity index 100% rename from services/sensor/test/fuzztest/createdatachannelstub_fuzzer/corpus/init rename to test/fuzztest/services/suspendsensorsstub_fuzzer/corpus/init diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/project.xml b/test/fuzztest/services/suspendsensorsstub_fuzzer/project.xml similarity index 100% rename from interfaces/native/test/fuzztest/getactivesensorinfos_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/native/test/BUILD.gn b/test/unittest/interfaces/inner_api/BUILD.gn similarity index 68% rename from interfaces/native/test/BUILD.gn rename to test/unittest/interfaces/inner_api/BUILD.gn index e5dc08e9de64e0d4814fa0fc0ea27ab1a6c9c595..e835d03643a15e326a224281972ff7a45df094dd 100644 --- a/interfaces/native/test/BUILD.gn +++ b/test/unittest/interfaces/inner_api/BUILD.gn @@ -12,24 +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/interfaces/native/test/unittest/sensor_agent_test.cpp", "$SUBSYSTEM_DIR/test/unittest/common/src/system_info.cpp", + "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api/sensor_agent_test.cpp", ] include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/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_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 = "sensor/interfaces/inner_api" - sources = [ "unittest/sensor_algorithm_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api/sensor_algorithm_test.cpp" ] include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/native/include", + "$SUBSYSTEM_DIR/interfaces/inner_api", + "$SUBSYSTEM_DIR/frameworks/native/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_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 = "sensor/interfaces/inner_api" - sources = [ "unittest/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/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", @@ -98,17 +101,18 @@ ohos_unittest("SensorPowerTest") { } ohos_unittest("PostureTest") { - module_out_path = "sensors/sensor/interfaces" + module_out_path = "sensor/interfaces/inner_api" - sources = [ "unittest/posture_test.cpp" ] + sources = [ "$SUBSYSTEM_DIR/test/unittest/interfaces/inner_api/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", @@ -124,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", diff --git a/interfaces/native/test/unittest/head_posture_test.cpp b/test/unittest/interfaces/inner_api/head_posture_test.cpp similarity index 100% rename from interfaces/native/test/unittest/head_posture_test.cpp rename to test/unittest/interfaces/inner_api/head_posture_test.cpp diff --git a/interfaces/native/test/unittest/posture_test.cpp b/test/unittest/interfaces/inner_api/posture_test.cpp similarity index 100% rename from interfaces/native/test/unittest/posture_test.cpp rename to test/unittest/interfaces/inner_api/posture_test.cpp diff --git a/interfaces/native/test/unittest/sensor_agent_test.cpp b/test/unittest/interfaces/inner_api/sensor_agent_test.cpp similarity index 99% rename from interfaces/native/test/unittest/sensor_agent_test.cpp rename to test/unittest/interfaces/inner_api/sensor_agent_test.cpp index 93ed023cdeabfccfc36a47a96d85ffbb87bf41af..a3a5dcedd9c291912190717b9b9423206d2ddac6 100755 --- a/interfaces/native/test/unittest/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/interfaces/native/test/unittest/sensor_algorithm_test.cpp b/test/unittest/interfaces/inner_api/sensor_algorithm_test.cpp similarity index 100% rename from interfaces/native/test/unittest/sensor_algorithm_test.cpp rename to test/unittest/interfaces/inner_api/sensor_algorithm_test.cpp diff --git a/interfaces/native/test/unittest/sensor_power_test.cpp b/test/unittest/interfaces/inner_api/sensor_power_test.cpp similarity index 100% rename from interfaces/native/test/unittest/sensor_power_test.cpp rename to test/unittest/interfaces/inner_api/sensor_power_test.cpp diff --git a/interfaces/plugin/test/unittest/BUILD.gn b/test/unittest/interfaces/js/BUILD.gn similarity index 100% rename from interfaces/plugin/test/unittest/BUILD.gn rename to test/unittest/interfaces/js/BUILD.gn diff --git a/interfaces/plugin/test/unittest/barometer/BUILD.gn b/test/unittest/interfaces/js/barometer/BUILD.gn similarity index 94% rename from interfaces/plugin/test/unittest/barometer/BUILD.gn rename to test/unittest/interfaces/js/barometer/BUILD.gn index 23e8ddce567a586d9f886b452e90c02df242e02e..61cc010db66cd0a36f4f067a3f961fc1bc28535b 100755 --- a/interfaces/plugin/test/unittest/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/interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js b/test/unittest/interfaces/js/barometer/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js rename to test/unittest/interfaces/js/barometer/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/barometer/config.json b/test/unittest/interfaces/js/barometer/config.json similarity index 100% rename from interfaces/plugin/test/unittest/barometer/config.json rename to test/unittest/interfaces/js/barometer/config.json diff --git a/interfaces/plugin/test/unittest/color/BUILD.gn b/test/unittest/interfaces/js/color/BUILD.gn similarity index 94% rename from interfaces/plugin/test/unittest/color/BUILD.gn rename to test/unittest/interfaces/js/color/BUILD.gn index a77fe897c10a5961362d07084e9d10293be62d9c..cf13f01ffaaf5b48ef0ce043a5fd53cc34e60235 100755 --- a/interfaces/plugin/test/unittest/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/interfaces/plugin/test/unittest/color/ExampleJsunit.test.js b/test/unittest/interfaces/js/color/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/color/ExampleJsunit.test.js rename to test/unittest/interfaces/js/color/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/color/config.json b/test/unittest/interfaces/js/color/config.json similarity index 100% rename from interfaces/plugin/test/unittest/color/config.json rename to test/unittest/interfaces/js/color/config.json diff --git a/interfaces/plugin/test/unittest/gyroscope/BUILD.gn b/test/unittest/interfaces/js/gyroscope/BUILD.gn similarity index 94% rename from interfaces/plugin/test/unittest/gyroscope/BUILD.gn rename to test/unittest/interfaces/js/gyroscope/BUILD.gn index 2a40c6ac4f004ee6e8279b389dde6e0a7d2c6415..4e921e2f52762ac3d98fabb5b98ea003214306ba 100755 --- a/interfaces/plugin/test/unittest/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/interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js b/test/unittest/interfaces/js/gyroscope/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js rename to test/unittest/interfaces/js/gyroscope/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/gyroscope/config.json b/test/unittest/interfaces/js/gyroscope/config.json similarity index 100% rename from interfaces/plugin/test/unittest/gyroscope/config.json rename to test/unittest/interfaces/js/gyroscope/config.json diff --git a/interfaces/plugin/test/unittest/pedometer/BUILD.gn b/test/unittest/interfaces/js/pedometer/BUILD.gn similarity index 94% rename from interfaces/plugin/test/unittest/pedometer/BUILD.gn rename to test/unittest/interfaces/js/pedometer/BUILD.gn index ea5565011753fa827c7cda2500425b63cc44172f..4088531ff0c7ad0f46363d5acfb28b90b995777a 100644 --- a/interfaces/plugin/test/unittest/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/interfaces/plugin/test/unittest/pedometer/ExampleJsunit.test.js b/test/unittest/interfaces/js/pedometer/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/pedometer/ExampleJsunit.test.js rename to test/unittest/interfaces/js/pedometer/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/pedometer/config.json b/test/unittest/interfaces/js/pedometer/config.json similarity index 100% rename from interfaces/plugin/test/unittest/pedometer/config.json rename to test/unittest/interfaces/js/pedometer/config.json diff --git a/interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn b/test/unittest/interfaces/js/pedometer_detection/BUILD.gn similarity index 94% rename from interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn rename to test/unittest/interfaces/js/pedometer_detection/BUILD.gn index 18b81579baec175b5c085415be5d12cef2ee8d3b..6b47c04f0f94a85210dac5d3d426e6505a5385a8 100755 --- a/interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn +++ b/test/unittest/interfaces/js/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/interfaces/js" 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/interfaces/js/pedometer_detection/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/pedometer_detection/ExampleJsunit.test.js rename to test/unittest/interfaces/js/pedometer_detection/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/pedometer_detection/config.json b/test/unittest/interfaces/js/pedometer_detection/config.json similarity index 100% rename from interfaces/plugin/test/unittest/pedometer_detection/config.json rename to test/unittest/interfaces/js/pedometer_detection/config.json diff --git a/interfaces/plugin/test/unittest/sar/BUILD.gn b/test/unittest/interfaces/js/sar/BUILD.gn similarity index 94% rename from interfaces/plugin/test/unittest/sar/BUILD.gn rename to test/unittest/interfaces/js/sar/BUILD.gn index a635b5bd5b4be10eff32f991b7b7147c9ea8d72f..cb376253c367375a0568fcfcac0d687748f5df2d 100755 --- a/interfaces/plugin/test/unittest/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/interfaces/plugin/test/unittest/sar/ExampleJsunit.test.js b/test/unittest/interfaces/js/sar/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/sar/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sar/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/sar/config.json b/test/unittest/interfaces/js/sar/config.json similarity index 100% rename from interfaces/plugin/test/unittest/sar/config.json rename to test/unittest/interfaces/js/sar/config.json diff --git a/interfaces/plugin/test/unittest/sensor/BUILD.gn b/test/unittest/interfaces/js/sensor/BUILD.gn similarity index 94% rename from interfaces/plugin/test/unittest/sensor/BUILD.gn rename to test/unittest/interfaces/js/sensor/BUILD.gn index 6a4cef74cd714b9e20759a082fd4aff3e5abffce..b0b9915f3881a91359db8886b6e095a931893e99 100755 --- a/interfaces/plugin/test/unittest/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/interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js similarity index 100% rename from interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/ExampleJsunit.test.js diff --git a/interfaces/plugin/test/unittest/sensor/config.json b/test/unittest/interfaces/js/sensor/config.json similarity index 100% rename from interfaces/plugin/test/unittest/sensor/config.json rename to test/unittest/interfaces/js/sensor/config.json diff --git a/interfaces/plugin/test/unittest/signature/openharmony_core.p7b b/test/unittest/interfaces/js/signature/openharmony_core.p7b similarity index 100% rename from interfaces/plugin/test/unittest/signature/openharmony_core.p7b rename to test/unittest/interfaces/js/signature/openharmony_core.p7b diff --git a/interfaces/plugin/test/unittest/signature/openharmony_sx.p7b b/test/unittest/interfaces/js/signature/openharmony_sx.p7b similarity index 100% rename from interfaces/plugin/test/unittest/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 97bb603beb0bd9fbce4001e94a3b2fb1242b45f3..91777c231eec20ce583b58d1e307e9240671b510 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/include", "$SUBSYSTEM_DIR/utils/common/include", ]