From c4ab4334767dbd3b8ad4e03ff32300abe7ba8853 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Mon, 21 Oct 2024 16:16:15 +0800 Subject: [PATCH 1/3] test Signed-off-by: li-tiangang4 --- bundle.json | 2 -- utils/BUILD.gn | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 0c80f8b..dee1eaf 100755 --- a/bundle.json +++ b/bundle.json @@ -44,8 +44,6 @@ "hitrace", "graphic_surface", "window_manager", - "openssl", - "graphic_2d" ] }, "build": { diff --git a/utils/BUILD.gn b/utils/BUILD.gn index af7c746..a27a682 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -24,6 +24,7 @@ ohos_shared_library("libdinput_utils") { cfi_cross_dso = true debug = false } + branch_protector_ret = "pac_ret" include_dirs = [ "${utils_path}/include", -- Gitee From bab2e2a97e50309475b2f7264bb19f62db70dd86 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Mon, 21 Oct 2024 16:18:58 +0800 Subject: [PATCH 2/3] test Signed-off-by: li-tiangang4 --- utils/src/dinput_utils_tool.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 0ddfe37..5e5baf9 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -54,6 +54,8 @@ namespace { constexpr int32_t MAX_RETRY_COUNT = 3; constexpr uint32_t SLEEP_TIME_US = 10 * 1000; constexpr char DHID_SPLIT = '.'; + constexpr int32_t MAX_RETRY_COUNT = 3; + constexpr uint32_t SLEEP_TIME_US = 10 * 1000; } DevInfo GetLocalDeviceInfo() { -- Gitee From 06af0ba6b9822578684f5808df445c35855a7227 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Mon, 21 Oct 2024 16:21:28 +0800 Subject: [PATCH 3/3] test Signed-off-by: li-tiangang4 --- bundle.json | 1 + utils/src/dinput_utils_tool.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/bundle.json b/bundle.json index dee1eaf..ae3ff16 100755 --- a/bundle.json +++ b/bundle.json @@ -44,6 +44,7 @@ "hitrace", "graphic_surface", "window_manager", + "openssl", ] }, "build": { diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 5e5baf9..85cbafe 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -55,6 +55,8 @@ namespace { constexpr uint32_t SLEEP_TIME_US = 10 * 1000; constexpr char DHID_SPLIT = '.'; constexpr int32_t MAX_RETRY_COUNT = 3; + constexpr int32_t INT32_STRING_LENGTH = 40; + constexpr uint32_t ERROR_MSG_MAX_LEN = 256; constexpr uint32_t SLEEP_TIME_US = 10 * 1000; } DevInfo GetLocalDeviceInfo() -- Gitee