diff --git a/bundle.json b/bundle.json
index 5f91db18ec05c336a94e4af74bec3f73e03a45bd..62241f7e1a63fd14cf9d6df24c2d4491285f62c6 100644
--- a/bundle.json
+++ b/bundle.json
@@ -28,8 +28,8 @@
                 "c_utils",
                 "eventhandler",
                 "frame_aware_sched",
-                "hitrace_native",
-                "hiviewdfx_hilog_native",
+                "hilog",
+                "hitrace",
                 "ipc",
                 "safwk",
                 "samgr"
diff --git a/frameworks/concurrent_task_client/BUILD.gn b/frameworks/concurrent_task_client/BUILD.gn
index ac17c97d636bc7b1b8ac5028f961947590cc5321..a3352340547bf5afd10ef9d7b5f530d6dae2d8dd 100644
--- a/frameworks/concurrent_task_client/BUILD.gn
+++ b/frameworks/concurrent_task_client/BUILD.gn
@@ -28,15 +28,13 @@ config("client_private_config") {
 }
 
 config("client_public_config") {
-  visibility = [":*"]
+  visibility = [ ":*" ]
   cflags = [ "-fstack-protector-strong" ]
   include_dirs = [ "include" ]
 }
 
 ohos_shared_library("concurrent_task_client") {
-  configs = [
-    ":client_private_config",
-  ]
+  configs = [ ":client_private_config" ]
 
   public_configs = [ ":client_public_config" ]
 
@@ -45,14 +43,12 @@ ohos_shared_library("concurrent_task_client") {
     "src/concurrent_task_service_proxy.cpp",
   ]
 
-  deps = [
-    "//third_party/jsoncpp:jsoncpp",
-  ]
+  deps = [ "//third_party/jsoncpp:jsoncpp" ]
 
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
     "samgr:samgr_proxy",
   ]
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 0ea6add597aa778040c73dc683b790c0b1ea569e..ac889527965e70f13a10b19db29501494915fdf2 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -14,7 +14,7 @@
 import("//build/ohos.gni")
 
 config("concurrent_task_config") {
-  visibility = [":*"]
+  visibility = [ ":*" ]
   cflags_cc = [ "-fexceptions" ]
   include_dirs = [
     "include",
@@ -29,29 +29,24 @@ config("concurrent_task_config") {
 }
 
 ohos_shared_library("concurrentsvc") {
-
-  public_configs = [
-    ":concurrent_task_config",
-  ]
+  public_configs = [ ":concurrent_task_config" ]
 
   sources = [
+    "src/concurrent_task_controller.cpp",
     "src/concurrent_task_service.cpp",
     "src/concurrent_task_service_ability.cpp",
     "src/concurrent_task_service_stub.cpp",
-    "src/concurrent_task_controller.cpp",
     "src/qos_interface.cpp",
     "src/qos_manager.cpp",
   ]
 
-  deps = [
-    "//third_party/jsoncpp:jsoncpp",
-  ]
+  deps = [ "//third_party/jsoncpp:jsoncpp" ]
 
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
     "frame_aware_sched:rtg_interface",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 04085b19888e34ebcf4c5954dcbaf1fc9f5179f6..ab39237ff7cd0fb6bac7c9323e5ad1b50013f8c3 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -50,14 +50,14 @@ config("ffrt_test_config") {
     "QOS_CHECKPOINT",
     "QOS_SUBMIT",
     "QOS_DEMO",
-    "ATRACE_MODE=0", # 0 is off, 5 is bytrace, 6 is pmu
+    "ATRACE_MODE=0",  # 0 is off, 5 is bytrace, 6 is pmu
     "ATRACE_LEVEL=0",
     "ATRACE_LOGI_ENABLE=0",
     "ATRACE_LOGD_ENABLE=0",
     "ATRACE_SCOPE_LOG_ENABLE=0",
     "ATRACE_DURATION_LOG_ENABLE=0",
     "FFRT_RELEASE",
-    "DISABLE_MONITOR"
+    "DISABLE_MONITOR",
   ]
 
   if (target_cpu == "arm64") {
@@ -66,213 +66,193 @@ config("ffrt_test_config") {
 }
 
 ohos_unittest("concurrent_svc_intf_test") {
-    module_out_path = module_output_path
-
-    configs = [
-        ":test_config",
-    ]
-
-    sources = [
-        "unittest/phone/concurrent_svc_intf_test.cpp",
-    ]
-    deps = [
-        "../frameworks/concurrent_task_client:concurrent_task_client",
-    ]
-    external_deps = [
-        "c_utils:utils",
-        "eventhandler:libeventhandler",
-        "safwk:system_ability_fwk",
-        "samgr:samgr_proxy",
-        "ipc:ipc_single",
-        "hiviewdfx_hilog_native:libhilog",
-    ]
+  module_out_path = module_output_path
+
+  configs = [ ":test_config" ]
+
+  sources = [ "unittest/phone/concurrent_svc_intf_test.cpp" ]
+  deps = [ "../frameworks/concurrent_task_client:concurrent_task_client" ]
+  external_deps = [
+    "c_utils:utils",
+    "eventhandler:libeventhandler",
+    "hilog:libhilog",
+    "ipc:ipc_single",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
+  ]
 
-    if (is_standard_system) {
-      public_deps = gtest_public_deps
-    }
+  if (is_standard_system) {
+    public_deps = gtest_public_deps
+  }
 
-    subsystem_name = "resourceschedule"
-    part_name = "resourceschedule_qos_manager"
+  subsystem_name = "resourceschedule"
+  part_name = "resourceschedule_qos_manager"
 }
 
 ohos_unittest("concurrent_task_client_test") {
-    module_out_path = module_output_path
+  module_out_path = module_output_path
 
-    configs = [
-        ":ffrt_test_config",
-        ":test_config",
-    ]
+  configs = [
+    ":ffrt_test_config",
+    ":test_config",
+  ]
 
-    sources = [
-        "unittest/phone/concurrent_task_client_test.cpp",
-    ]
-    deps = [
-        "../frameworks/concurrent_task_client:concurrent_task_client",
-    ]
+  sources = [ "unittest/phone/concurrent_task_client_test.cpp" ]
+  deps = [ "../frameworks/concurrent_task_client:concurrent_task_client" ]
 
-    if (is_standard_system) {
-      public_deps = gtest_public_deps
-    }
+  if (is_standard_system) {
+    public_deps = gtest_public_deps
+  }
 
-    external_deps = [
-      "ipc:ipc_single",
-      "hiviewdfx_hilog_native:libhilog",
-    ]
+  external_deps = [
+    "hilog:libhilog",
+    "ipc:ipc_single",
+  ]
 
-    subsystem_name = "resourceschedule"
-    part_name = "resourceschedule_qos_manager"
+  subsystem_name = "resourceschedule"
+  part_name = "resourceschedule_qos_manager"
 }
 
 ohos_unittest("concurrent_task_controller_test") {
-    module_out_path = module_output_path
+  module_out_path = module_output_path
 
-    configs = [
-        ":ffrt_test_config",
-        ":test_config",
-    ]
+  configs = [
+    ":ffrt_test_config",
+    ":test_config",
+  ]
 
-    sources = [
-        "unittest/phone/concurrent_task_controller_test.cpp",
-    ]
-    deps = [
-        "../services:concurrentsvc",
-        "../frameworks/concurrent_task_client:concurrent_task_client",
-        "//third_party/jsoncpp:jsoncpp",
-    ]
+  sources = [ "unittest/phone/concurrent_task_controller_test.cpp" ]
+  deps = [
+    "../frameworks/concurrent_task_client:concurrent_task_client",
+    "../services:concurrentsvc",
+    "//third_party/jsoncpp:jsoncpp",
+  ]
 
-    external_deps = [
-        "c_utils:utils",
-        "hiviewdfx_hilog_native:libhilog",
-        "safwk:system_ability_fwk",
-        "samgr:samgr_proxy",
-    ]
+  external_deps = [
+    "c_utils:utils",
+    "hilog:libhilog",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
+  ]
 
-    if (is_standard_system) {
-      public_deps = gtest_public_deps
-    }
+  if (is_standard_system) {
+    public_deps = gtest_public_deps
+  }
 
-    subsystem_name = "resourceschedule"
-    part_name = "resourceschedule_qos_manager"
+  subsystem_name = "resourceschedule"
+  part_name = "resourceschedule_qos_manager"
 }
 
 ohos_unittest("concurrent_task_service_ability_test") {
-    module_out_path = module_output_path
+  module_out_path = module_output_path
 
-    configs = [
-        ":ffrt_test_config",
-        ":test_config",
-    ]
+  configs = [
+    ":ffrt_test_config",
+    ":test_config",
+  ]
 
-    sources = [
-        "unittest/phone/concurrent_task_service_ability_test.cpp",
-    ]
-    deps = [
-        "../services:concurrentsvc",
-        "../frameworks/concurrent_task_client:concurrent_task_client",
-    ]
-    external_deps = [
-        "c_utils:utils",
-        "hiviewdfx_hilog_native:libhilog",
-        "safwk:system_ability_fwk",
-        "samgr:samgr_proxy",
-    ]
+  sources = [ "unittest/phone/concurrent_task_service_ability_test.cpp" ]
+  deps = [
+    "../frameworks/concurrent_task_client:concurrent_task_client",
+    "../services:concurrentsvc",
+  ]
+  external_deps = [
+    "c_utils:utils",
+    "hilog:libhilog",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
+  ]
 
-    if (is_standard_system) {
-      public_deps = gtest_public_deps
-    }
+  if (is_standard_system) {
+    public_deps = gtest_public_deps
+  }
 
-    subsystem_name = "resourceschedule"
-    part_name = "resourceschedule_qos_manager"
+  subsystem_name = "resourceschedule"
+  part_name = "resourceschedule_qos_manager"
 }
 
 ohos_unittest("qos_interface_test") {
-    module_out_path = module_output_path
+  module_out_path = module_output_path
 
-    configs = [
-        ":ffrt_test_config",
-        ":test_config",
-    ]
+  configs = [
+    ":ffrt_test_config",
+    ":test_config",
+  ]
 
-    sources = [
-        "unittest/phone/qos_interface_test.cpp",
-    ]
-    deps = [
-        "../services:concurrentsvc",
-        "../frameworks/concurrent_task_client:concurrent_task_client",
-    ]
-    external_deps = [
-        "c_utils:utils",
-        "safwk:system_ability_fwk",
-        "samgr:samgr_proxy",
-        "hiviewdfx_hilog_native:libhilog",
-    ]
+  sources = [ "unittest/phone/qos_interface_test.cpp" ]
+  deps = [
+    "../frameworks/concurrent_task_client:concurrent_task_client",
+    "../services:concurrentsvc",
+  ]
+  external_deps = [
+    "c_utils:utils",
+    "hilog:libhilog",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
+  ]
 
-    if (is_standard_system) {
-      public_deps = gtest_public_deps
-    }
+  if (is_standard_system) {
+    public_deps = gtest_public_deps
+  }
 
-    subsystem_name = "resourceschedule"
-    part_name = "resourceschedule_qos_manager"
+  subsystem_name = "resourceschedule"
+  part_name = "resourceschedule_qos_manager"
 }
 
 ohos_unittest("qos_manager_test") {
-    module_out_path = module_output_path
+  module_out_path = module_output_path
 
-    configs = [
-        ":ffrt_test_config",
-        ":test_config",
-    ]
+  configs = [
+    ":ffrt_test_config",
+    ":test_config",
+  ]
 
-    sources = [
-        "unittest/phone/qos_manager_test.cpp",
-    ]
-    deps = [
-        "../services:concurrentsvc",
-        "../frameworks/concurrent_task_client:concurrent_task_client",
-    ]
-    external_deps = [
-        "c_utils:utils",
-        "safwk:system_ability_fwk",
-        "samgr:samgr_proxy",
-        "hiviewdfx_hilog_native:libhilog",
-    ]
+  sources = [ "unittest/phone/qos_manager_test.cpp" ]
+  deps = [
+    "../frameworks/concurrent_task_client:concurrent_task_client",
+    "../services:concurrentsvc",
+  ]
+  external_deps = [
+    "c_utils:utils",
+    "hilog:libhilog",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
+  ]
 
-    if (is_standard_system) {
-      public_deps = gtest_public_deps
-    }
+  if (is_standard_system) {
+    public_deps = gtest_public_deps
+  }
 
-    subsystem_name = "resourceschedule"
-    part_name = "resourceschedule_qos_manager"
+  subsystem_name = "resourceschedule"
+  part_name = "resourceschedule_qos_manager"
 }
 
 ohos_unittest("concurrent_task_service_test") {
-    module_out_path = module_output_path
+  module_out_path = module_output_path
 
-    configs = [
-        ":ffrt_test_config",
-        ":test_config",
-    ]
+  configs = [
+    ":ffrt_test_config",
+    ":test_config",
+  ]
 
-    sources = [
-        "unittest/phone/concurrent_task_service_test.cpp",
-    ]
-    deps = [
-        "../services:concurrentsvc",
-        "../frameworks/concurrent_task_client:concurrent_task_client",
-    ]
-    external_deps = [
-        "c_utils:utils",
-        "safwk:system_ability_fwk",
-        "samgr:samgr_proxy",
-        "hiviewdfx_hilog_native:libhilog",
-    ]
+  sources = [ "unittest/phone/concurrent_task_service_test.cpp" ]
+  deps = [
+    "../frameworks/concurrent_task_client:concurrent_task_client",
+    "../services:concurrentsvc",
+  ]
+  external_deps = [
+    "c_utils:utils",
+    "hilog:libhilog",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
+  ]
 
-    if (is_standard_system) {
-      public_deps = gtest_public_deps
-    }
+  if (is_standard_system) {
+    public_deps = gtest_public_deps
+  }
 
-    subsystem_name = "resourceschedule"
-    part_name = "resourceschedule_qos_manager"
+  subsystem_name = "resourceschedule"
+  part_name = "resourceschedule_qos_manager"
 }
 
 group("concurrent_unittest") {
@@ -280,13 +260,13 @@ group("concurrent_unittest") {
   deps = []
   if (!is_asan) {
     deps += [
-      ":qos_interface_test",
-      ":qos_manager_test",
       ":concurrent_svc_intf_test",
       ":concurrent_task_client_test",
       ":concurrent_task_controller_test",
       ":concurrent_task_service_ability_test",
       ":concurrent_task_service_test",
+      ":qos_interface_test",
+      ":qos_manager_test",
     ]
   }
 }