From f534527e78805bbf6fb2f647f8d5f00d1055fd1e Mon Sep 17 00:00:00 2001 From: hongtao Date: Thu, 21 Jul 2022 10:45:46 +0800 Subject: [PATCH] change utils path Signed-off-by: hongtao Change-Id: I3a86395b244c2af9c69a0e4c41b60ace25cdc0ca --- frameworks/accesstoken/BUILD.gn | 9 +++++---- frameworks/common/BUILD.gn | 6 ++---- frameworks/privacy/BUILD.gn | 9 +++++---- interfaces/innerkits/accesstoken/BUILD.gn | 4 ++-- interfaces/innerkits/accesstoken/test/BUILD.gn | 4 ++-- interfaces/innerkits/privacy/BUILD.gn | 4 ++-- interfaces/innerkits/privacy/test/BUILD.gn | 4 ++-- interfaces/innerkits/tokensync/BUILD.gn | 4 ++-- interfaces/innerkits/tokensync/test/BUILD.gn | 3 +-- .../kits/accesstoken/test/benchmarktest/BUILD.gn | 2 +- interfaces/kits/privacy/BUILD.gn | 4 ++-- services/accesstokenmanager/BUILD.gn | 2 +- services/accesstokenmanager/test/BUILD.gn | 8 +++++--- services/privacymanager/BUILD.gn | 2 +- services/tokensyncmanager/BUILD.gn | 2 +- .../test/unittest/token_sync_service/BUILD.gn | 4 ++-- .../access_token/allochaptoken_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/alloclocaltokenid_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/checknativedcap_fuzzer/BUILD.gn | 12 ++++++------ .../clearusergrantedpermissionstate_fuzzer/BUILD.gn | 12 ++++++------ .../deleteremotedevicetokens_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/deleteremotetoken_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/deletetoken_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/getdefpermission_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/getpermissionflags_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/grantpermission_fuzzer/BUILD.gn | 12 ++++++------ .../revokeusergrantedpermission_fuzzer/BUILD.gn | 12 ++++++------ .../setremotehaptokeninfo_fuzzer/BUILD.gn | 12 ++++++------ .../setremotenativetokeninfo_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/updatehaptoken_fuzzer/BUILD.gn | 12 ++++++------ .../verifyaccesstoken001_fuzzer/BUILD.gn | 12 ++++++------ .../access_token/verifyaccesstoken_fuzzer/BUILD.gn | 12 ++++++------ tools/accesstoken/BUILD.gn | 2 +- 33 files changed, 133 insertions(+), 132 deletions(-) diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn index b05a2c716..4e131e87d 100644 --- a/frameworks/accesstoken/BUILD.gn +++ b/frameworks/accesstoken/BUILD.gn @@ -31,7 +31,7 @@ ohos_shared_library("accesstoken_communication_adapter_cxx") { include_dirs = [ "include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] sources = [ @@ -46,7 +46,8 @@ ohos_shared_library("accesstoken_communication_adapter_cxx") { "src/permission_state_full_parcel.cpp", ] - deps = [ "//utils/native/base:utils" ] - - external_deps = [ "ipc:ipc_single" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_single", + ] } diff --git a/frameworks/common/BUILD.gn b/frameworks/common/BUILD.gn index e3629cf62..8c57f90a5 100644 --- a/frameworks/common/BUILD.gn +++ b/frameworks/common/BUILD.gn @@ -37,11 +37,9 @@ ohos_shared_library("accesstoken_common_cxx") { "src/random_mbedtls.cpp", ] - deps = [ - "//third_party/mbedtls:mbedtls_shared", - "//utils/native/base:utils", - ] + deps = [ "//third_party/mbedtls:mbedtls_shared" ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "startup_l2:syspara", ] diff --git a/frameworks/privacy/BUILD.gn b/frameworks/privacy/BUILD.gn index e0106a79d..210c2bbba 100644 --- a/frameworks/privacy/BUILD.gn +++ b/frameworks/privacy/BUILD.gn @@ -22,7 +22,7 @@ ohos_shared_library("privacy_communication_adapter_cxx") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/privacy/include", "//base/security/access_token/frameworks/common/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] sources = [ @@ -33,7 +33,8 @@ ohos_shared_library("privacy_communication_adapter_cxx") { "src/used_record_detail_parcel.cpp", ] - deps = [ "//utils/native/base:utils" ] - - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } diff --git a/interfaces/innerkits/accesstoken/BUILD.gn b/interfaces/innerkits/accesstoken/BUILD.gn index 2fa470248..b8f3f24bd 100644 --- a/interfaces/innerkits/accesstoken/BUILD.gn +++ b/interfaces/innerkits/accesstoken/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("libaccesstoken_sdk") { public_configs = [ ":accesstoken" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "include", "src", "//base/security/access_token/frameworks/accesstoken/include", @@ -46,10 +46,10 @@ ohos_shared_library("libaccesstoken_sdk") { deps = [ "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "//base/security/access_token/frameworks/common:accesstoken_common_cxx", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", "samgr_standard:samgr_proxy", diff --git a/interfaces/innerkits/accesstoken/test/BUILD.gn b/interfaces/innerkits/accesstoken/test/BUILD.gn index 8120ebb50..a841ba6ae 100644 --- a/interfaces/innerkits/accesstoken/test/BUILD.gn +++ b/interfaces/innerkits/accesstoken/test/BUILD.gn @@ -20,7 +20,7 @@ ohos_unittest("libaccesstoken_sdk_test") { module_out_path = part_name + "/" + part_name include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/googletest/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include", @@ -36,10 +36,10 @@ ohos_unittest("libaccesstoken_sdk_test") { "//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", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", ] diff --git a/interfaces/innerkits/privacy/BUILD.gn b/interfaces/innerkits/privacy/BUILD.gn index 044a1a680..27249f45e 100644 --- a/interfaces/innerkits/privacy/BUILD.gn +++ b/interfaces/innerkits/privacy/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("libprivacy_sdk") { public_configs = [ ":pricacy" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "include", "src", "//base/security/access_token/frameworks/privacy/include", @@ -46,10 +46,10 @@ ohos_shared_library("libprivacy_sdk") { deps = [ "//base/security/access_token/frameworks/common:accesstoken_common_cxx", "//base/security/access_token/frameworks/privacy:privacy_communication_adapter_cxx", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/innerkits/privacy/test/BUILD.gn b/interfaces/innerkits/privacy/test/BUILD.gn index b7401c066..7b3c1f2a8 100644 --- a/interfaces/innerkits/privacy/test/BUILD.gn +++ b/interfaces/innerkits/privacy/test/BUILD.gn @@ -19,7 +19,7 @@ ohos_unittest("libprivacy_sdk_test") { module_out_path = part_name + "/" + part_name include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/googletest/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include", @@ -38,9 +38,9 @@ ohos_unittest("libprivacy_sdk_test") { "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//base/security/access_token/services/privacymanager:privacy_manager_service", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "init:libbegetutil", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/innerkits/tokensync/BUILD.gn b/interfaces/innerkits/tokensync/BUILD.gn index c595ead52..402a842a2 100644 --- a/interfaces/innerkits/tokensync/BUILD.gn +++ b/interfaces/innerkits/tokensync/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("libtokensync_sdk") { public_configs = [ ":tokensync" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "include", "src", "//base/security/access_token/frameworks/tokensync/include", @@ -50,10 +50,10 @@ ohos_shared_library("libtokensync_sdk") { deps = [ "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "//base/security/access_token/frameworks/common:accesstoken_common_cxx", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/innerkits/tokensync/test/BUILD.gn b/interfaces/innerkits/tokensync/test/BUILD.gn index 30d164b86..8df5ebaee 100644 --- a/interfaces/innerkits/tokensync/test/BUILD.gn +++ b/interfaces/innerkits/tokensync/test/BUILD.gn @@ -19,7 +19,7 @@ ohos_unittest("libtokensync_sdk_test") { module_out_path = part_name + "/" + part_name include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/googletest/include", "//base/security/access_token/interfaces/innerkits/tokensync/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", @@ -32,7 +32,6 @@ ohos_unittest("libtokensync_sdk_test") { deps = [ #"//base/security/permission/frameworks/permission_standard/permissioninfrastructure:permission_standard_infrastructure_cxx", "//base/security/access_token/interfaces/innerkits/tokensync:libtokensync_sdk", - "//utils/native/base:utils", ] } diff --git a/interfaces/kits/accesstoken/test/benchmarktest/BUILD.gn b/interfaces/kits/accesstoken/test/benchmarktest/BUILD.gn index 12ff0d36f..8852db898 100644 --- a/interfaces/kits/accesstoken/test/benchmarktest/BUILD.gn +++ b/interfaces/kits/accesstoken/test/benchmarktest/BUILD.gn @@ -20,7 +20,7 @@ config("access_token_kits_config_benchmarktest") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/googletest/include", "//base/security/access_token/interfaces/innerkits/token_setproc/include", "//base/security/access_token/frameworks/common/include", diff --git a/interfaces/kits/privacy/BUILD.gn b/interfaces/kits/privacy/BUILD.gn index 2be5556d3..7d84d27c2 100644 --- a/interfaces/kits/privacy/BUILD.gn +++ b/interfaces/kits/privacy/BUILD.gn @@ -21,7 +21,7 @@ ohos_shared_library("libprivacymanager") { "//base/security/access_token/interfaces/innerkits/privacy/include", "//foundation/arkui/napi/interfaces/inner_api", "//foundation/arkui/napi/interfaces/kits", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] sources = [ @@ -33,10 +33,10 @@ ohos_shared_library("libprivacymanager") { deps = [ "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk", "//foundation/arkui/napi:ace_napi", - "//utils/native/base:utils", ] cflags_cc = [ "-DHILOG_ENABLE" ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index 0fca1e591..ac758b5fb 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -77,10 +77,10 @@ ohos_shared_library("accesstoken_manager_service") { "//base/security/access_token/services/accesstokenmanager:access_token.rc", "//base/security/access_token/services/common/database:accesstoken_database_cxx", "//third_party/sqlite:sqlite", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/accesstokenmanager/test/BUILD.gn b/services/accesstokenmanager/test/BUILD.gn index 7f2603492..605903a68 100644 --- a/services/accesstokenmanager/test/BUILD.gn +++ b/services/accesstokenmanager/test/BUILD.gn @@ -31,7 +31,7 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { "//base/security/access_token/services/common/database/include", "//third_party/json/include", "//third_party/googletest/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] sources = [ @@ -53,10 +53,12 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { "//base/security/access_token/services/accesstokenmanager/:accesstoken_manager_service", "//base/security/access_token/services/common/database:accesstoken_database_cxx", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] } group("unittest") { diff --git a/services/privacymanager/BUILD.gn b/services/privacymanager/BUILD.gn index 5a9801289..081dd2ca3 100644 --- a/services/privacymanager/BUILD.gn +++ b/services/privacymanager/BUILD.gn @@ -63,10 +63,10 @@ ohos_shared_library("privacy_manager_service") { "//base/security/access_token/services/common/database:accesstoken_database_cxx", "//base/security/access_token/services/privacymanager:privacy.rc", "//third_party/sqlite:sqlite", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "ipc:ipc_core", diff --git a/services/tokensyncmanager/BUILD.gn b/services/tokensyncmanager/BUILD.gn index 01a5d7e58..d9485573d 100644 --- a/services/tokensyncmanager/BUILD.gn +++ b/services/tokensyncmanager/BUILD.gn @@ -71,7 +71,6 @@ ohos_shared_library("token_sync_manager_service") { "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/services/tokensyncmanager:token_sync.rc", "//third_party/zlib:libz", - "//utils/native/base:utils", ] if (token_sync_enable == true) { @@ -79,6 +78,7 @@ ohos_shared_library("token_sync_manager_service") { } external_deps = [ + "c_utils:utils", "device_manager:devicemanagersdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn index 92ef4b156..72390f13f 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn +++ b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn @@ -47,7 +47,7 @@ ohos_unittest("libtoken_sync_service_sdk_test") { ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/googletest/include", "//base/security/access_token/services/tokensyncmanager/include/service", "//base/security/access_token/services/tokensyncmanager/include/remote", @@ -75,7 +75,6 @@ ohos_unittest("libtoken_sync_service_sdk_test") { "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/zlib:libz", - "//utils/native/base:utils", ] cflags_cc = [ "-DHILOG_ENABLE" ] @@ -85,6 +84,7 @@ ohos_unittest("libtoken_sync_service_sdk_test") { } external_deps = [ + "c_utils:utils", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", diff --git a/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn index 904b51553..7f773f0c8 100644 --- a/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("AllocHapTokenFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/allochaptoken_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("AllocHapTokenFuzzTest") { ] sources = [ "allochaptoken_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn index c79db1085..87ddbd2a1 100644 --- a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("AllocLocalTokenIDFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/alloclocaltokenid_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("AllocLocalTokenIDFuzzTest") { ] sources = [ "alloclocaltokenid_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn b/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn index 0cf9f2307..38d3c8425 100644 --- a/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("CheckNativeDCapFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/checknativedcap_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("CheckNativeDCapFuzzTest") { ] sources = [ "checknativedcap_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn b/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn index fc80c90eb..32f153f3f 100644 --- a/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("ClearUserGrantedPermissionStateFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("ClearUserGrantedPermissionStateFuzzTest") { ] sources = [ "clearusergrantedpermissionstate_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn b/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn index 97bd5ba28..6d69bec75 100644 --- a/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("DeleteRemoteDeviceTokensFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("DeleteRemoteDeviceTokensFuzzTest") { ] sources = [ "deleteremotedevicetokens_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn index 9ff378294..5b686f792 100644 --- a/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("DeleteRemoteTokenFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/deleteremotetoken_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("DeleteRemoteTokenFuzzTest") { ] sources = [ "deleteremotetoken_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn index 1f0cc35a5..f37c04746 100644 --- a/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("DeleteTokenFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/deletetoken_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("DeleteTokenFuzzTest") { ] sources = [ "deletetoken_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn b/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn index 6b4f7ae03..925202101 100644 --- a/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("GetDefPermissionFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/getdefpermission_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/frameworks/common/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("GetDefPermissionFuzzTest") { ] sources = [ "getdefpermission_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn b/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn index 0ee9e2ade..328246ace 100644 --- a/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("GetPermissionFlagsFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/getpermissionflags_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("GetPermissionFlagsFuzzTest") { ] sources = [ "getpermissionflags_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn b/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn index 54534c61e..bb588f85f 100644 --- a/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("GrantPermissionFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/grantpermission_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("GrantPermissionFuzzTest") { ] sources = [ "grantpermission_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn b/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn index b12e58998..94f45a419 100644 --- a/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("RevokeUserGrantedPermissionFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("RevokeUserGrantedPermissionFuzzTest") { ] sources = [ "revokeusergrantedpermission_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn b/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn index 8160aaf1f..d9591910a 100644 --- a/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("SetRemoteHapTokenInfoFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("SetRemoteHapTokenInfoFuzzTest") { ] sources = [ "setremotehaptokeninfo_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn b/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn index c9db092dc..fbfdebf50 100644 --- a/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("SetRemoteNativeTokenInfoFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("SetRemoteNativeTokenInfoFuzzTest") { ] sources = [ "setremotenativetokeninfo_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn index 9a7c0c830..2ae1796e7 100644 --- a/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("UpdateHapTokenFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/updatehaptoken_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("UpdateHapTokenFuzzTest") { ] sources = [ "updatehaptoken_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn b/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn index 77851ad1b..d373c8157 100644 --- a/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("VerifyAccessToken001FuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/verifyaccesstoken001_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("VerifyAccessToken001FuzzTest") { ] sources = [ "verifyaccesstoken001_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn index cc08fd4fc..961604817 100644 --- a/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn @@ -21,7 +21,7 @@ ohos_fuzztest("VerifyAccessTokenFuzzTest") { fuzz_config_file = "//base/security/access_token/test/fuzztest/access_token/verifyaccesstoken_fuzzer" include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] cflags = [ @@ -32,12 +32,12 @@ ohos_fuzztest("VerifyAccessTokenFuzzTest") { ] sources = [ "verifyaccesstoken_fuzzer.cpp" ] - deps = [ - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//utils/native/base:utils", - ] + deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", diff --git a/tools/accesstoken/BUILD.gn b/tools/accesstoken/BUILD.gn index d87974693..d5ef0095d 100644 --- a/tools/accesstoken/BUILD.gn +++ b/tools/accesstoken/BUILD.gn @@ -35,7 +35,6 @@ ohos_source_set("tools_atm_source_set") { "${ability_runtime_path}/tools/aa:aa", "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk", - "//utils/native/base:utils", ] cflags = [ "-DHILOG_ENABLE" ] @@ -46,6 +45,7 @@ ohos_source_set("tools_atm_source_set") { external_deps = [ "bundle_framework:appexecfwk_core", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] -- Gitee