diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn index b05a2c71619d22d4fb37c568c55c2522ff4ac886..4e131e87d26fec20d5bd2d9f95985faec4dce7c3 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 e3629cf62ad1aefdbaee32ab0776fac06d21ea19..8c57f90a5854155566cdb3af58004a66337fd44f 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 e0106a79d2849a5394bd962dd8c177b0bba4b6f4..210c2bbbacdf2c7262c30ff2cdf6dd1368a22f9c 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 2fa4702487f35e78bcbafa78b55e6dcfcbcb9668..b8f3f24bdb8ab6b6dd381dffe914dcc4da156021 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 8120ebb50ec1fffe3ebb0a2515f00a2c719c9e28..a841ba6aea095347c066700233ee51fe25ffda98 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 044a1a6803c2473024879dd8e9e93a66d45aadf5..27249f45eb6aede747ff3a7dadfe5fa40cd3022b 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 b7401c066066f220cef6a27cd64864970fc3b6df..7b3c1f2a86e35fa0b6f5c051301661420e10843e 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 c595ead52fb640f2e89d5536bc20ec998d7a43a6..402a842a2b9f00ef2044e294e98c3a42b3ca3af8 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 30d164b865ff7504f9b5a976503b01d3fb01d9c9..8df5ebaee58cf791f121cd5da52439ac7b9deec6 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 12ff0d36f1a2471a6d166765156a726a2d5a7a36..8852db8985173ec9e94c80e531d6810c3c2d965f 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 2be5556d3645a22f7993b2219fdbf37698f5a2e9..7d84d27c2bb67aba90e06810afc515d9a4a0f519 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 0fca1e5918a9466f0d8c6810d58daf583e908374..ac758b5fb099f49bcedb010c688248df7f808a82 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 7f2603492b86bdf63026072b4e5fc6be2573daee..605903a68e78e60cdac3748a9ae3832e391bd118 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 5a98012890bd6944f6f56f046038ce0e0e432b02..081dd2ca30ec125e85e524c6c166f51273a85c8b 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 01a5d7e58f59b8d5ef989539c6650164a5c17d77..d9485573dd4c1ec6edbc8da01736410666d62d0e 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 92ef4b15600160c19d1e1de4ac8f93c91b6594b9..72390f13fcd9cb2fb5de4258dd7e4744e0d9b46e 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 904b51553a13b2a80502d0d8b662a7bf626b677f..7f773f0c8783c753227dbe7ac6235611bd08eac6 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 c79db1085857927556ea7303ff668692e31c075b..87ddbd2a1ba111d741b878cf65b7f3db550671f0 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 0cf9f230725215f7a079b882481cb9bc82bf3693..38d3c84257250af93ecddfbe6de09264c7797797 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 fc80c90eb71c2b3d62e4544b9172982cc8f0670c..32f153f3fc6b6b8b93f2d345bf837a709092e599 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 97bd5ba28f1d235384f0cc859c532ed2072e20ae..6d69bec7578736595543f4b7b00eea1503394314 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 9ff378294d1d0eacefd2fcebeb246dc318824791..5b686f792b3c90db14caf6cf5615c491a2636b93 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 1f0cc35a521958433abc7965e1d0bba5590a8aef..f37c047465f08512de0205367db15f9c64e9328a 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 6b4f7ae032a80008cbf29a43dbbf8b4cb297a805..9252021015ee050df1214e70abf658f939dda9ec 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 0ee9e2ade010101dfb207cddfc879e977f88896e..328246ace4697bb6c57f53431b05530f77ff5468 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 54534c61e163bc5c765facbcfe9e975ac979e142..bb588f85f353625a963923da27ed0c838459fd7b 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 b12e589984b4c50f700257335b7d380c1be63b95..94f45a4198179b274bd451cc6ffeceec43ae6b56 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 8160aaf1f38ca7b609c94fe263640db29eb3b3dd..d9591910a650268a960d17402879b6574ca80057 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 c9db092dcbc067b3e666d178a325f59b1035cce6..fbfdebf50ae9cd6223c102b80eaf064b5059caec 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 9a7c0c830d71f10a3f342868a9ac63443f6a9750..2ae1796e744ff1822440024ce7581ab3c6b2b9f9 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 77851ad1b8cbbbe1e724b8d20a0ac59a0896f8bb..d373c815713442263d787b034b55b3e7a31393c0 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 cc08fd4fc856304db56ebb5f9382610f5fd8dcb4..96160481713587bbcef647043bfb2ab642f657ba 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 d879746936f681fa1982029d46bef468ca46dc6b..d5ef0095d6a3f6d16fed5006e7f8f255002a6b2b 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", ]