From 9a8b340b21d1c48de9f5871f3a43d7c6c12b5d4a Mon Sep 17 00:00:00 2001
From: hongtao <hongtao11@huawei.com>
Date: Tue, 26 Jul 2022 15:36:13 +0800
Subject: [PATCH] replace  utils path to c_utils

Signed-off-by: hongtao <hongtao11@huawei.com>
Change-Id: If92e459fd2d16316be93f2db1941f278a6769d46
---
 BUILD.gn                      | 16 ++++++++++------
 bundle.json                   |  2 +-
 interfaces/innerkits/BUILD.gn |  8 ++++----
 test/moduletest/BUILD.gn      |  4 ++--
 test/unittest/BUILD.gn        |  4 ++--
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 30206a9e..ace75f7f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,7 +21,7 @@ config("appspawn_config") {
     "standard",
     "adapter",
     "interfaces/innerkits/include",
-    "//utils/native/base/include",
+    "//commonlibrary/c_utils/base/include",
     "util/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "//base/global/resource_management/interfaces/inner_api/include",
@@ -53,12 +53,12 @@ ohos_executable("appspawn") {
     "ability_base:want",
     "ability_runtime:app_manager",
     "ability_runtime:runtime",
+    "c_utils:utils",
     "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
     "napi:ace_napi",
-    "utils_base:utils",
   ]
 
   install_enable = true
@@ -89,9 +89,11 @@ ohos_static_library("appspawn_server") {
   deps = [
     "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
     "//base/startup/init/interfaces/innerkits:libbegetutil",
-    "//utils/native/base:utils",
   ]
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  external_deps = [
+    "c_utils:utils",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
   if (build_selinux) {
     external_deps += [ "selinux:libhap_restorecon" ]
   }
@@ -132,9 +134,11 @@ ohos_static_library("nwebspawn_server") {
   deps = [
     "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
     "//base/startup/init/interfaces/innerkits:libbegetutil",
-    "//utils/native/base:utils",
   ]
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  external_deps = [
+    "c_utils:utils",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
   if (build_selinux) {
     external_deps += [ "selinux:libhap_restorecon" ]
   }
diff --git a/bundle.json b/bundle.json
index 6718e99b..d9ab34a6 100644
--- a/bundle.json
+++ b/bundle.json
@@ -28,7 +28,7 @@
         "deps": {
             "components": [
                 "ability_base",
-                "utils_base",
+                "c_utils",
                 "ipc",
                 "selinux",
                 "hiviewdfx_hilog_native",
diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn
index 75498d81..2f9c50f4 100644
--- a/interfaces/innerkits/BUILD.gn
+++ b/interfaces/innerkits/BUILD.gn
@@ -30,11 +30,11 @@ ohos_static_library("appspawn_socket_client") {
   ]
 
   public_configs = [ ":exported_header_files" ]
-  deps = [
-    "//base/startup/init/interfaces/innerkits:libbegetutil",
-    "//utils/native/base:utils",
+  deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
+  external_deps = [
+    "c_utils:utils",
+    "hiviewdfx_hilog_native:libhilog",
   ]
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
 
   subsystem_name = "${subsystem_name}"
   part_name = "${part_name}"
diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn
index b740593e..c59a8a16 100644
--- a/test/moduletest/BUILD.gn
+++ b/test/moduletest/BUILD.gn
@@ -20,7 +20,7 @@ ohos_moduletest("AppSpawnModuleTest") {
   sources = [ "${appspawn_path}/test/moduletest/appspawn_module_test.cpp" ]
 
   include_dirs = [
-    "//utils/native/base/include",
+    "//commonlibrary/c_utils/base/include",
     "//third_party/zlib/contrib/minizip",
     "//third_party/zlib",
   ]
@@ -34,11 +34,11 @@ ohos_moduletest("AppSpawnModuleTest") {
     "${ability_runtime_path}/services/appmgr:libappms",
     "${appspawn_path}/interfaces/innerkits:appspawn_socket_client",
     "//third_party/googletest:gtest_main",
-    "//utils/native/base:utils",
   ]
 
   external_deps = [
     "bundle_framework:appexecfwk_base",
+    "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index 4eea6aa8..08800d6b 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -35,7 +35,7 @@ config("utest_config") {
     "${appspawn_path}/adapter",
     "${appspawn_path}/interfaces/innerkits/include",
     "${appspawn_path}/util/include",
-    "//utils/native/base/include",
+    "//commonlibrary/c_utils/base/include",
     "ability_runtime_kits_path/appkit/native/app/include",
     "${ability_runtime_path}/interfaces/innerkits/app_manager/include/appmgr",
     "${ability_runtime_path}/interfaces/innerkits/ability_manager/include",
@@ -92,12 +92,12 @@ ohos_unittest("AppSpawn_ut") {
     "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "c_utils:utils",
     "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
     "napi:ace_napi",
-    "utils_base:utils",
   ]
 }
 
-- 
Gitee