From 6960b5a693c98a9dafd6dd9fde2d77e30447a338 Mon Sep 17 00:00:00 2001
From: hongtao <hongtao11@huawei.com>
Date: Thu, 21 Jul 2022 10:48:13 +0800
Subject: [PATCH] change utils path

Signed-off-by: hongtao <hongtao11@huawei.com>
Change-Id: Ie10cd4ad958a43ff4af7fed3d525a908764512d9
---
 T507/camera/src/device_manager/BUILD.gn | 19 +++++++++++--------
 T507/camera/src/pipeline_core/BUILD.gn  | 12 ++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/T507/camera/src/device_manager/BUILD.gn b/T507/camera/src/device_manager/BUILD.gn
index 741fb32..9b4e7c0 100755
--- a/T507/camera/src/device_manager/BUILD.gn
+++ b/T507/camera/src/device_manager/BUILD.gn
@@ -60,7 +60,7 @@ if (defined(ohos_lite)) {
       "$camera_path/utils/event",
       "$camera_path/utils/metadata/include",
       "$camera_path/device_manager/include",
-      "//utils/native/base/include",
+      "//commonlibrary/c_utils/base/include",
       "$camera_device_name_path/camera/include/device_manager",
       "$camera_path/adapter/platform/mpp/src/device_manager/include",
       "//drivers/hdf_core/framework/include/utils",
@@ -108,7 +108,7 @@ if (defined(ohos_lite)) {
       "$camera_path/include",
       "$camera_path/utils/event",
       "$camera_path/device_manager/include",
-      "//utils/native/base/include",
+      "//commonlibrary/c_utils/base/include",
       "$camera_device_name_path/camera/include/device_manager",
       "$camera_path/adapter/platform/mpp/src/device_manager/include",
       "//drivers/hdf_core/framework/include/utils",
@@ -117,10 +117,7 @@ if (defined(ohos_lite)) {
       "//foundation/multimedia/camera_standard/frameworks/native/metadata/include",
     ]
 
-    deps = [
-      "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata",
-      "//utils/native/base:utils",
-    ]
+    deps = [ "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata" ]
 
     hispark_taurus_lib_path =
         "//device/board/seed/T507/camera/src/driver_adapter/libs/"
@@ -130,9 +127,15 @@ if (defined(ohos_lite)) {
     ldflags += [ "-ldriver_adapter.z" ]
 
     if (is_standard_system) {
-      external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+      external_deps = [
+        "c_utils:utils",
+        "hiviewdfx_hilog_native:libhilog",
+      ]
     } else {
-      external_deps = [ "hilog:libhilog" ]
+      external_deps = [
+        "c_utils:utils",
+        "hilog:libhilog",
+      ]
     }
 
     public_configs = [ ":device_manager_config" ]
diff --git a/T507/camera/src/pipeline_core/BUILD.gn b/T507/camera/src/pipeline_core/BUILD.gn
index c99508a..9d248da 100755
--- a/T507/camera/src/pipeline_core/BUILD.gn
+++ b/T507/camera/src/pipeline_core/BUILD.gn
@@ -85,7 +85,7 @@ if (defined(ohos_lite)) {
       "$camera_path/pipeline_core/src/pipeline_core.cpp",
     ]
     include_dirs = [
-      "//utils/native/base/include",
+      "//commonlibrary/c_utils/base/include",
       "//base/hiviewdfx/interfaces/innerkits/libhilog/include",
       "$camera_path/../interfaces/include",
       "$camera_path/../interfaces/hdi_passthrough",
@@ -130,7 +130,7 @@ if (defined(ohos_lite)) {
       "$camera_path/adapter/platform/mpp/src/device_manager/include",
       "//foundation/communication/ipc/ipc/native/src/core/include",
       "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
-      "//utils/native/base/include",
+      "//commonlibrary/c_utils/base/include",
       "//foundation/graphic/surface/interfaces/kits",
       "//foundation/graphic/utils/interfaces/kits",
 
@@ -219,7 +219,7 @@ if (defined(ohos_lite)) {
       "$camera_path/pipeline_core/src/pipeline_core.cpp",
     ]
     include_dirs = [
-      "//utils/native/base/include",
+      "//commonlibrary/c_utils/base/include",
       "//base/hiviewdfx/interfaces/innerkits/libhilog/include",
       "$camera_path/../interfaces/include",
       "$camera_path/../interfaces/hdi_ipc",
@@ -263,7 +263,7 @@ if (defined(ohos_lite)) {
       "$camera_device_name_path/camera/config/pipeline_core",
       "//foundation/communication/ipc/ipc/native/src/core/include",
       "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
-      "//utils/native/base/include",
+      "//commonlibrary/c_utils/base/include",
       "//foundation/multimedia/camera_standard/frameworks/native/metadata/include",
 
       # hcs parser
@@ -313,9 +313,9 @@ if (defined(ohos_lite)) {
 
     include_dirs = [
       "$camera_path/pipeline_core/ipp/include",
-      "//utils/native/base/include",
+      "//commonlibrary/c_utils/base/include",
     ]
-    deps = [ "//utils/native/base:utils" ]
+    external_deps = [ "c_utils:utils" ]
     public_configs = [ ":example_config" ]
     subsystem_name = "hdf"
     part_name = "hdf"
-- 
Gitee