diff --git a/bundle.json b/bundle.json index 0c80f8be60152752633253e2c90e61fa9d2ba9cd..ae3ff163ab3525e580edc7f8fc25422013cdc8d1 100755 --- a/bundle.json +++ b/bundle.json @@ -45,7 +45,6 @@ "graphic_surface", "window_manager", "openssl", - "graphic_2d" ] }, "build": { diff --git a/utils/BUILD.gn b/utils/BUILD.gn index af7c74669168056a68733ed8aed26c66a52258e0..a27a682bae65c4aacbcb1ecc9cee4953ad849a41 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", diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 0ddfe371e4cf276f4213ec49d0b5ea4367cae3ca..85cbafe41788fe8d1df13f80ae7febdc2ca9bed6 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -54,6 +54,10 @@ 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 int32_t INT32_STRING_LENGTH = 40; + constexpr uint32_t ERROR_MSG_MAX_LEN = 256; + constexpr uint32_t SLEEP_TIME_US = 10 * 1000; } DevInfo GetLocalDeviceInfo() {