diff --git a/0000-adapt-for-build-c_utils.patch b/0000-adapt-for-build-c_utils.patch new file mode 100644 index 0000000000000000000000000000000000000000..d92f8fe9c4abe10d9fd5b292a9603fb176795414 --- /dev/null +++ b/0000-adapt-for-build-c_utils.patch @@ -0,0 +1,138 @@ +From 80f5c4618a582ac2735a770e5b6e2fc172a17f8e Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 16:45:15 +0800 +Subject: [PATCH] adapt for build + +--- + base/include/linux/ashmem.h | 44 +++++++++++++++++++++++++++++++++++++ + base/src/event_reactor.h | 1 + + base/src/file_ex.cpp | 3 ++- + base/src/parcel.cpp | 1 + + base/src/string_ex.cpp | 2 ++ + base/src/thread_pool.cpp | 1 + + 6 files changed, 51 insertions(+), 1 deletion(-) + create mode 100644 base/include/linux/ashmem.h + +diff --git a/base/include/linux/ashmem.h b/base/include/linux/ashmem.h +new file mode 100644 +index 0000000..174667f +--- /dev/null ++++ b/base/include/linux/ashmem.h +@@ -0,0 +1,44 @@ ++/**************************************************************************** ++ **************************************************************************** ++ *** ++ *** This header was automatically generated from a Linux kernel header ++ *** of the same name, to make information necessary for userspace to ++ *** call into the kernel available to libc. It contains only constants, ++ *** structures, and macros generated from the original header, and thus, ++ *** contains no copyrightable information. ++ *** ++ *** To edit the content of this header, modify the corresponding ++ *** source file (e.g. under external/kernel-headers/original/) then ++ *** run bionic/libc/kernel/tools/update_all.py ++ *** ++ *** Any manual change here will be lost the next time this script will ++ *** be run. You've been warned! ++ *** ++ **************************************************************************** ++ ****************************************************************************/ ++#ifndef _UAPI_LINUX_ASHMEM_H ++#define _UAPI_LINUX_ASHMEM_H ++#include ++#include ++#define ASHMEM_NAME_LEN 256 ++#define ASHMEM_NAME_DEF "dev/ashmem" ++#define ASHMEM_NOT_PURGED 0 ++#define ASHMEM_WAS_PURGED 1 ++#define ASHMEM_IS_UNPINNED 0 ++#define ASHMEM_IS_PINNED 1 ++struct ashmem_pin { ++ __u32 offset; ++ __u32 len; ++}; ++#define __ASHMEMIOC 0x77 ++#define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN]) ++#define ASHMEM_GET_NAME _IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN]) ++#define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t) ++#define ASHMEM_GET_SIZE _IO(__ASHMEMIOC, 4) ++#define ASHMEM_SET_PROT_MASK _IOW(__ASHMEMIOC, 5, unsigned long) ++#define ASHMEM_GET_PROT_MASK _IO(__ASHMEMIOC, 6) ++#define ASHMEM_PIN _IOW(__ASHMEMIOC, 7, struct ashmem_pin) ++#define ASHMEM_UNPIN _IOW(__ASHMEMIOC, 8, struct ashmem_pin) ++#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9) ++#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10) ++#endif +diff --git a/base/src/event_reactor.h b/base/src/event_reactor.h +index 794e44a..1a282ec 100644 +--- a/base/src/event_reactor.h ++++ b/base/src/event_reactor.h +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + namespace OHOS { + namespace Utils { +diff --git a/base/src/file_ex.cpp b/base/src/file_ex.cpp +index 578b1be..a9e0572 100644 +--- a/base/src/file_ex.cpp ++++ b/base/src/file_ex.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "directory_ex.h" + #include "utils_log.h" + +@@ -262,7 +263,7 @@ bool SaveBufferToFile(const string& filePath, const vector& content, bool + } + + // if the file is not exist,create it first! +- uint32_t mode = truncated ? (ios::out | ios::binary | ios::trunc) : (ios::out | ios::binary | ios::app); ++ ios_base::openmode mode = truncated ? (ios::out | ios::binary | ios::trunc) : (ios::out | ios::binary | ios::app); + ofstream file; + file.open(filePath.c_str(), mode); + if (!file.is_open()) { +diff --git a/base/src/parcel.cpp b/base/src/parcel.cpp +index 4d62353..b0012bc 100644 +--- a/base/src/parcel.cpp ++++ b/base/src/parcel.cpp +@@ -16,6 +16,7 @@ + #include "parcel.h" + #include "securec.h" + #include "utils_log.h" ++#include + + namespace OHOS { + +diff --git a/base/src/string_ex.cpp b/base/src/string_ex.cpp +index 32340ae..782e419 100644 +--- a/base/src/string_ex.cpp ++++ b/base/src/string_ex.cpp +@@ -20,6 +20,8 @@ + #include + #include + #include ++#include ++#include + using namespace std; + + namespace OHOS { +diff --git a/base/src/thread_pool.cpp b/base/src/thread_pool.cpp +index 9951929..b4e663c 100644 +--- a/base/src/thread_pool.cpp ++++ b/base/src/thread_pool.cpp +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + namespace OHOS { + +-- +2.33.0 + diff --git a/0001-remove-dependency-and-adpat-for-build-config_policy.patch b/0001-remove-dependency-and-adpat-for-build-config_policy.patch new file mode 100644 index 0000000000000000000000000000000000000000..32bc43ff8ed8b55c3918133f0c9fcf2e8f383856 --- /dev/null +++ b/0001-remove-dependency-and-adpat-for-build-config_policy.patch @@ -0,0 +1,91 @@ +From 998af3dc5949cbfebf9d446b655d8be02f3cce82 Mon Sep 17 00:00:00 2001 +From: heppen +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 + diff --git a/0002-remove-dependency-and-adapt-for-openeuler-dsoftbus.patch b/0002-remove-dependency-and-adapt-for-openeuler-dsoftbus.patch new file mode 100644 index 0000000000000000000000000000000000000000..4187d65da8daadf77d983a014f3da03814b64b30 --- /dev/null +++ b/0002-remove-dependency-and-adapt-for-openeuler-dsoftbus.patch @@ -0,0 +1,934 @@ +From ad68a9dc1f289fb63cc4b10613f3bd46b546c225 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:01:51 +0800 +Subject: [PATCH] remove dependency and adapt for openeuler + +--- + adapter/BUILD.gn | 2 +- + .../common/bus_center/bus_center_adapter.gni | 4 +- + .../common/dfx/softbus_adapter_hisysevent.cpp | 263 +++++++++--------- + bundle.json | 4 +- + .../bus_center/src/bus_center_adapter.c | 2 +- + core/authentication/include/auth_hichain.h | 2 + + core/authentication/src/auth_hichain.c | 8 +- + core/authentication/src/auth_session_fsm.c | 8 + + .../lane_manager/src/lnn_lane_link_proc.c | 2 +- + .../lane_manager/src/lnn_select_rule.c | 2 +- + .../standard/softbus_permission.cpp | 151 +++++----- + .../common/src/softbus_thread_pool.c | 3 +- + core/frame/BUILD.gn | 6 +- + .../src/permission_status_change_cb.cpp | 18 +- + .../src/softbus_client_info_manager.cpp | 9 +- + .../standard/init/src/softbus_server_stub.cpp | 137 ++++----- + 16 files changed, 325 insertions(+), 296 deletions(-) + +diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn +index 20f4e606d..2b7fa0fb8 100644 +--- a/adapter/BUILD.gn ++++ b/adapter/BUILD.gn +@@ -206,7 +206,7 @@ if (defined(ohos_lite)) { + public_configs = [ ":config_adapter_common" ] + if (is_standard_system) { + external_deps = [ +- "hisysevent_native:libhisysevent", ++ # "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", + ] + } +diff --git a/adapter/common/bus_center/bus_center_adapter.gni b/adapter/common/bus_center/bus_center_adapter.gni +index ebd12a0f3..6c8887d8b 100644 +--- a/adapter/common/bus_center/bus_center_adapter.gni ++++ b/adapter/common/bus_center/bus_center_adapter.gni +@@ -87,8 +87,8 @@ if (defined(ohos_lite)) { + if (has_ces_part) { + bus_center_adapter_src += + [ "$adapter_bus_center_path/common_event/lnn_common_event_monitor.cpp" ] +- bus_center_adapter_external_deps += +- [ "common_event_service:cesfwk_innerkits" ] ++ # bus_center_adapter_external_deps += ++ # [ "common_event_service:cesfwk_innerkits" ] + } else { + bus_center_adapter_src += [ "$adapter_bus_center_path/common_event/lnn_common_event_monitor_virtual.cpp" ] + } +diff --git a/adapter/common/dfx/softbus_adapter_hisysevent.cpp b/adapter/common/dfx/softbus_adapter_hisysevent.cpp +index 1c6d36352..d04490317 100644 +--- a/adapter/common/dfx/softbus_adapter_hisysevent.cpp ++++ b/adapter/common/dfx/softbus_adapter_hisysevent.cpp +@@ -23,127 +23,127 @@ + #include "softbus_adapter_mem.h" + #include "softbus_adapter_thread.h" + #include "message_handler.h" +-#include "hisysevent_c.h" ++// #include "hisysevent_c.h" + +-static const char *g_domain = "DSOFTBUS"; +-static bool g_init_lock = false; +-static SoftBusMutex g_dfx_lock; +-static HiSysEventParam g_dstParam[SOFTBUS_EVT_PARAM_BUTT]; ++// static const char *g_domain = "DSOFTBUS"; ++// static bool g_init_lock = false; ++// static SoftBusMutex g_dfx_lock; ++// static HiSysEventParam g_dstParam[SOFTBUS_EVT_PARAM_BUTT]; + +-static int32_t ConvertEventParam(SoftBusEvtParam *srcParam, HiSysEventParam *dstParam) +-{ +- switch (srcParam->paramType) { +- case SOFTBUS_EVT_PARAMTYPE_BOOL: +- dstParam->t = HISYSEVENT_BOOL; +- dstParam->v.b = srcParam->paramValue.b; +- break; +- case SOFTBUS_EVT_PARAMTYPE_UINT8: +- dstParam->t = HISYSEVENT_UINT8; +- dstParam->v.ui8 = srcParam->paramValue.u8v; +- break; +- case SOFTBUS_EVT_PARAMTYPE_UINT16: +- dstParam->t = HISYSEVENT_UINT16; +- dstParam->v.ui16 = srcParam->paramValue.u16v; +- break; +- case SOFTBUS_EVT_PARAMTYPE_INT32: +- dstParam->t = HISYSEVENT_INT32; +- dstParam->v.i32 = srcParam->paramValue.i32v; +- break; +- case SOFTBUS_EVT_PARAMTYPE_UINT32: +- dstParam->t = HISYSEVENT_UINT32; +- dstParam->v.ui32 = srcParam->paramValue.u32v; +- break; +- case SOFTBUS_EVT_PARAMTYPE_UINT64: +- dstParam->t = HISYSEVENT_UINT64; +- dstParam->v.ui64 = srcParam->paramValue.u64v; +- break; +- case SOFTBUS_EVT_PARAMTYPE_FLOAT: +- dstParam->t = HISYSEVENT_FLOAT; +- dstParam->v.f = srcParam->paramValue.f; +- break; +- case SOFTBUS_EVT_PARAMTYPE_DOUBLE: +- dstParam->t = HISYSEVENT_DOUBLE; +- dstParam->v.d = srcParam->paramValue.d; +- break; +- case SOFTBUS_EVT_PARAMTYPE_STRING: +- dstParam->t = HISYSEVENT_STRING; +- dstParam->v.s = (char *)SoftBusCalloc(sizeof(char) * SOFTBUS_HISYSEVT_PARAM_LEN); +- if (dstParam->v.s == NULL) { +- HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertEventParam: SoftBusMalloc fail"); +- return SOFTBUS_ERR; +- } +- if (strcpy_s(dstParam->v.s, SOFTBUS_HISYSEVT_PARAM_LEN, srcParam->paramValue.str) != EOK) { +- SoftBusFree(dstParam->v.s); +- HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertEventParam:copy string var fail"); +- return SOFTBUS_ERR; +- } +- break; +- default: +- break; +- } +- return SOFTBUS_OK; +-} ++// static int32_t ConvertEventParam(SoftBusEvtParam *srcParam, HiSysEventParam *dstParam) ++// { ++ // switch (srcParam->paramType) { ++ // case SOFTBUS_EVT_PARAMTYPE_BOOL: ++ // dstParam->t = HISYSEVENT_BOOL; ++ // dstParam->v.b = srcParam->paramValue.b; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_UINT8: ++ // dstParam->t = HISYSEVENT_UINT8; ++ // dstParam->v.ui8 = srcParam->paramValue.u8v; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_UINT16: ++ // dstParam->t = HISYSEVENT_UINT16; ++ // dstParam->v.ui16 = srcParam->paramValue.u16v; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_INT32: ++ // dstParam->t = HISYSEVENT_INT32; ++ // dstParam->v.i32 = srcParam->paramValue.i32v; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_UINT32: ++ // dstParam->t = HISYSEVENT_UINT32; ++ // dstParam->v.ui32 = srcParam->paramValue.u32v; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_UINT64: ++ // dstParam->t = HISYSEVENT_UINT64; ++ // dstParam->v.ui64 = srcParam->paramValue.u64v; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_FLOAT: ++ // dstParam->t = HISYSEVENT_FLOAT; ++ // dstParam->v.f = srcParam->paramValue.f; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_DOUBLE: ++ // dstParam->t = HISYSEVENT_DOUBLE; ++ // dstParam->v.d = srcParam->paramValue.d; ++ // break; ++ // case SOFTBUS_EVT_PARAMTYPE_STRING: ++ // dstParam->t = HISYSEVENT_STRING; ++ // dstParam->v.s = (char *)SoftBusCalloc(sizeof(char) * SOFTBUS_HISYSEVT_PARAM_LEN); ++ // if (dstParam->v.s == NULL) { ++ // HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertEventParam: SoftBusMalloc fail"); ++ // return SOFTBUS_ERR; ++ // } ++ // if (strcpy_s(dstParam->v.s, SOFTBUS_HISYSEVT_PARAM_LEN, srcParam->paramValue.str) != EOK) { ++ // SoftBusFree(dstParam->v.s); ++ // HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertEventParam:copy string var fail"); ++ // return SOFTBUS_ERR; ++ // } ++ // break; ++ // default: ++ // break; ++ // } ++// return SOFTBUS_OK; ++// } + +-static int32_t ConvertMsgToHiSysEvent(SoftBusEvtReportMsg *msg) +-{ +- if (memset_s(g_dstParam, sizeof(HiSysEventParam) * SOFTBUS_EVT_PARAM_BUTT, 0, +- sizeof(HiSysEventParam) * SOFTBUS_EVT_PARAM_BUTT) != EOK) { +- HILOG_ERROR(SOFTBUS_HILOG_ID, "init g_dstParam fail"); +- return SOFTBUS_ERR; +- } +- for (uint32_t i = 0; i < msg->paramNum; i++) { +- if (strcpy_s(g_dstParam[i].name, SOFTBUS_HISYSEVT_NAME_LEN, msg->paramArray[i].paramName) != EOK) { +- HILOG_ERROR(SOFTBUS_HILOG_ID, "copy param fail"); +- return SOFTBUS_ERR; +- } +- if (ConvertEventParam(&msg->paramArray[i], &g_dstParam[i]) != SOFTBUS_OK) { +- HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertMsgToHiSysEvent:convert param fail"); +- return SOFTBUS_ERR; +- } +- } +- return SOFTBUS_OK; +-} ++// static int32_t ConvertMsgToHiSysEvent(SoftBusEvtReportMsg *msg) ++// { ++// if (memset_s(g_dstParam, sizeof(HiSysEventParam) * SOFTBUS_EVT_PARAM_BUTT, 0, ++// sizeof(HiSysEventParam) * SOFTBUS_EVT_PARAM_BUTT) != EOK) { ++// HILOG_ERROR(SOFTBUS_HILOG_ID, "init g_dstParam fail"); ++// return SOFTBUS_ERR; ++// } ++// for (uint32_t i = 0; i < msg->paramNum; i++) { ++// if (strcpy_s(g_dstParam[i].name, SOFTBUS_HISYSEVT_NAME_LEN, msg->paramArray[i].paramName) != EOK) { ++// HILOG_ERROR(SOFTBUS_HILOG_ID, "copy param fail"); ++// return SOFTBUS_ERR; ++// } ++// if (ConvertEventParam(&msg->paramArray[i], &g_dstParam[i]) != SOFTBUS_OK) { ++// HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertMsgToHiSysEvent:convert param fail"); ++// return SOFTBUS_ERR; ++// } ++// } ++// return SOFTBUS_OK; ++// } + +-static void HiSysEventParamDeInit(uint32_t size) +-{ +- for (uint32_t i = 0; i < size; i++) { +- if (g_dstParam[i].t == HISYSEVENT_STRING && g_dstParam[i].v.s != NULL) { +- SoftBusFree(g_dstParam[i].v.s); +- g_dstParam[i].v.s = NULL; +- } +- } +- } ++// static void HiSysEventParamDeInit(uint32_t size) ++// { ++// for (uint32_t i = 0; i < size; i++) { ++// if (g_dstParam[i].t == HISYSEVENT_STRING && g_dstParam[i].v.s != NULL) { ++// SoftBusFree(g_dstParam[i].v.s); ++// g_dstParam[i].v.s = NULL; ++// } ++// } ++// } + +-static HiSysEventEventType ConvertMsgType(SoftBusEvtType type) +-{ +- HiSysEventEventType hiSysEvtType; +- switch (type) { +- case SOFTBUS_EVT_TYPE_FAULT: +- hiSysEvtType = HISYSEVENT_FAULT; +- break; +- case SOFTBUS_EVT_TYPE_STATISTIC: +- hiSysEvtType = HISYSEVENT_STATISTIC; +- break; +- case SOFTBUS_EVT_TYPE_SECURITY: +- hiSysEvtType = HISYSEVENT_SECURITY; +- break; +- case SOFTBUS_EVT_TYPE_BEHAVIOR: +- hiSysEvtType = HISYSEVENT_BEHAVIOR; +- break; +- default: +- hiSysEvtType = HISYSEVENT_STATISTIC; +- break; +- } +- return hiSysEvtType; +-} ++// static HiSysEventEventType ConvertMsgType(SoftBusEvtType type) ++// { ++// HiSysEventEventType hiSysEvtType; ++// switch (type) { ++// case SOFTBUS_EVT_TYPE_FAULT: ++// hiSysEvtType = HISYSEVENT_FAULT; ++// break; ++// case SOFTBUS_EVT_TYPE_STATISTIC: ++// hiSysEvtType = HISYSEVENT_STATISTIC; ++// break; ++// case SOFTBUS_EVT_TYPE_SECURITY: ++// hiSysEvtType = HISYSEVENT_SECURITY; ++// break; ++// case SOFTBUS_EVT_TYPE_BEHAVIOR: ++// hiSysEvtType = HISYSEVENT_BEHAVIOR; ++// break; ++// default: ++// hiSysEvtType = HISYSEVENT_STATISTIC; ++// break; ++// } ++// return hiSysEvtType; ++// } + +-static void InitHisEvtMutexLock() +-{ +- if (SoftBusMutexInit(&g_dfx_lock, NULL) != SOFTBUS_OK) { +- HILOG_ERROR(SOFTBUS_HILOG_ID, "init HisEvtMutexLock fail"); +- return; +- } +-} ++// static void InitHisEvtMutexLock() ++// { ++// if (SoftBusMutexInit(&g_dfx_lock, NULL) != SOFTBUS_OK) { ++// HILOG_ERROR(SOFTBUS_HILOG_ID, "init HisEvtMutexLock fail"); ++// return; ++// } ++// } + + #ifdef __cplusplus + #if __cplusplus +@@ -153,22 +153,23 @@ extern "C" { + + int32_t SoftbusWriteHisEvt(SoftBusEvtReportMsg* reportMsg) + { +- if (reportMsg == nullptr) { +- return SOFTBUS_ERR; +- } +- if (!g_init_lock) { +- InitHisEvtMutexLock(); +- g_init_lock = true; +- } +- if (SoftBusMutexLock(&g_dfx_lock) != 0) { +- HILOG_ERROR(SOFTBUS_HILOG_ID, "%s:lock failed", __func__); +- return SOFTBUS_LOCK_ERR; +- } +- ConvertMsgToHiSysEvent(reportMsg); +- OH_HiSysEvent_Write(g_domain, reportMsg->evtName, ConvertMsgType(reportMsg->evtType), +- g_dstParam, reportMsg->paramNum); +- HiSysEventParamDeInit(reportMsg->paramNum); +- (void)SoftBusMutexUnlock(&g_dfx_lock); ++ // if (reportMsg == nullptr) { ++ // return SOFTBUS_ERR; ++ // } ++ // if (!g_init_lock) { ++ // InitHisEvtMutexLock(); ++ // g_init_lock = true; ++ // } ++ // if (SoftBusMutexLock(&g_dfx_lock) != 0) { ++ // HILOG_ERROR(SOFTBUS_HILOG_ID, "%s:lock failed", __func__); ++ // return SOFTBUS_LOCK_ERR; ++ // } ++ // ConvertMsgToHiSysEvent(reportMsg); ++ // OH_HiSysEvent_Write(g_domain, reportMsg->evtName, ConvertMsgType(reportMsg->evtType), ++ // g_dstParam, reportMsg->paramNum); ++ // HiSysEventParamDeInit(reportMsg->paramNum); ++ // (void)SoftBusMutexUnlock(&g_dfx_lock); ++ (void)reportMsg; + return SOFTBUS_OK; + } + +diff --git a/bundle.json b/bundle.json +index fafbe1a58..e6f2752ba 100644 +--- a/bundle.json ++++ b/bundle.json +@@ -81,7 +81,9 @@ + "bus_center/softbus_bus_center.h", + "common/softbus_common.h", + "discovery/discovery_service.h", +- "transport/session.h" ++ "transport/session.h", ++ "../inner_kits/transport/dfs_session.h", ++ "../inner_kits/transport/inner_session.h" + ], + "header_base": "//foundation/communication/dsoftbus/interfaces/kits" + } +diff --git a/core/adapter/bus_center/src/bus_center_adapter.c b/core/adapter/bus_center/src/bus_center_adapter.c +index 70f1d4a87..909a67563 100644 +--- a/core/adapter/bus_center/src/bus_center_adapter.c ++++ b/core/adapter/bus_center/src/bus_center_adapter.c +@@ -27,7 +27,7 @@ + #include "softbus_errcode.h" + #include "softbus_log.h" + +-#define DEFAULT_DEVICE_NAME "OpenHarmony" ++#define DEFAULT_DEVICE_NAME "openEuler" + + int32_t GetCommonDevInfo(const CommonDeviceKey key, char *value, uint32_t len) + { +diff --git a/core/authentication/include/auth_hichain.h b/core/authentication/include/auth_hichain.h +index 812541147..dbbff1e1f 100644 +--- a/core/authentication/include/auth_hichain.h ++++ b/core/authentication/include/auth_hichain.h +@@ -37,6 +37,8 @@ int32_t HichainProcessData(int64_t authSeq, const uint8_t *data, uint32_t len); + + void HichainDestroy(void); + ++void OnFinish(int64_t authSeq, int operationCode, const char *returnData); ++ + #ifdef __cplusplus + #if __cplusplus + } +diff --git a/core/authentication/src/auth_hichain.c b/core/authentication/src/auth_hichain.c +index f7b362e03..78a5f0783 100644 +--- a/core/authentication/src/auth_hichain.c ++++ b/core/authentication/src/auth_hichain.c +@@ -90,7 +90,7 @@ static void OnSessionKeyReturned(int64_t authSeq, const uint8_t *sessionKey, uin + (void)AuthSessionSaveSessionKey(authSeq, sessionKey, sessionKeyLen); + } + +-static void OnFinish(int64_t authSeq, int operationCode, const char *returnData) ++void OnFinish(int64_t authSeq, int operationCode, const char *returnData) + { + (void)operationCode; + (void)returnData; +@@ -286,6 +286,12 @@ void UnregTrustDataChangeListener(void) + + int32_t HichainStartAuth(int64_t authSeq, const char *udid, const char *uid) + { ++ // bypass auth ++ uint8_t tempKey[32] = {0}; ++ memset(tempKey, 1, 32); ++ g_hichainCallback.onSessionKeyReturned(authSeq, tempKey, 32); ++ return SOFTBUS_OK; ++ + if (udid == NULL || uid == NULL) { + SoftBusLog(SOFTBUS_LOG_AUTH, SOFTBUS_LOG_ERROR, "udid/uid is invalid."); + return SOFTBUS_INVALID_PARAM; +diff --git a/core/authentication/src/auth_session_fsm.c b/core/authentication/src/auth_session_fsm.c +index eaf6844e9..56d9b84fc 100644 +--- a/core/authentication/src/auth_session_fsm.c ++++ b/core/authentication/src/auth_session_fsm.c +@@ -264,6 +264,11 @@ static void HandleMsgRecvDeviceId(AuthFsm *authFsm, MessagePara *para) + ret = SOFTBUS_AUTH_SYNC_DEVID_FAIL; + break; + } ++ // bypass auth ++ if (HichainStartAuth(authFsm->authSeq, info->udid, info->connInfo.peerUid) != SOFTBUS_OK) { ++ ret = SOFTBUS_AUTH_HICHAIN_AUTH_FAIL; ++ break; ++ } + } else { + /* just client need start authDevice. */ + if (HichainStartAuth(authFsm->authSeq, info->udid, info->connInfo.peerUid) != SOFTBUS_OK) { +@@ -275,6 +280,9 @@ static void HandleMsgRecvDeviceId(AuthFsm *authFsm, MessagePara *para) + ret = SOFTBUS_OK; + } while (false); + ++ // by pass auth ++ OnFinish(authFsm->authSeq, 0, NULL); ++ + if (ret != SOFTBUS_OK) { + SoftBusLog(SOFTBUS_LOG_AUTH, SOFTBUS_LOG_ERROR, "handle devId msg fail, ret=%d", ret); + CompleteAuthSession(authFsm, ret); +diff --git a/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_lane_link_proc.c b/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_lane_link_proc.c +index c966df363..b37b90a76 100755 +--- a/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_lane_link_proc.c ++++ b/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_lane_link_proc.c +@@ -34,7 +34,7 @@ + #include "softbus_network_utils.h" + #include "softbus_protocol_def.h" + #include "softbus_utils.h" +-#include "wifi_device.h" ++// #include "wifi_device.h" + + typedef int32_t (*LaneLinkByType)(uint32_t reqId, const LinkRequest *reqInfo, const LaneLinkCb *callback); + +diff --git a/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_select_rule.c b/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_select_rule.c +index 79712a68f..ec66978ec 100644 +--- a/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_select_rule.c ++++ b/core/bus_center/lnn/lane_hub/lane_manager/src/lnn_select_rule.c +@@ -30,7 +30,7 @@ + #include "softbus_network_utils.h" + #include "softbus_utils.h" + #include "softbus_wifi_api_adapter.h" +-#include "wifi_device.h" ++// #include "wifi_device.h" + + #define LNN_LINK_DEFAULT_SCORE 60 /* Indicates that scoring is not supported */ + +diff --git a/core/common/security/permission/standard/softbus_permission.cpp b/core/common/security/permission/standard/softbus_permission.cpp +index e2b3ac720..5016dec1d 100644 +--- a/core/common/security/permission/standard/softbus_permission.cpp ++++ b/core/common/security/permission/standard/softbus_permission.cpp +@@ -17,8 +17,9 @@ + + #include + #include ++#include + +-#include "accesstoken_kit.h" ++// #include "accesstoken_kit.h" + #include "ipc_skeleton.h" + #include "permission_entry.h" + #include "softbus_adapter_mem.h" +@@ -32,95 +33,100 @@ + #endif + + namespace { +- using namespace OHOS::Security; ++ // using namespace OHOS::Security; + + const std::string PERMISSION_JSON_FILE = PERMISSION_JSON_FILE_PATH; + const std::string DANGER_APP_PERMISSION = "ohos.permission.DISTRIBUTED_DATASYNC"; +- const int32_t SYSTEM_UID = 1000; +- const int32_t MULTE_USER_RADIX = 100000; +- const std::string SAMGR_PROCESS_NAME = "samgr"; ++ // const int32_t SYSTEM_UID = 1000; ++ // const int32_t MULTE_USER_RADIX = 100000; ++ // const std::string SAMGR_PROCESS_NAME = "samgr"; + } + + int32_t TransPermissionInit(void) + { +- int32_t ret = LoadPermissionJson(PERMISSION_JSON_FILE.c_str()); +- if (ret != SOFTBUS_OK) { +- return ret; +- } +- return InitDynamicPermission(); ++ // int32_t ret = LoadPermissionJson(PERMISSION_JSON_FILE.c_str()); ++ // if (ret != SOFTBUS_OK) { ++ // return ret; ++ // } ++ // return InitDynamicPermission(); ++ return SOFTBUS_OK; + } + + void TransPermissionDeinit(void) + { +- DeinitPermissionJson(); ++ // DeinitPermissionJson(); + } + + int32_t CheckTransPermission(pid_t callingUid, pid_t callingPid, + const char *pkgName, const char *sessionName, uint32_t actions) + { +- if (sessionName == nullptr || pkgName == nullptr) { +- return SOFTBUS_PERMISSION_DENIED; +- } +- SoftBusPermissionItem *pItem = CreatePermissionItem(NATIVE_APP, callingUid, callingPid, pkgName, actions); +- if (pItem == nullptr) { +- return SOFTBUS_MALLOC_ERR; +- } +- int32_t ret = CheckPermissionEntry(sessionName, pItem); +- SoftBusFree(pItem); +- if (ret >= SYSTEM_APP) { +- return SOFTBUS_OK; +- } +- return SOFTBUS_PERMISSION_DENIED; ++ // if (sessionName == nullptr || pkgName == nullptr) { ++ // return SOFTBUS_PERMISSION_DENIED; ++ // } ++ // SoftBusPermissionItem *pItem = CreatePermissionItem(NATIVE_APP, callingUid, callingPid, pkgName, actions); ++ // if (pItem == nullptr) { ++ // return SOFTBUS_MALLOC_ERR; ++ // } ++ // int32_t ret = CheckPermissionEntry(sessionName, pItem); ++ // SoftBusFree(pItem); ++ // if (ret >= SYSTEM_APP) { ++ // return SOFTBUS_OK; ++ // } ++ // return SOFTBUS_PERMISSION_DENIED; ++ return SOFTBUS_OK; + } + + int32_t CheckTransSecLevel(const char *mySessionName, const char *peerSessionName) + { +- if (mySessionName == nullptr || peerSessionName == nullptr) { +- return SOFTBUS_INVALID_PARAM; +- } +- if (strcmp(mySessionName, peerSessionName) == 0) { +- return SOFTBUS_OK; +- } +- if (!PermIsSecLevelPublic(mySessionName)) { +- return SOFTBUS_PERMISSION_DENIED; +- } +- if (!PermIsSecLevelPublic(peerSessionName)) { +- return SOFTBUS_PERMISSION_DENIED; +- } ++ // if (mySessionName == nullptr || peerSessionName == nullptr) { ++ // return SOFTBUS_INVALID_PARAM; ++ // } ++ // if (strcmp(mySessionName, peerSessionName) == 0) { ++ // return SOFTBUS_OK; ++ // } ++ // if (!PermIsSecLevelPublic(mySessionName)) { ++ // return SOFTBUS_PERMISSION_DENIED; ++ // } ++ // if (!PermIsSecLevelPublic(peerSessionName)) { ++ // return SOFTBUS_PERMISSION_DENIED; ++ // } + return SOFTBUS_OK; + } + + bool CheckDiscPermission(pid_t callingUid, const char *pkgName) + { +- std::string pkg = ""; +- if (pkgName != nullptr) { +- pkg = std::string(pkgName); +- } else { +- return false; +- } +- if (callingUid == SYSTEM_UID || callingUid % MULTE_USER_RADIX == SYSTEM_UID) { +- return true; +- } +- return false; ++ // std::string pkg = ""; ++ // if (pkgName != nullptr) { ++ // pkg = std::string(pkgName); ++ // } else { ++ // return false; ++ // } ++ // if (callingUid == SYSTEM_UID || callingUid % MULTE_USER_RADIX == SYSTEM_UID) { ++ // return true; ++ // } ++ // return false; ++ return 0; + } + + bool CheckBusCenterPermission(pid_t callingUid, const char *pkgName) + { +- std::string pkg = ""; +- if (pkgName != nullptr) { +- pkg = std::string(pkgName); +- } else { +- return false; +- } +- if (callingUid == SYSTEM_UID || callingUid % MULTE_USER_RADIX == SYSTEM_UID) { +- return true; +- } +- return false; ++ // std::string pkg = ""; ++ // if (pkgName != nullptr) { ++ // pkg = std::string(pkgName); ++ // } else { ++ // return false; ++ // } ++ // if (callingUid == SYSTEM_UID || callingUid % MULTE_USER_RADIX == SYSTEM_UID) { ++ // return true; ++ // } ++ // return false; ++ return true; + } + + int32_t GrantTransPermission(int32_t callingUid, int32_t callingPid, const char *sessionName) + { +- return AddDynamicPermission(callingUid, callingPid, sessionName); ++ // return AddDynamicPermission(callingUid, callingPid, sessionName); ++ return SOFTBUS_OK; + } + + int32_t RemoveTransPermission(const char *sessionName) +@@ -130,19 +136,20 @@ int32_t RemoveTransPermission(const char *sessionName) + + int32_t CheckDynamicPermission(void) + { +- uint32_t callingToken = OHOS::IPCSkeleton::GetCallingTokenID(); +- +- auto tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(callingToken); +- if (tokenType != AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "not native call"); +- return SOFTBUS_ERR; +- } +- AccessToken::NativeTokenInfo nativeTokenInfo; +- int32_t result = AccessToken::AccessTokenKit::GetNativeTokenInfo(callingToken, nativeTokenInfo); +- if (result == SOFTBUS_OK && nativeTokenInfo.processName == SAMGR_PROCESS_NAME) { +- return SOFTBUS_OK; +- } +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, +- "check dynamic permission failed, processName:%{private}s", nativeTokenInfo.processName.c_str()); +- return SOFTBUS_ERR; ++ // uint32_t callingToken = OHOS::IPCSkeleton::GetCallingTokenID(); ++ ++ // auto tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(callingToken); ++ // if (tokenType != AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "not native call"); ++ // return SOFTBUS_ERR; ++ // } ++ // AccessToken::NativeTokenInfo nativeTokenInfo; ++ // int32_t result = AccessToken::AccessTokenKit::GetNativeTokenInfo(callingToken, nativeTokenInfo); ++ // if (result == SOFTBUS_OK && nativeTokenInfo.processName == SAMGR_PROCESS_NAME) { ++ // return SOFTBUS_OK; ++ // } ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, ++ // "check dynamic permission failed, processName:%{private}s", nativeTokenInfo.processName.c_str()); ++ // return SOFTBUS_ERR; ++ return SOFTBUS_OK; + } +diff --git a/core/connection/common/src/softbus_thread_pool.c b/core/connection/common/src/softbus_thread_pool.c +index 854cfbb6e..71dad9311 100644 +--- a/core/connection/common/src/softbus_thread_pool.c ++++ b/core/connection/common/src/softbus_thread_pool.c +@@ -24,7 +24,8 @@ + #include "softbus_log.h" + + #ifndef MIN_STACK_SIZE +-#define MIN_STACK_SIZE 0x8000 ++// #define MIN_STACK_SIZE 0x8000 ++#define MIN_STACK_SIZE 0x200000 + #endif + #define THREAD_POOL_NAME "SoftBusConnect" + +diff --git a/core/frame/BUILD.gn b/core/frame/BUILD.gn +index ec37faeb9..ad2e1cc18 100644 +--- a/core/frame/BUILD.gn ++++ b/core/frame/BUILD.gn +@@ -173,7 +173,7 @@ if (defined(ohos_lite)) { + sources = dsoftbus_server_common_src + sources += [ + "$dsoftbus_root_path/sdk/frame/$os_type/src/if_softbus_client.cpp", +- "$os_type/client_manager/src/permission_status_change_cb.cpp", ++ # "$os_type/client_manager/src/permission_status_change_cb.cpp", + "$os_type/client_manager/src/softbus_client_info_manager.cpp", + "$os_type/init/src/if_softbus_server.cpp", + "$os_type/init/src/softbus_server.cpp", +@@ -195,8 +195,8 @@ if (defined(ohos_lite)) { + if (is_standard_system) { + external_deps = dsoftbus_server_common_external_deps + external_deps += [ +- "access_token:libaccesstoken_sdk", +- "access_token:libprivacy_sdk", ++ # "access_token:libaccesstoken_sdk", ++ # "access_token:libprivacy_sdk", + "device_auth:deviceauth_sdk", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", +diff --git a/core/frame/standard/client_manager/src/permission_status_change_cb.cpp b/core/frame/standard/client_manager/src/permission_status_change_cb.cpp +index 391f03f99..8d871c669 100644 +--- a/core/frame/standard/client_manager/src/permission_status_change_cb.cpp ++++ b/core/frame/standard/client_manager/src/permission_status_change_cb.cpp +@@ -33,14 +33,14 @@ void PermissionStatusChangeCb::PermStateChangeCallback(PermStateChangeInfo& resu + void RegisterDataSyncPermission(const uint32_t callingTokenId, + const std::string permissionName, const std::string pkgName) + { +- PermStateChangeScope scopeInfo; +- scopeInfo.permList = {permissionName}; +- scopeInfo.tokenIDs = {callingTokenId}; +- std::shared_ptr callbackPtr_ = +- std::make_shared(scopeInfo, pkgName); +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_INFO, "after tokenId:%{public}d register", callingTokenId); +- if (AccessTokenKit::RegisterPermStateChangeCallback(callbackPtr_) != SOFTBUS_OK) { +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "RegisterPermStateChangeCallback failed."); +- } ++ // PermStateChangeScope scopeInfo; ++ // scopeInfo.permList = {permissionName}; ++ // scopeInfo.tokenIDs = {callingTokenId}; ++ // std::shared_ptr callbackPtr_ = ++ // std::make_shared(scopeInfo, pkgName); ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_INFO, "after tokenId:%{public}d register", callingTokenId); ++ // if (AccessTokenKit::RegisterPermStateChangeCallback(callbackPtr_) != SOFTBUS_OK) { ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "RegisterPermStateChangeCallback failed."); ++ // } + } + } // namespace OHOS +\ No newline at end of file +diff --git a/core/frame/standard/client_manager/src/softbus_client_info_manager.cpp b/core/frame/standard/client_manager/src/softbus_client_info_manager.cpp +index 6014d0ca8..2a6b07b1b 100644 +--- a/core/frame/standard/client_manager/src/softbus_client_info_manager.cpp ++++ b/core/frame/standard/client_manager/src/softbus_client_info_manager.cpp +@@ -14,7 +14,8 @@ + */ + + #include "softbus_client_info_manager.h" +-#include "permission_status_change_cb.h" ++#include "ipc_skeleton.h" ++// #include "permission_status_change_cb.h" + #include "softbus_server.h" + #include "softbus_errcode.h" + #include "softbus_log.h" +@@ -36,9 +37,9 @@ int32_t SoftbusClientInfoManager::SoftbusAddService(const std::string &pkgName, + std::lock_guard autoLock(clientObjectMapLock_); + std::pair, sptr> clientObject(object, abilityDeath); + clientObjectMap_.emplace(pkgName, clientObject); +- uint32_t tokenCaller = IPCSkeleton::GetCallingTokenID(); +- std::string permissionName = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; +- RegisterDataSyncPermission(tokenCaller, permissionName, pkgName); ++ // uint32_t tokenCaller = IPCSkeleton::GetCallingTokenID(); ++ // std::string permissionName = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; ++ // RegisterDataSyncPermission(tokenCaller, permissionName, pkgName); + return SOFTBUS_OK; + } + +diff --git a/core/frame/standard/init/src/softbus_server_stub.cpp b/core/frame/standard/init/src/softbus_server_stub.cpp +index dd8bf9469..fc0058ee9 100644 +--- a/core/frame/standard/init/src/softbus_server_stub.cpp ++++ b/core/frame/standard/init/src/softbus_server_stub.cpp +@@ -30,80 +30,81 @@ + #include "softbus_server_frame.h" + #include "trans_channel_manager.h" + #include "trans_session_manager.h" +-#include "accesstoken_kit.h" +-#include "access_token.h" +-#include "privacy_kit.h" ++// #include "accesstoken_kit.h" ++// #include "access_token.h" ++// #include "privacy_kit.h" + #include "softbus_hisysevt_transreporter.h" + +-using namespace OHOS::Security::AccessToken; ++// using namespace OHOS::Security::AccessToken; + + namespace OHOS { + int32_t SoftBusServerStub::CheckOpenSessionPermission(const SessionParam *param) + { +- char pkgName[PKG_NAME_SIZE_MAX] = {0}; +- if ((param == NULL) || +- (TransGetPkgNameBySessionName(param->sessionName, pkgName, PKG_NAME_SIZE_MAX) != SOFTBUS_OK)) { +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "OpenSession TransGetPkgNameBySessionName failed"); +- return SOFTBUS_INVALID_PARAM; +- } +- +- pid_t callingUid = OHOS::IPCSkeleton::GetCallingUid(); +- pid_t callingPid = OHOS::IPCSkeleton::GetCallingPid(); +- if (CheckTransPermission(callingUid, callingPid, pkgName, param->sessionName, ACTION_OPEN) != SOFTBUS_OK) { +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "OpenSession no permission"); +- return SOFTBUS_PERMISSION_DENIED; +- } +- +- if (CheckTransSecLevel(param->sessionName, param->peerSessionName) != SOFTBUS_OK) { +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "OpenSession sec level invalid"); +- return SOFTBUS_PERMISSION_DENIED; +- } ++ // char pkgName[PKG_NAME_SIZE_MAX] = {0}; ++ // if ((param == NULL) || ++ // (TransGetPkgNameBySessionName(param->sessionName, pkgName, PKG_NAME_SIZE_MAX) != SOFTBUS_OK)) { ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "OpenSession TransGetPkgNameBySessionName failed"); ++ // return SOFTBUS_INVALID_PARAM; ++ // } ++ ++ // pid_t callingUid = OHOS::IPCSkeleton::GetCallingUid(); ++ // pid_t callingPid = OHOS::IPCSkeleton::GetCallingPid(); ++ // if (CheckTransPermission(callingUid, callingPid, pkgName, param->sessionName, ACTION_OPEN) != SOFTBUS_OK) { ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "OpenSession no permission"); ++ // return SOFTBUS_PERMISSION_DENIED; ++ // } ++ ++ // if (CheckTransSecLevel(param->sessionName, param->peerSessionName) != SOFTBUS_OK) { ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_ERROR, "OpenSession sec level invalid"); ++ // return SOFTBUS_PERMISSION_DENIED; ++ // } + return SOFTBUS_OK; + } + + int32_t SoftBusServerStub::CheckChannelPermission(int32_t channelId, int32_t channelType) + { +- char pkgName[PKG_NAME_SIZE_MAX] = {0}; +- char sessionName[SESSION_NAME_SIZE_MAX] = {0}; +- int32_t ret = SOFTBUS_OK; +- TransInfo info; +- info.channelId = channelId; +- info.channelType = channelType; +- ret = TransGetNameByChanId(&info, pkgName, sessionName, PKG_NAME_SIZE_MAX, SESSION_NAME_SIZE_MAX); +- if (ret != SOFTBUS_OK) { +- SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "ServerCloseChannel invalid channel info"); +- return ret; +- } +- +- pid_t callingUid = OHOS::IPCSkeleton::GetCallingUid(); +- pid_t callingPid = OHOS::IPCSkeleton::GetCallingPid(); +- if (CheckTransPermission(callingUid, callingPid, pkgName, sessionName, ACTION_OPEN) != SOFTBUS_OK) { +- return SOFTBUS_PERMISSION_DENIED; +- } ++ // char pkgName[PKG_NAME_SIZE_MAX] = {0}; ++ // char sessionName[SESSION_NAME_SIZE_MAX] = {0}; ++ // int32_t ret = SOFTBUS_OK; ++ // TransInfo info; ++ // info.channelId = channelId; ++ // info.channelType = channelType; ++ // ret = TransGetNameByChanId(&info, pkgName, sessionName, PKG_NAME_SIZE_MAX, SESSION_NAME_SIZE_MAX); ++ // if (ret != SOFTBUS_OK) { ++ // SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "ServerCloseChannel invalid channel info"); ++ // return ret; ++ // } ++ ++ // pid_t callingUid = OHOS::IPCSkeleton::GetCallingUid(); ++ // pid_t callingPid = OHOS::IPCSkeleton::GetCallingPid(); ++ // if (CheckTransPermission(callingUid, callingPid, pkgName, sessionName, ACTION_OPEN) != SOFTBUS_OK) { ++ // return SOFTBUS_PERMISSION_DENIED; ++ // } + return SOFTBUS_OK; + } + +-static inline int32_t CheckAndRecordAccessToken(const char* permission) +-{ +- uint32_t tokenCaller = IPCSkeleton::GetCallingTokenID(); +- int32_t ret = AccessTokenKit::VerifyAccessToken(tokenCaller, permission); +- +- ATokenTypeEnum type = AccessTokenKit::GetTokenTypeFlag(tokenCaller); +- int32_t successCnt = (int32_t)(ret == PERMISSION_GRANTED); +- int32_t failCnt = 1 - successCnt; +- if (type == TOKEN_HAP) { +- PrivacyKit::AddPermissionUsedRecord(tokenCaller, permission, successCnt, failCnt); +- } ++// static inline int32_t CheckAndRecordAccessToken(const char* permission) ++// { ++ // uint32_t tokenCaller = IPCSkeleton::GetCallingTokenID(); ++ // int32_t ret = AccessTokenKit::VerifyAccessToken(tokenCaller, permission); ++ ++ // ATokenTypeEnum type = AccessTokenKit::GetTokenTypeFlag(tokenCaller); ++ // int32_t successCnt = (int32_t)(ret == PERMISSION_GRANTED); ++ // int32_t failCnt = 1 - successCnt; ++ // if (type == TOKEN_HAP) { ++ // PrivacyKit::AddPermissionUsedRecord(tokenCaller, permission, successCnt, failCnt); ++ // } + +- return ret; +-} ++ // return ret; ++ // return SOFTBUS_OK; ++// } + +-static inline void SoftbusReportPermissionFaultEvt(uint32_t ipcCode) +-{ +- if (ipcCode == SERVER_OPEN_SESSION) { +- SoftbusReportTransErrorEvt(SOFTBUS_ACCESS_TOKEN_DENIED); +- } +-} ++// static inline void SoftbusReportPermissionFaultEvt(uint32_t ipcCode) ++// { ++// if (ipcCode == SERVER_OPEN_SESSION) { ++// SoftbusReportTransErrorEvt(SOFTBUS_ACCESS_TOKEN_DENIED); ++// } ++// } + + SoftBusServerStub::SoftBusServerStub() + { +@@ -205,16 +206,16 @@ int32_t SoftBusServerStub::OnRemoteRequest(uint32_t code, + return SOFTBUS_ERR; + } + +- auto itPerm = memberPermissionMap_.find(code); +- if (itPerm != memberPermissionMap_.end()) { +- const char *permission = itPerm->second; +- if ((permission != nullptr) && +- (CheckAndRecordAccessToken(permission) != PERMISSION_GRANTED)) { +- SoftbusReportPermissionFaultEvt(code); +- SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_INFO, "access token permission %s denied!", permission); +- return SOFTBUS_ACCESS_TOKEN_DENIED; +- } +- } ++ // auto itPerm = memberPermissionMap_.find(code); ++ // if (itPerm != memberPermissionMap_.end()) { ++ // const char *permission = itPerm->second; ++ // if ((permission != nullptr) && ++ // (CheckAndRecordAccessToken(permission) != PERMISSION_GRANTED)) { ++ // SoftbusReportPermissionFaultEvt(code); ++ // SoftBusLog(SOFTBUS_LOG_COMM, SOFTBUS_LOG_INFO, "access token permission %s denied!", permission); ++ // return SOFTBUS_ACCESS_TOKEN_DENIED; ++ // } ++ // } + + auto itFunc = memberFuncMap_.find(code); + if (itFunc != memberFuncMap_.end()) { +-- +2.33.0 + diff --git a/0003-remove-dependency-and-adapt-for-build-eventhandler.patch b/0003-remove-dependency-and-adapt-for-build-eventhandler.patch new file mode 100644 index 0000000000000000000000000000000000000000..fa0cbb1bc06ac536381036d5c11eab906b27ce1e --- /dev/null +++ b/0003-remove-dependency-and-adapt-for-build-eventhandler.patch @@ -0,0 +1,280 @@ +From 67bd1bcc2fd1570850ec5c5aee18c282712267dc Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:05:46 +0800 +Subject: [PATCH] remove dependency and adpat for build + +--- + frameworks/eventhandler/BUILD.gn | 2 +- + .../include/event_handler_utils.h | 38 ++++++++-------- + frameworks/eventhandler/src/event_handler.cpp | 44 +++++++++---------- + frameworks/eventhandler/src/inner_event.cpp | 44 +++++++++---------- + interfaces/inner_api/event_queue.h | 1 + + interfaces/inner_api/inner_event.h | 6 +-- + 6 files changed, 68 insertions(+), 67 deletions(-) + +diff --git a/frameworks/eventhandler/BUILD.gn b/frameworks/eventhandler/BUILD.gn +index ceed950..7342337 100644 +--- a/frameworks/eventhandler/BUILD.gn ++++ b/frameworks/eventhandler/BUILD.gn +@@ -37,7 +37,7 @@ ohos_shared_library("libeventhandler") { + public_configs = [ ":public_libeventhandler_config" ] + + external_deps = [ +- "hitrace_native:libhitracechain", ++ # "hitrace_native:libhitracechain", + "hiviewdfx_hilog_native:libhilog", + ] + +diff --git a/frameworks/eventhandler/include/event_handler_utils.h b/frameworks/eventhandler/include/event_handler_utils.h +index 72fbdac..37e862f 100644 +--- a/frameworks/eventhandler/include/event_handler_utils.h ++++ b/frameworks/eventhandler/include/event_handler_utils.h +@@ -22,7 +22,7 @@ + #include + + #include "hilog/log.h" +-#include "hitrace/trace.h" ++// #include "hitrace/trace.h" + #include "inner_event.h" + + #define DEFINE_HILOG_LABEL(name) \ +@@ -66,30 +66,30 @@ static inline int32_t NanosecondsToTimeout(int64_t nanoseconds) + return (milliseconds > INT32_MAX) ? INT32_MAX : static_cast(milliseconds); + } + +-using HiTraceChain = OHOS::HiviewDFX::HiTraceChain; ++// using HiTraceChain = OHOS::HiviewDFX::HiTraceChain; + + static inline bool AllowHiTraceOutPut(const std::shared_ptr& traceId, bool isSyncEvent) + { +- if ((!traceId) || (!traceId->IsValid())) { +- return false; +- } +- if ((!isSyncEvent) && (!traceId->IsFlagEnabled(HITRACE_FLAG_INCLUDE_ASYNC))) { +- return false; +- } ++ // if ((!traceId) || (!traceId->IsValid())) { ++ // return false; ++ // } ++ // if ((!isSyncEvent) && (!traceId->IsFlagEnabled(HITRACE_FLAG_INCLUDE_ASYNC))) { ++ // return false; ++ // } + return true; + } + +-static inline void HiTracePointerOutPut(const std::shared_ptr& spanId, +- const InnerEvent::Pointer& event, const char* action, HiTraceTracepointType type) +-{ +- if (!event->HasTask()) { +- HiTraceChain::Tracepoint(type, *spanId, "%s event, event id: %d", action, event->GetInnerEventId()); +- } else if (!event->GetTaskName().empty()) { +- HiTraceChain::Tracepoint(type, *spanId, "%s task with name, name: %s", action, event->GetTaskName().c_str()); +- } else { +- HiTraceChain::Tracepoint(type, *spanId, "%s UnNamed Task", action); +- } +-} ++// static inline void HiTracePointerOutPut(const std::shared_ptr& spanId, ++// const InnerEvent::Pointer& event, const char* action, HiTraceTracepointType type) ++// { ++// if (!event->HasTask()) { ++// HiTraceChain::Tracepoint(type, *spanId, "%s event, event id: %d", action, event->GetInnerEventId()); ++// } else if (!event->GetTaskName().empty()) { ++// HiTraceChain::Tracepoint(type, *spanId, "%s task with name, name: %s", action, event->GetTaskName().c_str()); ++// } else { ++// HiTraceChain::Tracepoint(type, *spanId, "%s UnNamed Task", action); ++// } ++// } + + static inline void GetLastErr(char *errmsg, size_t size = MAX_ERRORMSG_LEN) + { +diff --git a/frameworks/eventhandler/src/event_handler.cpp b/frameworks/eventhandler/src/event_handler.cpp +index ab6e876..8477424 100644 +--- a/frameworks/eventhandler/src/event_handler.cpp ++++ b/frameworks/eventhandler/src/event_handler.cpp +@@ -74,11 +74,11 @@ bool EventHandler::SendEvent(InnerEvent::Pointer &event, int64_t delayTime, Prio + + event->SetOwner(shared_from_this()); + // get traceId from event, if HiTraceChain::begin has been called, would get a valid trace id. +- auto traceId = event->GetOrCreateTraceId(); ++ // auto traceId = event->GetOrCreateTraceId(); + // if traceId is valid, out put trace information +- if (AllowHiTraceOutPut(traceId, event->HasWaiter())) { +- HiTracePointerOutPut(traceId, event, "Send", HiTraceTracepointType::HITRACE_TP_CS); +- } ++ // if (AllowHiTraceOutPut(traceId, event->HasWaiter())) { ++ // HiTracePointerOutPut(traceId, event, "Send", HiTraceTracepointType::HITRACE_TP_CS); ++ // } + + eventRunner_->GetEventQueue()->Insert(event, priority); + return true; +@@ -117,7 +117,7 @@ bool EventHandler::SendSyncEvent(InnerEvent::Pointer &event, Priority priority) + } + + // get traceId from event, if HiTraceChain::begin has been called, would get a valid trace id. +- auto spanId = event->GetOrCreateTraceId(); ++ // auto spanId = event->GetOrCreateTraceId(); + + // Create waiter, used to block. + auto waiter = event->CreateWaiter(); +@@ -128,9 +128,9 @@ bool EventHandler::SendSyncEvent(InnerEvent::Pointer &event, Priority priority) + // Wait until event is processed(recycled). + waiter->Wait(); + +- if ((spanId) && (spanId->IsValid())) { +- HiTraceChain::Tracepoint(HiTraceTracepointType::HITRACE_TP_CR, *spanId, "event is processed"); +- } ++ // if ((spanId) && (spanId->IsValid())) { ++ // HiTraceChain::Tracepoint(HiTraceTracepointType::HITRACE_TP_CR, *spanId, "event is processed"); ++ // } + + return true; + } +@@ -305,13 +305,13 @@ void EventHandler::DistributeEvent(const InnerEvent::Pointer &event) + + currentEventHandler = shared_from_this(); + +- auto spanId = event->GetTraceId(); +- auto traceId = HiTraceChain::GetId(); +- bool allowTraceOutPut = AllowHiTraceOutPut(spanId, event->HasWaiter()); +- if (allowTraceOutPut) { +- HiTraceChain::SetId(*spanId); +- HiTracePointerOutPut(spanId, event, "Receive", HiTraceTracepointType::HITRACE_TP_SR); +- } ++ // auto spanId = event->GetTraceId(); ++ // auto traceId = HiTraceChain::GetId(); ++ // bool allowTraceOutPut = AllowHiTraceOutPut(spanId, event->HasWaiter()); ++ // if (allowTraceOutPut) { ++ // HiTraceChain::SetId(*spanId); ++ // HiTracePointerOutPut(spanId, event, "Receive", HiTraceTracepointType::HITRACE_TP_SR); ++ // } + + InnerEvent::TimePoint nowStart = InnerEvent::Clock::now(); + DeliveryTimeAction(event, nowStart); +@@ -326,13 +326,13 @@ void EventHandler::DistributeEvent(const InnerEvent::Pointer &event) + + DistributeTimeAction(event, nowStart); + +- if (allowTraceOutPut) { +- HiTraceChain::Tracepoint(HiTraceTracepointType::HITRACE_TP_SS, *spanId, "Event Distribute over"); +- HiTraceChain::ClearId(); +- if (traceId.IsValid()) { +- HiTraceChain::SetId(traceId); +- } +- } ++ // if (allowTraceOutPut) { ++ // HiTraceChain::Tracepoint(HiTraceTracepointType::HITRACE_TP_SS, *spanId, "Event Distribute over"); ++ // HiTraceChain::ClearId(); ++ // if (traceId.IsValid()) { ++ // HiTraceChain::SetId(traceId); ++ // } ++ // } + } + + void EventHandler::Dump(Dumper &dumper) +diff --git a/frameworks/eventhandler/src/inner_event.cpp b/frameworks/eventhandler/src/inner_event.cpp +index 654b44e..90e0c49 100644 +--- a/frameworks/eventhandler/src/inner_event.cpp ++++ b/frameworks/eventhandler/src/inner_event.cpp +@@ -209,9 +209,9 @@ void InnerEvent::ClearEvent() + } + } + +- if (hiTraceId_) { +- hiTraceId_.reset(); +- } ++ // if (hiTraceId_) { ++ // hiTraceId_.reset(); ++ // } + + // Clear owner + owner_.reset(); +@@ -233,25 +233,25 @@ bool InnerEvent::HasWaiter() const + return (waiter_ != nullptr); + } + +-const std::shared_ptr InnerEvent::GetOrCreateTraceId() +-{ +- if (hiTraceId_) { +- return hiTraceId_; +- } +- +- auto traceId = HiTraceChain::GetId(); +- if (!traceId.IsValid()) { +- return nullptr; +- } +- +- hiTraceId_ = std::make_shared(HiTraceChain::CreateSpan()); +- return hiTraceId_; +-} +- +-const std::shared_ptr InnerEvent::GetTraceId() +-{ +- return hiTraceId_; +-} ++// const std::shared_ptr InnerEvent::GetOrCreateTraceId() ++// { ++ // if (hiTraceId_) { ++ // return hiTraceId_; ++ // } ++ ++ // auto traceId = HiTraceChain::GetId(); ++ // if (!traceId.IsValid()) { ++ // return nullptr; ++ // } ++ ++ // hiTraceId_ = std::make_shared(HiTraceChain::CreateSpan()); ++ // return hiTraceId_; ++// } ++ ++// const std::shared_ptr InnerEvent::GetTraceId() ++// { ++// // return hiTraceId_; ++// } + + std::string InnerEvent::Dump() + { +diff --git a/interfaces/inner_api/event_queue.h b/interfaces/inner_api/event_queue.h +index 1b4d82c..e98500d 100644 +--- a/interfaces/inner_api/event_queue.h ++++ b/interfaces/inner_api/event_queue.h +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "inner_event.h" + #include "event_handler_errors.h" +diff --git a/interfaces/inner_api/inner_event.h b/interfaces/inner_api/inner_event.h +index b8fb32c..1bedc46 100644 +--- a/interfaces/inner_api/inner_event.h ++++ b/interfaces/inner_api/inner_event.h +@@ -437,14 +437,14 @@ private: + * + * @return return hiTrace Id. + */ +- const std::shared_ptr GetOrCreateTraceId(); ++ // const std::shared_ptr GetOrCreateTraceId(); + + /** + * return trace id. + * + * @return return hiTrace Id. + */ +- const std::shared_ptr GetTraceId(); ++ // const std::shared_ptr GetTraceId(); + + /* + * Calculate the type id for different smart pointers. +@@ -522,7 +522,7 @@ private: + std::shared_ptr waiter_; + + // use to store hitrace Id +- std::shared_ptr hiTraceId_; ++ // std::shared_ptr hiTraceId_; + }; + } // namespace AppExecFwk + } // namespace OHOS +-- +2.33.0 + diff --git a/0004-remove-dependency-and-adapt-for-build-ipc.patch b/0004-remove-dependency-and-adapt-for-build-ipc.patch new file mode 100644 index 0000000000000000000000000000000000000000..97a4aee3c24e1aa5dab558550efa7bddfa540d79 --- /dev/null +++ b/0004-remove-dependency-and-adapt-for-build-ipc.patch @@ -0,0 +1,699 @@ +From 69d852f1b2e243188e06d6462343dc0ed06f772d Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:19:42 +0800 +Subject: [PATCH] remove dependency and adapt for build + +--- + interfaces/innerkits/ipc_core/BUILD.gn | 4 +- + .../ipc_core/include/iremote_broker.h | 1 + + .../ipc_core/include/message_parcel.h | 1 + + interfaces/innerkits/ipc_single/BUILD.gn | 2 +- + .../access_token/src/access_token_adapter.c | 2 +- + .../src/core/source/ipc_object_proxy.cpp | 2 +- + .../src/core/source/ipc_object_stub.cpp | 76 ++++--- + ipc/native/src/core/source/iremote_broker.cpp | 2 +- + .../src/mock/include/dbinder_base_invoker.h | 12 +- + ipc/native/src/mock/include/hitrace_invoker.h | 18 +- + ipc/native/src/mock/include/invoker_factory.h | 1 + + .../src/mock/source/binder_connector.cpp | 2 +- + ipc/native/src/mock/source/binder_invoker.cpp | 12 +- + .../src/mock/source/hitrace_invoker.cpp | 212 +++++++++--------- + .../src/mock/source/invoker_factory.cpp | 2 +- + .../src/napi/src/napi_remote_object.cpp | 2 +- + ipc/native/src/napi/src/napi_remote_proxy.cpp | 2 +- + .../unittest/common/ipc_hitrace_unittest.cpp | 2 +- + .../include/dbinder_test_service_skeleton.h | 2 +- + 19 files changed, 181 insertions(+), 176 deletions(-) + +diff --git a/interfaces/innerkits/ipc_core/BUILD.gn b/interfaces/innerkits/ipc_core/BUILD.gn +index cb35083..3c4d57b 100644 +--- a/interfaces/innerkits/ipc_core/BUILD.gn ++++ b/interfaces/innerkits/ipc_core/BUILD.gn +@@ -71,10 +71,10 @@ ohos_shared_library("ipc_core") { + all_dependent_configs = [ ":ipc_all_deps_config" ] + + external_deps = [ +- "access_token:libaccesstoken_sdk", ++ # "access_token:libaccesstoken_sdk", + "c_utils:utils", + "dsoftbus:softbus_client", +- "hitrace_native:libhitracechain", ++ # "hitrace_native:libhitracechain", + "hiviewdfx_hilog_native:libhilog", + ] + +diff --git a/interfaces/innerkits/ipc_core/include/iremote_broker.h b/interfaces/innerkits/ipc_core/include/iremote_broker.h +index ed2045c..7105ff7 100644 +--- a/interfaces/innerkits/ipc_core/include/iremote_broker.h ++++ b/interfaces/innerkits/ipc_core/include/iremote_broker.h +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include "iremote_object.h" + #include "refbase.h" + +diff --git a/interfaces/innerkits/ipc_core/include/message_parcel.h b/interfaces/innerkits/ipc_core/include/message_parcel.h +index 0f3302e..efa57ab 100644 +--- a/interfaces/innerkits/ipc_core/include/message_parcel.h ++++ b/interfaces/innerkits/ipc_core/include/message_parcel.h +@@ -20,6 +20,7 @@ + #include "parcel.h" + #include "refbase.h" + #include ++#include + + namespace OHOS { + class IRemoteObject; +diff --git a/interfaces/innerkits/ipc_single/BUILD.gn b/interfaces/innerkits/ipc_single/BUILD.gn +index de33cdb..f61f26c 100644 +--- a/interfaces/innerkits/ipc_single/BUILD.gn ++++ b/interfaces/innerkits/ipc_single/BUILD.gn +@@ -59,7 +59,7 @@ ohos_shared_library("ipc_single") { + + external_deps = [ + "c_utils:utils", +- "hitrace_native:libhitracechain", ++ # "hitrace_native:libhitracechain", + "hiviewdfx_hilog_native:libhilog", + ] + +diff --git a/ipc/native/c/adapter/access_token/src/access_token_adapter.c b/ipc/native/c/adapter/access_token/src/access_token_adapter.c +index c25aa57..396cee4 100644 +--- a/ipc/native/c/adapter/access_token/src/access_token_adapter.c ++++ b/ipc/native/c/adapter/access_token/src/access_token_adapter.c +@@ -19,7 +19,7 @@ + #include + #include + +-#include "bits/ioctl.h" ++// #include "bits/ioctl.h" + + #define ACCESS_TOKEN_ID_IOCTL_BASE 'A' + +diff --git a/ipc/native/src/core/source/ipc_object_proxy.cpp b/ipc/native/src/core/source/ipc_object_proxy.cpp +index 559c276..23f56a8 100644 +--- a/ipc/native/src/core/source/ipc_object_proxy.cpp ++++ b/ipc/native/src/core/source/ipc_object_proxy.cpp +@@ -17,7 +17,7 @@ + + #include + +-#include "__mutex_base" ++// #include "__mutex_base" + #include "algorithm" + #include "errors.h" + #include "hilog/log_c.h" +diff --git a/ipc/native/src/core/source/ipc_object_stub.cpp b/ipc/native/src/core/source/ipc_object_stub.cpp +index 28df2cd..781d600 100644 +--- a/ipc/native/src/core/source/ipc_object_stub.cpp ++++ b/ipc/native/src/core/source/ipc_object_stub.cpp +@@ -39,8 +39,8 @@ + #include "vector" + + #ifndef CONFIG_IPC_SINGLE +-#include "accesstoken_kit.h" +-#include "access_token_adapter.h" ++// #include "accesstoken_kit.h" ++// #include "access_token_adapter.h" + #include "dbinder_databus_invoker.h" + #include "dbinder_error_code.h" + #include "rpc_feature_set.h" +@@ -56,10 +56,10 @@ static constexpr int HIDUMPER_SERVICE_UID = 1212; + using namespace OHOS::HiviewDFX; + static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_ID_IPC, "IPCObjectStub" }; + #ifndef CONFIG_IPC_SINGLE +-using namespace OHOS::Security; ++// using namespace OHOS::Security; + // Authentication information can be added only for processes with system permission. + static constexpr pid_t ALLOWED_UID = 10000; +-static constexpr int APL_BASIC = 2; ++// static constexpr int APL_BASIC = 2; + // Only the samgr can obtain the UID and PID. + static const std::string SAMGR_PROCESS_NAME = "samgr"; + #endif +@@ -259,7 +259,7 @@ int IPCObjectStub::SendRequest(uint32_t code, MessageParcel &data, MessageParcel + break; + } + case GRANT_DATABUS_NAME: { +- if (!IPCSkeleton::IsLocalCalling() || !IsSamgrCall((uint32_t)RpcGetSelfTokenID())) { ++ if (!IPCSkeleton::IsLocalCalling() || !IsSamgrCall((uint32_t)0)) { + ZLOGE(LABEL, "GRANT_DATABUS_NAME message is excluded in sa manager"); + result = IPC_STUB_INVALID_DATA_ERR; + break; +@@ -268,7 +268,7 @@ int IPCObjectStub::SendRequest(uint32_t code, MessageParcel &data, MessageParcel + break; + } + case TRANS_DATABUS_NAME: { +- if (!IPCSkeleton::IsLocalCalling() || !IsSamgrCall((uint32_t)RpcGetSelfTokenID())) { ++ if (!IPCSkeleton::IsLocalCalling() || !IsSamgrCall((uint32_t)0)) { + ZLOGE(LABEL, "TRANS_DATABUS_NAME message is excluded in sa manager"); + result = IPC_STUB_INVALID_DATA_ERR; + break; +@@ -611,41 +611,43 @@ std::string IPCObjectStub::CreateDatabusName(int uid, int pid, int systemAbility + + bool IPCObjectStub::IsSamgrCall(uint32_t accessToken) + { +- auto tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(accessToken); +- if (tokenType != AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { +- ZLOGE(LABEL, "not native call"); +- return false; +- } +- AccessToken::NativeTokenInfo nativeTokenInfo; +- int32_t result = AccessToken::AccessTokenKit::GetNativeTokenInfo(accessToken, nativeTokenInfo); +- if (result == ERR_NONE && nativeTokenInfo.processName == SAMGR_PROCESS_NAME) { +- return true; +- } +- ZLOGE(LABEL, "not samgr called, processName:%{private}s", nativeTokenInfo.processName.c_str()); +- return false; ++ // auto tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(accessToken); ++ // if (tokenType != AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { ++ // ZLOGE(LABEL, "not native call"); ++ // return false; ++ // } ++ // AccessToken::NativeTokenInfo nativeTokenInfo; ++ // int32_t result = AccessToken::AccessTokenKit::GetNativeTokenInfo(accessToken, nativeTokenInfo); ++ // if (result == ERR_NONE && nativeTokenInfo.processName == SAMGR_PROCESS_NAME) { ++ // return true; ++ // } ++ // ZLOGE(LABEL, "not samgr called, processName:%{private}s", nativeTokenInfo.processName.c_str()); ++ // return false; ++ return true; + } + + bool IPCObjectStub::HasDumpPermission(uint32_t accessToken) const + { +- int res = AccessToken::AccessTokenKit::VerifyAccessToken(accessToken, "ohos.permission.DUMP"); +- if (res == AccessToken::PermissionState::PERMISSION_GRANTED) { +- return true; +- } +- bool ret = false; +- auto tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(accessToken); +- if (tokenType == AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { +- AccessToken::NativeTokenInfo nativeTokenInfo; +- int32_t result = AccessToken::AccessTokenKit::GetNativeTokenInfo(accessToken, nativeTokenInfo); +- ret = (result == ERR_NONE && nativeTokenInfo.apl >= APL_BASIC); +- } else if (tokenType == AccessToken::ATokenTypeEnum::TOKEN_HAP) { +- AccessToken::HapTokenInfo hapTokenInfo; +- int32_t result = AccessToken::AccessTokenKit::GetHapTokenInfo(accessToken, hapTokenInfo); +- ret = (result == ERR_NONE && hapTokenInfo.apl >= APL_BASIC); +- } +- if (!ret) { +- ZLOGD(LABEL, "No dump permission, please check!"); +- } +- return ret; ++ // int res = AccessToken::AccessTokenKit::VerifyAccessToken(accessToken, "ohos.permission.DUMP"); ++ // if (res == AccessToken::PermissionState::PERMISSION_GRANTED) { ++ // return true; ++ // } ++ // bool ret = false; ++ // auto tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(accessToken); ++ // if (tokenType == AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { ++ // AccessToken::NativeTokenInfo nativeTokenInfo; ++ // int32_t result = AccessToken::AccessTokenKit::GetNativeTokenInfo(accessToken, nativeTokenInfo); ++ // ret = (result == ERR_NONE && nativeTokenInfo.apl >= APL_BASIC); ++ // } else if (tokenType == AccessToken::ATokenTypeEnum::TOKEN_HAP) { ++ // AccessToken::HapTokenInfo hapTokenInfo; ++ // int32_t result = AccessToken::AccessTokenKit::GetHapTokenInfo(accessToken, hapTokenInfo); ++ // ret = (result == ERR_NONE && hapTokenInfo.apl >= APL_BASIC); ++ // } ++ // if (!ret) { ++ // ZLOGD(LABEL, "No dump permission, please check!"); ++ // } ++ // return ret; ++ return true; + } + #endif + } // namespace OHOS +diff --git a/ipc/native/src/core/source/iremote_broker.cpp b/ipc/native/src/core/source/iremote_broker.cpp +index dcbb59c..12f498e 100644 +--- a/ipc/native/src/core/source/iremote_broker.cpp ++++ b/ipc/native/src/core/source/iremote_broker.cpp +@@ -17,7 +17,7 @@ + + #include + +-#include "__mutex_base" ++// #include "__mutex_base" + #include "functional" + #include "hilog/log_c.h" + #include "hilog/log_cpp.h" +diff --git a/ipc/native/src/mock/include/dbinder_base_invoker.h b/ipc/native/src/mock/include/dbinder_base_invoker.h +index ca7fd8e..7d40e7d 100644 +--- a/ipc/native/src/mock/include/dbinder_base_invoker.h ++++ b/ipc/native/src/mock/include/dbinder_base_invoker.h +@@ -701,9 +701,9 @@ int DBinderBaseInvoker::SendRequest(int32_t handle, uint32_t code, MessagePar + int userWaitTime = option.GetWaitTime(); + MessageParcel &newData = const_cast(data); + size_t oldWritePosition = newData.GetWritePosition(); +- HiTraceId traceId = HiTraceChain::GetId(); ++ // HiTraceId traceId = HiTraceChain::GetId(); + // set client send trace point if trace is enabled +- HiTraceId childId = HitraceInvoker::TraceClientSend(handle, code, newData, flags, traceId); ++ // HiTraceId childId = HitraceInvoker::TraceClientSend(handle, code, newData, flags, traceId); + std::shared_ptr session = WriteTransaction(BC_TRANSACTION, flags, handle, 0, code, data, seqNumber, 0); + if (session == nullptr) { + newData.RewindWrite(oldWritePosition); +@@ -720,7 +720,7 @@ int DBinderBaseInvoker::SendRequest(int32_t handle, uint32_t code, MessagePar + } else { + ret = SendOrWaitForCompletion(userWaitTime, seqNumber, session, &reply); + } +- HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); ++ // HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); + // restore Parcel data + newData.RewindWrite(oldWritePosition); + return ret; +@@ -865,8 +865,8 @@ template void DBinderBaseInvoker::ProcessTransaction(dbinder_transa + data.InjectOffsets(reinterpret_cast(reinterpret_cast(tr->buffer) + tr->offsets), + tr->offsets_size / sizeof(binder_size_t)); + } +- uint32_t &newflags = const_cast(tr->flags); +- int isServerTraced = HitraceInvoker::TraceServerReceieve(tr->cookie, tr->code, data, newflags); ++ // uint32_t &newflags = const_cast(tr->flags); ++ // int isServerTraced = HitraceInvoker::TraceServerReceieve(tr->cookie, tr->code, data, newflags); + + const pid_t oldPid = GetCallerPid(); + const auto oldUid = static_cast(GetCallerUid()); +@@ -918,7 +918,7 @@ template void DBinderBaseInvoker::ProcessTransaction(dbinder_transa + ZLOGE(LOG_LABEL, "delete raw data in process skeleton"); + current->DetachRawData(listenFd); + } +- HitraceInvoker::TraceServerSend(tr->cookie, tr->code, isServerTraced, newflags); ++ // HitraceInvoker::TraceServerSend(tr->cookie, tr->code, isServerTraced, newflags); + if (!(flags & MessageOption::TF_ASYNC)) { + SetClientFd(listenFd); + SetSeqNum(senderSeqNumber); +diff --git a/ipc/native/src/mock/include/hitrace_invoker.h b/ipc/native/src/mock/include/hitrace_invoker.h +index 7da8029..785a1d2 100644 +--- a/ipc/native/src/mock/include/hitrace_invoker.h ++++ b/ipc/native/src/mock/include/hitrace_invoker.h +@@ -16,24 +16,24 @@ + #ifndef OHOS_IPC_HITRACE_INVOKER_H + #define OHOS_IPC_HITRACE_INVOKER_H + +-#include "hitrace/trace.h" ++// #include "hitrace/trace.h" + #include "iremote_object.h" + namespace OHOS { + class HitraceInvoker { + public: +- static bool IsClientTraced(int32_t handle, uint32_t flags, const HiviewDFX::HiTraceId &traceId); ++ // static bool IsClientTraced(int32_t handle, uint32_t flags, const HiviewDFX::HiTraceId &traceId); + +- static HiviewDFX::HiTraceId TraceClientSend(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags, +- const HiviewDFX::HiTraceId &traceId); ++ // static HiviewDFX::HiTraceId TraceClientSend(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags, ++ // const HiviewDFX::HiTraceId &traceId); + +- static void TraceClientReceieve(int32_t handle, uint32_t code, uint32_t flags, const HiviewDFX::HiTraceId &traceId, +- const HiviewDFX::HiTraceId &childId); ++ // static void TraceClientReceieve(int32_t handle, uint32_t code, uint32_t flags, const HiviewDFX::HiTraceId &traceId, ++ // const HiviewDFX::HiTraceId &childId); + +- static void RecoveryDataAndFlag(Parcel &data, uint32_t &flags, size_t oldReadPosition, uint8_t idLen); ++ // static void RecoveryDataAndFlag(Parcel &data, uint32_t &flags, size_t oldReadPosition, uint8_t idLen); + +- static bool TraceServerReceieve(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags); ++ // static bool TraceServerReceieve(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags); + +- static void TraceServerSend(int32_t handle, uint32_t code, bool isServerTraced, uint32_t flags); ++ // static void TraceServerSend(int32_t handle, uint32_t code, bool isServerTraced, uint32_t flags); + + private: + static const int PADDED_SIZE_OF_PARCEL = 4; +diff --git a/ipc/native/src/mock/include/invoker_factory.h b/ipc/native/src/mock/include/invoker_factory.h +index 14bd25f..83086c5 100644 +--- a/ipc/native/src/mock/include/invoker_factory.h ++++ b/ipc/native/src/mock/include/invoker_factory.h +@@ -17,6 +17,7 @@ + #define OHOS_IPC_INVOKER_FACTORY_H + + #include ++#include + #include + #include "iremote_invoker.h" + +diff --git a/ipc/native/src/mock/source/binder_connector.cpp b/ipc/native/src/mock/source/binder_connector.cpp +index a262de6..733769d 100644 +--- a/ipc/native/src/mock/source/binder_connector.cpp ++++ b/ipc/native/src/mock/source/binder_connector.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#include "__mutex_base" ++// #include "__mutex_base" + #include "cerrno" + #include "hilog/log_c.h" + #include "hilog/log_cpp.h" +diff --git a/ipc/native/src/mock/source/binder_invoker.cpp b/ipc/native/src/mock/source/binder_invoker.cpp +index 9ce6b59..946940c 100644 +--- a/ipc/native/src/mock/source/binder_invoker.cpp ++++ b/ipc/native/src/mock/source/binder_invoker.cpp +@@ -96,9 +96,9 @@ int BinderInvoker::SendRequest(int handle, uint32_t code, MessageParcel &data, M + uint32_t flags = (uint32_t)option.GetFlags(); + MessageParcel &newData = const_cast(data); + size_t oldWritePosition = newData.GetWritePosition(); +- HiTraceId traceId = HiTraceChain::GetId(); ++ // HiTraceId traceId = HiTraceChain::GetId(); + // set client send trace point if trace is enabled +- HiTraceId childId = HitraceInvoker::TraceClientSend(handle, code, newData, flags, traceId); ++ // HiTraceId childId = HitraceInvoker::TraceClientSend(handle, code, newData, flags, traceId); + if (!WriteTransaction(BC_TRANSACTION, flags, handle, code, data, nullptr)) { + newData.RewindWrite(oldWritePosition); + ZLOGE(LABEL, "WriteTransaction ERROR"); +@@ -114,7 +114,7 @@ int BinderInvoker::SendRequest(int handle, uint32_t code, MessageParcel &data, M + } else { + error = WaitForCompletion(&reply); + } +- HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); ++ // HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); + // restore Parcel data + newData.RewindWrite(oldWritePosition); + if (error != ERR_NONE) { +@@ -413,8 +413,8 @@ void BinderInvoker::OnTransaction(const uint8_t *buffer) + if (tr->offsets_size > 0) { + data->InjectOffsets(tr->data.ptr.offsets, tr->offsets_size / sizeof(binder_size_t)); + } +- uint32_t &newflags = const_cast(tr->flags); +- int isServerTraced = HitraceInvoker::TraceServerReceieve(tr->target.handle, tr->code, *data, newflags); ++ // uint32_t &newflags = const_cast(tr->flags); ++ // int isServerTraced = HitraceInvoker::TraceServerReceieve(tr->target.handle, tr->code, *data, newflags); + const pid_t oldPid = callerPid_; + const auto oldUid = static_cast(callerUid_); + const uint32_t oldToken = callerTokenID_; +@@ -469,7 +469,7 @@ void BinderInvoker::OnTransaction(const uint8_t *buffer) + Str16ToStr8(targetObject->descriptor_).c_str(), tr->code, duration); + } + } +- HitraceInvoker::TraceServerSend(tr->target.handle, tr->code, isServerTraced, newflags); ++ // HitraceInvoker::TraceServerSend(tr->target.handle, tr->code, isServerTraced, newflags); + if (!(flagValue & TF_ONE_WAY)) { + SendReply(reply, 0, error); + } +diff --git a/ipc/native/src/mock/source/hitrace_invoker.cpp b/ipc/native/src/mock/source/hitrace_invoker.cpp +index 4f7f7c3..bc55772 100644 +--- a/ipc/native/src/mock/source/hitrace_invoker.cpp ++++ b/ipc/native/src/mock/source/hitrace_invoker.cpp +@@ -20,7 +20,7 @@ + + #include "hilog/log_c.h" + #include "hilog/log_cpp.h" +-#include "hitrace/trace.h" ++// #include "hitrace/trace.h" + #include "ipc_debug.h" + #include "log_tags.h" + #include "parcel.h" +@@ -29,118 +29,118 @@ + namespace OHOS { + // the value should be equal to the set of parcel + using namespace OHOS::HiviewDFX; +-static const HiLogLabel TRACE_LABEL = { LOG_CORE, LOG_ID_IPC, "BinderHiTrace" }; ++// static const HiLogLabel TRACE_LABEL = { LOG_CORE, LOG_ID_IPC, "BinderHiTrace" }; + +-bool HitraceInvoker::IsClientTraced(int32_t handle, uint32_t flags, const HiTraceId &traceId) +-{ +- return (traceId.IsValid() && (handle != 0) && +- ((flags & TF_ONE_WAY) ? traceId.IsFlagEnabled(HITRACE_FLAG_INCLUDE_ASYNC) : true)); +-} ++// bool HitraceInvoker::IsClientTraced(int32_t handle, uint32_t flags, const HiTraceId &traceId) ++// { ++// return (traceId.IsValid() && (handle != 0) && ++// ((flags & TF_ONE_WAY) ? traceId.IsFlagEnabled(HITRACE_FLAG_INCLUDE_ASYNC) : true)); ++// } + +-HiTraceId HitraceInvoker::TraceClientSend(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags, +- const HiTraceId &traceId) +-{ +- HiTraceId childId = traceId; +- bool isClientTraced = IsClientTraced(handle, flags, traceId); +- if (isClientTraced) { +- childId = HiTraceChain::CreateSpan(); +- // add childid to parcel data +- uint8_t idBytes[HITRACE_ID_LEN]; +- size_t idLen = (size_t)(childId.ToBytes(idBytes, HITRACE_ID_LEN)); +- if (idLen != HITRACE_ID_LEN) { +- ZLOGE(TRACE_LABEL, "%{public}s:idLen not correct", __func__); +- return childId; +- } ++// HiTraceId HitraceInvoker::TraceClientSend(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags, ++// const HiTraceId &traceId) ++// { ++// HiTraceId childId = traceId; ++// bool isClientTraced = IsClientTraced(handle, flags, traceId); ++// if (isClientTraced) { ++// childId = HiTraceChain::CreateSpan(); ++// // add childid to parcel data ++// uint8_t idBytes[HITRACE_ID_LEN]; ++// size_t idLen = (size_t)(childId.ToBytes(idBytes, HITRACE_ID_LEN)); ++// if (idLen != HITRACE_ID_LEN) { ++// ZLOGE(TRACE_LABEL, "%{public}s:idLen not correct", __func__); ++// return childId; ++// } + +- size_t oldWritePosition = data.GetWritePosition(); +- if (!data.WriteBuffer(idBytes, idLen)) { +- ZLOGE(TRACE_LABEL, "%{public}s:Write idBytes fail", __func__); +- // restore Parcel data +- data.RewindWrite(oldWritePosition); +- return childId; +- } ++// size_t oldWritePosition = data.GetWritePosition(); ++// if (!data.WriteBuffer(idBytes, idLen)) { ++// ZLOGE(TRACE_LABEL, "%{public}s:Write idBytes fail", __func__); ++// // restore Parcel data ++// data.RewindWrite(oldWritePosition); ++// return childId; ++// } + +- // padded size of traceid +- if (!data.WriteUint8(data.GetWritePosition() - oldWritePosition)) { +- ZLOGE(TRACE_LABEL, "%{public}s:Write idLen fail", __func__); +- // restore Parcel data +- data.RewindWrite(oldWritePosition); +- return childId; +- } +- // tracepoint: CS(Client Send) +- HiTraceChain::Tracepoint(HITRACE_TP_CS, childId, "%s handle=%d,code=%u", +- (flags & TF_ONE_WAY) ? "ASYNC" : "SYNC", +- handle, code); +- flags |= TF_HITRACE; +- } +- return childId; +-} ++// // padded size of traceid ++// if (!data.WriteUint8(data.GetWritePosition() - oldWritePosition)) { ++// ZLOGE(TRACE_LABEL, "%{public}s:Write idLen fail", __func__); ++// // restore Parcel data ++// data.RewindWrite(oldWritePosition); ++// return childId; ++// } ++// // tracepoint: CS(Client Send) ++// HiTraceChain::Tracepoint(HITRACE_TP_CS, childId, "%s handle=%d,code=%u", ++// (flags & TF_ONE_WAY) ? "ASYNC" : "SYNC", ++// handle, code); ++// flags |= TF_HITRACE; ++// } ++// return childId; ++// } + +-void HitraceInvoker::TraceClientReceieve(int32_t handle, uint32_t code, uint32_t flags, const HiTraceId &traceId, +- const HiTraceId &childId) +-{ +- if (!(flags & TF_HITRACE)) { +- return; +- } +- bool isClientTraced = IsClientTraced(handle, flags, traceId); +- if (isClientTraced) { +- if (!(flags & TF_ONE_WAY)) { +- // restore thread trace id +- HiTraceChain::SetId(traceId); +- // tracepoint: CR(Client Receive) +- HiTraceChain::Tracepoint(HITRACE_TP_CR, childId, "%s handle=%d,code=%u", "SYNC", handle, code); +- } +- } +-} ++// void HitraceInvoker::TraceClientReceieve(int32_t handle, uint32_t code, uint32_t flags, const HiTraceId &traceId, ++// const HiTraceId &childId) ++// { ++// if (!(flags & TF_HITRACE)) { ++// return; ++// } ++// bool isClientTraced = IsClientTraced(handle, flags, traceId); ++// if (isClientTraced) { ++// if (!(flags & TF_ONE_WAY)) { ++// // restore thread trace id ++// HiTraceChain::SetId(traceId); ++// // tracepoint: CR(Client Receive) ++// HiTraceChain::Tracepoint(HITRACE_TP_CR, childId, "%s handle=%d,code=%u", "SYNC", handle, code); ++// } ++// } ++// } + +-void HitraceInvoker::RecoveryDataAndFlag(Parcel &data, uint32_t &flags, size_t oldReadPosition, uint8_t idLen) +-{ +- // restore data +- data.RewindRead(oldReadPosition); +- // padded size(4 bytes) of uint8_t +- data.SetDataSize(data.GetDataSize() - PADDED_SIZE_OF_PARCEL - idLen); +- flags &= ~(uint32_t)TF_HITRACE; +-} ++// void HitraceInvoker::RecoveryDataAndFlag(Parcel &data, uint32_t &flags, size_t oldReadPosition, uint8_t idLen) ++// { ++// // restore data ++// data.RewindRead(oldReadPosition); ++// // padded size(4 bytes) of uint8_t ++// data.SetDataSize(data.GetDataSize() - PADDED_SIZE_OF_PARCEL - idLen); ++// flags &= ~(uint32_t)TF_HITRACE; ++// } + +-bool HitraceInvoker::TraceServerReceieve(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags) +-{ +- bool isServerTraced = (flags & TF_HITRACE) != 0; +- if (isServerTraced) { +- size_t oldReadPosition = data.GetReadPosition(); +- // padded size(4 bytes) of uint8_t +- data.RewindRead(data.GetDataSize() - PADDED_SIZE_OF_PARCEL); +- // the padded size of traceid +- uint8_t idLen = data.ReadUint8(); +- if (idLen >= sizeof(HiTraceIdStruct)) { +- // padded size(4 bytes) of uint8_t +- data.RewindRead(data.GetDataSize() - PADDED_SIZE_OF_PARCEL - idLen); +- const uint8_t *idBytes = data.ReadUnpadBuffer(sizeof(HiTraceIdStruct)); +- if (idBytes == nullptr) { +- ZLOGE(TRACE_LABEL, "%{public}s:idBytes is null", __func__); +- isServerTraced = 0; +- RecoveryDataAndFlag(data, flags, oldReadPosition, idLen); +- return isServerTraced; +- } +- HiTraceId traceId(idBytes, sizeof(HiTraceIdStruct)); +- HiTraceChain::SetId(traceId); +- // tracepoint: SR(Server Receive) +- HiTraceChain::Tracepoint(HITRACE_TP_SR, traceId, +- "%s handle=%d,code=%u", (flags & TF_ONE_WAY) ? "ASYNC" : "SYNC", +- handle, code); +- } ++// bool HitraceInvoker::TraceServerReceieve(int32_t handle, uint32_t code, Parcel &data, uint32_t &flags) ++// { ++// bool isServerTraced = (flags & TF_HITRACE) != 0; ++// if (isServerTraced) { ++// size_t oldReadPosition = data.GetReadPosition(); ++// // padded size(4 bytes) of uint8_t ++// data.RewindRead(data.GetDataSize() - PADDED_SIZE_OF_PARCEL); ++// // the padded size of traceid ++// uint8_t idLen = data.ReadUint8(); ++// if (idLen >= sizeof(HiTraceIdStruct)) { ++// // padded size(4 bytes) of uint8_t ++// data.RewindRead(data.GetDataSize() - PADDED_SIZE_OF_PARCEL - idLen); ++// const uint8_t *idBytes = data.ReadUnpadBuffer(sizeof(HiTraceIdStruct)); ++// if (idBytes == nullptr) { ++// ZLOGE(TRACE_LABEL, "%{public}s:idBytes is null", __func__); ++// isServerTraced = 0; ++// RecoveryDataAndFlag(data, flags, oldReadPosition, idLen); ++// return isServerTraced; ++// } ++// HiTraceId traceId(idBytes, sizeof(HiTraceIdStruct)); ++// HiTraceChain::SetId(traceId); ++// // tracepoint: SR(Server Receive) ++// HiTraceChain::Tracepoint(HITRACE_TP_SR, traceId, ++// "%s handle=%d,code=%u", (flags & TF_ONE_WAY) ? "ASYNC" : "SYNC", ++// handle, code); ++// } + +- RecoveryDataAndFlag(data, flags, oldReadPosition, idLen); +- } +- return isServerTraced; +-} ++// RecoveryDataAndFlag(data, flags, oldReadPosition, idLen); ++// } ++// return isServerTraced; ++// } + +-void HitraceInvoker::TraceServerSend(int32_t handle, uint32_t code, bool isServerTraced, uint32_t flags) +-{ +- if (isServerTraced) { +- // tracepoint: SS(Server Send) +- HiTraceChain::Tracepoint(HITRACE_TP_SS, HiTraceChain::GetId(), "%s handle=%d,code=%u", +- (flags & TF_ONE_WAY) ? "ASYNC" : "SYNC", handle, code); +- } +- HiTraceChain::ClearId(); +-} ++// void HitraceInvoker::TraceServerSend(int32_t handle, uint32_t code, bool isServerTraced, uint32_t flags) ++// { ++// if (isServerTraced) { ++// // tracepoint: SS(Server Send) ++// HiTraceChain::Tracepoint(HITRACE_TP_SS, HiTraceChain::GetId(), "%s handle=%d,code=%u", ++// (flags & TF_ONE_WAY) ? "ASYNC" : "SYNC", handle, code); ++// } ++// HiTraceChain::ClearId(); ++// } + } // namespace OHOS +diff --git a/ipc/native/src/mock/source/invoker_factory.cpp b/ipc/native/src/mock/source/invoker_factory.cpp +index 5b2946b..e539639 100644 +--- a/ipc/native/src/mock/source/invoker_factory.cpp ++++ b/ipc/native/src/mock/source/invoker_factory.cpp +@@ -18,7 +18,7 @@ + #include + #include + +-#include "__mutex_base" ++// #include "__mutex_base" + #include "functional" + #include "iremote_invoker.h" + #include "unordered_map" +diff --git a/ipc/native/src/napi/src/napi_remote_object.cpp b/ipc/native/src/napi/src/napi_remote_object.cpp +index 1275bb3..4ff5260 100644 +--- a/ipc/native/src/napi/src/napi_remote_object.cpp ++++ b/ipc/native/src/napi/src/napi_remote_object.cpp +@@ -22,7 +22,7 @@ + #include + #include "access_token_adapter.h" + #include "hilog/log.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + #include "ipc_object_proxy.h" + #include "ipc_object_stub.h" + #include "ipc_skeleton.h" +diff --git a/ipc/native/src/napi/src/napi_remote_proxy.cpp b/ipc/native/src/napi/src/napi_remote_proxy.cpp +index 0239944..9b4c6d9 100644 +--- a/ipc/native/src/napi/src/napi_remote_proxy.cpp ++++ b/ipc/native/src/napi/src/napi_remote_proxy.cpp +@@ -21,7 +21,7 @@ + #include + #include "access_token_adapter.h" + #include "hilog/log.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + #include "ipc_object_proxy.h" + #include "ipc_object_stub.h" + #include "ipc_skeleton.h" +diff --git a/ipc/native/test/unittest/common/ipc_hitrace_unittest.cpp b/ipc/native/test/unittest/common/ipc_hitrace_unittest.cpp +index 8b008f5..77649f0 100644 +--- a/ipc/native/test/unittest/common/ipc_hitrace_unittest.cpp ++++ b/ipc/native/test/unittest/common/ipc_hitrace_unittest.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include "ipc_debug.h" +-#include "hitrace/trace.h" ++// #include "hitrace/trace.h" + #include "ipc_skeleton.h" + #include "ipc_object_proxy.h" + #include "test_service_skeleton.h" +diff --git a/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h b/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h +index 41fe229..40d5177 100644 +--- a/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h ++++ b/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h +@@ -23,7 +23,7 @@ + #include "iremote_proxy.h" + #include "hilog/log.h" + #include "log_tags.h" +-#include "hitrace/trace.h" ++// #include "hitrace/trace.h" + + namespace OHOS { + class IDBinderTestService : public IRemoteBroker { +-- +2.33.0 + diff --git a/0005-remove-dependency-on-hitrace-safwk.patch b/0005-remove-dependency-on-hitrace-safwk.patch new file mode 100644 index 0000000000000000000000000000000000000000..e9d2119f8b4c64d55f6d3b15b59ef5d58309e4d9 --- /dev/null +++ b/0005-remove-dependency-on-hitrace-safwk.patch @@ -0,0 +1,71 @@ +From e0aace24cbc8d0943bb79589d1a236fb8ff5afdb Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:23:24 +0800 +Subject: [PATCH] remove dependency on hitrace + +--- + interfaces/innerkits/safwk/BUILD.gn | 2 +- + services/safwk/src/local_ability_manager.cpp | 4 ++-- + services/safwk/src/system_ability.cpp | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/interfaces/innerkits/safwk/BUILD.gn b/interfaces/innerkits/safwk/BUILD.gn +index 5509789..3dd18cb 100644 +--- a/interfaces/innerkits/safwk/BUILD.gn ++++ b/interfaces/innerkits/safwk/BUILD.gn +@@ -51,7 +51,7 @@ ohos_shared_library("system_ability_fwk") { + if (is_standard_system) { + external_deps = [ + "c_utils:utils", +- "hitrace_native:hitrace_meter", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr:samgr_common", +diff --git a/services/safwk/src/local_ability_manager.cpp b/services/safwk/src/local_ability_manager.cpp +index 11f7a06..0af6af9 100644 +--- a/services/safwk/src/local_ability_manager.cpp ++++ b/services/safwk/src/local_ability_manager.cpp +@@ -22,7 +22,7 @@ + + #include "datetime_ex.h" + #include "errors.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + #include "ipc_skeleton.h" + #include "iservice_registry.h" + #include "safwk_log.h" +@@ -88,7 +88,7 @@ void LocalAbilityManager::DoStartSAProcess(const std::string& profilePath, int32 + } + { + std::string traceTag = GetTraceTag(realProfilePath); +- HITRACE_METER_NAME(HITRACE_TAG_SAMGR, traceTag); ++ // HITRACE_METER_NAME(HITRACE_TAG_SAMGR, traceTag); + bool ret = InitSystemAbilityProfiles(realProfilePath, saId); + if (!ret) { + HILOGE(TAG, "InitSystemAbilityProfiles no right profile, will exit"); +diff --git a/services/safwk/src/system_ability.cpp b/services/safwk/src/system_ability.cpp +index 84911e0..e618560 100644 +--- a/services/safwk/src/system_ability.cpp ++++ b/services/safwk/src/system_ability.cpp +@@ -19,7 +19,7 @@ + + #include "datetime_ex.h" + #include "errors.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + #include "if_system_ability_manager.h" + #include "iservice_registry.h" + #include "local_ability_manager.h" +@@ -114,7 +114,7 @@ void SystemAbility::Start() + } + HILOGD(TAG, "[PerformanceTest] SAFWK OnStart systemAbilityId:%{public}d", saId_); + int64_t begin = GetTickCount(); +- HITRACE_METER_NAME(HITRACE_TAG_SAMGR, ToString(saId_) + "_OnStart"); ++ // HITRACE_METER_NAME(HITRACE_TAG_SAMGR, ToString(saId_) + "_OnStart"); + OnStart(); + isRunning_ = true; + HILOGI(TAG, "[PerformanceTest] SAFWK OnStart systemAbilityId:%{public}d finished, spend:%{public}" PRId64 " ms", +-- +2.33.0 + diff --git a/0006-remove-dependency-and-adapt-for-build-samgr.patch b/0006-remove-dependency-and-adapt-for-build-samgr.patch new file mode 100644 index 0000000000000000000000000000000000000000..dda5f8a01cc81dafd760ab962928aefd466266b9 --- /dev/null +++ b/0006-remove-dependency-and-adapt-for-build-samgr.patch @@ -0,0 +1,234 @@ +From b83a54f6670d1fecc941ac6601cf714efbf89a2a Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:26:10 +0800 +Subject: [PATCH] remove dependency and adapt for build + +--- + interfaces/innerkits/common/BUILD.gn | 4 +- + services/common/src/parse_util.cpp | 7 ++-- + services/dfx/source/hisysevent_adapter.cpp | 42 ++++++++++--------- + services/samgr/native/BUILD.gn | 6 +-- + .../native/source/system_ability_manager.cpp | 2 +- + .../source/system_ability_manager_stub.cpp | 27 ++++++------ + 6 files changed, 46 insertions(+), 42 deletions(-) + +diff --git a/interfaces/innerkits/common/BUILD.gn b/interfaces/innerkits/common/BUILD.gn +index ffbf5a9..368eece 100644 +--- a/interfaces/innerkits/common/BUILD.gn ++++ b/interfaces/innerkits/common/BUILD.gn +@@ -49,8 +49,8 @@ ohos_shared_library("samgr_common") { + if (is_standard_system) { + external_deps = [ + "c_utils:utils", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + ] + part_name = "samgr" +diff --git a/services/common/src/parse_util.cpp b/services/common/src/parse_util.cpp +index af7aecc..66ad8e6 100644 +--- a/services/common/src/parse_util.cpp ++++ b/services/common/src/parse_util.cpp +@@ -21,10 +21,11 @@ + #include + #include + #include ++#include + + #include "datetime_ex.h" + #include "hisysevent_adapter.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + #include "libxml/globals.h" + #include "libxml/tree.h" + #include "libxml/xmlstring.h" +@@ -105,7 +106,7 @@ void ParseUtil::OpenSo(SaProfile& saProfile) + { + if (saProfile.handle == nullptr) { + std::string dlopenTag = ToString(saProfile.saId) + "_DLOPEN"; +- HITRACE_METER_NAME(HITRACE_TAG_SAMGR, dlopenTag); ++ // HITRACE_METER_NAME(HITRACE_TAG_SAMGR, dlopenTag); + int64_t begin = GetTickCount(); + DlHandle handle = dlopen(Str16ToStr8(saProfile.libPath).c_str(), RTLD_NOW); + HILOGI("[PerformanceTest] SA:%{public}d OpenSo spend %{public}" PRId64 " ms", +@@ -117,7 +118,7 @@ void ParseUtil::OpenSo(SaProfile& saProfile) + if ((libPathVec.size() > 0)) { + fileName = libPathVec[libPathVec.size() - 1]; + } +- ReportAddSystemAbilityFailed(saProfile.saId, fileName); ++ // ReportAddSystemAbilityFailed(saProfile.saId, fileName); + HILOGE("dlopen %{public}s failed with errno:%s!", fileName.c_str(), dlerror()); + return; + } +diff --git a/services/dfx/source/hisysevent_adapter.cpp b/services/dfx/source/hisysevent_adapter.cpp +index 608011e..5da4ad1 100644 +--- a/services/dfx/source/hisysevent_adapter.cpp ++++ b/services/dfx/source/hisysevent_adapter.cpp +@@ -16,14 +16,14 @@ + + #include + +-#include "def.h" +-#include "hisysevent.h" ++// #include "def.h" ++// #include "hisysevent.h" + #include "sam_log.h" + + namespace OHOS { + using namespace OHOS::HiviewDFX; + namespace { +-const std::string DOMAIN_NAME = std::string(HiSysEvent::Domain::SAMGR); ++// const std::string DOMAIN_NAME = std::string(HiSysEvent::Domain::SAMGR); + const std::string ADD_SYSTEMABILITY_FAIL = "SAMGR_ADD_SYSTEMABILITY_FAIL"; + const std::string CALLER_PID = "CALLER_PID"; + const std::string SAID = "SAID"; +@@ -34,26 +34,28 @@ const std::string GETSA__TAG = "SAMGR_GETSA_FREQUENCY"; + + void ReportAddSystemAbilityFailed(int32_t said, const std::string& filaName) + { +- int ret = HiSysEvent::Write(DOMAIN_NAME, +- ADD_SYSTEMABILITY_FAIL, +- HiSysEvent::EventType::FAULT, +- SAID, said, +- FILE_NAME, filaName); +- if (ret != 0) { +- HILOGE("hisysevent report add system ability event failed! ret %{public}d.", ret); +- } ++ HILOGE("Skip this method"); ++ // int ret = HiSysEvent::Write(DOMAIN_NAME, ++ // ADD_SYSTEMABILITY_FAIL, ++ // HiSysEvent::EventType::FAULT, ++ // SAID, said, ++ // FILE_NAME, filaName); ++ // if (ret != 0) { ++ // HILOGE("hisysevent report add system ability event failed! ret %{public}d.", ret); ++ // } + } + + void ReportGetSAFrequency(uint32_t callerPid, uint32_t said, int32_t count) + { +- int ret = HiSysEvent::Write(DOMAIN_NAME, +- GETSA__TAG, +- HiSysEvent::EventType::STATISTIC, +- CALLER_PID, callerPid, +- SAID, said, +- COUNT, count); +- if (ret != 0) { +- HILOGE("hisysevent report get sa frequency failed! ret %{public}d.", ret); +- } ++ HILOGE("Skip this method"); ++ // int ret = HiSysEvent::Write(DOMAIN_NAME, ++ // GETSA__TAG, ++ // HiSysEvent::EventType::STATISTIC, ++ // CALLER_PID, callerPid, ++ // SAID, said, ++ // COUNT, count); ++ // if (ret != 0) { ++ // HILOGE("hisysevent report get sa frequency failed! ret %{public}d.", ret); ++ // } + } + } // OHOS +diff --git a/services/samgr/native/BUILD.gn b/services/samgr/native/BUILD.gn +index 8ec85e5..2e99473 100644 +--- a/services/samgr/native/BUILD.gn ++++ b/services/samgr/native/BUILD.gn +@@ -59,11 +59,11 @@ ohos_executable("samgr") { + + if (is_standard_system) { + external_deps = [ +- "access_token:libaccesstoken_sdk", ++ # "access_token:libaccesstoken_sdk", + "c_utils:utils", + "eventhandler:libeventhandler", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", +diff --git a/services/samgr/native/source/system_ability_manager.cpp b/services/samgr/native/source/system_ability_manager.cpp +index e43c103..95c894e 100644 +--- a/services/samgr/native/source/system_ability_manager.cpp ++++ b/services/samgr/native/source/system_ability_manager.cpp +@@ -23,7 +23,7 @@ + #include "directory_ex.h" + #include "errors.h" + #include "hisysevent_adapter.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + #include "if_local_ability_manager.h" + #include "ipc_skeleton.h" + #include "local_ability_manager_proxy.h" +diff --git a/services/samgr/native/source/system_ability_manager_stub.cpp b/services/samgr/native/source/system_ability_manager_stub.cpp +index 5b168dc..89fe52d 100644 +--- a/services/samgr/native/source/system_ability_manager_stub.cpp ++++ b/services/samgr/native/source/system_ability_manager_stub.cpp +@@ -18,10 +18,10 @@ + #include + #include + +-#include "accesstoken_kit.h" ++// #include "accesstoken_kit.h" + #include "datetime_ex.h" + #include "errors.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + #include "ipc_skeleton.h" + #include "ipc_types.h" + #include "sam_log.h" +@@ -97,7 +97,7 @@ namespace { + } + } + +-using namespace OHOS::Security; ++// using namespace OHOS::Security; + namespace OHOS { + SystemAbilityManagerStub::SystemAbilityManagerStub() + { +@@ -489,10 +489,10 @@ int32_t SystemAbilityManagerStub::RemoveSystemAbilityInner(MessageParcel& data, + + int32_t SystemAbilityManagerStub::AddSystemProcessInner(MessageParcel& data, MessageParcel& reply) + { +- if (!CanRequest()) { +- HILOGE("AddSystemProcessInner PERMISSION DENIED!"); +- return ERR_PERMISSION_DENIED; +- } ++ // if (!CanRequest()) { ++ // HILOGE("AddSystemProcessInner PERMISSION DENIED!"); ++ // return ERR_PERMISSION_DENIED; ++ // } + std::u16string procName = data.ReadString16(); + if (procName.empty()) { + HILOGW("SystemAbilityManagerStub::AddSystemProcessInner read process name failed!"); +@@ -518,7 +518,7 @@ int32_t SystemAbilityManagerStub::LoadSystemAbilityInner(MessageParcel& data, Me + { + int32_t systemAbilityId = data.ReadInt32(); + std::string loadSystemAbilityTag = ToString(systemAbilityId) + "_LoadSystemAbility"; +- HITRACE_METER_NAME(HITRACE_TAG_SAMGR, loadSystemAbilityTag); ++ // HITRACE_METER_NAME(HITRACE_TAG_SAMGR, loadSystemAbilityTag); + if (!CheckInputSysAbilityId(systemAbilityId)) { + HILOGW("SystemAbilityManagerStub::LoadSystemAbilityInner read systemAbilityId failed!"); + return ERR_INVALID_VALUE; +@@ -589,10 +589,11 @@ int32_t SystemAbilityManagerStub::LoadRemoteSystemAbilityInner(MessageParcel& da + + bool SystemAbilityManagerStub::CanRequest() + { +- auto accessTokenId = IPCSkeleton::GetCallingTokenID(); +- AccessToken::ATokenTypeEnum tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(accessTokenId); +- HILOGD("SystemAbilityManagerStub::CanRequest tokenId:%{private}u, tokenType:%{public}d", +- accessTokenId, tokenType); +- return (tokenType == AccessToken::ATokenTypeEnum::TOKEN_NATIVE); ++ return true; ++ // auto accessTokenId = IPCSkeleton::GetCallingTokenID(); ++ // AccessToken::ATokenTypeEnum tokenType = AccessToken::AccessTokenKit::GetTokenTypeFlag(accessTokenId); ++ // HILOGD("SystemAbilityManagerStub::CanRequest tokenId:%{private}u, tokenType:%{public}d", ++ // accessTokenId, tokenType); ++ // return (tokenType == AccessToken::ATokenTypeEnum::TOKEN_NATIVE); + } + } // namespace OHOS +-- +2.33.0 + diff --git a/0007-adapt-for-build-sqlite.patch b/0007-adapt-for-build-sqlite.patch new file mode 100644 index 0000000000000000000000000000000000000000..448cea20b6ca8baffc74f8b3bcccedf8095fb640 --- /dev/null +++ b/0007-adapt-for-build-sqlite.patch @@ -0,0 +1,24 @@ +From c85aa929e7f0428509ab05a9991d9ec6bfcbe406 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:29:23 +0800 +Subject: [PATCH] adapt for build + +--- + BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/BUILD.gn b/BUILD.gn +index af76d78..516dcaf 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -19,6 +19,7 @@ config("sqlite_config") { + "include", + "//commonlibrary/c_utils/base/include", + ] ++ cflags_c = [ "-Wno-unused-but-set-variable" ] + } + + # This is the configuration used to build sqlite itself. +-- +2.33.0 + diff --git a/0008-remove-dependency-and-adapt-for-build-huks.patch b/0008-remove-dependency-and-adapt-for-build-huks.patch new file mode 100644 index 0000000000000000000000000000000000000000..dc8de4a1e52117629427b245762bc7feac41525c --- /dev/null +++ b/0008-remove-dependency-and-adapt-for-build-huks.patch @@ -0,0 +1,1063 @@ +From 9fe22ea5837611fadad5c9270417e62b1debf070 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:34:18 +0800 +Subject: [PATCH] remove dependency and adapt for build + +--- + frameworks/crypto_lite/js/napi/BUILD.gn | 2 +- + frameworks/huks_standard/main/common/BUILD.gn | 12 ++-- + .../main/common/include/hks_config.h | 10 +-- + frameworks/huks_standard/main/core/BUILD.gn | 12 ++-- + .../huks_standard/main/crypto_engine/BUILD.gn | 12 ++-- + .../main/crypto_engine/mbedtls/BUILD.gn | 12 ++-- + .../main/crypto_engine/openssl/BUILD.gn | 12 ++-- + .../huks_standard/main/os_dependency/BUILD.gn | 12 ++-- + .../innerkits/huks_standard/main/BUILD.gn | 12 ++-- + interfaces/kits/c/BUILD.gn | 2 +- + interfaces/kits/napi/BUILD.gn | 12 ++-- + services/huks_standard/BUILD.gn | 12 ++-- + .../huks_engine/main/core/BUILD.gn | 12 ++-- + .../huks_engine/main/core_dependency/BUILD.gn | 13 ++-- + .../huks_standard/huks_service/main/BUILD.gn | 12 ++-- + .../huks_service/main/core/BUILD.gn | 16 ++--- + .../huks_service/main/os_dependency/BUILD.gn | 16 ++--- + .../main/os_dependency/idl/BUILD.gn | 14 ++-- + .../huks_service/main/systemapi_mock/BUILD.gn | 10 +-- + .../hisysevent_wrapper/BUILD.gn | 12 ++-- + .../src/hisysevent_wrapper.cpp | 65 ++++++++++--------- + .../hitrace_meter_wrapper/BUILD.gn | 12 ++-- + .../src/hitrace_meter_wrapper.cpp | 10 +-- + .../main/systemapi_wrap/useridm/BUILD.gn | 14 ++-- + test/reliability/BUILD.gn | 2 +- + .../huks_standard_test/module_test/BUILD.gn | 4 +- + .../inner_kits_passthrough/BUILD.gn | 8 +-- + .../module_test/mock/BUILD.gn | 2 +- + .../os_dependency/idl/ipc/BUILD.gn | 2 +- + .../systemapi_wrap/useridm_test/BUILD.gn | 2 +- + .../storage_multithread_test/BUILD.gn | 2 +- + .../three_stage_test/BUILD.gn | 2 +- + utils/condition/BUILD.gn | 12 ++-- + utils/crypto_adapter/BUILD.gn | 12 ++-- + utils/file_operator/BUILD.gn | 12 ++-- + utils/list/BUILD.gn | 10 +-- + utils/mutex/BUILD.gn | 12 ++-- + 37 files changed, 207 insertions(+), 203 deletions(-) + +diff --git a/frameworks/crypto_lite/js/napi/BUILD.gn b/frameworks/crypto_lite/js/napi/BUILD.gn +index 5cc2e51c..fe01944b 100644 +--- a/frameworks/crypto_lite/js/napi/BUILD.gn ++++ b/frameworks/crypto_lite/js/napi/BUILD.gn +@@ -17,7 +17,7 @@ import("//build/ohos.gni") + + ohos_shared_library("cipher_napi") { + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/frameworks/huks_standard/main/common/BUILD.gn b/frameworks/huks_standard/main/common/BUILD.gn +index 536d4cce..bfb42775 100644 +--- a/frameworks/huks_standard/main/common/BUILD.gn ++++ b/frameworks/huks_standard/main/common/BUILD.gn +@@ -21,15 +21,15 @@ config("huks_config") { + } + + ohos_static_library("libhuks_common_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/frameworks/huks_standard/main/common/include/hks_config.h b/frameworks/huks_standard/main/common/include/hks_config.h +index b8137e63..188b48fb 100644 +--- a/frameworks/huks_standard/main/common/include/hks_config.h ++++ b/frameworks/huks_standard/main/common/include/hks_config.h +@@ -25,7 +25,7 @@ + + #define HKS_SUPPORT_API_ATTEST_KEY + +-#define HKS_SUPPORT_ACCESS_TOKEN ++// #define HKS_SUPPORT_ACCESS_TOKEN + + /* AES */ + #define HKS_SUPPORT_AES_C +@@ -220,9 +220,9 @@ + #endif + + /* Key user auth access control */ +-#if defined(HKS_SUPPORT_HMAC_C) && defined(HKS_SUPPORT_API_GENERATE_KEY) && (defined(HKS_SUPPORT_API_IMPORT) || \ +- defined(HKS_SUPPORT_API_GENERATE_KEY) || defined(HKS_SUPPORT_API_IMPORT_WRAPPED_KEY)) +-#define HKS_SUPPORT_USER_AUTH_ACCESS_CONTROL +-#endif ++// #if defined(HKS_SUPPORT_HMAC_C) && defined(HKS_SUPPORT_API_GENERATE_KEY) && (defined(HKS_SUPPORT_API_IMPORT) || \ ++// defined(HKS_SUPPORT_API_GENERATE_KEY) || defined(HKS_SUPPORT_API_IMPORT_WRAPPED_KEY)) ++// #define HKS_SUPPORT_USER_AUTH_ACCESS_CONTROL ++// #endif + + #endif /* HKS_CONFIG_H */ +diff --git a/frameworks/huks_standard/main/core/BUILD.gn b/frameworks/huks_standard/main/core/BUILD.gn +index 5108a6ac..675829aa 100644 +--- a/frameworks/huks_standard/main/core/BUILD.gn ++++ b/frameworks/huks_standard/main/core/BUILD.gn +@@ -18,11 +18,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_core_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -32,7 +32,7 @@ ohos_static_library("libhuks_core_standard_static") { + "//third_party/openssl/include/", + ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/frameworks/huks_standard/main/crypto_engine/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/BUILD.gn +index 598b3fdc..a19a8fa2 100644 +--- a/frameworks/huks_standard/main/crypto_engine/BUILD.gn ++++ b/frameworks/huks_standard/main/crypto_engine/BUILD.gn +@@ -15,13 +15,13 @@ import("//base/security/huks/huks.gni") + import("//build/ohos.gni") + + ohos_static_library("libhuks_crypto_engine_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn +index ddd52675..47b07c86 100644 +--- a/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn ++++ b/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_mbedtls_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -31,7 +31,7 @@ ohos_static_library("libhuks_mbedtls_standard_static") { + include_dirs = [ "//commonlibrary/c_utils/base/include" ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn +index 82e2d183..e5e7facd 100644 +--- a/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn ++++ b/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn +@@ -19,17 +19,17 @@ config("huks_config") { + } + + ohos_static_library("libhuks_openssl_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/frameworks/huks_standard/main/os_dependency/BUILD.gn b/frameworks/huks_standard/main/os_dependency/BUILD.gn +index fa5d8be6..d0e4bdec 100644 +--- a/frameworks/huks_standard/main/os_dependency/BUILD.gn ++++ b/frameworks/huks_standard/main/os_dependency/BUILD.gn +@@ -21,18 +21,18 @@ config("huks_config") { + } + + ohos_static_library("libhuks_os_dependency_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + include_dirs = [ "log" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/interfaces/innerkits/huks_standard/main/BUILD.gn b/interfaces/innerkits/huks_standard/main/BUILD.gn +index 29c855d4..42da7625 100644 +--- a/interfaces/innerkits/huks_standard/main/BUILD.gn ++++ b/interfaces/innerkits/huks_standard/main/BUILD.gn +@@ -19,17 +19,17 @@ config("huks_config") { + + if (os_level == "standard") { + ohos_shared_library("libhukssdk") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/interfaces/kits/c/BUILD.gn b/interfaces/kits/c/BUILD.gn +index 0b5f6763..18f546c6 100755 +--- a/interfaces/kits/c/BUILD.gn ++++ b/interfaces/kits/c/BUILD.gn +@@ -38,7 +38,7 @@ config("huks_config") { + ohos_shared_library("huks_ndk") { + public_configs = [ ":huks_config" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn +index 64812f7b..bcd972a8 100644 +--- a/interfaces/kits/napi/BUILD.gn ++++ b/interfaces/kits/napi/BUILD.gn +@@ -14,14 +14,14 @@ + import("//build/ohos.gni") + + ohos_shared_library("huks") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + defines = [ + "HUKS_NAPI_ERRORCODE_WITH_MESSAGE", +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/services/huks_standard/BUILD.gn b/services/huks_standard/BUILD.gn +index 9d15449c..b5d9192c 100644 +--- a/services/huks_standard/BUILD.gn ++++ b/services/huks_standard/BUILD.gn +@@ -21,15 +21,15 @@ ohos_prebuilt_etc("huks_service.rc") { + } + + ohos_shared_library("huks_service") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/services/huks_standard/huks_engine/main/core/BUILD.gn b/services/huks_standard/huks_engine/main/core/BUILD.gn +index b234c6c4..c0c8e08f 100644 +--- a/services/huks_standard/huks_engine/main/core/BUILD.gn ++++ b/services/huks_standard/huks_engine/main/core/BUILD.gn +@@ -19,17 +19,17 @@ config("huks_config") { + } + + ohos_shared_library("huks_engine_core_standard") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn b/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn +index d9c50406..6a765fd4 100644 +--- a/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn ++++ b/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn +@@ -18,17 +18,17 @@ config("huks_config") { + } + + ohos_static_library("libhuks_core_hal_api_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +@@ -39,6 +39,7 @@ ohos_static_library("libhuks_core_hal_api_static") { + "-Werror", + ] + cflags = cflags_cc ++ cflags_c = [ "-Wno-sign-compare" ] + complete_static_lib = true + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + } +diff --git a/services/huks_standard/huks_service/main/BUILD.gn b/services/huks_standard/huks_service/main/BUILD.gn +index 710a937e..2ef29256 100644 +--- a/services/huks_standard/huks_service/main/BUILD.gn ++++ b/services/huks_standard/huks_service/main/BUILD.gn +@@ -14,15 +14,15 @@ + import("//build/ohos.gni") + + ohos_static_library("libhuks_service_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/services/huks_standard/huks_service/main/core/BUILD.gn b/services/huks_standard/huks_service/main/core/BUILD.gn +index 12ea145f..709dfb9b 100644 +--- a/services/huks_standard/huks_service/main/core/BUILD.gn ++++ b/services/huks_standard/huks_service/main/core/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_service_core_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -32,11 +32,11 @@ ohos_static_library("libhuks_service_core_standard_static") { + "//base/security/huks/utils/file_operator", + "//base/security/huks/utils/list", + "//base/security/huks/utils/mutex", +- "//base/security/huks/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper", ++ # "//base/security/huks/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper", + "//commonlibrary/c_utils/base/include", + ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +@@ -74,7 +74,7 @@ ohos_static_library("libhuks_service_core_standard_static") { + } + external_deps = [ + "c_utils:utils", +- "hitrace_native:libhitracechain", ++ # "hitrace_native:libhitracechain", + "hiviewdfx_hilog_native:libhilog", + ] + complete_static_lib = true +diff --git a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn +index d6743dce..be850e83 100644 +--- a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn ++++ b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn +@@ -21,17 +21,17 @@ config("huks_config") { + } + + ohos_static_library("libhuks_service_os_dependency_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +@@ -56,8 +56,8 @@ ohos_static_library("libhuks_service_os_dependency_standard_static") { + sources += [ "sa/hks_event_observer.cpp" ] + defines += [ "SUPPORT_COMMON_EVENT" ] + external_deps += [ +- "ability_base:want", +- "common_event_service:cesfwk_innerkits", ++ # "ability_base:want", ++ # "common_event_service:cesfwk_innerkits", + ] + if (has_os_account_part) { + defines += [ "HAS_OS_ACCOUNT_PART" ] +diff --git a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn +index c8c27476..c1f2e207 100644 +--- a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn ++++ b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn +@@ -18,18 +18,18 @@ config("huks_config") { + } + + ohos_static_library("libhuks_service_idl_standard_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + include_dirs = [ "//base/security/huks/services/huks_standard/huks_service/main/os_dependency/idl/passthrough" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +@@ -47,7 +47,7 @@ ohos_static_library("libhuks_service_idl_standard_static") { + external_deps = [ "ipc:ipc_core" ] + + external_deps += [ +- "access_token:libaccesstoken_sdk", ++ # "access_token:libaccesstoken_sdk", + "hiviewdfx_hilog_native:libhilog", + ] + +diff --git a/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn +index 68efecae..66f480f4 100644 +--- a/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn ++++ b/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn +@@ -18,11 +18,11 @@ config("libhuks_service_systemapi_mock_config") { + } + + ohos_static_library("libhuks_service_systemapi_mock_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] +diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn +index 84809fef..faf53319 100644 +--- a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn ++++ b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_utils_hisysevent_wrapper_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -41,7 +41,7 @@ ohos_static_library("libhuks_utils_hisysevent_wrapper_static") { + "-Werror", + ] + external_deps = [ +- "hisysevent_native:libhisysevent", ++ # "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", + ] + complete_static_lib = true +diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp +index 2b16337e..81e4738e 100644 +--- a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp ++++ b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp +@@ -15,56 +15,57 @@ + + + #include "hisysevent_wrapper.h" +-#include "hisysevent.h" ++// #include "hisysevent.h" + + #include "hks_log.h" + #include "hks_template.h" + +-using namespace OHOS::HiviewDFX; ++// using namespace OHOS::HiviewDFX; + +-static constexpr const char g_eventName[] = "HUKS_FAULT"; +-static constexpr const char g_tagFunction[] = "FUNCTION"; +-static constexpr const char g_tagUserId[] = "USER_ID"; +-static constexpr const char g_tagProcessUID[] = "PROCESS_UID"; +-static constexpr const char g_tagKeyType[] = "KEY_TYPE"; +-static constexpr const char g_tagErrorCode[] = "ERROR_CODE"; +-static constexpr const char g_tagExtra[] = "EXTRA"; ++// static constexpr const char g_eventName[] = "HUKS_FAULT"; ++// static constexpr const char g_tagFunction[] = "FUNCTION"; ++// static constexpr const char g_tagUserId[] = "USER_ID"; ++// static constexpr const char g_tagProcessUID[] = "PROCESS_UID"; ++// static constexpr const char g_tagKeyType[] = "KEY_TYPE"; ++// static constexpr const char g_tagErrorCode[] = "ERROR_CODE"; ++// static constexpr const char g_tagExtra[] = "EXTRA"; + + static int32_t ConvertToHiSysEventType(enum EventType inEventType, + int32_t *outEventTypeInt) + { +- switch (inEventType) { +- case FAULT: +- *outEventTypeInt = HiSysEvent::EventType::FAULT; +- break; +- case STATISTIC: +- *outEventTypeInt = HiSysEvent::EventType::STATISTIC; +- break; +- case SECURITY: +- *outEventTypeInt = HiSysEvent::EventType::SECURITY; +- break; +- case BEHAVIOR: +- *outEventTypeInt = HiSysEvent::EventType::BEHAVIOR; +- break; +- default: +- HKS_LOG_E("Invalid inEventType!"); +- return HKS_ERROR_INVALID_ARGUMENT; +- } ++ // switch (inEventType) { ++ // case FAULT: ++ // *outEventTypeInt = HiSysEvent::EventType::FAULT; ++ // break; ++ // case STATISTIC: ++ // *outEventTypeInt = HiSysEvent::EventType::STATISTIC; ++ // break; ++ // case SECURITY: ++ // *outEventTypeInt = HiSysEvent::EventType::SECURITY; ++ // break; ++ // case BEHAVIOR: ++ // *outEventTypeInt = HiSysEvent::EventType::BEHAVIOR; ++ // break; ++ // default: ++ // HKS_LOG_E("Invalid inEventType!"); ++ // return HKS_ERROR_INVALID_ARGUMENT; ++ // } + return HKS_SUCCESS; + } + + int WriteEvent(enum EventType eventType, const char *functionName, const struct EventValues *eventValues, + const char *extra) + { ++ return 0; + int32_t outEventTypeInt = 0; + int32_t ret = ConvertToHiSysEventType(eventType, &outEventTypeInt); + HKS_IF_NOT_SUCC_LOGE_RETURN(ret, ret, "convert to hiSysEvent event type failed!") + +- enum HiSysEvent::EventType outEventType = static_cast(outEventTypeInt); ++ // enum HiSysEvent::EventType outEventType = static_cast(outEventTypeInt); + +- ret = HiSysEventWrite(HiSysEvent::Domain::HUKS, g_eventName, +- outEventType, g_tagFunction, functionName, g_tagUserId, eventValues->userId, g_tagProcessUID, +- eventValues->processName, g_tagKeyType, eventValues->keyType, g_tagErrorCode, eventValues->errorCode, +- g_tagExtra, extra); +- return ret; ++ // ret = HiSysEventWrite(HiSysEvent::Domain::HUKS, g_eventName, ++ // outEventType, g_tagFunction, functionName, g_tagUserId, eventValues->userId, g_tagProcessUID, ++ // eventValues->processName, g_tagKeyType, eventValues->keyType, g_tagErrorCode, eventValues->errorCode, ++ // g_tagExtra, extra); ++ // return ret; + } +diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn +index ee9d940a..3fc2ef43 100644 +--- a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn ++++ b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_utils_hitrace_meter_wrapper_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -36,6 +36,6 @@ ohos_static_library("libhuks_utils_hitrace_meter_wrapper_static") { + "-Wall", + "-Werror", + ] +- external_deps = [ "hitrace_native:hitrace_meter" ] ++ # external_deps = [ "hitrace_native:hitrace_meter" ] + complete_static_lib = true + } +diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp +index 89dc408e..2872b4c2 100644 +--- a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp ++++ b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp +@@ -16,17 +16,19 @@ + #include "hitrace_meter_wrapper.h" + + #include "hks_log.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + + #include + + void HksTraceMeterStart(uint64_t label, const char *value, float limit) + { +- const std::string valueString(value); +- StartTrace(label, valueString, limit); ++ return; ++ // const std::string valueString(value); ++ // StartTrace(label, valueString, limit); + } + + void HksTraceMeterFinish(uint64_t label) + { +- FinishTrace(label); ++ return; ++ // FinishTrace(label); + } +\ No newline at end of file +diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn +index c7b42fd1..36359b4b 100644 +--- a/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn ++++ b/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn +@@ -18,17 +18,17 @@ config("huks_config") { + } + + ohos_static_library("libhuks_service_systemapi_wrap_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +@@ -36,7 +36,7 @@ ohos_static_library("libhuks_service_systemapi_wrap_static") { + deps = [ + "//base/security/huks/frameworks/huks_standard/main/common:libhuks_common_standard_static", + "//base/security/huks/utils/condition:libhuks_utils_condition_static", +- "//base/useriam/user_auth_framework/frameworks/native/client:userauth_client", ++ # "//base/useriam/user_auth_framework/frameworks/native/client:userauth_client", + ] + + external_deps = [ +diff --git a/test/reliability/BUILD.gn b/test/reliability/BUILD.gn +index 5e0c4be0..26005ad8 100644 +--- a/test/reliability/BUILD.gn ++++ b/test/reliability/BUILD.gn +@@ -29,7 +29,7 @@ ohos_reliabilitytest("huks_stability_test") { + ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/test/unittest/huks_standard_test/module_test/BUILD.gn b/test/unittest/huks_standard_test/module_test/BUILD.gn +index 72a30bb5..9bc1a0ac 100644 +--- a/test/unittest/huks_standard_test/module_test/BUILD.gn ++++ b/test/unittest/huks_standard_test/module_test/BUILD.gn +@@ -170,7 +170,7 @@ ohos_unittest("huks_module_test") { + ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HUKS_LOG_ENABLE_", + ] + +@@ -197,7 +197,7 @@ ohos_unittest("huks_module_test") { + if (support_jsapi) { + sources += [ "//base/security/huks/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/sa/src/huks_event_observer_test.cpp" ] + external_deps += [ +- "ability_base:want", ++ # "ability_base:want", + "common_event_service:cesfwk_innerkits", + ] + } +diff --git a/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn b/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn +index 0bfdb0dd..210dc0ec 100644 +--- a/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn ++++ b/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn +@@ -124,9 +124,9 @@ config("hilog_dir") { + [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include" ] + } + ohos_static_library("libhukssdk_static") { +- sanitize = { +- integer_overflow = true +- } ++ # sanitize = { ++ # integer_overflow = true ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":public_huks_config" ] +@@ -180,7 +180,7 @@ ohos_static_library("libhukssdk_static") { + if (support_jsapi) { + external_deps += [ "os_account:os_account_innerkits" ] + external_deps += [ +- "ability_base:want", ++ # "ability_base:want", + "common_event_service:cesfwk_innerkits", + "ipc:ipc_core", + ] +diff --git a/test/unittest/huks_standard_test/module_test/mock/BUILD.gn b/test/unittest/huks_standard_test/module_test/mock/BUILD.gn +index 5d80576b..c2c2a609 100644 +--- a/test/unittest/huks_standard_test/module_test/mock/BUILD.gn ++++ b/test/unittest/huks_standard_test/module_test/mock/BUILD.gn +@@ -34,7 +34,7 @@ ohos_unittest("huks_mock_test") { + sources += [ "//base/security/huks/test/unittest/huks_standard_test/module_test/mock/ipc/src/huks_access_test.cpp" ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HUKS_LOG_ENABLE_", + ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] +diff --git a/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn b/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn +index c670243a..6a855a55 100644 +--- a/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn ++++ b/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn +@@ -23,7 +23,7 @@ ohos_unittest("service_ipc_test") { + sources = [ "src/huks_ipc_serialization_test.cpp" ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HUKS_LOG_ENABLE_", + ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] +diff --git a/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn b/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn +index 082e4d02..aaeee542 100644 +--- a/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn ++++ b/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn +@@ -23,7 +23,7 @@ ohos_unittest("huks_useridm_wrap_test") { + sources = [ "src/hks_useridm_api_wrap_test.cpp" ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HUKS_LOG_ENABLE_", + ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] +diff --git a/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn b/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn +index c8a9b7a3..5ba8f0a9 100644 +--- a/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn ++++ b/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn +@@ -19,7 +19,7 @@ ohos_unittest("huks_multithread_test") { + module_out_path = module_output_path + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/test/unittest/huks_standard_test/three_stage_test/BUILD.gn b/test/unittest/huks_standard_test/three_stage_test/BUILD.gn +index 2ef2fa79..0395c1e9 100644 +--- a/test/unittest/huks_standard_test/three_stage_test/BUILD.gn ++++ b/test/unittest/huks_standard_test/three_stage_test/BUILD.gn +@@ -79,7 +79,7 @@ ohos_unittest("huks_UT_test") { + ] + + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HUKS_LOG_ENABLE_", + ] + +diff --git a/utils/condition/BUILD.gn b/utils/condition/BUILD.gn +index da41ca08..2c8e8795 100644 +--- a/utils/condition/BUILD.gn ++++ b/utils/condition/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_utils_condition_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -33,7 +33,7 @@ ohos_static_library("libhuks_utils_condition_static") { + ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/utils/crypto_adapter/BUILD.gn b/utils/crypto_adapter/BUILD.gn +index 381f5b82..8a067f0f 100644 +--- a/utils/crypto_adapter/BUILD.gn ++++ b/utils/crypto_adapter/BUILD.gn +@@ -19,17 +19,17 @@ config("huks_config") { + } + + ohos_static_library("libhuks_utils_client_service_adapter_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] + include_dirs = [ "//third_party/openssl/include/" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/utils/file_operator/BUILD.gn b/utils/file_operator/BUILD.gn +index 5864fdf3..8666d7f4 100644 +--- a/utils/file_operator/BUILD.gn ++++ b/utils/file_operator/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_utils_file_operator_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -33,7 +33,7 @@ ohos_static_library("libhuks_utils_file_operator_static") { + ] + configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +diff --git a/utils/list/BUILD.gn b/utils/list/BUILD.gn +index ba8d1492..95c65d59 100644 +--- a/utils/list/BUILD.gn ++++ b/utils/list/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_utils_list_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +diff --git a/utils/mutex/BUILD.gn b/utils/mutex/BUILD.gn +index f4db2132..94b5a904 100644 +--- a/utils/mutex/BUILD.gn ++++ b/utils/mutex/BUILD.gn +@@ -19,11 +19,11 @@ config("huks_config") { + } + + ohos_static_library("libhuks_utils_mutex_static") { +- sanitize = { +- integer_overflow = true +- cfi = true +- debug = false +- } ++ # sanitize = { ++ # integer_overflow = true ++ # cfi = true ++ # debug = false ++ # } + subsystem_name = "security" + part_name = "huks" + public_configs = [ ":huks_config" ] +@@ -33,7 +33,7 @@ ohos_static_library("libhuks_utils_mutex_static") { + "//base/security/huks/interfaces/innerkits/huks_standard/main/include", + ] + defines = [ +- "L2_STANDARD", ++ # "L2_STANDARD", + "_HARDWARE_ROOT_KEY_", + "_HUKS_LOG_ENABLE_", + ] +-- +2.33.0 + diff --git a/0009-remove-dependency-and-adapt-for-build-device_auth.patch b/0009-remove-dependency-and-adapt-for-build-device_auth.patch new file mode 100644 index 0000000000000000000000000000000000000000..5a13d5888cba028b6e355dbddd35957db94f1a5d --- /dev/null +++ b/0009-remove-dependency-and-adapt-for-build-device_auth.patch @@ -0,0 +1,210 @@ +From 7b37fc1df4da5befa175ff6687238c0012d2bb5e Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:37:06 +0800 +Subject: [PATCH] remove dependency and adapt for build + +--- + services/BUILD.gn | 16 +++---- + .../src/hiview_adapter/hisysevent_adapter.cpp | 33 +++++++------- + .../src/hiview_adapter/hitrace_adapter.cpp | 10 +++-- + .../permission_adapter/permission_adapter.cpp | 43 ++++++++++--------- + 4 files changed, 53 insertions(+), 49 deletions(-) + +diff --git a/services/BUILD.gn b/services/BUILD.gn +index 655f169..967d958 100644 +--- a/services/BUILD.gn ++++ b/services/BUILD.gn +@@ -176,8 +176,8 @@ if (os_level == "mini" || os_level == "small") { + external_deps = [ + "c_utils:utils", + "dsoftbus:softbus_client", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + ] + if (support_jsapi) { +@@ -225,10 +225,10 @@ if (os_level == "mini" || os_level == "small") { + ] + + external_deps = [ +- "access_token:libaccesstoken_sdk", ++ # "access_token:libaccesstoken_sdk", + "c_utils:utils", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", + "ipc:ipc_core", +@@ -269,10 +269,10 @@ if (os_level == "mini" || os_level == "small") { + ] + + external_deps = [ +- "access_token:libaccesstoken_sdk", ++ # "access_token:libaccesstoken_sdk", + "c_utils:utils", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", + "ipc:ipc_core", +diff --git a/services/frameworks/src/hiview_adapter/hisysevent_adapter.cpp b/services/frameworks/src/hiview_adapter/hisysevent_adapter.cpp +index 3954919..f5b3380 100644 +--- a/services/frameworks/src/hiview_adapter/hisysevent_adapter.cpp ++++ b/services/frameworks/src/hiview_adapter/hisysevent_adapter.cpp +@@ -14,33 +14,34 @@ + */ + + #include "hisysevent_adapter.h" +-#include "hisysevent.h" ++// #include "hisysevent.h" + + #ifdef __cplusplus + extern "C" { + #endif + +-constexpr char STR_EVENT_CORE_FUNCTION[] = "CORE_FUNCTION"; +-constexpr char STR_EVENT[] = "EVENT"; +-constexpr char STR_APP_ID[] = "APP_ID"; +-constexpr char STR_BATCH_NUMBER[] = "BATCH_NUMBER"; +-constexpr char STR_RESULT[] = "RESULT"; +-constexpr char STR_OS_ACCOUNT_ID[] = "OS_ACCOUNT_ID"; ++// constexpr char STR_EVENT_CORE_FUNCTION[] = "CORE_FUNCTION"; ++// constexpr char STR_EVENT[] = "EVENT"; ++// constexpr char STR_APP_ID[] = "APP_ID"; ++// constexpr char STR_BATCH_NUMBER[] = "BATCH_NUMBER"; ++// constexpr char STR_RESULT[] = "RESULT"; ++// constexpr char STR_OS_ACCOUNT_ID[] = "OS_ACCOUNT_ID"; + + void ReportCoreFuncInvokeEvent(const InvokeEvent *event) + { ++ return; + if (event == nullptr) { + return; + } +- OHOS::HiviewDFX::HiSysEvent::Write( +- OHOS::HiviewDFX::HiSysEvent::Domain::DEVICE_AUTH, +- STR_EVENT_CORE_FUNCTION, +- OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC, +- STR_EVENT, event->eventId, +- STR_APP_ID, event->appId, +- STR_BATCH_NUMBER, event->batchNumber, +- STR_RESULT, event->result, +- STR_OS_ACCOUNT_ID, event->osAccountId); ++ // OHOS::HiviewDFX::HiSysEvent::Write( ++ // OHOS::HiviewDFX::HiSysEvent::Domain::DEVICE_AUTH, ++ // STR_EVENT_CORE_FUNCTION, ++ // OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC, ++ // STR_EVENT, event->eventId, ++ // STR_APP_ID, event->appId, ++ // STR_BATCH_NUMBER, event->batchNumber, ++ // STR_RESULT, event->result, ++ // STR_OS_ACCOUNT_ID, event->osAccountId); + } + + #ifdef __cplusplus +diff --git a/services/frameworks/src/hiview_adapter/hitrace_adapter.cpp b/services/frameworks/src/hiview_adapter/hitrace_adapter.cpp +index 57eca82..0beea45 100644 +--- a/services/frameworks/src/hiview_adapter/hitrace_adapter.cpp ++++ b/services/frameworks/src/hiview_adapter/hitrace_adapter.cpp +@@ -15,24 +15,26 @@ + + #include "hitrace_adapter.h" + +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + + #ifdef __cplusplus + extern "C" { + #endif + + void DevAuthStartTrace(const char *value) +-{ ++{ ++ return; + if (value == nullptr) { + return; + } + +- StartTrace(HITRACE_TAG_APP, value); ++ // StartTrace(HITRACE_TAG_APP, value); + } + + void DevAuthFinishTrace(void) + { +- FinishTrace(HITRACE_TAG_APP); ++ return; ++ // FinishTrace(HITRACE_TAG_APP); + } + + #ifdef __cplusplus +diff --git a/services/frameworks/src/permission_adapter/permission_adapter.cpp b/services/frameworks/src/permission_adapter/permission_adapter.cpp +index b4b1eb2..74f1d92 100644 +--- a/services/frameworks/src/permission_adapter/permission_adapter.cpp ++++ b/services/frameworks/src/permission_adapter/permission_adapter.cpp +@@ -15,34 +15,35 @@ + + #include "permission_adapter.h" + +-#include "accesstoken_kit.h" ++// #include "accesstoken_kit.h" + #include "ipc_skeleton.h" + + #include "device_auth_defines.h" + #include "hc_log.h" + + using namespace OHOS; +-using namespace OHOS::Security::AccessToken; ++// using namespace OHOS::Security::AccessToken; + + int32_t CheckPermission(void) + { +- AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID(); +- ATokenTypeEnum tokenType = AccessTokenKit::GetTokenTypeFlag(tokenId); +- if (tokenType == TOKEN_NATIVE) { +- NativeTokenInfo findInfo; +- if (AccessTokenKit::GetNativeTokenInfo(tokenId, findInfo) != 0) { +- LOGE("GetNativeTokenInfo failed!"); +- return HC_ERROR; +- } +- if ((findInfo.apl == APL_SYSTEM_CORE) || (findInfo.apl == APL_SYSTEM_BASIC)) { +- LOGI("Check permission(APL3=SYSTEM_CORE or APL2=SYSTEM_BASIC) success!"); +- return HC_SUCCESS; +- } else { +- LOGE("Check permission(APL3=SYSTEM_CORE or APL2=SYSTEM_BASIC) failed! APL: %d", findInfo.apl); +- return HC_ERROR; +- } +- } else { +- LOGE("Invalid token type: %d", tokenType); +- return HC_ERROR; +- } ++ // AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID(); ++ // ATokenTypeEnum tokenType = AccessTokenKit::GetTokenTypeFlag(tokenId); ++ // if (tokenType == TOKEN_NATIVE) { ++ // NativeTokenInfo findInfo; ++ // if (AccessTokenKit::GetNativeTokenInfo(tokenId, findInfo) != 0) { ++ // LOGE("GetNativeTokenInfo failed!"); ++ // return HC_ERROR; ++ // } ++ // if ((findInfo.apl == APL_SYSTEM_CORE) || (findInfo.apl == APL_SYSTEM_BASIC)) { ++ // LOGI("Check permission(APL3=SYSTEM_CORE or APL2=SYSTEM_BASIC) success!"); ++ // return HC_SUCCESS; ++ // } else { ++ // LOGE("Check permission(APL3=SYSTEM_CORE or APL2=SYSTEM_BASIC) failed! APL: %d", findInfo.apl); ++ // return HC_ERROR; ++ // } ++ // } else { ++ // LOGE("Invalid token type: %d", tokenType); ++ // return HC_ERROR; ++ // } ++ return HC_SUCCESS; + } +\ No newline at end of file +-- +2.33.0 + diff --git a/0010-adapt-for-build-mbedtls.patch b/0010-adapt-for-build-mbedtls.patch new file mode 100644 index 0000000000000000000000000000000000000000..e5a1f22b1b1fe7cd3fd75752fc6584979f0a8848 --- /dev/null +++ b/0010-adapt-for-build-mbedtls.patch @@ -0,0 +1,33 @@ +From 0cc0151dcf4507479a2db8912a67d68a8946e70d Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:40:56 +0800 +Subject: [PATCH] adapt for build + +--- + BUILD.gn | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/BUILD.gn b/BUILD.gn +index 2c77990..ec05d65 100755 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -11,7 +11,7 @@ + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +-# ++# + + import("//third_party/mbedtls/mbedtls.gni") + +@@ -115,6 +115,7 @@ if (defined(ohos_lite)) { + + ohos_shared_library("mbedtls_shared") { + public_configs = [ ":mbedtls_config" ] ++ cflags_c = [ "-Wno-unused-but-set-variable" ] + output_name = "mbedtls" + subsystem_name = "common" + part_name = "dsoftbus" +-- +2.33.0 + diff --git a/0011-remove-dependency-and-adapt-for-build-device_manager.patch b/0011-remove-dependency-and-adapt-for-build-device_manager.patch new file mode 100644 index 0000000000000000000000000000000000000000..b5068ac72f3b72f0a765129ff7a21bba39628c4e --- /dev/null +++ b/0011-remove-dependency-and-adapt-for-build-device_manager.patch @@ -0,0 +1,406 @@ +From cd2f37dcc4bc09b440753670b0f4ec7c1c425c0c Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 17:44:14 +0800 +Subject: [PATCH] remove dependency and adapt for build + +--- + bundle.json | 3 ++- + common/src/dfx/standard/dm_hisysevent.cpp | 23 ++++++++-------- + common/src/dfx/standard/dm_hitrace.cpp | 8 +++--- + ext/no_interaction_auth/BUILD.gn | 10 +++---- + ext/pin_auth/BUILD.gn | 2 +- + interfaces/inner_kits/native_cpp/BUILD.gn | 4 +-- + interfaces/kits/js/BUILD.gn | 2 +- + services/implementation/BUILD.gn | 6 ++--- + services/service/BUILD.gn | 12 +++------ + .../ipc/standard/ipc_server_listener.h | 1 + + .../dmcommoneventmanager_fuzzer/BUILD.gn | 2 +- + .../dmdiscoverymanager_fuzzer/BUILD.gn | 2 +- + test/fuzztest/pinauth_fuzzer/BUILD.gn | 2 +- + test/fuzztest/pinauthui_fuzzer/BUILD.gn | 2 +- + test/unittest/BUILD.gn | 26 +++++++++---------- + test/unittest/UTTest_dm_dfx.h | 2 +- + utils/BUILD.gn | 6 ++--- + .../standard/permission_manager.cpp | 2 +- + 18 files changed, 58 insertions(+), 57 deletions(-) + +diff --git a/bundle.json b/bundle.json +index 5d6b7849..bee412cb 100644 +--- a/bundle.json ++++ b/bundle.json +@@ -72,7 +72,8 @@ + "device_manager_callback.h", + "dm_device_info.h", + "dm_publish_info.h", +- "dm_subscribe_info.h" ++ "dm_subscribe_info.h", ++ "dm_app_image_info.h" + ], + "header_base": "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include" + } +diff --git a/common/src/dfx/standard/dm_hisysevent.cpp b/common/src/dfx/standard/dm_hisysevent.cpp +index 4e9b2970..a508cb85 100644 +--- a/common/src/dfx/standard/dm_hisysevent.cpp ++++ b/common/src/dfx/standard/dm_hisysevent.cpp +@@ -17,23 +17,24 @@ + + #include "dm_constants.h" // for DM_OK + #include "dm_log.h" // for LOGE +-#include "hisysevent.h" // for HiSysEvent, HiSysEvent::Domain, HiSysEvent... ++// #include "hisysevent.h" // for HiSysEvent, HiSysEvent::Domain, HiSysEvent... + #include "unistd.h" // for getpid, getuid + + namespace OHOS { + namespace DistributedHardware { + void SysEventWrite(const std::string &status, int32_t eventType, const std::string &msg) + { +- int32_t res = OHOS::HiviewDFX::HiSysEvent::Write( +- OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_DEVICE_MANAGER, +- status.c_str(), +- (OHOS::HiviewDFX::HiSysEvent::EventType)eventType, +- "PID", getpid(), +- "UID", getuid(), +- "MSG", msg.c_str()); +- if (res != DM_OK) { +- LOGE("%s Write HiSysEvent error, res:%d", status.c_str(), res); +- } ++ return; ++ // int32_t res = OHOS::HiviewDFX::HiSysEvent::Write( ++ // OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_DEVICE_MANAGER, ++ // status.c_str(), ++ // (OHOS::HiviewDFX::HiSysEvent::EventType)eventType, ++ // "PID", getpid(), ++ // "UID", getuid(), ++ // "MSG", msg.c_str()); ++ // if (res != DM_OK) { ++ // LOGE("%s Write HiSysEvent error, res:%d", status.c_str(), res); ++ // } + } + } // namespace DistributedHardware + } // namespace OHOS +diff --git a/common/src/dfx/standard/dm_hitrace.cpp b/common/src/dfx/standard/dm_hitrace.cpp +index 1bbe65fa..caa79885 100644 +--- a/common/src/dfx/standard/dm_hitrace.cpp ++++ b/common/src/dfx/standard/dm_hitrace.cpp +@@ -13,18 +13,20 @@ + * limitations under the License. + */ + #include "dm_hitrace.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + + namespace OHOS { + namespace DistributedHardware { + void DmTraceStart(const std::string &msg) + { +- StartTrace(HITRACE_TAG_DEVICE_MANAGER, msg); ++ return; ++ // StartTrace(HITRACE_TAG_DEVICE_MANAGER, msg); + } + + void DmTraceEnd() + { +- FinishTrace(HITRACE_TAG_DEVICE_MANAGER); ++ return; ++ // FinishTrace(HITRACE_TAG_DEVICE_MANAGER); + } + } // namespace DistributedHardware + } // namespace OHOS +diff --git a/ext/no_interaction_auth/BUILD.gn b/ext/no_interaction_auth/BUILD.gn +index 231e60e4..29b7d6c1 100644 +--- a/ext/no_interaction_auth/BUILD.gn ++++ b/ext/no_interaction_auth/BUILD.gn +@@ -72,12 +72,12 @@ if (defined(ohos_lite)) { + ] + + external_deps = [ +- "ability_base:want", +- "bundle_framework:appexecfwk_base", +- "bundle_framework:appexecfwk_core", ++ # "ability_base:want", ++ #"bundle_framework:appexecfwk_base", ++ #"bundle_framework:appexecfwk_core", + "c_utils:utils", +- "common_event_service:cesfwk_core", +- "common_event_service:cesfwk_innerkits", ++ # "common_event_service:cesfwk_core", ++ # "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", + "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", +diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn +index d49e4f4a..efcb0321 100644 +--- a/ext/pin_auth/BUILD.gn ++++ b/ext/pin_auth/BUILD.gn +@@ -140,7 +140,7 @@ if (defined(ohos_lite)) { + ] + + external_deps = [ +- "ability_base:want", ++ # "ability_base:want", + "init:libbegetutil", + ] + +diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn +index d5726567..81ea6a65 100644 +--- a/interfaces/inner_kits/native_cpp/BUILD.gn ++++ b/interfaces/inner_kits/native_cpp/BUILD.gn +@@ -149,8 +149,8 @@ if (defined(ohos_lite)) { + + external_deps = [ + "c_utils:utils", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr:samgr_proxy", +diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn +index a71f79a1..bd0febab 100644 +--- a/interfaces/kits/js/BUILD.gn ++++ b/interfaces/kits/js/BUILD.gn +@@ -46,7 +46,7 @@ ohos_shared_library("devicemanager") { + "LOG_DOMAIN=0xD004100", + ] + +- external_deps = [ "bundle_framework:appexecfwk_base" ] ++ external_deps = [ #"bundle_framework:appexecfwk_base" ] + + subsystem_name = "distributedhardware" + relative_install_dir = "module/distributedhardware" +diff --git a/services/implementation/BUILD.gn b/services/implementation/BUILD.gn +index 126232e2..45bf523b 100644 +--- a/services/implementation/BUILD.gn ++++ b/services/implementation/BUILD.gn +@@ -220,10 +220,10 @@ if (defined(ohos_lite)) { + } + + external_deps = [ +- "ability_base:want", ++ # "ability_base:want", + "c_utils:utils", +- "common_event_service:cesfwk_core", +- "common_event_service:cesfwk_innerkits", ++ # "common_event_service:cesfwk_core", ++ # "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", + "init:libbegetutil", + "ipc:ipc_core", +diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn +index bb353c12..fd7bb180 100644 +--- a/services/service/BUILD.gn ++++ b/services/service/BUILD.gn +@@ -112,10 +112,10 @@ if (defined(ohos_lite)) { + "//third_party/mbedtls", + ] + +- external_deps = [ +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", +- ] ++ # external_deps = [ ++ # # "hisysevent_native:libhisysevent", ++ # # "hitrace_native:hitrace_meter", ++ # ] + } + } else { + executable("devicemanagerservice") { +@@ -180,10 +180,6 @@ if (defined(ohos_lite)) { + ] + } + } +-} else if (!support_jsapi) { +- group("devicemanagerservice") { +- deps = [] +- } + } else { + config("devicemanagerservice_config") { + include_dirs = [ +diff --git a/services/service/include/ipc/standard/ipc_server_listener.h b/services/service/include/ipc/standard/ipc_server_listener.h +index 0ff7bb80..02283724 100644 +--- a/services/service/include/ipc/standard/ipc_server_listener.h ++++ b/services/service/include/ipc/standard/ipc_server_listener.h +@@ -17,6 +17,7 @@ + #define OHOS_DM_IPC_SERVER_LISTENER_H + + #include ++#include + + #include "ipc_req.h" + #include "ipc_rsp.h" +diff --git a/test/fuzztest/dmcommoneventmanager_fuzzer/BUILD.gn b/test/fuzztest/dmcommoneventmanager_fuzzer/BUILD.gn +index a7dda4f8..997596f2 100644 +--- a/test/fuzztest/dmcommoneventmanager_fuzzer/BUILD.gn ++++ b/test/fuzztest/dmcommoneventmanager_fuzzer/BUILD.gn +@@ -57,7 +57,7 @@ ohos_fuzztest("DmCommonEventManagerFuzzTest") { + ] + + external_deps = [ +- "ability_base:want", ++ # "ability_base:want", + "c_utils:utils", + "common_event_service:cesfwk_core", + "common_event_service:cesfwk_innerkits", +diff --git a/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn b/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn +index a183baab..64b5f7bf 100644 +--- a/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn ++++ b/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn +@@ -56,7 +56,7 @@ ohos_fuzztest("DmDiscoveryManagerFuzzTest") { + ] + + external_deps = [ +- "ability_base:want", ++ # "ability_base:want", + "c_utils:utils", + "common_event_service:cesfwk_core", + "common_event_service:cesfwk_innerkits", +diff --git a/test/fuzztest/pinauth_fuzzer/BUILD.gn b/test/fuzztest/pinauth_fuzzer/BUILD.gn +index a37f310f..5d9e7b8c 100644 +--- a/test/fuzztest/pinauth_fuzzer/BUILD.gn ++++ b/test/fuzztest/pinauth_fuzzer/BUILD.gn +@@ -92,7 +92,7 @@ ohos_fuzztest("PinAuthFuzzTest") { + ] + + external_deps = [ +- "ability_base:want", ++ # "ability_base:want", + "init:libbegetutil", + ] + } +diff --git a/test/fuzztest/pinauthui_fuzzer/BUILD.gn b/test/fuzztest/pinauthui_fuzzer/BUILD.gn +index 5de26477..dd56d78e 100644 +--- a/test/fuzztest/pinauthui_fuzzer/BUILD.gn ++++ b/test/fuzztest/pinauthui_fuzzer/BUILD.gn +@@ -92,7 +92,7 @@ ohos_fuzztest("PinAuthUiFuzzTest") { + ] + + external_deps = [ +- "ability_base:want", ++ # "ability_base:want", + "init:libbegetutil", + ] + } +diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn +index b154fdfb..cae3a92b 100644 +--- a/test/unittest/BUILD.gn ++++ b/test/unittest/BUILD.gn +@@ -178,8 +178,8 @@ ohos_unittest("UTTest_softbus_connector") { + deps = [ ":device_manager_test_common" ] + + external_deps = [ +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + ] + } + +@@ -194,8 +194,8 @@ ohos_unittest("UTTest_softbus_session") { + deps = [ ":device_manager_test_common" ] + + external_deps = [ +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + ] + } + +@@ -367,8 +367,8 @@ ohos_unittest("UTTest_dm_device_state_manager") { + deps = [ ":device_manager_test_common" ] + + external_deps = [ +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + ] + } + +@@ -504,7 +504,7 @@ ohos_unittest("UTTest_dm_discovery_manager") { + + deps = [ ":device_manager_test_common" ] + +- external_deps = [ "hitrace_native:hitrace_meter" ] ++ # external_deps = [ "hitrace_native:hitrace_meter" ] + } + + ## UnitTest UTTest_dm_discovery_manager }}} +@@ -528,7 +528,7 @@ ohos_unittest("UTTest_dm_publish_manager") { + + deps = [ ":device_manager_test_common" ] + +- external_deps = [ "hitrace_native:hitrace_meter" ] ++ # external_deps = [ "hitrace_native:hitrace_meter" ] + } + + ## UnitTest UTTest_dm_publish_manager }}} +@@ -642,15 +642,15 @@ ohos_static_library("device_manager_test_common") { + } + + external_deps = [ +- "ability_base:want", +- "bundle_framework:appexecfwk_base", +- "bundle_framework:appexecfwk_core", ++ # "ability_base:want", ++ #"bundle_framework:appexecfwk_base", ++ #"bundle_framework:appexecfwk_core", + "common_event_service:cesfwk_core", + "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", + "ipc:ipc_core", +diff --git a/test/unittest/UTTest_dm_dfx.h b/test/unittest/UTTest_dm_dfx.h +index 8bba3789..d20b9b8f 100644 +--- a/test/unittest/UTTest_dm_dfx.h ++++ b/test/unittest/UTTest_dm_dfx.h +@@ -29,7 +29,7 @@ + #undef private + #include "dm_hisysevent.h" + #include "dm_hitrace.h" +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + + namespace OHOS { + namespace DistributedHardware { +diff --git a/utils/BUILD.gn b/utils/BUILD.gn +index 0d231c71..59e9e9bd 100644 +--- a/utils/BUILD.gn ++++ b/utils/BUILD.gn +@@ -181,10 +181,10 @@ if (defined(ohos_lite)) { + deps = [ "//third_party/mbedtls:mbedtls_shared" ] + + external_deps = [ +- "access_token:libaccesstoken_sdk", ++ # "access_token:libaccesstoken_sdk", + "c_utils:utils", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr:samgr_proxy", +diff --git a/utils/src/permission/standard/permission_manager.cpp b/utils/src/permission/standard/permission_manager.cpp +index 11db468c..e3de417b 100644 +--- a/utils/src/permission/standard/permission_manager.cpp ++++ b/utils/src/permission/standard/permission_manager.cpp +@@ -24,7 +24,7 @@ + #include "iservice_registry.h" + #include "system_ability_definition.h" + #include "ipc_skeleton.h" +-#include "access_token.h" ++// #include "access_token.h" + #include "hap_token_info.h" + #include "native_token_info.h" + #include "accesstoken_kit.h" +-- +2.33.0 + diff --git a/0012-remove-dependency-and-adapt-for-build-device_security_level.patch b/0012-remove-dependency-and-adapt-for-build-device_security_level.patch new file mode 100644 index 0000000000000000000000000000000000000000..4223e3a9974b72179e051e8ebf6c776da6848188 --- /dev/null +++ b/0012-remove-dependency-and-adapt-for-build-device_security_level.patch @@ -0,0 +1,215 @@ +From 4c65e5a05c65fab987ca8669678d701e284138c8 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 20 Jun 2023 18:43:58 +0800 +Subject: [PATCH] remove dependency and adapt for build + +--- + .../messenger_device_status_manager.cpp | 1 + + services/dfx/BUILD.gn | 4 +- + services/dfx/dslm_bigdata.cpp | 71 ++++++++++--------- + services/dfx/dslm_hitrace.cpp | 28 +++++--- + 4 files changed, 57 insertions(+), 47 deletions(-) + +diff --git a/baselib/msglib/src/standard/messenger_device_status_manager.cpp b/baselib/msglib/src/standard/messenger_device_status_manager.cpp +index 955f9ca..fdb2bc9 100644 +--- a/baselib/msglib/src/standard/messenger_device_status_manager.cpp ++++ b/baselib/msglib/src/standard/messenger_device_status_manager.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "device_manager.h" + #include "securec.h" +diff --git a/services/dfx/BUILD.gn b/services/dfx/BUILD.gn +index cea9105..bccaea7 100644 +--- a/services/dfx/BUILD.gn ++++ b/services/dfx/BUILD.gn +@@ -33,8 +33,8 @@ ohos_source_set("dslm_extension_dfx") { + external_deps = [ + "c_utils:utils", + "hilog_native:libhilog", +- "hisysevent_native:libhisysevent", +- "hitrace_native:hitrace_meter", ++ # "hisysevent_native:libhisysevent", ++ # "hitrace_native:hitrace_meter", + ] + + configs = [ "//base/security/device_security_level/common:common_configs" ] +diff --git a/services/dfx/dslm_bigdata.cpp b/services/dfx/dslm_bigdata.cpp +index 9965fe1..caead97 100644 +--- a/services/dfx/dslm_bigdata.cpp ++++ b/services/dfx/dslm_bigdata.cpp +@@ -14,40 +14,42 @@ + */ + + #include "dslm_bigdata.h" +-#include "hisysevent.h" ++// #include "hisysevent.h" + + #ifdef __cplusplus + extern "C" { + #endif +-namespace { +-constexpr char STR_EVENT_START_FAILED[] = "SERVICE_START_FAILED"; +-constexpr char STR_EVENT_INIT_SELF_LEVEL_FAULT[] = "INIT_SELF_LEVEL_FAULT"; +-constexpr char STR_EVENT_CALL_INTERFACE[] = "CALL_INTERFACE"; +-constexpr char STR_EVENT_QUERY_INFO[] = "QUERY_INFO"; +-constexpr char STR_ERROR_TYPE[] = "ERROR_TYPE"; +-constexpr char STR_ERROR_STR[] = "ERROR_STR"; +-constexpr char STR_USER_ID[] = "USER_ID"; +-constexpr char STR_COST_TIME[] = "COST_TIME"; +-constexpr char STR_RET_CODE[] = "RET_CODE"; +-constexpr char STR_SEC_LEVEL[] = "SEC_LEVEL"; +-constexpr char STR_RET_MODE[] = "RET_MODE"; +-constexpr char STR_LOCAL_MODEL[] = "LOCAL_MODEL"; +-constexpr char STR_TARGET_MODEL[] = "TARGET_MODEL"; +-constexpr char STR_PKG_NAME[] = "PKG_NAME"; +-constexpr char STR_LOCAL_VERSION[] = "LOCAL_VERSION"; +-constexpr char STR_TARGET_VERSION[] = "TARGET_VERSION"; +-constexpr char STR_CRED_TYPE[] = "CRED_TYPE"; +-} // namespace ++// namespace { ++// constexpr char STR_EVENT_START_FAILED[] = "SERVICE_START_FAILED"; ++// constexpr char STR_EVENT_INIT_SELF_LEVEL_FAULT[] = "INIT_SELF_LEVEL_FAULT"; ++// constexpr char STR_EVENT_CALL_INTERFACE[] = "CALL_INTERFACE"; ++// constexpr char STR_EVENT_QUERY_INFO[] = "QUERY_INFO"; ++// constexpr char STR_ERROR_TYPE[] = "ERROR_TYPE"; ++// constexpr char STR_ERROR_STR[] = "ERROR_STR"; ++// constexpr char STR_USER_ID[] = "USER_ID"; ++// constexpr char STR_COST_TIME[] = "COST_TIME"; ++// constexpr char STR_RET_CODE[] = "RET_CODE"; ++// constexpr char STR_SEC_LEVEL[] = "SEC_LEVEL"; ++// constexpr char STR_RET_MODE[] = "RET_MODE"; ++// constexpr char STR_LOCAL_MODEL[] = "LOCAL_MODEL"; ++// constexpr char STR_TARGET_MODEL[] = "TARGET_MODEL"; ++// constexpr char STR_PKG_NAME[] = "PKG_NAME"; ++// constexpr char STR_LOCAL_VERSION[] = "LOCAL_VERSION"; ++// constexpr char STR_TARGET_VERSION[] = "TARGET_VERSION"; ++// constexpr char STR_CRED_TYPE[] = "CRED_TYPE"; ++// } // namespace + void ReportServiceStartFailedEvent(const uint32_t errorType) + { +- HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_START_FAILED, +- OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, STR_ERROR_TYPE, errorType); ++ return; ++ // HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_START_FAILED, ++ // OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, STR_ERROR_TYPE, errorType); + } + + void ReportInitSelfFailedEvent(const char *errorString) + { +- HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_INIT_SELF_LEVEL_FAULT, +- OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, STR_ERROR_STR, errorString); ++ return; ++ // HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_INIT_SELF_LEVEL_FAULT, ++ // OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, STR_ERROR_STR, errorString); + } + + void ReportAppInvokeEvent(const AppInvokeEvent *event) +@@ -56,10 +58,11 @@ void ReportAppInvokeEvent(const AppInvokeEvent *event) + return; + } + +- HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_CALL_INTERFACE, +- OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC, STR_USER_ID, event->uid, STR_COST_TIME, event->costTime, +- STR_RET_CODE, event->retCode, STR_SEC_LEVEL, event->secLevel, STR_RET_MODE, event->retMode, STR_LOCAL_MODEL, +- event->localModel, STR_TARGET_MODEL, event->targetModel, STR_PKG_NAME, event->pkgName); ++ return; ++ // HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_CALL_INTERFACE, ++ // OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC, STR_USER_ID, event->uid, STR_COST_TIME, event->costTime, ++ // STR_RET_CODE, event->retCode, STR_SEC_LEVEL, event->secLevel, STR_RET_MODE, event->retMode, STR_LOCAL_MODEL, ++ // event->localModel, STR_TARGET_MODEL, event->targetModel, STR_PKG_NAME, event->pkgName); + } + + void ReportSecurityInfoSyncEvent(const SecurityInfoSyncEvent *event) +@@ -67,12 +70,12 @@ void ReportSecurityInfoSyncEvent(const SecurityInfoSyncEvent *event) + if (event == nullptr) { + return; + } +- +- HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_QUERY_INFO, +- OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC, STR_LOCAL_MODEL, event->localModel, STR_TARGET_MODEL, +- event->targetModel, STR_LOCAL_VERSION, event->localVersion, STR_TARGET_VERSION, event->targetVersion, +- STR_CRED_TYPE, event->credType, STR_RET_CODE, event->retCode, STR_COST_TIME, event->costTime, STR_SEC_LEVEL, +- event->secLevel); ++ return; ++ // HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::DSLM, STR_EVENT_QUERY_INFO, ++ // OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC, STR_LOCAL_MODEL, event->localModel, STR_TARGET_MODEL, ++ // event->targetModel, STR_LOCAL_VERSION, event->localVersion, STR_TARGET_VERSION, event->targetVersion, ++ // STR_CRED_TYPE, event->credType, STR_RET_CODE, event->retCode, STR_COST_TIME, event->costTime, STR_SEC_LEVEL, ++ // event->secLevel); + } + + #ifdef __cplusplus +diff --git a/services/dfx/dslm_hitrace.cpp b/services/dfx/dslm_hitrace.cpp +index e610db8..727926d 100644 +--- a/services/dfx/dslm_hitrace.cpp ++++ b/services/dfx/dslm_hitrace.cpp +@@ -15,7 +15,7 @@ + + #include "dslm_hitrace.h" + +-#include "hitrace_meter.h" ++// #include "hitrace_meter.h" + + #ifdef __cplusplus + extern "C" { +@@ -23,37 +23,43 @@ extern "C" { + + void DslmStartProcessTrace(const char *value) + { +- StartTrace(HITRACE_TAG_DLSM, std::string(value)); ++ return; ++ // StartTrace(HITRACE_TAG_DLSM, std::string(value)); + } + + void DslmStartStateMachineTrace(uint32_t machineId, uint32_t event) + { +- std::string traceValue = +- std::string("StartStateMachine_") + std::to_string(machineId) + "_" + std::to_string(event); ++ return; ++ // std::string traceValue = ++ // std::string("StartStateMachine_") + std::to_string(machineId) + "_" + std::to_string(event); + +- StartTrace(HITRACE_TAG_DLSM, traceValue); ++ // StartTrace(HITRACE_TAG_DLSM, traceValue); + } + + void DslmFinishProcessTrace(void) + { +- FinishTrace(HITRACE_TAG_DLSM); ++ return; ++ // FinishTrace(HITRACE_TAG_DLSM); + } + + void DslmStartProcessTraceAsync(const char *value, uint32_t owner, uint32_t cookie) + { +- std::string traceValue = std::string(value) + "_" + std::to_string(owner) + "_" + std::to_string(cookie); +- StartAsyncTrace(HITRACE_TAG_DLSM, traceValue, cookie); ++ return; ++ // std::string traceValue = std::string(value) + "_" + std::to_string(owner) + "_" + std::to_string(cookie); ++ // StartAsyncTrace(HITRACE_TAG_DLSM, traceValue, cookie); + } + + void DslmFinishProcessTraceAsync(const char *value, uint32_t owner, uint32_t cookie) + { +- std::string traceValue = std::string(value) + "_" + std::to_string(owner) + "_" + std::to_string(cookie); +- FinishAsyncTrace(HITRACE_TAG_DLSM, traceValue, cookie); ++ return; ++ // std::string traceValue = std::string(value) + "_" + std::to_string(owner) + "_" + std::to_string(cookie); ++ // FinishAsyncTrace(HITRACE_TAG_DLSM, traceValue, cookie); + } + + void DslmCountTrace(const char *name, int64_t count) + { +- CountTrace(HITRACE_TAG_DLSM, std::string(name), count); ++ return; ++ // CountTrace(HITRACE_TAG_DLSM, std::string(name), count); + } + + #ifdef __cplusplus +-- +2.33.0 + diff --git a/commonlibrary_c_utils-OpenHarmony-v3.2-Release.tar.gz b/commonlibrary_c_utils-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b490fae75ebdefd7e8b79f895f858628e6f649e2 Binary files /dev/null and b/commonlibrary_c_utils-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/communication_dsoftbus-OpenHarmony-v3.2-Release.tar.gz b/communication_dsoftbus-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7c68859b98ece4d6482abe555c240e8b4b5a704c Binary files /dev/null and b/communication_dsoftbus-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/communication_ipc-OpenHarmony-v3.2-Release.tar.gz b/communication_ipc-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..421c086b4fea3911588f8f0b159a57cfb01478a1 Binary files /dev/null and b/communication_ipc-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/customization_config_policy-OpenHarmony-v3.2-Release.tar.gz b/customization_config_policy-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4959e418c261d2c4a011ab8d4ce430c147dee23b Binary files /dev/null and b/customization_config_policy-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/distributed-beget.tar.gz b/distributed-beget.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5a91a85431757d7217f3968d99e0117e4a6067ae Binary files /dev/null and b/distributed-beget.tar.gz differ diff --git a/distributed-utils.spec b/distributed-utils.spec new file mode 100644 index 0000000000000000000000000000000000000000..400cfff0269b33c5d341418a4b569da22e6cdf2d --- /dev/null +++ b/distributed-utils.spec @@ -0,0 +1,212 @@ +%define debug_package %{nil} +%global oh_version OpenHarmony-v3.2-Release + +%global c_utils_dir %{_builddir}/commonlibrary/c_utils +%global config_policy_dir %{_builddir}/base/customization/config_policy +%global dsoftbus_dir %{_builddir}/foundation/communication/dsoftbus +%global eventhandler_dir %{_builddir}/base/notification/eventhandler +%global init_dir %{_builddir}/base/startup/init +%global ipc_dir %{_builddir}/foundation/communication/ipc +%global safwk_dir %{_builddir}/foundation/systemabilitymgr/safwk +%global samgr_dir %{_builddir}/foundation/systemabilitymgr/samgr +%global sqlite_dir %{_builddir}/third_party/sqlite +%global libcoap_dir %{_builddir}/third_party/libcoap +%global huks_dir %{_builddir}/base/security/huks +%global device_auth_dir %{_builddir}/base/security/device_auth +%global mbedtls_dir %{_builddir}/third_party/mbedtls +%global device_manager_dir %{_builddir}/foundation/distributedhardware/device_manager +%global json_dir %{_builddir}/third_party/json +%global dataclassification_dir %{_builddir}/base/security/dataclassification +%global device_security_level_dir %{_builddir}/base/security/device_security_level + +%global build_opt /opt/distributed-middleware-build + +Name: distributed-utils +Version: 1.0.0 +Release: 1 +Summary: Distributed middleware used components. +License: Apache-2.0 +Url: https://gitee.com/openharmony/ +Source0: https://gitee.com/openharmony/commonlibrary_c_utils/repository/archive/openHarmony-v3.2-Release.tar.gz #/commonlibrary_c_utils-OpenHarmony-v3.2-Release.tar.gz +Source1: https://gitee.com/openharmony/customization_config_policy/repository/archive/openHarmony-v3.2-Release.tar.gz #/customization_config_policy-OpenHarmony-v3.2-Release.tar.gz +Source2: https://gitee.com/openharmony/communication_dsoftbus/repository/archive/openHarmony-v3.2-Release.tar.gz #/communication_dsoftbus-OpenHarmony-v3.2-Release.tar.gz +Source3: https://gitee.com/openharmony/notification_eventhandler/repository/archive/openHarmony-v3.2-Release.tar.gz #/notification_eventhandler-OpenHarmony-v3.2-Release.tar.gz +Source4: https://gitee.com/openeuler/distributed-beget/repository/archive/distributed-beget.tar.gz +Source5: https://gitee.com/openharmony/communication_ipc/repository/archive/openHarmony-v3.2-Release.tar.gz #/communication_ipc-OpenHarmony-v3.2-Release.tar.gz +Source6: https://gitee.com/openharmony/systemabilitymgr_safwk/repository/archive/openHarmony-v3.2-Release.tar.gz #/systemabilitymgr_safwk-OpenHarmony-v3.2-Release.tar.gz +Source7: https://gitee.com/openharmony/systemabilitymgr_samgr/repository/archive/openHarmony-v3.2-Release.tar.gz #/systemabilitymgr_samgr-OpenHarmony-v3.2-Release.tar.gz +Source8: https://gitee.com/openharmony/third_party_sqlite/repository/archive/openHarmony-v3.2-Release.tar.gz #/third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz +Source9: https://gitee.com/openharmony/third_party_libcoap/repository/archive/openHarmony-v3.2-Release.tar.gz #/third_party_libcoap-OpenHarmony-v3.2-Release.tar.gz +Source10: https://gitee.com/openharmony/security_huks/repository/archive/openHarmony-v3.2-Release.tar.gz #/security_huks-OpenHarmony-v3.2-Release.tar.gz +Source11: https://gitee.com/openharmony/security_device_auth/repository/archive/openHarmony-v3.2-Release.tar.gz #/security_device_auth-OpenHarmony-v3.2-Release.tar.gz +Source12: https://gitee.com/openharmony/third_party_mbedtls/repository/archive/openHarmony-v3.2-Release.tar.gz #/third_party_mbedtls-OpenHarmony-v3.2-Release.tar.gz +Source13: https://gitee.com/openharmony/distributedhardware_device_manager/repository/archive/openHarmony-v3.2-Release.tar.gz #/distributedhardware_device_manager-OpenHarmony-v3.2-Release.tar.gz +Source14: https://gitee.com/openharmony/third_party_json/repository/archive/openHarmony-v3.2-Release.tar.gz #/third_party_json-OpenHarmony-v3.2-Release.tar.gz +Source15: https://gitee.com/openharmony/security_dataclassification/repository/archive/openHarmony-v3.2-Release.tar.gz #/security_dataclassification-OpenHarmony-v3.2-Release.tar.gz +Source16: https://gitee.com/openharmony/security_device_security_level/repository/archive/openHarmony-v3.2-Release.tar.gz #/security_device_security_level-OpenHarmony-v3.2-Release.tar.gz + +Patch0: 0000-adapt-for-build-c_utils.patch +Patch1: 0001-remove-dependency-and-adpat-for-build-config_policy.patch +Patch2: 0002-remove-dependency-and-adapt-for-openeuler-dsoftbus.patch +Patch3: 0003-remove-dependency-and-adapt-for-build-eventhandler.patch +Patch4: 0004-remove-dependency-and-adapt-for-build-ipc.patch +Patch5: 0005-remove-dependency-on-hitrace-safwk.patch +Patch6: 0006-remove-dependency-and-adapt-for-build-samgr.patch +Patch7: 0007-adapt-for-build-sqlite.patch +Patch8: 0008-remove-dependency-and-adapt-for-build-huks.patch +Patch9: 0009-remove-dependency-and-adapt-for-build-device_auth.patch +Patch10: 0010-adapt-for-build-mbedtls.patch +Patch11: 0011-remove-dependency-and-adapt-for-build-device_manager.patch +Patch12: 0012-remove-dependency-and-adapt-for-build-device_security_level.patch + +BuildRequires: python3-jinja2 python3-pyyaml cjson cjson-devel +BuildRequires: libatomic libicu-devel libxml2-devel openssl-devel +BuildRequires: distributed-build hilog + +%description +Tools used by distributed middleware. + +# Generate directory structure for build. +%prep +rm -rf %{_builddir}/* + +cp -rp %{build_opt} %{_builddir}/build +[ ! -L "%{_builddir}/build.sh" ] && ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh +[ ! -L "%{_builddir}/.gn" ] && ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn +[ ! -L "%{_builddir}/build.py" ] && ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py +cp -r %{_builddir}/build/openeuler/vendor %{_builddir}/ +cp -r %{_builddir}/build/openeuler/compiler_gn/third_party %{_builddir}/ +cp -rf %{_builddir}/build/openeuler/compiler_gn/base %{_builddir}/ + +rm -rf %{_builddir}/third_party/mbedtls/* + +%setup -q -D -T -a 0 -c -n %{c_utils_dir}/.. +%setup -q -D -T -a 1 -c -n %{config_policy_dir}/.. +%setup -q -D -T -a 2 -c -n %{dsoftbus_dir}/.. +%setup -q -D -T -a 3 -c -n %{eventhandler_dir}/.. +%setup -q -D -T -a 4 -c -n %{init_dir}/.. +%setup -q -D -T -a 5 -c -n %{ipc_dir}/.. +%setup -q -D -T -a 6 -c -n %{safwk_dir}/.. +%setup -q -D -T -a 7 -c -n %{samgr_dir}/.. +%setup -q -D -T -a 8 -c -n %{sqlite_dir}/.. +%setup -q -D -T -a 9 -c -n %{libcoap_dir}/.. +%setup -q -D -T -a 10 -c -n %{huks_dir}/.. +%setup -q -D -T -a 11 -c -n %{device_auth_dir}/.. +%setup -q -D -T -a 12 -c -n %{mbedtls_dir}/.. +%setup -q -D -T -a 13 -c -n %{device_manager_dir}/.. +%setup -q -D -T -a 14 -c -n %{json_dir}/.. +%setup -q -D -T -a 15 -c -n %{dataclassification_dir}/.. +%setup -q -D -T -a 16 -c -n %{device_security_level_dir}/.. + +%patch0 -p1 -d %{c_utils_dir} +%patch1 -p1 -d %{config_policy_dir} +%patch2 -p1 -d %{dsoftbus_dir} +%patch3 -p1 -d %{eventhandler_dir} +%patch4 -p1 -d %{ipc_dir} +%patch5 -p1 -d %{safwk_dir} +%patch6 -p1 -d %{samgr_dir} +%patch7 -p1 -d %{sqlite_dir} +%patch8 -p1 -d %{huks_dir} +%patch9 -p1 -d %{device_auth_dir} +%patch10 -p1 -d %{mbedtls_dir} +%patch11 -p1 -d %{device_manager_dir} +%patch12 -p1 -d %{device_security_level_dir} + +# build all components with build.sh +%build +cd %{_builddir} +rm -rf %{_builddir}/out + +%ifarch x86_64 +./build.sh --product-name openeuler --target-cpu x86_64 +%endif + +%ifarch aarch64 +./build.sh --product-name openeuler --target-cpu arm64 +%endif + +%install +install -d -m 0755 %{buildroot}/system/lib64 +install -d -m 0755 %{buildroot}/system/bin +install -d -m 0755 %{buildroot}/usr/lib64 +install -d -m 0755 %{buildroot}/usr/bin +install -d -m 0755 %{buildroot}%{_includedir}/c_utils +install -d -m 0755 %{buildroot}%{_includedir}/config_policy +install -d -m 0755 %{buildroot}%{_includedir}/dsoftbus +install -d -m 0755 %{buildroot}%{_includedir}/eventhandler +install -d -m 0755 %{buildroot}%{_includedir}/init +install -d -m 0755 %{buildroot}%{_includedir}/ipc +install -d -m 0755 %{buildroot}%{_includedir}/safwk +install -d -m 0755 %{buildroot}%{_includedir}/samgr +install -d -m 0755 %{buildroot}%{_includedir}/huks +install -d -m 0755 %{buildroot}%{_includedir}/device_auth +install -d -m 0755 %{buildroot}%{_includedir}/device_manager +install -d -m 0755 %{buildroot}%{_includedir}/nlohmann_json +install -d -m 0755 %{buildroot}%{_includedir}/nlohmann_json/single_include +install -d -m 0755 %{buildroot}%{_includedir}/dataclassification +install -d -m 0755 %{buildroot}%{_includedir}/device_security_level + +%ifarch aarch64 +module_out_path="out/openeuler/linux_clang_arm64" +header_out_path="out/openeuler/innerkits/linux-arm64" +%endif +%ifarch x86_64 +module_out_path="out/openeuler/linux_clang_x86_64" +header_out_path="out/openeuler/linux-x86_64" +%endif + +# copy shared libs and static libs. +pushd %{_builddir}/${module_out_path} +for so_file in $(find . -name *.z.so -type f) +do + cp ${so_file} %{buildroot}/system/lib64 + cp ${so_file} %{buildroot}/usr/lib64 +done + +for a_file in $(find ./ -name *.a -type f) +do + cp ${a_file} %{buildroot}/system/lib64 + cp ${so_file} %{buildroot}/usr/lib64 +done +popd + +# copy executable file. +install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/sa_main %{buildroot}/system/bin/ +install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/samgr %{buildroot}/system/bin/ +install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/deviceauth_service %{buildroot}/system/bin/ +install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/sa_main %{buildroot}/usr/bin/ +install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/samgr %{buildroot}/usr/bin/ +install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/deviceauth_service %{buildroot}/usr/bin/ + +# copy header files of component to includedir. +pushd %{_builddir}/${header_out_path} +find c_utils -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/c_utils +find config_policy -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/config_policy +find dsoftbus -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/dsoftbus +find eventhandler -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/eventhandler +find init -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/init +find ipc -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/ipc +find safwk -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/safwk +find samgr -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/samgr +find huks -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/huks +find device_auth -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/device_auth +find device_manager -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/device_manager +find dataclassification -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/dataclassification +find device_security_level -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/device_security_level +popd + +# copy nlohmann_json header file to includedir. +cd %{json_dir} +cp -rvf include/nlohmann %{buildroot}/%{_includedir}/nlohmann_json +cp -rvf single_include/nlohmann %{buildroot}/%{_includedir}/nlohmann_json/single_include + +%files +/system/lib64/* +/system/bin/* +/%{_includedir}/* +/usr/lib64/* +/usr/bin/* + +%changelog +* Tue Jun 20 2023 hepeng - 1.0.0-1 +- add components used by distributed middleware. diff --git a/distributedhardware_device_manager-OpenHarmony-v3.2-Release.tar.gz b/distributedhardware_device_manager-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0fead35ada9e512336b93b464b06a991b90975f1 Binary files /dev/null and b/distributedhardware_device_manager-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/notification_eventhandler-OpenHarmony-v3.2-Release.tar.gz b/notification_eventhandler-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fcb900a392d4c5c21fbc788eba9c522e68279842 Binary files /dev/null and b/notification_eventhandler-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/security_dataclassification-OpenHarmony-v3.2-Release.tar.gz b/security_dataclassification-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..14ac88db786e8d9d3455bae4142b076a4ff0ba0c Binary files /dev/null and b/security_dataclassification-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/security_device_auth-OpenHarmony-v3.2-Release.tar.gz b/security_device_auth-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b9d56c86dab3f9dfe456d08a601d0ae6ea1b75c0 Binary files /dev/null and b/security_device_auth-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/security_device_security_level-OpenHarmony-v3.2-Release.tar.gz b/security_device_security_level-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3dbfe9c8ebd1fe446b32b52030a31dee5ac214d5 Binary files /dev/null and b/security_device_security_level-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/security_huks-OpenHarmony-v3.2-Release.tar.gz b/security_huks-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1a4ba6a30c2b52de55d1a009fa23e3bc807e4409 Binary files /dev/null and b/security_huks-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/systemabilitymgr_safwk-OpenHarmony-v3.2-Release.tar.gz b/systemabilitymgr_safwk-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..54c05836d21d640e679ea74b2c7e6474baaa9598 Binary files /dev/null and b/systemabilitymgr_safwk-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/systemabilitymgr_samgr-OpenHarmony-v3.2-Release.tar.gz b/systemabilitymgr_samgr-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..86c493a51d0be217f185b3a1f82de824a9dcccb7 Binary files /dev/null and b/systemabilitymgr_samgr-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/third_party_json-OpenHarmony-v3.2-Release.tar.gz b/third_party_json-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..842a58bb2eb0d3d567d286f5312d95a8f8faee1a Binary files /dev/null and b/third_party_json-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/third_party_libcoap-OpenHarmony-v3.2-Release.tar.gz b/third_party_libcoap-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c3f9b6b1ea4482311706116f7d997da93f48cce5 Binary files /dev/null and b/third_party_libcoap-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/third_party_mbedtls-OpenHarmony-v3.2-Release.tar.gz b/third_party_mbedtls-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ebeed7a70f98594f833c4b765ce08d8ab4187545 Binary files /dev/null and b/third_party_mbedtls-OpenHarmony-v3.2-Release.tar.gz differ diff --git a/third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz b/third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6f2779836f00ddb75a8d2d1edb9c690313187904 Binary files /dev/null and b/third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz differ