From 1d0f45c29e78307ab79c31a2b8b2ce150d46a247 Mon Sep 17 00:00:00 2001 From: xuejikan Date: Wed, 10 May 2023 10:54:23 +0800 Subject: [PATCH] modified build.gn Signed-off-by: xuejikan --- bundle.json | 5 ++-- interfaces/innerkits/datatransmitmgr/BUILD.gn | 6 ++--- .../datatransmitmgr_fuzzer/BUILD.gn | 18 +++++-------- test/unittest/datatransmitmgr/BUILD.gn | 25 ++++++++----------- 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/bundle.json b/bundle.json index 4cdc336..a91285a 100644 --- a/bundle.json +++ b/bundle.json @@ -25,9 +25,10 @@ "ram": " ", "deps": { "components": [ + "access_token", + "c_utils", "device_security_level", - "hiviewdfx_hilog_native", - "c_utils" + "hiviewdfx_hilog_native" ], "third_party": [] }, diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn index f9e75de..f24ba30 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 = [ - "//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", + "../../../frameworks/datatransmitmgr/dev_slinfo_adpt.c", + "../../../frameworks/datatransmitmgr/dev_slinfo_list.c", + "../../../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 49082e1..110696b 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 = "//base/security/dataclassification/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer" + fuzz_config_file = "./" cflags = [ "-g", @@ -25,22 +25,16 @@ ohos_fuzztest("DataTransmitMgrFuzzTest") { "-fno-omit-frame-pointer", ] - include_dirs = [ - "//base/security/dataclassification/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer", - "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include", - ] + include_dirs = [ "../../../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 58eef50..4c88ed6 100644 --- a/test/unittest/datatransmitmgr/BUILD.gn +++ b/test/unittest/datatransmitmgr/BUILD.gn @@ -16,13 +16,7 @@ module_output_path = "dataclassification/datasecuritylevel" config("datatransmitmgr_test_config") { visibility = [ ":*" ] - 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", - ] + include_dirs = [ "//third_party/googletest/googletest/include" ] cflags = [ "-DHILOG_ENABLE" ] } @@ -31,15 +25,18 @@ ohos_unittest("DevSLMgrTest") { subsystem_name = "security" module_out_path = module_output_path - 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", + 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", ] + 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