From b969e78cb4a27de270509bfb02ed092bc9164d30 Mon Sep 17 00:00:00 2001 From: xuejikan Date: Wed, 24 May 2023 18:42:08 +0800 Subject: [PATCH] modified build.gn & bundle.json Signed-off-by: xuejikan --- bundle.json | 2 +- .../datatransmitmgr_fuzzer/BUILD.gn | 16 ++++++------- test/unittest/datatransmitmgr/BUILD.gn | 24 +++++++++---------- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/bundle.json b/bundle.json index 4cdc336..09b45ea 100644 --- a/bundle.json +++ b/bundle.json @@ -22,7 +22,7 @@ "standard" ], "rom": "30KB", - "ram": " ", + "ram": "", "deps": { "components": [ "device_security_level", diff --git a/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn b/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn index 49082e1..ba691a2 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 = "../datatransmitmgr_fuzzer" cflags = [ "-g", @@ -26,20 +26,18 @@ ohos_fuzztest("DataTransmitMgrFuzzTest") { ] include_dirs = [ - "//base/security/dataclassification/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer", - "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include", + "../datatransmitmgr_fuzzer", + "../../../../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", - ] + deps = [ "../../../../interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", diff --git a/test/unittest/datatransmitmgr/BUILD.gn b/test/unittest/datatransmitmgr/BUILD.gn index 58eef50..4c49664 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,19 @@ ohos_unittest("DevSLMgrTest") { subsystem_name = "security" module_out_path = module_output_path - sources = [ "DevSLMgrTest.cpp" ] + include_dirs = [ "../../../interfaces/innerkits/datatransmitmgr/include" ] - 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", + 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