92 lines
3.5 KiB
Diff
92 lines
3.5 KiB
Diff
From 998af3dc5949cbfebf9d446b655d8be02f3cce82 Mon Sep 17 00:00:00 2001
|
|
From: heppen <hepeng68@huawei.com>
|
|
Date: Tue, 20 Jun 2023 16:51:48 +0800
|
|
Subject: [PATCH] remove dependency and adpat for build
|
|
|
|
---
|
|
config_policy.gni | 2 +-
|
|
.../hisysevent_adapter/hisysevent_adapter.cpp | 29 ++++++++++---------
|
|
interfaces/kits/js/BUILD.gn | 3 +-
|
|
3 files changed, 17 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/config_policy.gni b/config_policy.gni
|
|
index c4a6a69..1d0388e 100644
|
|
--- a/config_policy.gni
|
|
+++ b/config_policy.gni
|
|
@@ -16,5 +16,5 @@ declare_args() {
|
|
config_policy_fs_prefix = ""
|
|
|
|
# Whether support napi so
|
|
- support_config_policy_napi = true
|
|
+ support_config_policy_napi = false
|
|
}
|
|
diff --git a/frameworks/dfx/hisysevent_adapter/hisysevent_adapter.cpp b/frameworks/dfx/hisysevent_adapter/hisysevent_adapter.cpp
|
|
index f486dd8..bd84ab0 100644
|
|
--- a/frameworks/dfx/hisysevent_adapter/hisysevent_adapter.cpp
|
|
+++ b/frameworks/dfx/hisysevent_adapter/hisysevent_adapter.cpp
|
|
@@ -14,7 +14,7 @@
|
|
*/
|
|
#include "hisysevent_adapter.h"
|
|
|
|
-#include "hisysevent.h"
|
|
+// #include "hisysevent.h"
|
|
#include "hilog/log.h"
|
|
|
|
namespace OHOS {
|
|
@@ -22,23 +22,24 @@ namespace Customization {
|
|
namespace ConfigPolicy {
|
|
using namespace OHOS::HiviewDFX;
|
|
static constexpr HiLogLabel LABEL = { LOG_CORE, 0xD001E00, "ReportConfigPolicyEvent" };
|
|
-const std::string DOMAIN_STR = std::string(HiSysEvent::Domain::CUSTOMIZATION_CONFIG);
|
|
+// const std::string DOMAIN_STR = std::string(HiSysEvent::Domain::CUSTOMIZATION_CONFIG);
|
|
|
|
void ReportConfigPolicyEvent(ReportType reportType, const std::string &apiName, const std::string &msgInfo)
|
|
{
|
|
- int ret;
|
|
- if (reportType == ReportType::CONFIG_POLICY_FAILED) {
|
|
- ret = HiSysEvent::Write(DOMAIN_STR, "CONFIG_POLICY_FAILED", HiSysEvent::EventType::FAULT, "APINAME", apiName,
|
|
- "MSG", msgInfo);
|
|
- } else {
|
|
- ret =
|
|
- HiSysEvent::Write(DOMAIN_STR, "CONFIG_POLICY_EVENT", HiSysEvent::EventType::STATISTIC, "APINAME", apiName);
|
|
- }
|
|
+ return;
|
|
+ // int ret;
|
|
+ // if (reportType == ReportType::CONFIG_POLICY_FAILED) {
|
|
+ // ret = HiSysEvent::Write(DOMAIN_STR, "CONFIG_POLICY_FAILED", HiSysEvent::EventType::FAULT, "APINAME", apiName,
|
|
+ // "MSG", msgInfo);
|
|
+ // } else {
|
|
+ // ret =
|
|
+ // HiSysEvent::Write(DOMAIN_STR, "CONFIG_POLICY_EVENT", HiSysEvent::EventType::STATISTIC, "APINAME", apiName);
|
|
+ // }
|
|
|
|
- if (ret != 0) {
|
|
- HiLog::Error(LABEL, "hisysevent write failed! ret %{public}d, apiName %{public}s, errMsg %{public}s", ret,
|
|
- apiName.c_str(), msgInfo.c_str());
|
|
- }
|
|
+ // if (ret != 0) {
|
|
+ // HiLog::Error(LABEL, "hisysevent write failed! ret %{public}d, apiName %{public}s, errMsg %{public}s", ret,
|
|
+ // apiName.c_str(), msgInfo.c_str());
|
|
+ // }
|
|
}
|
|
} // namespace ConfigPolicy
|
|
} // namespace Customization
|
|
diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn
|
|
index 2640cea..bf4c27f 100644
|
|
--- a/interfaces/kits/js/BUILD.gn
|
|
+++ b/interfaces/kits/js/BUILD.gn
|
|
@@ -28,9 +28,8 @@ ohos_shared_library("configpolicy") {
|
|
|
|
deps = [ "//base/customization/config_policy/frameworks/config_policy:configpolicy_util" ]
|
|
external_deps = [
|
|
- "hisysevent_native:libhisysevent",
|
|
+ # "hisysevent_native:libhisysevent",
|
|
"hiviewdfx_hilog_native:libhilog",
|
|
- "napi:ace_napi",
|
|
]
|
|
relative_install_dir = "module"
|
|
subsystem_name = "customization"
|
|
--
|
|
2.33.0
|
|
|