From 58373a6be14085cfdfd379a39c5182fb7b41880a Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Tue, 7 Nov 2023 08:30:03 +0000 Subject: [PATCH 1/5] isolate the user/eng Signed-off-by: rwx1283129 Change-Id: I37a980d0712665ccbbdc19462ee79ce5c7fc6e75 --- miscdevice.gni | 7 +++++++ services/miscdevice_service/BUILD.gn | 19 ++++++++++++++----- .../interface/src/light_hdi_connection.cpp | 4 ++++ .../interface/src/vibrator_hdi_connection.cpp | 4 ++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/miscdevice.gni b/miscdevice.gni index a7f6ed3..1b1a4a7 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 +} \ No newline at end of file diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 789b4f2..dc8304a 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", + ] + } + cflags = [ "-Wno-error=inconsistent-missing-override" ] deps = [ "$SUBSYSTEM_DIR/utils:libmiscdevice_utils" ] @@ -78,8 +83,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", @@ -99,7 +102,13 @@ ohos_shared_library("libmiscdevice_service_static") { "$SUBSYSTEM_DIR/utils/include", "//third_party/cJSON", ] - + + if (miscdevice_build_eng) { + sources += [ + "hdi_connection/adapter/src/compatible_connection.cpp", + "hdi_connection/adapter/src/compatible_light_connection.cpp", + ] + } cflags = [ "-Wno-error=inconsistent-missing-override" ] deps = [ "$SUBSYSTEM_DIR/utils:libmiscdevice_utils" ] 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 50767c0..30c4f7b 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 @@ -14,7 +14,9 @@ */ #include "light_hdi_connection.h" +#ifdef BUILD_VARIANT_ENG #include +#endif #include "compatible_light_connection.h" #ifdef HDF_DRIVERS_INTERFACE_LIGHT @@ -41,7 +43,9 @@ int32_t LightHdiConnection::ConnectHdi() return ERR_OK; } #endif // HDF_DRIVERS_INTERFACE_LIGHT +#ifdef BUILD_VARIANT_ENG iLightHdiConnection_ = std::make_unique(); +#endif return 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 8090b65..aebfd70 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" @@ -34,8 +36,10 @@ int32_t VibratorHdiConnection::ConnectHdi() int32_t ret = iVibratorHdiConnection_->ConnectHdi(); if (ret != ERR_OK) { MISC_HILOGE("Hdi direct failed"); +#ifdef BUILD_VARIANT_ENG iVibratorHdiConnection_ = std::make_unique(); ret = iVibratorHdiConnection_->ConnectHdi(); +#endif } if (ret != ERR_OK) { MISC_HILOGE("Hdi connection failed"); -- Gitee From 0d8cf570da440263f512e3566f474259442af076 Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Tue, 7 Nov 2023 09:23:26 +0000 Subject: [PATCH 2/5] exchange the false Signed-off-by: rwx1283129 Change-Id: Idef3654a11310c3beb60b24e6f2e01285f9e7420 --- .../hdi_connection/interface/src/light_hdi_connection.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 30c4f7b..4c5c92a 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 @@ -14,11 +14,10 @@ */ #include "light_hdi_connection.h" -#ifdef BUILD_VARIANT_ENG #include -#endif - +#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 -- Gitee From d6d4ab56c14d6c30efb84e2e2b2b4ba0bad1ac39 Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Tue, 7 Nov 2023 10:25:37 +0000 Subject: [PATCH 3/5] resolve the isolate with master Signed-off-by: rwx1283129 Change-Id: Id505a9ddaed0aac7e07f4320845c2052c863d178 --- services/miscdevice_service/BUILD.gn | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index dc8304a..c06f582 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -43,6 +43,12 @@ ohos_shared_library("libmiscdevice_service") { ] } + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + cflags = [ "-Wno-error=inconsistent-missing-override" ] deps = [ "$SUBSYSTEM_DIR/utils:libmiscdevice_utils" ] @@ -102,13 +108,20 @@ ohos_shared_library("libmiscdevice_service_static") { "$SUBSYSTEM_DIR/utils/include", "//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 + debug = false + } + cflags = [ "-Wno-error=inconsistent-missing-override" ] deps = [ "$SUBSYSTEM_DIR/utils:libmiscdevice_utils" ] -- Gitee From 820a131b7062c36dbd73f480d02f15bf6ee0527a Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Tue, 7 Nov 2023 10:30:39 +0000 Subject: [PATCH 4/5] exchange the format for gn file Signed-off-by: rwx1283129 Change-Id: I009c5634d82611f4d80900b4f340ba70e9d3c994 --- miscdevice.gni | 2 +- services/miscdevice_service/BUILD.gn | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/miscdevice.gni b/miscdevice.gni index 1b1a4a7..9ad3317 100644 --- a/miscdevice.gni +++ b/miscdevice.gni @@ -43,4 +43,4 @@ if (build_variant == "eng") { miscdevice_build_eng = true } else { miscdevice_build_eng = false -} \ No newline at end of file +} diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index c06f582..b5b42e8 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -43,7 +43,7 @@ ohos_shared_library("libmiscdevice_service") { ] } - sanitize = { + sanitize = { cfi = true cfi_cross_dso = true debug = false @@ -116,12 +116,12 @@ ohos_shared_library("libmiscdevice_service_static") { ] } - sanitize = { + sanitize = { cfi = true cfi_cross_dso = true debug = false } - + cflags = [ "-Wno-error=inconsistent-missing-override" ] deps = [ "$SUBSYSTEM_DIR/utils:libmiscdevice_utils" ] -- Gitee From cac5eb174b9ce77e32642d3c45598cf39808d565 Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Wed, 8 Nov 2023 02:17:33 +0000 Subject: [PATCH 5/5] Further modification details Signed-off-by: rwx1283129 Change-Id: Ib8a1d5c804a3053a3ee1de57d507ad9c0eb591bd --- .../hdi_connection/interface/src/light_hdi_connection.cpp | 2 +- .../hdi_connection/interface/src/vibrator_hdi_connection.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 4c5c92a..d98d67c 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 @@ -44,8 +44,8 @@ int32_t LightHdiConnection::ConnectHdi() #endif // HDF_DRIVERS_INTERFACE_LIGHT #ifdef BUILD_VARIANT_ENG iLightHdiConnection_ = std::make_unique(); -#endif 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 aebfd70..d774c76 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 @@ -34,17 +34,17 @@ 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"); -#ifdef BUILD_VARIANT_ENG iVibratorHdiConnection_ = std::make_unique(); ret = iVibratorHdiConnection_->ConnectHdi(); -#endif } if (ret != ERR_OK) { MISC_HILOGE("Hdi connection failed"); return VIBRATOR_HDF_CONNECT_ERR; } +#endif return ERR_OK; } -- Gitee