From a828b767d0855a8a63d77a36a409c3b7564948e5 Mon Sep 17 00:00:00 2001
From: caochao <2930650069@qq.com>
Date: Sat, 12 Feb 2022 14:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=83=A8=E4=BE=9D=E8=B5=96=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=A0=87=E5=87=86=E5=8C=96=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: cao_liu_chao <caochao12@huawei.com>
---
 interfaces/inner_kits/native_cpp/BUILD.gn | 25 +++++++----------
 services/devicemanagerservice/BUILD.gn    | 33 +++++++++--------------
 utils/BUILD.gn                            | 21 +++++++--------
 3 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn
index 61085fb4d..68c8c569c 100644
--- a/interfaces/inner_kits/native_cpp/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/BUILD.gn
@@ -22,7 +22,7 @@ if (defined(ohos_lite)) {
   shared_library("devicemanagersdk") {
   }
 } else {
-  ohos_shared_library("devicemanagersdk") {
+  config("devicemanagersdk_config") {
     include_dirs = [
       "include",
       "include/ipc",
@@ -31,15 +31,10 @@ if (defined(ohos_lite)) {
       "${common_path}/include",
       "${common_path}/include/ipc",
       "${common_path}/include/ipc/model",
-      "${utils_path}/include",
-      "${utils_path}/include/ipc/standard",
-      "//third_party/json/include",
-      "//utils/native/base/include",
-      "//utils/system/safwk/native/include",
-      "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
-      "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     ]
+  }
 
+  ohos_shared_library("devicemanagersdk") {
     sources = [
       "src/device_manager.cpp",
       "src/device_manager_impl.cpp",
@@ -51,11 +46,7 @@ if (defined(ohos_lite)) {
       "src/notify/device_manager_notify.cpp",
     ]
 
-    deps = [
-      "${utils_path}:devicemanagerutils",
-      "//foundation/aafwk/standard/interfaces/innerkits/want:want",
-      "//utils/native/base:utils",
-    ]
+    public_configs = [ ":devicemanagersdk_config" ]
 
     defines = [
       "HI_LOG_ENABLE",
@@ -63,14 +54,18 @@ if (defined(ohos_lite)) {
       "LOG_DOMAIN=0xD004100",
     ]
 
+    deps = [
+      "${utils_path}:devicemanagerutils",
+      "//foundation/aafwk/standard/interfaces/innerkits/want:want",
+    ]
+
     external_deps = [
       "bundle_framework:appexecfwk_base",
       "bundle_framework:appexecfwk_core",
       "hiviewdfx_hilog_native:libhilog",
       "ipc:ipc_core",
-      "resmgr_standard:global_resmgr",
-      "safwk:system_ability_fwk",
       "samgr_standard:samgr_proxy",
+      "utils_base:utils",
     ]
 
     subsystem_name = "distributedhardware"
diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn
index 908f2dd2b..5c0c2ae96 100644
--- a/services/devicemanagerservice/BUILD.gn
+++ b/services/devicemanagerservice/BUILD.gn
@@ -24,7 +24,7 @@ if (defined(ohos_lite)) {
     sources = [ "src/ipc/lite/ipc_server_main.cpp" ]
   }
 } else {
-  ohos_shared_library("devicemanagerservice") {
+  config("devicemanagerservice_config") {
     include_dirs = [
       "include",
       "include/config",
@@ -44,22 +44,12 @@ if (defined(ohos_lite)) {
       "${common_path}/include",
       "${common_path}/include/ipc",
       "${common_path}/include/ipc/model",
-      "${utils_path}/include",
-      "${utils_path}/include/ipc/standard",
-      "${innerkits_path}/native_cpp/include",
-      "${innerkits_path}/native_cpp/include/ipc",
-      "${innerkits_path}/native_cpp/include/ipc/standard",
-      "//utils/native/base/include",
-      "//utils/system/safwk/native/include",
-      "//base/notification/ces_standard/frameworks/core/include",
-      "//base/notification/ces_standard/interfaces/innerkits/native/include",
       "//base/security/deviceauth/interfaces/innerkits",
-      "//base/startup/syspara_lite/interfaces/kits",
-      "//base/startup/syspara_lite/adapter/native/syspara/include",
       "//third_party/json/include",
-      "//third_party/flutter/skia",
     ]
+  }
 
+  ohos_shared_library("devicemanagerservice") {
     sources = [
       "src/ability/standard/dm_ability_manager.cpp",
       "src/adapter/standard/dm_adapter_manager.cpp",
@@ -85,6 +75,14 @@ if (defined(ohos_lite)) {
       "src/ipc/standard/ipc_server_stub.cpp",
     ]
 
+    public_configs = [ ":devicemanagerservice_config" ]
+
+    defines = [
+      "HI_LOG_ENABLE",
+      "DH_LOG_TAG=\"devicemanagerservice\"",
+      "LOG_DOMAIN=0xD004100",
+    ]
+
     deps = [
       "${common_path}/include/dialog_ui/js:dialog_js_files_etc",
       "${innerkits_path}/native_cpp:devicemanagersdk",
@@ -95,16 +93,10 @@ if (defined(ohos_lite)) {
       "//foundation/aafwk/standard/services/abilitymgr:abilityms",
       "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr",
       "//foundation/windowmanager/wm:libwm",
-      "//utils/native/base:utils",
-    ]
-
-    defines = [
-      "HI_LOG_ENABLE",
-      "DH_LOG_TAG=\"devicemanagerservice\"",
-      "LOG_DOMAIN=0xD004100",
     ]
 
     external_deps = [
+      "ability_runtime:app_manager",
       "bundle_framework:appexecfwk_base",
       "bundle_framework:appexecfwk_core",
       "ces_standard:cesfwk_core",
@@ -117,6 +109,7 @@ if (defined(ohos_lite)) {
       "samgr_standard:samgr_proxy",
       "startup_l2:syspara",
       "startup_l2:syspara_watchagent",
+      "utils_base:utils",
     ]
 
     subsystem_name = "distributedhardware"
diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index 6fb1469cc..7080341e1 100644
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -23,20 +23,17 @@ if (defined(ohos_lite)) {
   shared_library("devicemanagerutils") {
   }
 } else {
-  ohos_shared_library("devicemanagerutils") {
+  config("devicemanagerutils_config") {
     include_dirs = [
+      "include",
+      "include/ipc/standard",
       "${common_path}/include",
       "${common_path}/include/ipc",
       "${common_path}/include/ipc/model",
-      "include",
-      "include/ipc/standard",
-      "//utils/native/base/include",
-      "//utils/system/safwk/native/include",
-      "//base/security/deviceauth/interfaces/innerkits",
-      "//base/startup/syspara_lite/adapter/native/syspara/include",
-      "//third_party/json/include",
     ]
+  }
 
+  ohos_shared_library("devicemanagerutils") {
     sources = [
       "src/dm_anonymous.cpp",
       "src/dm_log.cpp",
@@ -44,10 +41,7 @@ if (defined(ohos_lite)) {
       "src/ipc/standard/ipc_cmd_register.cpp",
     ]
 
-    deps = [
-      "//third_party/mbedtls:mbedtls_shared",
-      "//utils/native/base:utils",
-    ]
+    public_configs = [ ":devicemanagerutils_config" ]
 
     defines = [
       "HI_LOG_ENABLE",
@@ -55,9 +49,12 @@ if (defined(ohos_lite)) {
       "LOG_DOMAIN=0xD004100",
     ]
 
+    deps = [ "//third_party/mbedtls:mbedtls_shared" ]
+
     external_deps = [
       "hiviewdfx_hilog_native:libhilog",
       "ipc:ipc_core",
+      "utils_base:utils",
     ]
 
     subsystem_name = "distributedhardware"
-- 
Gitee