diff --git a/miscdevice.gni b/miscdevice.gni index a7f6ed343e18cc0791effd9239525ac73912dd4f..9ad331726331b1f23ac85d9a8166a9d2dc943450 100644 --- a/miscdevice.gni +++ b/miscdevice.gni @@ -37,3 +37,10 @@ if (!defined(global_parts_info) || } else { hdf_drivers_interface_light = false } + +if (build_variant == "eng") { + miscdevice_default_defines += [ "BUILD_VARIANT_ENG" ] + miscdevice_build_eng = true +} else { + miscdevice_build_eng = false +} diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 021a591571ddbfac19c5ab3cd9e7c08a7243a00f..b5b42e8893aaac8308f55f92d8902aa5b4fd292e 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -16,8 +16,6 @@ import("./../../miscdevice.gni") ohos_shared_library("libmiscdevice_service") { sources = [ - "hdi_connection/adapter/src/compatible_connection.cpp", - "hdi_connection/adapter/src/compatible_light_connection.cpp", "hdi_connection/adapter/src/hdi_connection.cpp", "hdi_connection/interface/src/light_hdi_connection.cpp", "hdi_connection/interface/src/vibrator_hdi_connection.cpp", @@ -38,6 +36,13 @@ ohos_shared_library("libmiscdevice_service") { "//third_party/cJSON", ] + if (miscdevice_build_eng) { + sources += [ + "hdi_connection/adapter/src/compatible_connection.cpp", + "hdi_connection/adapter/src/compatible_light_connection.cpp", + ] + } + sanitize = { cfi = true cfi_cross_dso = true @@ -84,8 +89,6 @@ ohos_shared_library("libmiscdevice_service") { ############################################################################# ohos_shared_library("libmiscdevice_service_static") { sources = [ - "hdi_connection/adapter/src/compatible_connection.cpp", - "hdi_connection/adapter/src/compatible_light_connection.cpp", "hdi_connection/adapter/src/hdi_connection.cpp", "hdi_connection/interface/src/light_hdi_connection.cpp", "hdi_connection/interface/src/vibrator_hdi_connection.cpp", @@ -106,6 +109,13 @@ ohos_shared_library("libmiscdevice_service_static") { "//third_party/cJSON", ] + if (miscdevice_build_eng) { + sources += [ + "hdi_connection/adapter/src/compatible_connection.cpp", + "hdi_connection/adapter/src/compatible_light_connection.cpp", + ] + } + sanitize = { cfi = true cfi_cross_dso = true diff --git a/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp index 50767c0d99d41b0b98f098a10d0d36145154cda9..d98d67c55df550ccad7f2adbe5d1fc061e0b6334 100644 --- a/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp @@ -15,8 +15,9 @@ #include "light_hdi_connection.h" #include - +#ifdef BUILD_VARIANT_ENG #include "compatible_light_connection.h" +#endif #ifdef HDF_DRIVERS_INTERFACE_LIGHT #include "hdi_light_connection.h" #endif // HDF_DRIVERS_INTERFACE_LIGHT @@ -41,8 +42,10 @@ int32_t LightHdiConnection::ConnectHdi() return ERR_OK; } #endif // HDF_DRIVERS_INTERFACE_LIGHT +#ifdef BUILD_VARIANT_ENG iLightHdiConnection_ = std::make_unique(); return ConnectHdiService(); +#endif } int32_t LightHdiConnection::ConnectHdiService() diff --git a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp index 8090b6589b605cae2dc972565b9ef4c988f785d9..d774c7699bfa006ea0441a27fe85f524de8f8c6f 100644 --- a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp @@ -16,7 +16,9 @@ #include "hitrace_meter.h" +#ifdef BUILD_VARIANT_ENG #include "compatible_connection.h" +#endif #include "hdi_connection.h" #include "sensors_errors.h" @@ -32,6 +34,7 @@ int32_t VibratorHdiConnection::ConnectHdi() { iVibratorHdiConnection_ = std::make_unique(); int32_t ret = iVibratorHdiConnection_->ConnectHdi(); +#ifdef BUILD_VARIANT_ENG if (ret != ERR_OK) { MISC_HILOGE("Hdi direct failed"); iVibratorHdiConnection_ = std::make_unique(); @@ -41,6 +44,7 @@ int32_t VibratorHdiConnection::ConnectHdi() MISC_HILOGE("Hdi connection failed"); return VIBRATOR_HDF_CONNECT_ERR; } +#endif return ERR_OK; }