From 54bea6188d75c51f331d8dbdb70eb6644a56a08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=B3=E4=B8=8D=E5=87=BA=E5=88=AB=E5=90=8D?= Date: Wed, 27 Oct 2021 10:47:35 +0800 Subject: [PATCH] bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- devicemanager.gni | 2 -- interfaces/inner_kits/native_cpp/BUILD.gn | 2 -- .../inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp | 2 +- services/devicemanagerservice/BUILD.gn | 2 -- utils/BUILD.gn | 2 -- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/devicemanager.gni b/devicemanager.gni index e6160d6bf..e8576d35d 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -21,6 +21,4 @@ services_path = "${devicemanager_path}/services" innerkits_path = "${devicemanager_path}/interfaces/inner_kits" -build_flags = [ "-Werror" ] - dm_ldflags = [ "-lpthread" ] diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index ab8cceee7..2903afc98 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -58,8 +58,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - deps = [ "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", diff --git a/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp b/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp index b500aebb2..2726d7ee3 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp @@ -29,7 +29,7 @@ IMPLEMENT_SINGLE_INSTANCE(IpcClientStub); static int32_t ClientIpcInterfaceMsgHandle(const IpcContext *ctx, void *ipcMsg, IpcIo *io, void *arg) { (void)arg; - if (ipcMsg == nullptr || io == nullptr || ctx == nullptr) { + if (ipcMsg == nullptr || io == nullptr) { DMLOG(DM_LOG_ERROR, "invalid param"); return DEVICEMANAGER_INVALID_PARAM; } diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index 8414cba61..85b8e5774 100644 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -89,8 +89,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - ldflags = dm_ldflags deps = [ diff --git a/utils/BUILD.gn b/utils/BUILD.gn index b7fcfd18e..adec2c8af 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -61,8 +61,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/startup/syspara_lite/frameworks/parameter/src:sysparam", -- Gitee