From e24d6d986804b65f5a331878f24b37731ffffd9a Mon Sep 17 00:00:00 2001
From: zhangqing <zhangqing50@h-partners.com>
Date: Mon, 3 Jun 2024 10:05:24 +0800
Subject: [PATCH] arkui-x update master OH to weekly_20240527 and OH fix build
 bug

Signed-off-by: zhangqing <zhangqing50@h-partners.com>
Change-Id: I0aed39e938790abe26edf719c4d23f37a91a0716
---
 qos/BUILD.gn |  5 +----
 qos/qos.cpp  | 10 ++++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/qos/BUILD.gn b/qos/BUILD.gn
index b6ee066..c790683 100644
--- a/qos/BUILD.gn
+++ b/qos/BUILD.gn
@@ -41,10 +41,7 @@ ohos_shared_library("qos") {
     defines = [ "QOS_EXT_ENABLE" ]
   }
 
-  external_deps = [
-    "hilog:libhilog",
-    "init:libbegetutil",
-  ]
+  external_deps = [ "hilog:libhilog" ]
 
   subsystem_name = "resourceschedule"
   part_name = "qos_manager"
diff --git a/qos/qos.cpp b/qos/qos.cpp
index fc928a6..6c6d91f 100644
--- a/qos/qos.cpp
+++ b/qos/qos.cpp
@@ -16,7 +16,9 @@
 #include <cstdlib>
 #include <unistd.h>
 #include "concurrent_task_log.h"
+#if !defined(CROSS_PLATFORM)
 #include "parameters.h"
+#endif
 #include "qos_interface.h"
 #include "qos.h"
 using namespace OHOS::ConcurrentTask;
@@ -33,12 +35,14 @@ QosController& QosController::GetInstance()
 
 int QosController::SetThreadQosForOtherThread(enum QosLevel level, int tid)
 {
+#if !defined(CROSS_PLATFORM)
     bool qosEnable = OHOS::system::GetBoolParameter("persist.all.setQos.on", true);
-    int qos = static_cast<int>(level);
     if (!qosEnable) {
-        CONCUR_LOGD("[Qos] qoslevel %{public}d apply for tid %{public}d disable", qos, tid);
+        CONCUR_LOGD("[Qos] qoslevel %{public}d apply for tid %{public}d disable", static_cast<int>(level), tid);
         return 0;
     }
+#endif
+    int qos = static_cast<int>(level);
     if (level < QosLevel::QOS_BACKGROUND || level >= QosLevel::QOS_MAX) {
         CONCUR_LOGE("[Qos] invalid qos level %{public}d", qos);
         return ERROR_NUM;
@@ -55,11 +59,13 @@ int QosController::SetThreadQosForOtherThread(enum QosLevel level, int tid)
 
 int QosController::ResetThreadQosForOtherThread(int tid)
 {
+#if !defined(CROSS_PLATFORM)
     bool qosEnable = OHOS::system::GetBoolParameter("persist.all.setQos.on", true);
     if (!qosEnable) {
         CONCUR_LOGD("[Qos] qoslevel reset disable for tid %{public}d.", tid);
         return 0;
     }
+#endif
     int ret = QosLeaveForOther(tid);
     if (ret == 0) {
         CONCUR_LOGD("[Qos] qoslevel reset for tid %{public}d success", tid);
-- 
Gitee