diff --git a/bundle.json b/bundle.json index a91285a635d6420c18e59a625dcd03b66ea16b85..4cdc3369771d76dd3b374db220633507ad79efa0 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 f24ba30742028fac238f64ac620e3cb9957807d5..f9e75debc5cc329d93ac6fdbd8bfa1054f970d66 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 110696b37658ab8b94dd642e57f8a1d920c6cd01..49082e1e657e623dabf46859198653ecc33edffe 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 4c88ed6047360730c2b60adbfe011c6ca98af730..58eef5043fc345e8f9c0dee3f0285c08db042f2c 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",