From 7ee743ee1b897bae2bdd22cd9fe4ab2bfe0ff43c Mon Sep 17 00:00:00 2001
From: openharmony_ci <120357966@qq.com>
Date: Wed, 10 May 2023 07:48:31 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!59=20:?=
 =?UTF-8?q?=20build.gn=E6=96=87=E4=BB=B6=E6=95=B4=E6=94=B9'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundle.json                                   |  5 ++--
 interfaces/innerkits/datatransmitmgr/BUILD.gn |  6 ++---
 .../datatransmitmgr_fuzzer/BUILD.gn           | 18 ++++++++-----
 test/unittest/datatransmitmgr/BUILD.gn        | 25 +++++++++++--------
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/bundle.json b/bundle.json
index a91285a..4cdc336 100644
--- a/bundle.json
+++ b/bundle.json
@@ -25,10 +25,9 @@
         "ram": " ",
         "deps": {
             "components": [
-                "access_token",
-                "c_utils",
                 "device_security_level",
-                "hiviewdfx_hilog_native"
+                "hiviewdfx_hilog_native",
+                "c_utils"
             ],
             "third_party": []
         },
diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn
index f24ba30..f9e75de 100644
--- a/interfaces/innerkits/datatransmitmgr/BUILD.gn
+++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn
@@ -29,9 +29,9 @@ ohos_shared_library("data_transit_mgr") {
   include_dirs = [ "include" ]
 
   sources = [
-    "../../../frameworks/datatransmitmgr/dev_slinfo_adpt.c",
-    "../../../frameworks/datatransmitmgr/dev_slinfo_list.c",
-    "../../../frameworks/datatransmitmgr/dev_slinfo_mgr.c",
+    "//base/security/dataclassification/frameworks/datatransmitmgr/dev_slinfo_adpt.c",
+    "//base/security/dataclassification/frameworks/datatransmitmgr/dev_slinfo_list.c",
+    "//base/security/dataclassification/frameworks/datatransmitmgr/dev_slinfo_mgr.c",
   ]
 
   external_deps = [
diff --git a/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn b/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn
index 110696b..49082e1 100644
--- a/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn
+++ b/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn
@@ -16,7 +16,7 @@ import("//build/test.gni")
 
 ohos_fuzztest("DataTransmitMgrFuzzTest") {
   module_out_path = "security/dataclassification"
-  fuzz_config_file = "./"
+  fuzz_config_file = "//base/security/dataclassification/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer"
 
   cflags = [
     "-g",
@@ -25,16 +25,22 @@ ohos_fuzztest("DataTransmitMgrFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
 
-  include_dirs = [ "../../../interfaces/innerkits/datatransmitmgr/include" ]
+  include_dirs = [
+    "//base/security/dataclassification/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer",
+    "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include",
+  ]
 
   sources = [ "datatransmitmgr_fuzzer.cpp" ]
 
+  deps = [
+    "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk",
+    "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
+    "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
+    "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr",
+  ]
+
   external_deps = [
-    "access_token:libaccesstoken_sdk",
-    "access_token:libnativetoken",
-    "access_token:libtoken_setproc",
     "c_utils:utils",
-    "dataclassification:data_transit_mgr",
     "dsoftbus:softbus_client",
     "hiviewdfx_hilog_native:libhilog",
   ]
diff --git a/test/unittest/datatransmitmgr/BUILD.gn b/test/unittest/datatransmitmgr/BUILD.gn
index 4c88ed6..58eef50 100644
--- a/test/unittest/datatransmitmgr/BUILD.gn
+++ b/test/unittest/datatransmitmgr/BUILD.gn
@@ -16,7 +16,13 @@ module_output_path = "dataclassification/datasecuritylevel"
 
 config("datatransmitmgr_test_config") {
   visibility = [ ":*" ]
-  include_dirs = [ "//third_party/googletest/googletest/include" ]
+  include_dirs = [
+    "//base/security/dataclassification/test/unittest/datatransmitmgr",
+    "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include",
+    "//base/startup/init/interfaces/innerkits/include/syspara",
+    "//third_party/googletest/googletest/include",
+    "//commonlibrary/c_utils/base/include",
+  ]
   cflags = [ "-DHILOG_ENABLE" ]
 }
 
@@ -25,18 +31,15 @@ ohos_unittest("DevSLMgrTest") {
   subsystem_name = "security"
   module_out_path = module_output_path
 
-  include_dirs = [ "../../../interfaces/innerkits/datatransmitmgr/include" ]
-  sources = [
-    "../../../frameworks/datatransmitmgr/dev_slinfo_adpt.c",
-    "../../../frameworks/datatransmitmgr/dev_slinfo_list.c",
-    "../../../frameworks/datatransmitmgr/dev_slinfo_mgr.c",
-    "DevSLMgrTest.cpp",
-  ]
+  sources = [ "DevSLMgrTest.cpp" ]
 
+  deps = [
+    "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk",
+    "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
+    "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
+    "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr",
+  ]
   external_deps = [
-    "access_token:libaccesstoken_sdk",
-    "access_token:libnativetoken",
-    "access_token:libtoken_setproc",
     "c_utils:utils",
     "device_security_level:dslm_sdk",
     "dsoftbus:softbus_client",
-- 
Gitee